Subversion Repositories pyscrabble

Compare Revisions

Ignore whitespace Rev 24 → Rev 23

/tags/1.6.2-4/debian/pyscrabble.desktop
File deleted
/tags/1.6.2-4/debian/pyscrabble-server.install
File deleted
/tags/1.6.2-4/debian/watch
File deleted
/tags/1.6.2-4/debian/pyscrabble-server.README.Debian
File deleted
/tags/1.6.2-4/debian/copyright
File deleted
/tags/1.6.2-4/debian/pyscrabble-server.postinst
File deleted
/tags/1.6.2-4/debian/pyscrabble-server.default
File deleted
/tags/1.6.2-4/debian/pyscrabble-server.postrm
File deleted
/tags/1.6.2-4/debian/control
File deleted
/tags/1.6.2-4/debian/pyscrabble-common.install
File deleted
/tags/1.6.2-4/debian/compat
File deleted
/tags/1.6.2-4/debian/pyscrabble.svg
File deleted
/tags/1.6.2-4/debian/patches/10_installation.dpatch
File deleted
Property changes:
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: tags/1.6.2-4/debian/patches/20_serverlist_timeout.dpatch
===================================================================
--- tags/1.6.2-4/debian/patches/20_serverlist_timeout.dpatch (revision 24)
+++ tags/1.6.2-4/debian/patches/20_serverlist_timeout.dpatch (nonexistent)
@@ -1,29 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 20_serverlist_timeout.dpatch by Ron Bentley <rtbentley@gmail.com>
-##
-## DP: Lower connection timeout when building server list to avoid
-## DP: hanging for a long time when one or more servers are unresponsive.
-
-@DPATCH@
-
---- pyscrabble-1.6.2~/pyscrabble/gui/register.py 2008-04-20 23:14:07.000000000 -0400
-+++ pyscrabble-1.6.2/pyscrabble/gui/register.py 2008-04-20 23:18:25.000000000 -0400
-@@ -62,6 +62,9 @@
- return
-
- self.serverList.clear()
-+
-+ defTimeout = socket.getdefaulttimeout()
-+ socket.setdefaulttimeout(6)
-
- for host,g_port,w_port,location in self.servers:
-
-@@ -73,6 +76,8 @@
- numUsers="N/A"
-
- self.serverList.append( (host,location, numUsers) )
-+
-+ socket.setdefaulttimeout(defTimeout)
-
- self.toolBar.set_sensitive(True)
-
Index: tags/1.6.2-4/debian/patches/00list
===================================================================
--- tags/1.6.2-4/debian/patches/00list (revision 24)
+++ tags/1.6.2-4/debian/patches/00list (nonexistent)
@@ -1,3 +0,0 @@
-10_installation
-20_about_close
-20_serverlist_timeout
Index: tags/1.6.2-4/debian/patches/20_about_close.dpatch
===================================================================
--- tags/1.6.2-4/debian/patches/20_about_close.dpatch (revision 24)
+++ tags/1.6.2-4/debian/patches/20_about_close.dpatch (nonexistent)
@@ -1,18 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 20_about_close.dpatch by Magnus Holmgren <magnus@kibibyte.se>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Make the Close button in the About dialog work
-
-@DPATCH@
-diff -urNad trunk~/pyscrabble/gtkutil.py trunk/pyscrabble/gtkutil.py
---- trunk~/pyscrabble/gtkutil.py 2006-12-05 15:49:00.000000000 +0100
-+++ trunk/pyscrabble/gtkutil.py 2007-10-03 16:30:51.000000000 +0200
-@@ -73,6 +73,7 @@
- dialog.set_translator_credits(_('translator-credits'))
- gtk.about_dialog_set_url_hook(util.showUrl, data=constants.ONLINE_SITE)
- dialog.set_version(constants.VERSION)
-+ dialog.connect("response", lambda d, r: d.destroy())
- dialog.show()
-
- def getSelectedItem(view, col):
/tags/1.6.2-4/debian/patches/20_about_close.dpatch
Property changes:
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: tags/1.6.2-4/debian/changelog
===================================================================
--- tags/1.6.2-4/debian/changelog (revision 24)
+++ tags/1.6.2-4/debian/changelog (nonexistent)
@@ -1,76 +0,0 @@
-pyscrabble (1.6.2-4) unstable; urgency=low
-
- * Merge changes from Ubuntu, except for the Replaces added to deal with
- the typo in in 1.6.2-3ubuntu3, which should be gone by now.
- * Move pyscrabble-server from /usr/games to /usr/sbin (Closes: #506811).
- * debian/rules: Drop the call to dh_desktop.
- * Upgrade to Standards-Version 3.8.3.
- + Add debian/README.source.
- * debian/rules: Rearrange targets.
-
- -- Magnus Holmgren <holmgren@debian.org> Tue, 22 Sep 2009 09:15:42 +0200
-
-pyscrabble (1.6.2-3ubuntu4) jaunty; urgency=low
-
- * debian/pyscrabble-common.install: resolve typographic error (LP: #362080)
-
- -- Brian Murray <brian@ubuntu.com> Thu, 16 Apr 2009 15:18:46 -0700
-
-pyscrabble (1.6.2-3ubuntu3) jaunty; urgency=low
-
- * debian/rules: pass --prefix=/usr to setup.py install, without which
- the package tries to install to /usr/local under python2.6.
-
- -- Steve Langasek <steve.langasek@ubuntu.com> Tue, 14 Apr 2009 13:01:54 +0000
-
-pyscrabble (1.6.2-3ubuntu2) jaunty; urgency=low
-
- * Revert the previous change; python2.4-zodb no longer exists, and
- depending on python2.4-zodb never gave correct results anyway because
- we were depending on python instead of python2.4 for the interpreter.
- * debian/pyscrabble-{common,server}.install: installation now to python
- dist-packages directory, instead of site-packages. (This will require
- a fix for bug 350016 in python2.6 before it can be built.)
-
- -- Steve Langasek <steve.langasek@ubuntu.com> Mon, 13 Apr 2009 07:08:06 +0000
-
-pyscrabble (1.6.2-3ubuntu1) intrepid; urgency=low
-
- * Modify dependency python-zodb to python2.4-zodb in debian/control
- for the python-zodb -> python2.4-zodb transition (LP: #262713)
-
- -- Riccardo Coccioli <volans@ubuntu.com> Fri, 29 Aug 2008 18:11:03 +0200
-
-pyscrabble (1.6.2-3) unstable; urgency=low
-
- * Acknowledge NMU (Closes: #471077).
- * New maintainer email address.
- * Remove XS- from Vcs field names.
- * Bump Standards-Version to 3.7.3. No changes necessary.
- * Lower connection timeout when checking servers to avoid extremely long
- delays (Closes: #473598). Thanks to Ron Bentley.
-
- -- Magnus Holmgren <holmgren@debian.org> Thu, 01 May 2008 23:35:04 +0200
-
-pyscrabble (1.6.2-2.1) unstable; urgency=low
-
- * Non-maintainer upload to solve release goal.
- * Add LSB dependency header to init.d scripts (Closes: #471077).
-
- -- Petter Reinholdtsen <pere@debian.org> Sun, 30 Mar 2008 15:18:15 +0200
-
-pyscrabble (1.6.2-2) unstable; urgency=low
-
- * Move /usr/share/games/pyscrabble/letters from pyscrabble-server to
- pyscrabble-common (Closes: #446571).
- * Add lsb-base dependency to pyscrabble-server.
- * Lower pyscrabble-server priority to "extra".
-
- -- Magnus Holmgren <magnus@kibibyte.se> Sun, 14 Oct 2007 10:30:15 +0200
-
-pyscrabble (1.6.2-1) unstable; urgency=low
-
- * Initial release (Closes: #416137).
-
- -- Magnus Holmgren <magnus@kibibyte.se> Wed, 03 Oct 2007 17:11:14 +0200
-
Index: tags/1.6.2-4/debian/pyscrabble.menu
===================================================================
--- tags/1.6.2-4/debian/pyscrabble.menu (revision 24)
+++ tags/1.6.2-4/debian/pyscrabble.menu (nonexistent)
@@ -1,8 +0,0 @@
-?package(pyscrabble):\
- needs="X11"\
- section="Games/Board"\
- title="PyScrabble"\
- longtitle="A classic word game"\
- command="/usr/games/pyscrabble"\
- icon16x16="/usr/share/pixmaps/pyscrabble-16x16.xpm"\
- icon32x32="/usr/share/pixmaps/pyscrabble-32x32.xpm"
Index: tags/1.6.2-4/debian/rules
===================================================================
--- tags/1.6.2-4/debian/rules (revision 24)
+++ tags/1.6.2-4/debian/rules (nonexistent)
@@ -1,99 +0,0 @@
-#!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-DESTDIR=$(CURDIR)/debian/tmp
-ICON_SIZES=16 22 32 48 64 96
-PIXMAP_SIZES=16 32
-
-include /usr/share/dpatch/dpatch.make
-
-unpatch: clean-patched
-clean: unpatch
- dh_clean
-
-clean-patched: patch-stamp
- dh_testdir
- dh_testroot
- rm -f build-stamp
- rm -f pyscrabble-*.png pyscrabble-*.xpm
-
- python setup.py clean -a
- find -name '*.pyc' -delete
-
-build: build-stamp
-build-stamp: patch-stamp
- python setup.py build
-
- for size in $(ICON_SIZES); do \
- rsvg -h $$size -w $$size debian/pyscrabble.svg pyscrabble-$$size.png; \
- done
- for size in $(PIXMAP_SIZES); do \
- convert pyscrabble-$$size.png pyscrabble-$${size}x$${size}.xpm; \
- done
- touch "$@"
-
-install: build
- dh_testdir
- dh_testroot
- dh_clean -k
-
- python setup.py install --no-compile --root=$(DESTDIR) \
- --prefix=/usr \
- --install-scripts=/usr/games \
- --confdir=/etc/pyscrabble \
- --logdir=/var/log/pyscrabble \
- --dbdir=/var/lib/pyscrabble
- install -m755 -d $(DESTDIR)/usr/sbin
- mv $(DESTDIR)/usr/games/pyscrabble-main.py $(DESTDIR)/usr/games/pyscrabble
- mv $(DESTDIR)/usr/games/server_console.py $(DESTDIR)/usr/sbin/pyscrabble-server
-# rm $(DESTDIR)/usr/bin/db_upgrade.py
- install -m755 -d $(DESTDIR)/usr/share/pixmaps
- install -m644 pyscrabble-*.xpm $(DESTDIR)/usr/share/pixmaps
- install -m755 -d $(DESTDIR)/usr/share/icons/hicolor/scalable/apps
- gzip < debian/pyscrabble.svg > $(DESTDIR)/usr/share/icons/hicolor/scalable/apps/pyscrabble.svgz
- for size in $(ICON_SIZES); do \
- install -m755 -d $(DESTDIR)/usr/share/icons/hicolor/$${size}x$${size}/apps; \
- install -m644 pyscrabble-$$size.png \
- $(DESTDIR)/usr/share/icons/hicolor/$${size}x$${size}/apps/pyscrabble.png; \
- done
- install -d -m755 $(DESTDIR)/usr/share/applications/
- install -m644 debian/pyscrabble.desktop $(DESTDIR)/usr/share/applications/
-
-
-
-# Build architecture-dependent files here.
-binary-arch:
-# We have nothing to do by default.
-
-# Build architecture-independent files here.
-binary-indep: build install
- dh_testdir
- dh_testroot
- dh_install --sourcedir=debian/tmp
- dh_link
- dh_pycentral
- dh_installchangelogs CHANGELOG.txt
- dh_installdocs
- dh_installexamples
- dh_installman
- dh_installinit -r
- dh_installmenu
- dh_strip
- dh_compress
- dh_fixperms
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
/tags/1.6.2-4/debian/rules
Property changes:
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: tags/1.6.2-4/debian/pyscrabble.install
===================================================================
--- tags/1.6.2-4/debian/pyscrabble.install (revision 24)
+++ tags/1.6.2-4/debian/pyscrabble.install (nonexistent)
@@ -1,10 +0,0 @@
-usr/games/pyscrabble
-usr/lib/python*/site-packages/pyscrabble/gui
-usr/lib/python*/site-packages/pyscrabble/net/client.py
-usr/lib/python*/site-packages/pyscrabble/gtk*.py
-usr/share/icons
-usr/share/pixmaps
-usr/share/applications
-usr/share/games/pyscrabble/sounds
-usr/share/games/pyscrabble/images
-usr/share/games/pyscrabble/locale
Index: tags/1.6.2-4/debian/pyscrabble-server.init
===================================================================
--- tags/1.6.2-4/debian/pyscrabble-server.init (revision 24)
+++ tags/1.6.2-4/debian/pyscrabble-server.init (nonexistent)
@@ -1,115 +0,0 @@
-#!/bin/sh
-### BEGIN INIT INFO
-# Provides: pyscrabble-server
-# Required-Start: $local_fs $remote_fs
-# Required-Stop: $local_fs $remote_fs
-# Default-Start: 2 3 4 5
-# Default-Stop: 0 1 6
-# Short-Description: PyScrabble server
-# Description: Controls the PyScrabble server
-### END INIT INFO
-
-set -e
-
-PATH=/sbin:/bin:/usr/bin
-DESC="PyScrabble server"
-NAME=python
-NAME2=pyscrabble-server
-DAEMON=/usr/sbin/pyscrabble-server
-PIDFILE=/var/run/$NAME2.pid
-SCRIPTNAME=/etc/init.d/$NAME2
-
-# Gracefully exit if the package has been removed.
-test -x $DAEMON || exit 0
-
-. /lib/lsb/init-functions
-
-USER="pyscrabble"
-
-# Read config file if it is present.
-if [ -r /etc/default/$NAME2 ]; then
- . /etc/default/$NAME2
-fi
-
-d_running() {
- start-stop-daemon --stop --quiet --pidfile $PIDFILE \
- --name $NAME --test > /dev/null
-}
-
-#
-# Function that starts the daemon/service.
-#
-d_start() {
- start-stop-daemon --start --oknodo --quiet --pidfile $PIDFILE --name $NAME \
- --background --make-pidfile --chuid "$USER" --startas $DAEMON
-}
-
-#
-# Function that stops the daemon/service.
-#
-d_stop() {
- start-stop-daemon --stop --oknodo --quiet --pidfile $PIDFILE --name $NAME
- rm -f $PIDFILE
-}
-
-case "$1" in
- start)
- log_daemon_msg "Starting $DESC" "$NAME2"
- if d_running; then
- log_progress_msg "already running"
- else
- d_start;
- fi
- log_end_msg 0
- ;;
- stop)
- log_daemon_msg "Stopping $DESC" "$NAME2"
- if ! d_running; then
- log_progress_msg "not running"
- else
- d_stop
- fi
- log_end_msg 0
- ;;
- #reload)
- #
- # If the daemon can reload its configuration without
- # restarting (for example, when it is sent a SIGHUP),
- # then implement that here.
- #
- # If the daemon responds to changes in its config file
- # directly anyway, make this an "exit 0".
- #
- # echo -n "Reloading $DESC configuration..."
- # d_reload
- # echo "done."
- #;;
- restart|force-reload)
- #
- # If the "reload" option is implemented, move the "force-reload"
- # option to the "reload" entry above. If not, "force-reload" is
- # just the same as "restart".
- #
- log_daemon_msg "Restarting $DESC" "$NAME2"
- d_stop
- # One second might not be time enough for a daemon to stop,
- # if this happens, d_start will fail (and dpkg will break if
- # the package is being upgraded). Change the timeout if needed
- # be, or change d_stop to have start-stop-daemon use --retry.
- # Notice that using --retry slows down the shutdown process somewhat.
- sleep 1
- d_start
- log_end_msg 0
- ;;
- status)
- d_running || status="not "
- log_action_msg "Status of $DESC:" "${status}running"
- ;;
- *)
- # echo "Usage: $SCRIPTNAME {start|stop|restart|reload|force-reload}" >&2
- echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload}" >&2
- exit 1
- ;;
-esac
-
-exit 0
Index: tags/1.6.2-4/debian/README.source
===================================================================
--- tags/1.6.2-4/debian/README.source (revision 24)
+++ tags/1.6.2-4/debian/README.source (nonexistent)
@@ -1,8 +0,0 @@
-This package uses dpatch to manage all modifications to the upstream
-source. Changes are stored in the source package as diffs in
-debian/patches and applied during the build. For basic usage
-information, see
-
- /usr/share/doc/dpatch/README.source.gz
-
-(after installing dpatch).
Index: tags/1.6.2-4/debian
===================================================================
--- tags/1.6.2-4/debian (revision 24)
+++ tags/1.6.2-4/debian (nonexistent)
/tags/1.6.2-4/debian
Property changes:
Deleted: mergeWithUpstream
## -1 +0,0 ##
-1
\ No newline at end of property