diff -u nethack-3.4.3/debian/control nethack-3.4.3/debian/control --- nethack-3.4.3/debian/control +++ nethack-3.4.3/debian/control @@ -1,7 +1,8 @@ Source: nethack Section: games Priority: optional -Maintainer: Joshua Kwan +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Joshua Kwan Standards-Version: 3.7.2 Build-Depends: flex, bison, groff-base, debhelper (>= 5.0.31), libx11-dev, libxt-dev, libxext-dev, libxmu-dev, xutils, bsdmainutils, libxaw7-dev | libxaw-dev, libncurses5-dev | libncurses-dev, libqt3-mt-dev (>= 3:3.3.4-7), dpatch, po-debconf diff -u nethack-3.4.3/debian/rules nethack-3.4.3/debian/rules --- nethack-3.4.3/debian/rules +++ nethack-3.4.3/debian/rules @@ -70,7 +70,7 @@ dh_testroot dh_clean -k dh_installdirs - dh_installinit --no-start -pnethack-common + dh_installinit --no-start -pnethack-common -- start 20 2 3 4 5 . dh_link chgrp games debian/nethack-common/usr/lib/games/nethack @@ -107,6 +107,9 @@ debian/nethack-common/usr/lib/games/nethack/$$prg; \ done + # recover needs to be setgid games + chmod g+s debian/nethack-common/usr/lib/games/nethack/recover + # all shell scripts, nethack binaries, overrides, and nethackrcs for flavor in $(TARGETS); do \ install -m 0755 -o root -g games debian/$$flavor/nethack.sh \ @@ -138,6 +141,7 @@ dh_testroot dh_installdocs -a -A debian/README.Debian README.menucolor dh_installdocs -pnethack-common debian/README.patches + dh_install dh_installmenu -a dh_installdebconf -pnethack-common dh_installexamples -pnethack-x11 debian/x11/NetHack.ad diff -u nethack-3.4.3/debian/changelog nethack-3.4.3/debian/changelog --- nethack-3.4.3/debian/changelog +++ nethack-3.4.3/debian/changelog @@ -1,3 +1,15 @@ +nethack (3.4.3-10.5ubuntu1) intrepid; urgency=low + + * Merge from Debian (LP: #237154), remaining changes: + - Remove stop links from rc0 and rc6 + - Add .desktop file + - Fix path in manpage + - set recover to be setgid games + * Modify Maintainer value to match the DebianMaintainerField + specification. + + -- Iain Lane Tue, 03 Jun 2008 19:12:01 +0100 + nethack (3.4.3-10.5) unstable; urgency=low * Non-maintainer upload to fix pending l10n issues. @@ -11,6 +23,18 @@ -- Christian Perrier Mon, 05 May 2008 18:39:59 +0200 +nethack (3.4.3-10.4ubuntu1) intrepid; urgency=low + + * Merge from Debian (LP: #234684), remaining changes: + - Remove stop links from rc0 and rc6 + - Add .desktop file + - Fix path in manpage + - set recover to be setgid games (LP: #196380) + * Modify Maintainer value to match the DebianMaintainerField + specification. + + -- Iain Lane Sun, 25 May 2008 12:42:00 +0100 + nethack (3.4.3-10.4) unstable; urgency=low * Non-maintainer upload with approval from Joshua Kwan. @@ -26,6 +50,16 @@ -- Pierre Habouzit Mon, 04 Feb 2008 17:23:08 +0100 +nethack (3.4.3-10.2ubuntu1) hardy; urgency=low + + * Merge from Debian. Remaining changes: + * Remove stop links from rc0 and rc6 + * Set XLIB_SKIP_ARGB_VISUALS for nethack-gnome + * Add .desktop file + * Fix path in manpage + + -- Jeff Bailey Tue, 27 Nov 2007 11:15:15 -0800 + nethack (3.4.3-10.2) unstable; urgency=low * NMU @@ -34,6 +68,28 @@ -- Clint Adams Tue, 31 Jul 2007 07:31:09 -0400 +nethack (3.4.3-10.1ubuntu3) gutsy; urgency=low + + * Remove stop links from rc0 and rc6. + + -- Colin Watson Wed, 25 Jul 2007 09:31:32 +0100 + +nethack (3.4.3-10.1ubuntu2) gutsy; urgency=low + + * Set XLIB_SKIP_ARGB_VISUALS in /usr/games/nethack-gnome to + work around gtk1 and composite troubles. + + -- Jeff Bailey Wed, 27 Jun 2007 07:28:15 -0400 + +nethack (3.4.3-10.1ubuntu1) gutsy; urgency=low + + * Merge with Debian. Remaining Ubuntu changes: + - .desktop files + - man page pathname fixes + - Maintainer mangling + + -- Emmet Hikory Tue, 01 May 2007 21:16:26 +0900 + nethack (3.4.3-10.1) unstable; urgency=low * Non-maintainer upload to fix pending l10n issues. @@ -44,6 +100,24 @@ -- Christian Perrier Tue, 27 Feb 2007 19:31:40 +0100 +nethack (3.4.3-10ubuntu2) feisty; urgency=low + + * Fix wrong path in man page (Closes Malone #62229) Thanks to + Vassilis Pandis for the patch. + * Change maintainer field to MOTU. + + -- Luke Yelavich Thu, 15 Mar 2007 22:28:21 +1100 + +nethack (3.4.3-10ubuntu1) feisty; urgency=low + + * Re-sync with Debian + * nethack (3.4.3-8ubuntu2) dapper; urgency=low + * Add desktop files for gnome, qt and x11 binaries + * Thanks to Emmet Hikory + * -- Gauvain Pocentek Sat, 6 May 2006 10:42:10 +0200 + + -- Barry deFreese Thu, 7 Dec 2006 22:40:07 -0500 + nethack (3.4.3-10) unstable; urgency=medium * Fix brown paper bag bug relocating the nethack-x11 fonts, thanks diff -u nethack-3.4.3/debian/nethack-common.postinst nethack-3.4.3/debian/nethack-common.postinst --- nethack-3.4.3/debian/nethack-common.postinst +++ nethack-3.4.3/debian/nethack-common.postinst @@ -117,6 +117,10 @@ rm -f /etc/init.d/nethack update-rc.d -f nethack remove fi + # Remove shutdown and reboot links; this init script does not need them. + if dpkg --compare-versions "$2" lt 3.4.3-10.1ubuntu3; then + rm -f /etc/rc0.d/K20nethack-common /etc/rc6.d/K20nethack-common + fi fi #DEBHELPER# diff -u nethack-3.4.3/debian/nethack-qt.dirs nethack-3.4.3/debian/nethack-qt.dirs --- nethack-3.4.3/debian/nethack-qt.dirs +++ nethack-3.4.3/debian/nethack-qt.dirs @@ -4,0 +5 @@ +usr/share/applications diff -u nethack-3.4.3/debian/nethack-x11.dirs nethack-3.4.3/debian/nethack-x11.dirs --- nethack-3.4.3/debian/nethack-x11.dirs +++ nethack-3.4.3/debian/nethack-x11.dirs @@ -6,0 +7 @@ +usr/share/applications diff -u nethack-3.4.3/debian/patches/04_manpage_paths.dpatch nethack-3.4.3/debian/patches/04_manpage_paths.dpatch --- nethack-3.4.3/debian/patches/04_manpage_paths.dpatch +++ nethack-3.4.3/debian/patches/04_manpage_paths.dpatch @@ -42,6 +42,15 @@ This option is usually only useful to the game administrator. The playground must contain several auxiliary files such as help files, the list of top scorers, and a subdirectory +@@ -222,7 +223,7 @@ + distinction, as he may eventually release a new version of his own. + .SH FILES + .PP +-All files are in the playground, normally /usr/games/lib/nethackdir. ++All files are in the playground, normally /usr/lib/games/nethack. + If DLB was defined during the compile, the data files and special levels + will be inside a larger file, normally nhdat, instead of being separate + files. @@ -283,7 +284,7 @@ .br MAILREADER Replacement for default reader only in patch2: unchanged: --- nethack-3.4.3.orig/debian/nethack-x11.install +++ nethack-3.4.3/debian/nethack-x11.install @@ -0,0 +1 @@ +debian/nethack-x11.desktop usr/share/applications only in patch2: unchanged: --- nethack-3.4.3.orig/debian/nethack-qt.install +++ nethack-3.4.3/debian/nethack-qt.install @@ -0,0 +1 @@ +debian/nethack-qt.desktop usr/share/applications only in patch2: unchanged: --- nethack-3.4.3.orig/debian/nethack-qt.desktop +++ nethack-3.4.3/debian/nethack-qt.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Type=Application +Encoding=UTF-8 +Name=Qt NetHack +GenericName=NetHack (Qt interface) +Comment= +Icon=nethack +Exec=/usr/games/nethack-qt +Terminal=false +Categories=Application;Game;AdventureGame; only in patch2: unchanged: --- nethack-3.4.3.orig/debian/nethack-x11.desktop +++ nethack-3.4.3/debian/nethack-x11.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Type=Application +Encoding=UTF-8 +Name=X NetHack +GenericName=NetHack (X interface) +Comment= +Icon=nethack +Exec=/usr/games/xnethack +Terminal=false +Categories=Application;Game;AdventureGame;