Author: ansgar-guest Date: 2008-02-02 18:28:35 +0000 (Sat, 02 Feb 2008) New Revision: 5615
Added: packages/trunk/xdigger/debian/patches/ packages/trunk/xdigger/debian/patches/config packages/trunk/xdigger/debian/patches/dont-create-highscore packages/trunk/xdigger/debian/patches/escape-hyphen-in-manpage packages/trunk/xdigger/debian/patches/series packages/trunk/xdigger/debian/patches/start-level-on-move packages/trunk/xdigger/debian/postinst packages/trunk/xdigger/debian/postrm packages/trunk/xdigger/debian/preinst Removed: packages/trunk/xdigger/debian/linda-override packages/trunk/xdigger/debian/lintian-override packages/trunk/xdigger/debian/postinst.debhelper packages/trunk/xdigger/debian/postrm.debhelper Modified: packages/trunk/xdigger/debian/ packages/trunk/xdigger/debian/changelog packages/trunk/xdigger/debian/control packages/trunk/xdigger/debian/copyright packages/trunk/xdigger/debian/menu packages/trunk/xdigger/debian/rules Log: * Bump Debian Standards version to 3.7.3 * Rename XS-Vcs-* headers to Vcs-* * Remove Homepage reference from long description * Refer to GPL version 2 in debian/copyright * debian/menu: Change section to Games/Action * Do not include high score file in Debian package * Change location of high score file to /var/games/xdigger.hiscore * Add myself to Uploaders * Remove lintian and linda overrides Property changes on: packages/trunk/xdigger/debian ___________________________________________________________________ Name: svn-bp:origUrl + http://pkg-games.alioth.debian.org/tarballs/xdigger_1.0.10.orig.tar.gz Name: mergeWithUpstream + 1 Modified: packages/trunk/xdigger/debian/changelog =================================================================== --- packages/trunk/xdigger/debian/changelog 2008-02-02 17:06:22 UTC (rev 5614) +++ packages/trunk/xdigger/debian/changelog 2008-02-02 18:28:35 UTC (rev 5615) @@ -1,10 +1,21 @@ -xdigger (1.0.10-12) unstable; urgency=low +xdigger (1.0.10-12) UNRELEASED; urgency=low [ Gonéri Le Bouder ] * add a desktop file, thanks Salvatore Palma (Closes: #454316) - -- Barry deFreese <[EMAIL PROTECTED]> Tue, 4 Dec 2007 18:32:48 +0100 + [ Ansgar Burchardt ] + * Bump Debian Standards version to 3.7.3 + * Rename XS-Vcs-* headers to Vcs-* + * Remove Homepage reference from long description + * Refer to GPL version 2 in debian/copyright + * debian/menu: Change section to Games/Action + * Do not include high score file in Debian package + * Change location of high score file to /var/games/xdigger.hiscore + * Add myself to Uploaders + * Remove lintian and linda overrides + -- Ansgar Burchardt <[EMAIL PROTECTED]> Sat, 02 Feb 2008 19:19:32 +0100 + xdigger (1.0.10-11) unstable; urgency=low * New maintainer (Debian Games Team) Modified: packages/trunk/xdigger/debian/control =================================================================== --- packages/trunk/xdigger/debian/control 2008-02-02 17:06:22 UTC (rev 5614) +++ packages/trunk/xdigger/debian/control 2008-02-02 18:28:35 UTC (rev 5615) @@ -2,12 +2,12 @@ Section: games Priority: optional Maintainer: Debian Games Team <[EMAIL PROTECTED]> -Uploaders: Barry deFreese <[EMAIL PROTECTED]> -Standards-Version: 3.7.2 -Build-Depends: debhelper (>=5), xutils, libx11-dev, x-dev, libxext-dev +Uploaders: Barry deFreese <[EMAIL PROTECTED]>, Ansgar Burchardt <[EMAIL PROTECTED]> +Standards-Version: 3.7.3 +Build-Depends: debhelper (>=5), xutils, libx11-dev, x-dev, libxext-dev, quilt Homepage: http://www.ibiblio.org/pub/Linux/games/arcade/ -XS-Vcs-Svn: ssh://svn.debian.org/svn/pkg-games/packages/trunk/xdigger/ -XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/xdigger/?op=log +Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/xdigger/ +Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/xdigger/?op=log Package: xdigger Architecture: any @@ -18,4 +18,3 @@ Boulderdash game (without scrolling). . Author: Alexander Lang <[EMAIL PROTECTED]> - Homepage: http://www.ibiblio.org/pub/Linux/games/arcade/ Modified: packages/trunk/xdigger/debian/copyright =================================================================== --- packages/trunk/xdigger/debian/copyright 2008-02-02 17:06:22 UTC (rev 5614) +++ packages/trunk/xdigger/debian/copyright 2008-02-02 18:28:35 UTC (rev 5615) @@ -9,7 +9,15 @@ This software is copyright (c) by Alexander Lang <[EMAIL PROTECTED]> -You are free to distribute this software under the terms of the GNU General -Public Licence. +XDigger is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2, or (at your option) +any later version. + +XDigger is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + On Debian systems, the complete text of the GNU General Public Licence can be -found in /usr/share/common-licenses/GPL file. +found in /usr/share/common-licenses/GPL-2 file. Deleted: packages/trunk/xdigger/debian/linda-override =================================================================== --- packages/trunk/xdigger/debian/linda-override 2008-02-02 17:06:22 UTC (rev 5614) +++ packages/trunk/xdigger/debian/linda-override 2008-02-02 18:28:35 UTC (rev 5615) @@ -1,2 +0,0 @@ -Tag: incorrect-file-perms -Data: /usr/games/xdigger Deleted: packages/trunk/xdigger/debian/lintian-override =================================================================== --- packages/trunk/xdigger/debian/lintian-override 2008-02-02 17:06:22 UTC (rev 5614) +++ packages/trunk/xdigger/debian/lintian-override 2008-02-02 18:28:35 UTC (rev 5615) @@ -1 +0,0 @@ -xdigger: non-standard-file-perm /usr/games/xdigger 2755 Modified: packages/trunk/xdigger/debian/menu =================================================================== --- packages/trunk/xdigger/debian/menu 2008-02-02 17:06:22 UTC (rev 5614) +++ packages/trunk/xdigger/debian/menu 2008-02-02 18:28:35 UTC (rev 5615) @@ -1,4 +1,4 @@ -?package(xdigger):needs="x11" section="Games/Arcade" \ +?package(xdigger):needs="x11" section="Games/Action" \ title="XDigger" \ description="XDigger is like Boulderdash without scrolling" \ hotkey="D" icon="/usr/share/pixmaps/xdigger.xpm" \ Added: packages/trunk/xdigger/debian/patches/config =================================================================== --- packages/trunk/xdigger/debian/patches/config (rev 0) +++ packages/trunk/xdigger/debian/patches/config 2008-02-02 18:28:35 UTC (rev 5615) @@ -0,0 +1,51 @@ +Index: xdigger-1.0.10/Imakefile +=================================================================== +--- xdigger-1.0.10.orig/Imakefile 2008-02-02 18:35:23.000000000 +0100 ++++ xdigger-1.0.10/Imakefile 2008-02-02 18:44:59.000000000 +0100 +@@ -1,12 +1,12 @@ + #include "configure.h" + +-BINDIR=/usr/bin/X11 +-MANDIR=$(MANSOURCEPATH)6 ++BINDIR=/usr/games ++MANDIR=/usr/share/man/man6 + MANSUFFIX=6 +-ICONDIR=/usr/include/X11/pixmaps ++ICONDIR=/usr/share/pixmaps + + # Flags +-CDEBUGFLAGS = -Wall ++CDEBUGFLAGS = -Wall -O2 + + #ifdef SOUND_RPLAY + RPLAYLIB = -lrplay +Index: xdigger-1.0.10/configure.h +=================================================================== +--- xdigger-1.0.10.orig/configure.h 2008-02-02 18:37:34.000000000 +0100 ++++ xdigger-1.0.10/configure.h 2008-02-02 18:38:03.000000000 +0100 +@@ -19,8 +19,8 @@ + #define _CONFIGURE_H + + /* Directories */ +-#define XDIGGER_LIB_DIR "/usr/lib/X11/xdigger" +-#define XDIGGER_HISCORE_DIR "/var/X11R6/scores" ++#define XDIGGER_LIB_DIR "/usr/share/games/xdigger" ++#define XDIGGER_HISCORE_DIR "/var/games" + + #define SOUND_DSP_AUDIO + +Index: xdigger-1.0.10/xdigger.man +=================================================================== +--- xdigger-1.0.10.orig/xdigger.man 2008-02-02 18:38:14.000000000 +0100 ++++ xdigger-1.0.10/xdigger.man 2008-02-02 18:38:37.000000000 +0100 +@@ -38,8 +38,8 @@ + \fB\-?\fP, \fB-h\fP, \fB--help\fP help + + .SH FILES +-/usr/lib/X11/xdigger/xdigger.level +-/var/X11R6/scores/xdigger.hiscore ++/usr/share/games/xdigger/xdigger.level ++/var/games/xdigger.hiscore + + .SH KEYBOARD BINDINGS + The \fBarrow\fP keys will move the man. Added: packages/trunk/xdigger/debian/patches/dont-create-highscore =================================================================== --- packages/trunk/xdigger/debian/patches/dont-create-highscore (rev 0) +++ packages/trunk/xdigger/debian/patches/dont-create-highscore 2008-02-02 18:28:35 UTC (rev 5615) @@ -0,0 +1,16 @@ +Index: xdigger-1.0.10/Imakefile +=================================================================== +--- xdigger-1.0.10.orig/Imakefile 2008-02-02 18:44:59.000000000 +0100 ++++ xdigger-1.0.10/Imakefile 2008-02-02 18:45:18.000000000 +0100 +@@ -31,7 +31,7 @@ + InstallNamedNonExec(pixmaps/xdigger.xpm,xdigger.xpm,$(ICONDIR)) + /* InstallNonExecFileNoClobber(xdigger.hiscore,XDIGGER_HISCORE_DIR) */ + +-install:: +- $(MKDIRHIER) XDIGGER_HISCORE_DIR +- touch XDIGGER_HISCORE_DIR/xdigger.hiscore +- chmod a+w XDIGGER_HISCORE_DIR/xdigger.hiscore ++#install:: ++# $(MKDIRHIER) XDIGGER_HISCORE_DIR ++# touch XDIGGER_HISCORE_DIR/xdigger.hiscore ++# chmod a+w XDIGGER_HISCORE_DIR/xdigger.hiscore Added: packages/trunk/xdigger/debian/patches/escape-hyphen-in-manpage =================================================================== --- packages/trunk/xdigger/debian/patches/escape-hyphen-in-manpage (rev 0) +++ packages/trunk/xdigger/debian/patches/escape-hyphen-in-manpage 2008-02-02 18:28:35 UTC (rev 5615) @@ -0,0 +1,16 @@ +Index: xdigger-1.0.10/xdigger.man +=================================================================== +--- xdigger-1.0.10.orig/xdigger.man 2008-02-02 19:23:04.000000000 +0100 ++++ xdigger-1.0.10/xdigger.man 2008-02-02 19:23:53.000000000 +0100 +@@ -33,9 +33,9 @@ + + \fB\-sound [dsp|audio|xbell|rplay|nas|auto|off]\fP sound device + +-\fB\-v\fP, \fB--version\fP version ++\fB\-v\fP, \fB\-\-version\fP version + +-\fB\-?\fP, \fB-h\fP, \fB--help\fP help ++\fB\-?\fP, \fB-h\fP, \fB\-\-help\fP help + + .SH FILES + /usr/share/games/xdigger/xdigger.level Added: packages/trunk/xdigger/debian/patches/series =================================================================== --- packages/trunk/xdigger/debian/patches/series (rev 0) +++ packages/trunk/xdigger/debian/patches/series 2008-02-02 18:28:35 UTC (rev 5615) @@ -0,0 +1,4 @@ +config +dont-create-highscore +start-level-on-move +escape-hyphen-in-manpage Added: packages/trunk/xdigger/debian/patches/start-level-on-move =================================================================== --- packages/trunk/xdigger/debian/patches/start-level-on-move (rev 0) +++ packages/trunk/xdigger/debian/patches/start-level-on-move 2008-02-02 18:28:35 UTC (rev 5615) @@ -0,0 +1,27 @@ +Index: xdigger-1.0.10/runlevels.c +=================================================================== +--- xdigger-1.0.10.orig/runlevels.c 2008-02-02 19:10:18.000000000 +0100 ++++ xdigger-1.0.10/runlevels.c 2008-02-02 19:11:08.000000000 +0100 +@@ -1280,18 +1280,22 @@ + wait_count = 0; + break; + case XK_Left: ++ wait_count = 0; + kb_left = True; rd_left = False; + if (cheat && inpause) step = True; + break; + case XK_Right: ++ wait_count = 0; + kb_right = True; rd_right = False; + if (cheat && inpause) step = True; + break; + case XK_Up: ++ wait_count = 0; + kb_up = True; rd_up = False; + if (cheat && inpause) step = True; + break; + case XK_Down: ++ wait_count = 0; + kb_down = True; rd_down = False; + if (cheat && inpause) step = True; + break; Added: packages/trunk/xdigger/debian/postinst =================================================================== --- packages/trunk/xdigger/debian/postinst (rev 0) +++ packages/trunk/xdigger/debian/postinst 2008-02-02 18:28:35 UTC (rev 5615) @@ -0,0 +1,16 @@ +#! /bin/sh +# postinst script for xdigger + +set -e + +scores=/var/games/xdigger.hiscore +if [ ! -e "$scores" ] ; then + touch "$scores" + chgrp games "$scores" + chmod 664 "$scores" +fi + +#DEBHELPER# + +exit 0 + Deleted: packages/trunk/xdigger/debian/postinst.debhelper =================================================================== --- packages/trunk/xdigger/debian/postinst.debhelper 2008-02-02 17:06:22 UTC (rev 5614) +++ packages/trunk/xdigger/debian/postinst.debhelper 2008-02-02 18:28:35 UTC (rev 5615) @@ -1,5 +0,0 @@ -# Automatically added by dh_installmenu -if [ "$1" = "configure" ] && [ -x "`which update-menus 2>/dev/null`" ]; then - update-menus -fi -# End automatically added section Added: packages/trunk/xdigger/debian/postrm =================================================================== --- packages/trunk/xdigger/debian/postrm (rev 0) +++ packages/trunk/xdigger/debian/postrm 2008-02-02 18:28:35 UTC (rev 5615) @@ -0,0 +1,13 @@ +#! /bin/sh +# postrm script for xdigger + +set -e + +if [ "$1" = purge ] ; then + rm -f /var/games/xdigger.hiscore +fi + +#DEBHELPER# + +exit 0 + Deleted: packages/trunk/xdigger/debian/postrm.debhelper =================================================================== --- packages/trunk/xdigger/debian/postrm.debhelper 2008-02-02 17:06:22 UTC (rev 5614) +++ packages/trunk/xdigger/debian/postrm.debhelper 2008-02-02 18:28:35 UTC (rev 5615) @@ -1,3 +0,0 @@ -# Automatically added by dh_installmenu -if [ -x "`which update-menus 2>/dev/null`" ]; then update-menus ; fi -# End automatically added section Added: packages/trunk/xdigger/debian/preinst =================================================================== --- packages/trunk/xdigger/debian/preinst (rev 0) +++ packages/trunk/xdigger/debian/preinst 2008-02-02 18:28:35 UTC (rev 5615) @@ -0,0 +1,18 @@ +#! /bin/sh +# preinst script for xdigger + +set -e + +# Location for high score file changed in 1.0.10-12 +# Old versions did include high score file in Debian package, so +# the score file must be moved in preinst +oldscore=/var/games/xdigger/xdigger.hiscore +newscore=/var/games/xdigger.hiscore +if [ -e $oldscore ] && $(dpkg --compare-versions "$2" lt-nl 1.0.10-12) ; then + mv $oldscore $newscore +fi + +#DEBHELPER# + +exit 0 + Modified: packages/trunk/xdigger/debian/rules =================================================================== --- packages/trunk/xdigger/debian/rules 2008-02-02 17:06:22 UTC (rev 5614) +++ packages/trunk/xdigger/debian/rules 2008-02-02 18:28:35 UTC (rev 5615) @@ -2,6 +2,7 @@ # debian/rules file for the Debian GNU/Linux xdigger package # Copyright 1997-99 by Hartmut Koptein <[EMAIL PROTECTED]> +include /usr/share/quilt/quilt.make # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 @@ -26,24 +27,30 @@ export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) +configure: configure-stamp +configure-stamp: patch + dh_testdir + xmkmf -a + + touch configure-stamp + build: build-stamp -build-stamp: +build-stamp: configure dh_testdir # Add here commands to compile the package. - xmkmf -a $(MAKE) touch build-stamp -clean: +clean: configure clean-patched unpatch +clean-patched: dh_testdir dh_testroot - rm -f build-stamp + rm -f build-stamp configure-stamp - # Add here commands to clean up after the build process. - [ ! -f Makefile ] || $(MAKE) distclean + $(MAKE) distclean dh_clean @@ -74,15 +81,9 @@ dh_link dh_strip dh_compress - dh_fixperms - chgrp games debian/xdigger/usr/games/xdigger \ - debian/xdigger/var/games/xdigger/xdigger.hiscore + dh_fixperms -Xusr/games/xdigger + chgrp games debian/xdigger/usr/games/xdigger chmod g+s debian/xdigger/usr/games/xdigger - chmod g+w debian/xdigger/var/games/xdigger/xdigger.hiscore - install -d debian/xdigger/usr/share/lintian/overrides - cp debian/lintian-override debian/xdigger/usr/share/lintian/overrides/xdigger - install -d debian/xdigger/usr/share/linda/overrides - cp debian/linda-override debian/xdigger/usr/share/linda/overrides/ dh_installdeb dh_shlibdeps dh_gencontrol _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits

