r13703 - packages/trunk/nethack/debian
Vincent Cheng
vincentc-guest at alioth.debian.org
Wed Jun 13 06:04:34 UTC 2012
Author: vincentc-guest
Date: 2012-06-13 06:04:33 +0000 (Wed, 13 Jun 2012)
New Revision: 13703
Removed:
packages/trunk/nethack/debian/README.Debian
packages/trunk/nethack/debian/nethack-common.menu
packages/trunk/nethack/debian/nethack-gnome.dirs
packages/trunk/nethack/debian/nethack-gnome.links
packages/trunk/nethack/debian/nethack-gnome.menu
packages/trunk/nethack/debian/nethack-gnome.postinst
packages/trunk/nethack/debian/nethack-gnome.prerm
Modified:
packages/trunk/nethack/debian/changelog
packages/trunk/nethack/debian/compat
packages/trunk/nethack/debian/control
packages/trunk/nethack/debian/nethack-common.lintian-overrides
packages/trunk/nethack/debian/nethack-common.postinst
packages/trunk/nethack/debian/nethack-x11.desktop
packages/trunk/nethack/debian/rules
Log:
nethack: Update to release 3.4.3-14
Deleted: packages/trunk/nethack/debian/README.Debian
===================================================================
--- packages/trunk/nethack/debian/README.Debian 2012-06-13 06:00:01 UTC (rev 13702)
+++ packages/trunk/nethack/debian/README.Debian 2012-06-13 06:04:33 UTC (rev 13703)
@@ -1,111 +0,0 @@
-README for Debian GNU/Linux Nethack 3.4.3
------------------------------------------
-
-[ Apologies for Save File Format Change ]
-
-The save-game format has changed again for Nethack 3.4.0. You
-should have been prompted by the installer to back up your old
-save game files and high score list into /tmp. Unfortunately,
-your old save-games are no longer useful with Nethack 3.4.0,
-although it may be possible to merge the old high score lists.
-
-Note that the save-game and bones format are the same between
-3.4.0 and 3.4.1. You do not need to clean out your save games
-for this upgrade.
-
-[ New in Nethack for Debian 3.4.1-1 and Later ]
-
-Back by popular demand is the no-frills nethack-console package.
-This package has NO graphical interface, and does not even depend
-on xbase-clients.
-
-The nethack-console package supports either ~/.nethackrc or
-~/.nethackrc.console files for configuration.
-
-[ New in Nethack for Debian 3.4.0-1 and Later ]
-
-The Debian Nethack packages have been restructured. Now,
-separate packages are provided for each graphical interface:
-
- * nethack-x11
- * nethack-gnome
- * nethack-qt
-
-Each of these packages also contains the classic text-based
-interface. You can get the classic interface by running
-/usr/games/nethack, or a graphical interface by running:
-
-(for x11): /usr/games/xnethack
-(for gnome): /usr/games/nethack-gnome
-(for qt): /usr/games/nethack-qt
-
-[ Changing the default graphical interface ]
-
-The /usr/games/nethack symlink is maintained with update-alternatives,
-so if you wish to make one of the graphical interfaces the default,
-simply run (as root):
-
-# update-alternatives --config nethack
-
-The common dungeon files and utilities have been moved out
-into a separate package, nethack-common.
-
-The old nethack package is now a dummy package that just depends
-on nethack-common and nethack-x11 to behave how the old version
-did.
-
-Please note that the Gnome interface is not yet fully stable,
-and is known to have some bugs. If you value your character, please
-use the x11, qt, or text interfaces.
-
-[ Configuration Files for 3.4.0-1 and Later ]
-
-The previous Debian releases of Nethack did not provide for
-separate configuration files for each windowing system. (If
-you ran xnethack, ~/.nethackrc was ignored.) Now, each windowing
-system has its own set of system defaults and per-user defaults:
-
-x11: ~/.nethackrc.x11 or /etc/nethack/nethackrc.x11
-gnome: ~/.nethackrc.gnome or /etc/nethack/nethackrc.gnome
-qt: ~/.nethackrc.qt or /etc/nethack/nethackrc.qt
-
-text: ~/.nethackrc or /etc/nethack/nethackrc.tty
-
-If the HACKOPTIONS environment variable is set to a filename,
-that configuration file is always used. Otherwise, the per-user
-config file is tried for the appropriate windowing system
-(~/.nethackrc.gnome for gnome, etc). If that is not found,
-the system-wide default in /etc/nethack is used.
-
-[ Game Dumps ]
-
-Summaries of the immediately previous game that someone has played will
-always be saved upon death, escape, or ascension in /var/games/nethack/dumps.
-These are ideal for posting to newsgroups and bragging to your friends.
-
-The configuration file hardcodes the path for 'dumpfile' (the location where
-this log will be saved) and it cannot be changed, so there is no chance of
-being able to create files in arbitrary places with gid: games.
-
-[ Description of Nethack ]
-
-Nethack is a wonderfully silly yet quite addicting Dungeons and
-Dragons-style adventure game. You play the part of a fierce fighter,
-wizard, or any of many other classes, fighting your way down to
-retrieve the Amulet of Yendor (try saying THAT one backwards!) for
-your god. On the way, you might encounter a quantum mechanic or two,
-or perhaps a microscopic space fleet, or -- if you're REALLY lucky --
-the Ravenous Bugblatter Beast of Traal.
-
-There is a nethack-spoilers package available separately if you are
-really stuck, to be used only as a last resort.
-
-A few utilities -- recover, for retrieving your auto-save files in case
-of a power failure, and dgn_comp and lev_comp, two utilities for making
-your own Nethack levels and dungeons, have been included in
-/usr/lib/games/nethack. As of Nethack 3.4.0, the dlb utility is
-included for master hackers.
-
-The recover utility will be run upon bootup by /etc/init.d/nethack-common.
-Any auto-save files still on the system from a possible crash will be
-retrieved and converted into proper save files.
Modified: packages/trunk/nethack/debian/changelog
===================================================================
--- packages/trunk/nethack/debian/changelog 2012-06-13 06:00:01 UTC (rev 13702)
+++ packages/trunk/nethack/debian/changelog 2012-06-13 06:04:33 UTC (rev 13703)
@@ -1,32 +1,37 @@
nethack (3.4.3-14) unstable; urgency=low
+ * Team upload.
+
+ [ Bernhard R. Link ]
+ * switch to "3.0 (quilt)"
+ * bump Standards-Version
+ * modernize debian/rules:
+ - use dpkg-buildflags
+ - support build-arch/-indep
+ - make parallel safe
+ - don't avoid make errors
+ * add patch so it can compile with -Werror=format-security
+ * drop no longer needed patches (-qt and -gnome are gone)
+ * don't use /dev/null as install template (Closes: 644647)
+ * drop nethack-common menu (both -console and -x11 have one)
+
+ [ Vincent Cheng ]
* Adopt package. (Closes: #673584)
- Change Maintainer to Debian Games Team.
- Add myself to Uploaders.
- * Switch patch system from obsolete dpatch to quilt.
- - Drop build-depends on dpatch.
- - Change source format to "3.0 (quilt)".
- - Convert all dpatch patches to quilt patches, and refresh/unfuzz them.
- - Remove unneeded debian/README.source.
- * Rename 96_binutils-gold.patch -> 22_binutils_gold.patch.
- * Modify 14_common_config.patch to enable AUTOPICKUP_EXCEPTIONS.
- (Closes: #329318)
- * Add 23_fix_kfreebsd_ftbfs.patch to fix FTBFS on kfreebsd.
- * Modify 91_enh_menucolors.patch to disable MENU_COLOR_REGEX on non-Linux
- archs (to fix FTBFS).
- * Avoid using /dev/null to create an empty text file in postinst.
- (Closes: #644647)
- * Remove all unused lintian overrides; use dh_lintian to install remaining
- overrides instead of manually installing them in debian/rules.
- * (Partially) enable build hardening using dpkg-buildflags.
+ * Modify 0006-Common-config.h-for-all-binary-packages.patch to enable
+ AUTOPICKUP_EXCEPTIONS. (Closes: #329318)
+ * Modify 0011-Pasi-Kallinen-s-patch-to-add-colors-to-inventory-ite.patch
+ and 0017-Debian-and-Linux-specifics-defined-in-unixconf.h.patch; add
+ 0021-fix-kfreebsd-ftbfs.patch to fix FTBFS on kfreebsd.
+ * Convert debian/copyright to DEP-5 machine-readable format.
+ * Use dh_lintian to install overrides instead of manually installing them
+ in debian/rules.
* Add watch file.
* Add Homepage field in debian/control.
* Add Vcs-* fields in debian/control.
- * Convert debian/copyright to DEP-5 machine-readable format.
- * Bump debhelper compatibility level from 7 to 9.
- * Update Standards version from 3.8.3 to 3.9.3, no changes required.
- -- Vincent Cheng <Vincentc1208 at gmail.com> Fri, 08 Jun 2012 19:53:18 -0700
+ -- Vincent Cheng <Vincentc1208 at gmail.com> Mon, 11 Jun 2012 00:47:38 -0700
nethack (3.4.3-13) unstable; urgency=low
Modified: packages/trunk/nethack/debian/compat
===================================================================
--- packages/trunk/nethack/debian/compat 2012-06-13 06:00:01 UTC (rev 13702)
+++ packages/trunk/nethack/debian/compat 2012-06-13 06:04:33 UTC (rev 13703)
@@ -1 +1 @@
-9
+7
Modified: packages/trunk/nethack/debian/control
===================================================================
--- packages/trunk/nethack/debian/control 2012-06-13 06:00:01 UTC (rev 13702)
+++ packages/trunk/nethack/debian/control 2012-06-13 06:04:33 UTC (rev 13703)
@@ -6,7 +6,7 @@
Build-Depends:
bison,
bsdmainutils,
- debhelper (>= 9),
+ debhelper (>= 7),
flex,
groff-base,
libncurses5-dev | libncurses-dev,
@@ -24,16 +24,8 @@
Package: nethack-common
Architecture: any
-Depends: debianutils (>= 1.12), ${misc:Depends}, ${shlibs:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
Recommends: nethack-console | nethack-x11
-Conflicts:
- nethack-console (<< ${binary:Version}),
- nethack-gnome (<< ${binary:Version}),
- nethack-lisp (<< ${binary:Version}),
- nethack-qt (<< ${binary:Version}),
- nethack-x11 (<< ${binary:Version}),
- suidmanager (<< 0.50)
-Replaces: nethack (<< 3.4.0)
Description: dungeon crawl game - common files
NetHack is a wonderfully silly, yet quite addictive, Dungeons &
Dragons-style adventure game. You play a character from one of many
Modified: packages/trunk/nethack/debian/nethack-common.lintian-overrides
===================================================================
--- packages/trunk/nethack/debian/nethack-common.lintian-overrides 2012-06-13 06:00:01 UTC (rev 13702)
+++ packages/trunk/nethack/debian/nethack-common.lintian-overrides 2012-06-13 06:04:33 UTC (rev 13703)
@@ -1,2 +1 @@
-nethack-common: menu-command-not-in-package usr/share/menu/nethack-common:6 usr/games/nethack
nethack-common: non-standard-game-executable-perm usr/lib/games/nethack/recover 0755 != 2755
Deleted: packages/trunk/nethack/debian/nethack-common.menu
===================================================================
--- packages/trunk/nethack/debian/nethack-common.menu 2012-06-13 06:00:01 UTC (rev 13702)
+++ packages/trunk/nethack/debian/nethack-common.menu 2012-06-13 06:04:33 UTC (rev 13703)
@@ -1,6 +0,0 @@
-?package(nethack-common):command="/usr/games/nethack" \
- needs="text" \
- hints="Roguelike,Maze,Dungeon" \
- section="Games/Adventure" \
- title="NetHack" \
- icon="/usr/share/pixmaps/nethack.xpm"
Modified: packages/trunk/nethack/debian/nethack-common.postinst
===================================================================
--- packages/trunk/nethack/debian/nethack-common.postinst 2012-06-13 06:00:01 UTC (rev 13702)
+++ packages/trunk/nethack/debian/nethack-common.postinst 2012-06-13 06:04:33 UTC (rev 13703)
@@ -16,8 +16,6 @@
# changed format anyway.
# Modified 11 Oct 2003, move all the preinst stuff here.
# Modified 19 Feb 2009, drop the "backup incompatible" stuff
-# Modified 09 Jun 2012 to fix #644647; don't use /dev/null as a source
-# for an empty text file
set -e
@@ -52,9 +50,9 @@
for file in perm record logfile; do
if [ ! -e /var/games/nethack/$file ]; then
- touch /var/games/nethack/$file
- chmod 0664 /var/games/nethack/$file
- chown root:games /var/games/nethack/$file
+ touch /var/games/nethack/$file
+ chmod 0664 /var/games/nethack/$file
+ chown root:games /var/games/nethack/$file
fi
done
Deleted: packages/trunk/nethack/debian/nethack-gnome.dirs
===================================================================
--- packages/trunk/nethack/debian/nethack-gnome.dirs 2012-06-13 06:00:01 UTC (rev 13702)
+++ packages/trunk/nethack/debian/nethack-gnome.dirs 2012-06-13 06:04:33 UTC (rev 13703)
@@ -1,5 +0,0 @@
-etc/nethack
-usr/games
-usr/lib/games/nethack
-usr/share/man/man6
-usr/share/pixmaps/nethack
Deleted: packages/trunk/nethack/debian/nethack-gnome.links
===================================================================
--- packages/trunk/nethack/debian/nethack-gnome.links 2012-06-13 06:00:01 UTC (rev 13702)
+++ packages/trunk/nethack/debian/nethack-gnome.links 2012-06-13 06:04:33 UTC (rev 13703)
@@ -1,2 +0,0 @@
-usr/lib/games/nethack/nethack-gnome.sh usr/games/nethack-gnome
-usr/share/man/man6/nethack.6.gz usr/share/man/man6/nethack-gnome.6.gz
Deleted: packages/trunk/nethack/debian/nethack-gnome.menu
===================================================================
--- packages/trunk/nethack/debian/nethack-gnome.menu 2012-06-13 06:00:01 UTC (rev 13702)
+++ packages/trunk/nethack/debian/nethack-gnome.menu 2012-06-13 06:04:33 UTC (rev 13703)
@@ -1,6 +0,0 @@
-?package(nethack-gnome):needs="x11" \
- command="/usr/games/nethack-gnome" \
- hints="Roguelike,Maze,Dungeon" \
- section="Games/Adventure" \
- title="GNOME NetHack" \
- icon="/usr/share/pixmaps/nethack.xpm"
Deleted: packages/trunk/nethack/debian/nethack-gnome.postinst
===================================================================
--- packages/trunk/nethack/debian/nethack-gnome.postinst 2012-06-13 06:00:01 UTC (rev 13702)
+++ packages/trunk/nethack/debian/nethack-gnome.postinst 2012-06-13 06:04:33 UTC (rev 13703)
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-set -e
-
-update-alternatives --install /usr/games/nethack nethack \
- /usr/lib/games/nethack/nethack-gnome-tty.sh 60
-
-update-alternatives --install /usr/games/nethack nethack \
- /usr/lib/games/nethack/nethack-gnome.sh 50
-
-#DEBHELPER#
Deleted: packages/trunk/nethack/debian/nethack-gnome.prerm
===================================================================
--- packages/trunk/nethack/debian/nethack-gnome.prerm 2012-06-13 06:00:01 UTC (rev 13702)
+++ packages/trunk/nethack/debian/nethack-gnome.prerm 2012-06-13 06:04:33 UTC (rev 13703)
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-set -e
-
-update-alternatives --remove nethack /usr/lib/games/nethack/nethack-gnome.sh
-update-alternatives --remove nethack /usr/lib/games/nethack/nethack-gnome-tty.sh
-
-#DEBHELPER#
Modified: packages/trunk/nethack/debian/nethack-x11.desktop
===================================================================
--- packages/trunk/nethack/debian/nethack-x11.desktop 2012-06-13 06:00:01 UTC (rev 13702)
+++ packages/trunk/nethack/debian/nethack-x11.desktop 2012-06-13 06:04:33 UTC (rev 13703)
@@ -1,6 +1,5 @@
[Desktop Entry]
Type=Application
-Encoding=UTF-8
Name=X NetHack
GenericName=NetHack (X interface)
Comment=
Modified: packages/trunk/nethack/debian/rules
===================================================================
--- packages/trunk/nethack/debian/rules 2012-06-13 06:00:01 UTC (rev 13702)
+++ packages/trunk/nethack/debian/rules 2012-06-13 06:04:33 UTC (rev 13703)
@@ -1,76 +1,80 @@
#!/usr/bin/make -f
-# Nethack build script for Debian
-#
-# Behold, mortal, the origins of this makefile...
-#
-# Ben Gertzfield wrote the original debian/rules in 1997.
-# Joshua Kwan revised it in 2003.
-#
-# Copyright 1997-2003 Ben Gertzfield, Joshua Kwan. This script is
-# released under the GNU General Public License, version 2 or later.
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- optimize := -O0
-else
- optimize := -O2
+ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+ MAKEFLAGS += -j$(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
endif
+DEB_CFLAGS := $(shell dpkg-buildflags --get CFLAGS) -Wall
+DEB_CPPFLAGS := $(shell dpkg-buildflags --get CPPFLAGS)
+DEB_LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS)
-export CFLAGS = $(optimize) -I../include -g -Wall -DGCC_WARN -D__CORRECT_ISO_CPP_STRINGS_H_PROTO $(shell dpkg-buildflags --get CFLAGS) $(shell dpkg-buildflags --get CPPFLAGS) -Wno-error=format-security
+# upstream Makefile only has CFLAGS (missing CPPFLAGS)
+# and does not give CFLAGS to linking calls, so add them.
+# also needs some stuff so the Makefile can be overriden:
+CFLAGS = $(DEB_CPPFLAGS) $(DEB_CFLAGS) -I../include -g -Wall -DGCC_WARN
+LFLAGS = $(DEB_CFLAGS) $(DEB_LDFLAGS)
-export LDFLAGS = $(shell dpkg-buildflags --get LDFLAGS)
+build-arch: build-arch-stamp
+build-arch-stamp: Makefile
+ if dpkg-buildflags --status >/dev/null 2>&1 ; then dpkg-buildflags --status ; fi
+ +$(call build_target,console)
+ +$(call build_target,x11)
+ +$(call build_target,lisp)
+ touch src/nethack.dummy ; sleep 2
+ $(MAKE) -j1 LFLAGS='$(LFLAGS)' CFLAGS='$(CFLAGS) -DUSE_XPM' \
+ GAME=src/nethack.dummy \
+ VARDATND="x11tiles pet_mark.xbm rip.xpm mapbg.xpm" \
+ Guidebook data oracles options quest.dat rumors dungeon spec_levs \
+ check-dlb x11tiles pet_mark.xbm rip.xpm mapbg.xpm
+ $(MAKE) -C util LFLAGS='$(LFLAGS)' CFLAGS='$(CFLAGS)' recover
+ touch $@
TARGETS = console lisp x11
-TARGET_NAMES = $(TARGETS:%=build-%)
-TARGET_STAMPS = $(TARGET_NAMES:%=%-stamp)
+define build_target
+ $(MAKE) clean
+ touch include/config.h
+ sleep 2
+ $(MAKE) LFLAGS='$(LFLAGS)' CFLAGS='$(CFLAGS) $(EXTRACPP_$1)' \
+ WINSRC='$(SRC_$1)' WINOBJ='$(OBJ_$1)' WINLIB='$(LIB_$1)' \
+ $(EXTRA_$1) GAME='nethack.$1' \
+ -C src 'nethack.$1'
+endef
+SRC_console = $$(WINTTYSRC)
+OBJ_console = $$(WINTTYOBJ)
+LIB_console = -lncurses
+EXTRACPP_console =
+SRC_x11 = $$(WINTTYSRC) $$(WINX11SRC)
+OBJ_x11 = $$(WINTTYOBJ) $$(WINX11OBJ)
+LIB_x11 = -lncurses -lXaw -Wl,--as-needed -lXmu -lXext -Wl,--no-as-needed -lXt -lXpm -lX11 -Wl,--as-needed -lm -Wl,--no-as-needed
+EXTRACPP_x11 = -DX11_GRAPHICS
+SRC_lisp = $$(WINLISPSRC)
+OBJ_lisp = $$(WINLISPOBJ)
+LIB_lisp = $$(WINLISPLIB)
+EXTRACPP_lisp = -DLISP_GRAPHICS -DDEFAULT_WINDOW_SYS=\"lisp\"
-build: build-arch build-indep
-build-arch: build-stamp
-
-build-indep: build-stamp
-
-build-stamp: $(TARGET_NAMES) build-common
- touch build-stamp
-
Makefile:
# setup.sh makes the symlinks for the Makefiles. Giving it any
# (in this case, 1) tells it to make symlinks.
sh sys/unix/setup.sh 1
-$(TARGET_NAMES): %: %-stamp
-$(TARGET_STAMPS): Makefile
- dh_testdir
- dh_installdirs
-
- touch include/config.h
- $(MAKE) nethack WIN=$(patsubst build-%-stamp,%,$@)
- cp src/nethack debian/$(patsubst build-%-stamp,%,$@)
- touch $@
-
-build-common: build-common-stamp
-
-build-common-stamp: Makefile $(TARGET_NAMES)
- $(MAKE) CFLAGS="$(CFLAGS) -DUSE_XPM" LFLAGS="$(LDFLAGS)" \
- Guidebook data oracles options quest.dat rumors dungeon spec_levs \
- check-dlb x11tiles pet_mark.xbm rip.xpm mapbg.xpm
- cd util && $(MAKE) CFLAGS="$(CFLAGS)" LFLAGS="$(LDFLAGS)" recover
- touch build-common-stamp
-
clean:
dh_testdir
dh_testroot
- rm -f build-stamp build-common-stamp $(TARGET_STAMPS)
+ rm -f build-arch-stamp
rm -f nh10.pcf*
- rm -f $(patsubst %,debian/%/nethack,$(TARGETS))
- -$(MAKE) spotless
- -find . -name Makefile -print0 | xargs -r -0 rm
+ rm -f $(patsubst %,src/nethack.%,$(TARGETS) dummy)
+ if [ -f Makefile ] ; then $(MAKE) spotless ; fi
+ find . -name Makefile -print0 | xargs -r -0 --no-run-if-empty rm
dh_clean
-install: build
+build-indep:
+binary-indep:
+# Ye olde no-op.
+
+binary-arch: build-arch-stamp
dh_testdir
dh_testroot
dh_prep
@@ -99,7 +103,7 @@
install -m 644 debian/x11/NetHack.ad \
debian/nethack-x11/etc/X11/app-defaults/NetHack
- /usr/bin/X11/bdftopcf -o nh10.pcf win/X11/nh10.bdf
+ /usr/bin/bdftopcf -o nh10.pcf win/X11/nh10.bdf
gzip -9f nh10.pcf
install -m 644 nh10.pcf.gz debian/nethack-x11/usr/share/fonts/X11/misc
# all graphics data needed by the graphical front ends
@@ -128,19 +132,11 @@
fi; \
install -m 0644 -o root -g root debian/$$flavor/nethackrc \
debian/nethack-$$flavor/etc/nethack/nethackrc.$$flavor; \
- install -m 2755 -o root -g games debian/$$flavor/nethack \
+ install -m 2755 -o root -g games src/nethack.$$flavor \
debian/nethack-$$flavor/usr/lib/games/nethack/nethack-$$flavor; \
done
-# spoilers have been split out into nethack-spoilers
-
-binary-indep:
-# Ye olde no-op.
-
-binary-arch: build install
- dh_testdir
- dh_testroot
- dh_installdocs -a -A debian/README.Debian README.menucolor
+ dh_installdocs -a -A README.menucolor
dh_installdocs -pnethack-common debian/README.patches
dh_install
dh_installmenu -a
@@ -159,9 +155,7 @@
dh_md5sums -a
dh_builddeb -a
-source diff:
- @echo >&2 'source and diff are obsolete - use dpkg-source -b'; false
-
binary: binary-indep binary-arch
+build: build-arch build-indep
-.PHONY: build build-common clean binary-indep binary-arch binary source diff install $(TARGET_NAMES)
+.PHONY: build build-arch build-indep clean binary-indep binary-arch binary
More information about the Pkg-games-commits
mailing list