The patch from the NMU
diff -Nur xgammon-0.98a.old/debian/changelog xgammon-0.98a/debian/changelog --- xgammon-0.98a.old/debian/changelog 2003-08-16 14:43:37.000000000 +0200 +++ xgammon-0.98a/debian/changelog 2003-08-21 00:26:28.000000000 +0200 @@ -1,3 +1,42 @@ +xgammon (0.98a-5.3) unstable; urgency=low + + * NMU + * Fixed an error in debian/rules. + * Changed priority to optional to fit with override. + + -- Sebastien Bacher <[EMAIL PROTECTED]> Thu, 21 Aug 2003 00:21:55 +0200 + +xgammon (0.98a-5.2) unstable; urgency=low + + * NMU + * Apply patch from BTS to close FTBFS (Closes: #196320). + * debian/changelog + + Removed add-log-mailing-address variable. + * debian/conffiles + + Removed since /etc files are auto-added by debhelper. + * debian/control + + Added Build-Depends on debhelper. + + Removed "." on the end of short description. + + Set maintainer to QA since the package is orphan. + + Updated Standards-Version to 3.6.1.0. + * debian/copyright + + Update copyright path. + * debian/menu + + Added backgammon hints (Closes: #121016). + + Changed doc path to /usr/share/doc (Closes: #179492). + * debian/postinst removal + + /usr/share/doc transition is over. + + Used dh_installmenu. + * debian/postrm + + Used dh_installmenu. + * debian/prerm removal + + /usr/share/doc transition is over. + * debian/rules + + Rewrite to usr debhelper + * + + -- Sebastien Bacher <[EMAIL PROTECTED]> Sat, 16 Aug 2003 14:44:29 +0200 + xgammon (0.98a-5.1) unstable; urgency=low * Non-maintainer upload. @@ -63,7 +102,3 @@ * Changed menu entry and installation of icon -Local variables: -mode: debian-changelog -add-log-mailing-address: "[EMAIL PROTECTED]" -End: diff -Nur xgammon-0.98a.old/debian/compat xgammon-0.98a/debian/compat --- xgammon-0.98a.old/debian/compat 1970-01-01 01:00:00.000000000 +0100 +++ xgammon-0.98a/debian/compat 2003-08-20 16:37:51.000000000 +0200 @@ -0,0 +1 @@ +4 diff -Nur xgammon-0.98a.old/debian/conffiles xgammon-0.98a/debian/conffiles --- xgammon-0.98a.old/debian/conffiles 2003-08-16 14:43:37.000000000 +0200 +++ xgammon-0.98a/debian/conffiles 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -/etc/X11/app-defaults/XGammon diff -Nur xgammon-0.98a.old/debian/control xgammon-0.98a/debian/control --- xgammon-0.98a.old/debian/control 2003-08-16 14:43:37.000000000 +0200 +++ xgammon-0.98a/debian/control 2003-08-21 00:23:07.000000000 +0200 @@ -1,14 +1,14 @@ Source: xgammon Section: games -Priority: extra -Maintainer: Luis Francisco Gonzalez <[EMAIL PROTECTED]> -Standards-Version: 2.3.0.0 -Build-Depends: flex, libxaw7-dev, xlibs-dev, xutils +Priority: optional +Maintainer: Debian QA Group <[EMAIL PROTECTED]> +Standards-Version: 3.6.1.0 +Build-Depends: debhelper (>=4.0), flex, libxaw7-dev, xlibs-dev, xutils Package: xgammon Architecture: any Depends: ${shlibs:Depends} -Description: Implementation of backgammon under X. +Description: Implementation of backgammon under X This a nicely implemented backgammon with the following features: - X11/Xaw interface, - a simple file selector and saving dialog, diff -Nur xgammon-0.98a.old/debian/copyright xgammon-0.98a/debian/copyright --- xgammon-0.98a.old/debian/copyright 2003-08-16 14:43:37.000000000 +0200 +++ xgammon-0.98a/debian/copyright 2003-08-20 16:05:38.000000000 +0200 @@ -7,4 +7,19 @@ Copyright: -See /usr/doc/copyright/GPL. + This package 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; version 2 dated June, 1991. + + This package 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. + + You should have received a copy of the GNU General Public License + along with this package; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. + +On Debian systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL'. diff -Nur xgammon-0.98a.old/debian/menu xgammon-0.98a/debian/menu --- xgammon-0.98a.old/debian/menu 2003-08-16 14:43:37.000000000 +0200 +++ xgammon-0.98a/debian/menu 2003-08-20 17:14:28.000000000 +0200 @@ -2,11 +2,13 @@ section=Games/Board\ icon=/usr/X11R6/include/X11/pixmaps/mini-xgammon.xpm\ title="XGammon"\ + hints="Backgammon"\ command=/usr/games/xgammon ?package(xgammon):needs="dwww"\ section=Games/Board\ title="XGammon"\ - command="/usr/doc/xgammon/README.gz"\ + hints="Backgammon"\ + command="/usr/share/doc/xgammon/README.gz"\ dwwwtype=gzip\ longtitle="xgammon - X-based implementation of the\ traditional board game." diff -Nur xgammon-0.98a.old/debian/postinst xgammon-0.98a/debian/postinst --- xgammon-0.98a.old/debian/postinst 2003-08-16 14:43:37.000000000 +0200 +++ xgammon-0.98a/debian/postinst 1970-01-01 01:00:00.000000000 +0100 @@ -1,10 +0,0 @@ -#!/bin/sh -e -if [ -x /usr/bin/update-menus ] ; then update-menus ; fi - -if [ "$1" = "configure" ]; then - if [ -d /usr/doc -a ! -e /usr/doc/xgammon -a -d /usr/share/doc/xgammon ]; then - ln -sf ../share/doc/xgammon /usr/doc/xgammon - fi -fi - -exit 0 diff -Nur xgammon-0.98a.old/debian/postrm xgammon-0.98a/debian/postrm --- xgammon-0.98a.old/debian/postrm 2003-08-16 14:43:37.000000000 +0200 +++ xgammon-0.98a/debian/postrm 1970-01-01 01:00:00.000000000 +0100 @@ -1,3 +0,0 @@ -#!/bin/sh -e -if [ -x /usr/bin/update-menus ] ; then update-menus ; fi - diff -Nur xgammon-0.98a.old/debian/prerm xgammon-0.98a/debian/prerm --- xgammon-0.98a.old/debian/prerm 2003-08-16 14:43:37.000000000 +0200 +++ xgammon-0.98a/debian/prerm 1970-01-01 01:00:00.000000000 +0100 @@ -1,7 +0,0 @@ -#!/bin/sh -e - -if [ \( "$1" = "upgrade" -o "$1" = "remove" \) -a -L /usr/doc/xgammon ]; then - rm -f /usr/doc/xgammon -fi - -exit 0 diff -Nur xgammon-0.98a.old/debian/rules xgammon-0.98a/debian/rules --- xgammon-0.98a.old/debian/rules 2003-08-16 14:43:37.000000000 +0200 +++ xgammon-0.98a/debian/rules 2003-08-21 00:26:22.000000000 +0200 @@ -2,82 +2,63 @@ # Made with the aid of debmake, by Christoph Lameter, # based on the sample debian/rules file for GNU hello by Ian Jackson. -package=xgammon +configure: configure-stamp +configure-stamp: + dh_testdir + touch configure-stamp + +build: build-stamp + +build-stamp: configure-stamp + dh_testdir -build: - $(checkdir) imake -I/usr/lib/X11/config - make - touch build + $(MAKE) + + touch build-stamp clean: - $(checkdir) - -rm -f build - imake -I/usr/lib/X11/config - make clean + dh_testdir + dh_testroot + rm -f build-stamp configure-stamp + + -$(MAKE) clean -rm -f xgammon.man -rm -f `find . -name "*~"` - -rm -rf debian/tmp debian/files* core debian/substvars + -rm -rf debian/xgammon + + dh_clean + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + $(MAKE) install DESTDIR=$(CURDIR)/debian/xgammon + +# Build architecture-independent files here. +binary-indep: build install +# We have nothing to do by default. + +# Build architecture-dependent files here. +binary-arch: build install + dh_testdir + dh_testroot + dh_installdirs + dh_installdocs + dh_installmenu + dh_installman xgammon.6 + dh_installchangelogs + dh_link + dh_compress + dh_fixperms + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb -binary-indep: checkroot build - $(checkdir) -# There are no architecture-independent files to be uploaded -# generated by this package. If there were any they would be -# made here. - -binary-arch: checkroot build - $(checkdir) - -rm -rf debian/tmp - install -d debian/tmp - cd debian/tmp && install -d `cat ../dirs` - make install DESTDIR=`pwd`/debian/tmp -# Install the manual - install -m 644 xgammon.6 debian/tmp/usr/share/man/man6/ - gzip -9 debian/tmp/usr/share/man/man6/* -# Install the menu files - install -p -m644 debian/menu debian/tmp/usr/lib/menu/xgammon -# Install docs and compress the files - install -m 644 README debian/tmp/usr/share/doc/xgammon - gzip -9 debian/tmp/usr/share/doc/xgammon/README - install -m 644 debian/changelog \ - debian/tmp/usr/share/doc/xgammon/changelog.Debian - gzip -9 debian/tmp/usr/share/doc/xgammon/changelog.Debian - install -m 644 debian/copyright \ - debian/tmp/usr/share/doc/xgammon/ -# And continue with debian control files - mkdir debian/tmp/DEBIAN - cp debian/postinst debian/tmp/DEBIAN/ - cp debian/prerm debian/tmp/DEBIAN/ - cp debian/postrm debian/tmp/DEBIAN/ - cp debian/control debian/tmp/DEBIAN/ - cp debian/conffiles debian/tmp/DEBIAN/ - chmod +x debian/tmp/DEBIAN/postinst debian/tmp/DEBIAN/prerm \ - debian/tmp/DEBIAN/postrm - chown -R root.root debian/tmp - chown root.games debian/tmp/usr/games/xgammon - strip --remove-section=comment --remove-section=note \ - debian/tmp/usr/games/xgammon - chmod -R go=rX debian/tmp - chmod -R u+w debian/tmp - dpkg-shlibdeps debian/tmp/usr/games/* - dpkg-gencontrol -pxgammon - cd debian/tmp && \ - find . -type f ! -regex "./DEBIAN/.*" -print0 | \ - xargs -0 md5sum | \ - sed -e '/\.\//s///' > DEBIAN/md5sums && \ - chmod 644 DEBIAN/md5sums - dpkg --build debian/tmp .. - -define checkdir - test -f debian/rules -endef - -# Below here is fairly generic really - -binary: binary-indep binary-arch - -checkroot: - $(checkdir) - test root = "`whoami`" +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install configure -.PHONY: binary binary-arch binary-indep clean checkroot diff -Nur xgammon-0.98a.old/xgammon.c xgammon-0.98a/xgammon.c --- xgammon-0.98a.old/xgammon.c 1995-08-29 07:28:41.000000000 +0200 +++ xgammon-0.98a/xgammon.c 2003-08-16 15:09:04.000000000 +0200 @@ -944,31 +944,31 @@ for (option=1; option<argc; option++) { if (strcmp (argv[option], "-?") == 0 || strcmp (argv[option], "-help") == 0) { -puts ("xgammon [-otherdisplay (display)] - [-boardgeometry (string)] - [-boardcolor (color)] [-bc (color)] - [-darkcolor (color)] [-dc (color)] - [-lightcolor (color)] [-lc (color)] - [-barcolor (color)] [-b (color)] - [-whitecolor (color)] the stone color for \"white\" - [-blackcolor (color)] the stone color for \"black\" - [-doublerfont (font)] sets the (big) font for the doubler dice - [-doubling +doubling] sets if you wish the computer to double - [-h (black|white)] set the color for the human player - (implies a human versus computer game) - [-gamekind -g (hvc|cvc|hvh)] sets the gamekind to either - human vs. human computer vs. computer - or human vs. computer (default) - [-winat (points)] play a tournament up to \"points\" points - [-watchmove +wachmove] if you wish to see the flying stones - [-buttonmove +buttonmove] set stones by simply pressing button - [-autoplay +autoplay] automatic play when only one move - is possible - [-stonesteps (number)] sets the stepsize the stones fly - in pixel (implies +watchmove) - [-delaytime (tsec.)] sets the time the cumputer waits - after each turn (implies -watchmove) - [-?] [-help] print this string"); +puts ("xgammon [-otherdisplay (display)]\n" +" [-boardgeometry (string)]\n" +" [-boardcolor (color)] [-bc (color)]\n" +" [-darkcolor (color)] [-dc (color)]\n" +" [-lightcolor (color)] [-lc (color)]\n" +" [-barcolor (color)] [-b (color)]\n" +" [-whitecolor (color)] the stone color for \"white\"\n" +" [-blackcolor (color)] the stone color for \"black\"\n" +" [-doublerfont (font)] sets the (big) font for the doubler dice\n" +" [-doubling +doubling] sets if you wish the computer to double\n" +" [-h (black|white)] set the color for the human player\n" +" (implies a human versus computer game)\n" +" [-gamekind -g (hvc|cvc|hvh)] sets the gamekind to either\n" +" human vs. human computer vs. computer\n" +" or human vs. computer (default)\n" +" [-winat (points)] play a tournament up to \"points\" points\n" +" [-watchmove +wachmove] if you wish to see the flying stones\n" +" [-buttonmove +buttonmove] set stones by simply pressing button\n" +" [-autoplay +autoplay] automatic play when only one move\n" +" is possible\n" +" [-stonesteps (number)] sets the stepsize the stones fly\n" +" in pixel (implies +watchmove)\n" +" [-delaytime (tsec.)] sets the time the cumputer waits\n" +" after each turn (implies -watchmove)\n" +" [-?] [-help] print this string"); exit (0); } else { fprintf (stderr,"xgammon: unknown option %s (ignored)\n", argv[option]);