Subversion Repositories pyscrabble

Compare Revisions

Ignore whitespace Rev 17 → Rev 16

/tags/1.6.2-3/debian/watch
File deleted
/tags/1.6.2-3/debian/pyscrabble-server.README.Debian
File deleted
/tags/1.6.2-3/debian/copyright
File deleted
/tags/1.6.2-3/debian/pyscrabble-server.postinst
File deleted
/tags/1.6.2-3/debian/pyscrabble-server.default
File deleted
/tags/1.6.2-3/debian/pyscrabble-server.postrm
File deleted
/tags/1.6.2-3/debian/control
File deleted
/tags/1.6.2-3/debian/pyscrabble-common.install
File deleted
/tags/1.6.2-3/debian/compat
File deleted
/tags/1.6.2-3/debian/pyscrabble.svg
File deleted
/tags/1.6.2-3/debian/changelog
File deleted
/tags/1.6.2-3/debian/patches/20_about_close.dpatch
File deleted
Property changes:
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: 1.6.2-3/debian/patches/10_installation.dpatch
===================================================================
--- 1.6.2-3/debian/patches/10_installation.dpatch (revision 17)
+++ 1.6.2-3/debian/patches/10_installation.dpatch (nonexistent)
@@ -1,352 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 10_installation.dpatch by Magnus Holmgren <magnus@kibibyte.se>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Mostly adapt server to run as a daemon
-
-@DPATCH@
-
---- pyscrabble-1.6.2.orig/pyscrabble/net/server.py
-+++ pyscrabble-1.6.2/pyscrabble/net/server.py
-@@ -46,7 +46,7 @@
- self.db = db.DB()
- self.maxUsersLoggedIn = 0
- self.startDate = util.Time(seconds=time.time(), dispDate=True)
-- self.rankings = rank.Rankings( resources["config"][constants.RANK_CONFIG] )
-+ self.rankings = rank.Rankings( resources["serverconfig"][constants.RANK_CONFIG] )
-
- dir = resources["resources"][constants.DICT_DIR].path
- for lang in os.listdir( dir ):
---- pyscrabble-1.6.2.orig/pyscrabble/dist.py
-+++ pyscrabble-1.6.2/pyscrabble/dist.py
-@@ -1,8 +1,6 @@
- import glob
- import os
- import sys
--from distutils.command.install_lib import install_lib
--from distutils.command.install_scripts import install_scripts
-
- APP_NAME = 'pyscrabble'
-
-@@ -31,50 +29,13 @@
- RESOURCE_PREFIX = 'resources'
-
- CONFIG_DIR = get_app_data_dir()
--if not os.path.exists(CONFIG_DIR):
-- CONFIG_DIR = os.path.join(RESOURCE_PREFIX, 'config')
-
--def getLocaleDirs(dir, domain):
-- l = []
--
-- langs = os.listdir( dir )
-- for lang in langs:
-- d = os.path.join(dir,lang,"LC_MESSAGES")
-- path = os.path.join(d, '%s.mo' % domain)
-- l.append( (d,[path]) )
--
-- return l
--
--def getResourceDirs(dir, ensureLower=True, basePath = None, outdir=None):
-- result = []
-- absolute = os.path.abspath(dir)
--
-- base = basePath
-- if base is None:
-- base = os.path.dirname(absolute)
-- else:
-- base = os.path.dirname( os.path.abspath(base) )
--
-- for root, dirs, files in os.walk(absolute):
-- if ensureLower and not os.path.basename(root).islower(): continue
-- if len(files) > 0:
-- f = []
-- d = root[len(base)+1:]
-- if outdir is not None:
-- d = os.path.join(outdir, d)
-- for file in files:
-- f.append( os.path.join(root, file) )
-- result.append( (d, f) )
-- return result
--
--def getDataFiles():
-- return getLocaleDirs('resources/locale',APP_NAME) + \
-- [('resources/images', glob.glob('resources/images/*.*')), \
-- ('resources/sounds', glob.glob('resources/sounds/*.*')), \
-- ('config', glob.glob('resources/config/*.cfg')), \
-- ('resources/web', glob.glob('resources/web/*.*'))] + \
-- getResourceDirs('resources/dict', True, 'resources') + \
-- getResourceDirs('resources/letters', True, 'resources')
-+try:
-+ from __installed__ import SERVER_LOG_DIR, SERVER_DB_DIR, SERVER_CONFIG_DIR
-+except ImportError:
-+ SERVER_CONFIG_DIR = os.path.join(RESOURCE_PREFIX, 'config')
-+ SERVER_DB_DIR = CONFIG_DIR
-+ SERVER_LOG_DIR = CONFIG_DIR
-
- def ensure_config_dir(dir):
- '''
-@@ -86,45 +47,6 @@
- os.makedirs(dir)
-
-
--class InstallScripts(install_scripts):
-- '''
-- install_scripts handler to strip any possible ^M's from files so they will run properly on unix
-- '''
--
-- def run(self):
-- install_scripts.run(self)
-- for file in self.get_outputs():
-- self.fix(file)
--
-- def fix(self, path):
-- f = open(path, "rb")
-- data = f.read().replace("\r\n", "\n")
-- f.close()
-- f = open(path, "w")
-- f.write(data)
-- f.close()
--
--
--class InstallLib(install_lib):
--
-- def generate_template(self):
-- filename = os.path.join(self.build_dir, APP_NAME, '__installed__.py')
-- self.mkpath(os.path.dirname(filename))
--
-- install = self.distribution.get_command_obj('install')
-- datadir = os.path.join(install.prefix, 'share', APP_NAME)
--
-- fp = open(filename, 'w')
-- fp.write('# Generated by setup.py do not modify\n')
-- fp.write("RESOURCE_PREFIX = '%s'\n" % datadir)
-- fp.close()
--
-- return filename
--
-- def install(self):
-- template = self.generate_template()
-- return install_lib.install(self) + [template]
--
- class Resource(object):
- '''
- Filesystem resource
---- pyscrabble-1.6.2.orig/pyscrabble/db.py
-+++ pyscrabble-1.6.2/pyscrabble/db.py
-@@ -1,5 +1,4 @@
- from pyscrabble import constants
--from pyscrabble import manager
- from ZODB import FileStorage, DB as _DB
- import transaction
-
-@@ -12,8 +11,10 @@
- '''
- Initialize the connection to the DB
- '''
-- r = manager.ResourceManager()
-- path = r["config"][constants.DB_LOCATION]
-+ import os
-+ from pyscrabble import dist
-+
-+ path = os.path.join(dist.SERVER_DB_DIR, constants.DB_LOCATION)
-
- storage = FileStorage.FileStorage(path)
- db = _DB(storage)
---- pyscrabble-1.6.2.orig/pyscrabble/manager.py
-+++ pyscrabble-1.6.2/pyscrabble/manager.py
-@@ -36,6 +36,7 @@
- '''
- self.loaded = True
-
-+ self["serverconfig"] = dist.Resource( dist.SERVER_CONFIG_DIR )
- self["config"] = dist.Resource( dist.CONFIG_DIR )
- self["resources"] = dist.Resource( dist.RESOURCE_PREFIX )
-
---- pyscrabble-1.6.2.orig/server_console.py
-+++ pyscrabble-1.6.2/server_console.py
-@@ -76,15 +76,15 @@
- '''
- Configure the server
- '''
-- dist.ensure_config_dir(dist.CONFIG_DIR)
-+ dist.ensure_config_dir(dist.SERVER_CONFIG_DIR)
- resources = manager.ResourceManager()
- logging.basicConfig(level=logging.DEBUG,
- format='%(asctime)s %(name)s %(levelname)s %(message)s',
-- filename=resources["config"][constants.LOG_FILE],
-- filemode='w')
-+ filename=os.path.join(dist.SERVER_LOG_DIR, constants.LOG_FILE),
-+ filemode='a')
-
-
-- config = resources["config"][constants.SERVER_CONSOLE_CONFIG]
-+ config = resources["serverconfig"][constants.SERVER_CONSOLE_CONFIG]
-
- if not os.path.exists(config):
- raise IOError, "%s must exist in %s" % (constants.SERVER_CONSOLE_CONFIG, resources["config"].path)
---- pyscrabble-1.6.2.orig/setup.py
-+++ pyscrabble-1.6.2/setup.py
-@@ -7,20 +7,130 @@
- HAS_PY2EXE = False
- import glob
- import os
--import pkg_resources
-+#import pkg_resources
- import sys
-+from distutils.command.install_lib import install_lib
-+from distutils.command.install_scripts import install_scripts
-+from distutils.command.install_data import install_data
-+from distutils.command.install import install
- from pyscrabble.constants import VERSION
- from pyscrabble import util
- from pyscrabble import dist
-
--def fix_path(item):
-- if type(item) in (list, tuple):
-- if 'config' in item[0]:
-- return (item[0].replace('config', dist.get_app_data_dir()), item[1])
-- else:
-- return (item[0].replace('resources/', 'share/pyscrabble/'), item[1])
-+
-+def getLocaleDirs(dir, domain):
-+ l = []
-+
-+ langs = os.listdir( dir )
-+ for lang in langs:
-+ d = os.path.join(dir,lang,"LC_MESSAGES")
-+ path = os.path.join(d, '%s.mo' % domain)
-+ l.append( (d,[path]) )
-+
-+ return l
-+
-+def getResourceDirs(dir, ensureLower=True, basePath = None, outdir=None):
-+ result = []
-+ absolute = os.path.abspath(dir)
-+
-+ base = basePath
-+ if base is None:
-+ base = os.path.dirname(absolute)
- else:
-- return item
-+ base = os.path.dirname( os.path.abspath(base) )
-+
-+ for root, dirs, files in os.walk(absolute):
-+ if ensureLower and not os.path.basename(root).islower(): continue
-+ if len(files) > 0:
-+ f = []
-+ d = root[len(base)+1:]
-+ if outdir is not None:
-+ d = os.path.join(outdir, d)
-+ for file in files:
-+ f.append( os.path.join(root, file) )
-+ result.append( (d, f) )
-+ return result
-+
-+def getDataFiles():
-+ return getLocaleDirs('resources/locale',dist.APP_NAME) + \
-+ [('resources/images', glob.glob('resources/images/*.*')), \
-+ ('resources/sounds', glob.glob('resources/sounds/*.*')), \
-+ ('config', glob.glob('resources/config/*.cfg')), \
-+ ('resources/web', glob.glob('resources/web/*.*'))] + \
-+ getResourceDirs('resources/dict', True, 'resources') + \
-+ getResourceDirs('resources/letters', True, 'resources')
-+
-+class InstallScripts(install_scripts):
-+ '''
-+ install_scripts handler to strip any possible ^Ms from files so they will run properly on unix
-+ '''
-+
-+ def run(self):
-+ install_scripts.run(self)
-+ for file in self.get_outputs():
-+ self.fix(file)
-+
-+ def fix(self, path):
-+ f = open(path, "rb")
-+ data = f.read().replace("\r\n", "\n")
-+ f.close()
-+ f = open(path, "w")
-+ f.write(data)
-+ f.close()
-+
-+
-+class InstallLib(install_lib):
-+
-+ def generate_template(self):
-+ filename = os.path.join(self.build_dir, dist.APP_NAME, '__installed__.py')
-+ self.mkpath(os.path.dirname(filename))
-+
-+ install = self.distribution.get_command_obj('install')
-+ datadir = os.path.join(install.prefix, 'share', 'games', dist.APP_NAME)
-+
-+ fp = open(filename, 'w')
-+ fp.write('# Generated by setup.py do not modify\n')
-+ fp.write("RESOURCE_PREFIX = %r\n" % datadir)
-+ fp.write("SERVER_CONFIG_DIR = %r\n" % install.confdir)
-+ fp.write("SERVER_DB_DIR = %r\n" % install.dbdir)
-+ fp.write("SERVER_LOG_DIR = %r\n" % install.logdir)
-+ fp.close()
-+
-+ return filename
-+
-+ def install(self):
-+ template = self.generate_template()
-+ return install_lib.install(self) + [template]
-+
-+class InstallData(install_data):
-+ def fix_path(self, item):
-+ install = self.distribution.get_command_obj('install')
-+ if type(item) in (list, tuple):
-+ if 'config' in item[0]:
-+ return (item[0].replace('config', install.confdir), item[1])
-+ else:
-+ return (item[0].replace('resources/', 'share/games/pyscrabble/'), item[1])
-+ else:
-+ return item
-+
-+ def finalize_options(self):
-+ self.data_files = [ self.fix_path(f) for f in self.data_files ]
-+ install_data.finalize_options(self)
-+
-+class Install(install):
-+ user_options = install.user_options + [ ('logdir=', None, "log directory"),
-+ ('dbdir=', None, "database directory"),
-+ ('confdir=', None, "configuration directory") ]
-+
-+ def initialize_options(self):
-+ self.logdir = None
-+ self.dbdir = None
-+ self.confdir = None
-+ install.initialize_options(self)
-+
-+ def finalize_options(self):
-+ print self.logdir
-+ install.finalize_options(self)
-
- kwargs = {
- 'name': 'pyscrabble',
-@@ -28,7 +138,7 @@
- 'author': 'Kevin Conaway',
- 'author_email': 'kevin.a.conaway@gmail.com',
- 'url': 'http://pyscrabble.sourceforge.net',
-- 'data_files': dist.getDataFiles(),
-+ 'data_files': getDataFiles(),
- 'packages': ['pyscrabble', 'pyscrabble.command', 'pyscrabble.game', 'pyscrabble.gui', 'pyscrabble.net']
- }
-
-@@ -77,10 +187,10 @@
- kwargs['data_files'] += [('.', ['CHANGELOG.txt'])]
- kwargs['data_files'] += [('.', ['LICENSE.txt'])]
- #for egg in eggpacks:
-- # kwargs['data_files'] += dist.getResourceDirs(egg.location, ensureLower=False, basePath=None, outdir='extra')
-+ # kwargs['data_files'] += getResourceDirs(egg.location, ensureLower=False, basePath=None, outdir='extra')
- else:
- kwargs['scripts'] = ['pyscrabble-main.py', 'server_console.py', 'db_upgrade.py']
-- kwargs['data_files'] = [fix_path(x) for x in kwargs['data_files']]
-- kwargs['cmdclass'] = {'install_lib': dist.InstallLib, 'install_scripts' : dist.InstallScripts}
-+ # kwargs['data_files'] = [fix_path(x) for x in kwargs['data_files']]
-+ kwargs['cmdclass'] = {'install': Install, 'install_lib': InstallLib, 'install_scripts' : InstallScripts, 'install_data': InstallData}
-
--setup(**kwargs)
-\ No newline at end of file
-+setup(**kwargs)
/1.6.2-3/debian/patches/10_installation.dpatch
Property changes:
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: 1.6.2-3/debian/patches/20_serverlist_timeout.dpatch
===================================================================
--- 1.6.2-3/debian/patches/20_serverlist_timeout.dpatch (revision 17)
+++ 1.6.2-3/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: 1.6.2-3/debian/patches/00list
===================================================================
--- 1.6.2-3/debian/patches/00list (revision 17)
+++ 1.6.2-3/debian/patches/00list (nonexistent)
@@ -1,3 +0,0 @@
-10_installation
-20_about_close
-20_serverlist_timeout
Index: 1.6.2-3/debian/pyscrabble.menu
===================================================================
--- 1.6.2-3/debian/pyscrabble.menu (revision 17)
+++ 1.6.2-3/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: 1.6.2-3/debian/rules
===================================================================
--- 1.6.2-3/debian/rules (revision 17)
+++ 1.6.2-3/debian/rules (nonexistent)
@@ -1,95 +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
-
-clean: clean-patched 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: 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
-
-install: build
- dh_testdir
- dh_testroot
- dh_clean -k
-
- python setup.py install --no-compile --root=$(DESTDIR) \
- --install-scripts=/usr/games \
- --confdir=/etc/pyscrabble \
- --logdir=/var/log/pyscrabble \
- --dbdir=/var/lib/pyscrabble
- mv $(DESTDIR)/usr/games/pyscrabble-main.py $(DESTDIR)/usr/games/pyscrabble
- mv $(DESTDIR)/usr/games/server_console.py $(DESTDIR)/usr/games/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_desktop
- 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
/1.6.2-3/debian/rules
Property changes:
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: 1.6.2-3/debian/pyscrabble.install
===================================================================
--- 1.6.2-3/debian/pyscrabble.install (revision 17)
+++ 1.6.2-3/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: 1.6.2-3/debian/pyscrabble-server.init
===================================================================
--- 1.6.2-3/debian/pyscrabble-server.init (revision 17)
+++ 1.6.2-3/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/games/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: 1.6.2-3/debian/pyscrabble.desktop
===================================================================
--- 1.6.2-3/debian/pyscrabble.desktop (revision 17)
+++ 1.6.2-3/debian/pyscrabble.desktop (nonexistent)
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Name=PyScrabble
-Comment=A classical game of words
-Comment[de]=Ein klassisches Wörterspiel
-Comment[sv]=Ett klassiskt ordspel
-Exec=pyscrabble
-Icon=pyscrabble
-Terminal=false
-Type=Application
-Categories=Game;BoardGame;GTK;
Index: 1.6.2-3/debian/pyscrabble-server.install
===================================================================
--- 1.6.2-3/debian/pyscrabble-server.install (revision 17)
+++ 1.6.2-3/debian/pyscrabble-server.install (nonexistent)
@@ -1,8 +0,0 @@
-usr/games/pyscrabble-server
-usr/lib/python*/site-packages/pyscrabble/db.py
-usr/lib/python*/site-packages/pyscrabble/net/server.py
-usr/lib/python*/site-packages/pyscrabble/net/site.py
-usr/lib/python*/site-packages/pyscrabble/net/interfaces.py
-usr/share/games/pyscrabble/web
-usr/share/games/pyscrabble/dict
-etc/pyscrabble
Index: 1.6.2-3/debian
===================================================================
--- 1.6.2-3/debian (revision 17)
+++ 1.6.2-3/debian (nonexistent)
/1.6.2-3/debian
Property changes:
Deleted: mergeWithUpstream
## -1 +0,0 ##
-1
\ No newline at end of property