[Pkg-nethack-devel] nethack changelog,1.34,1.35 nethack-common.dirs,1.1,1.2 nethack-common.links,1.1,1.2 nethack-console.links,1.1,1.2 nethack-gnome.links,1.1,1.2 nethack-lisp.links,1.1,1.2 nethack-qt.links,1.1,1.2 nethack-x11.links,1.1,1.2 rules,1.15,1.16

Joshua Kwan joshk-guest@quantz.debian.org
Fri, 26 Dec 2003 09:27:45 +0000


Update of /cvsroot/pkg-nethack/nethack
In directory quantz:/tmp/cvs-serv20044

Modified Files:
	changelog nethack-common.dirs nethack-common.links 
	nethack-console.links nethack-gnome.links nethack-lisp.links 
	nethack-qt.links nethack-x11.links rules 
Log Message:
Fix all the broken .links, and move some more stuff around in rules.


Index: nethack-common.links
===================================================================
RCS file: /cvsroot/pkg-nethack/nethack/nethack-common.links,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- nethack-common.links	22 Dec 2003 22:56:52 -0000	1.1
+++ nethack-common.links	26 Dec 2003 09:27:43 -0000	1.2
@@ -1 +1 @@
-../../../share/doc/nethack-common/copyright usr/lib/games/nethack/license
+usr/share/doc/nethack-common/copyright usr/lib/games/nethack/license

Index: nethack-lisp.links
===================================================================
RCS file: /cvsroot/pkg-nethack/nethack/nethack-lisp.links,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- nethack-lisp.links	22 Dec 2003 22:56:52 -0000	1.1
+++ nethack-lisp.links	26 Dec 2003 09:27:43 -0000	1.2
@@ -1,2 +1,2 @@
-../lib/games/nethack/nethack-lisp.sh usr/games/nethack-lisp
-nethack.6.gz usr/share/man/man6/nethack-lisp.6.gz
+usr/lib/games/nethack/nethack-lisp.sh usr/games/nethack-lisp
+usr/share/man/man6/nethack.6.gz usr/share/man/man6/nethack-lisp.6.gz

Index: nethack-x11.links
===================================================================
RCS file: /cvsroot/pkg-nethack/nethack/nethack-x11.links,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- nethack-x11.links	22 Dec 2003 22:56:52 -0000	1.1
+++ nethack-x11.links	26 Dec 2003 09:27:43 -0000	1.2
@@ -1,3 +1,3 @@
-../lib/games/nethack/nethack-x11.sh usr/games/xnethack
-nethack.6.gz usr/share/man/man6/xnethack.6.gz
+usr/lib/games/nethack/nethack-x11.sh usr/games/xnethack
+usr/share/man/man6/nethack.6.gz usr/share/man/man6/xnethack.6.gz
 

Index: nethack-console.links
===================================================================
RCS file: /cvsroot/pkg-nethack/nethack/nethack-console.links,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- nethack-console.links	22 Dec 2003 22:56:52 -0000	1.1
+++ nethack-console.links	26 Dec 2003 09:27:43 -0000	1.2
@@ -1,2 +1,2 @@
-../lib/games/nethack/nethack-console.sh usr/games/nethack-console
-nethack.6.gz usr/share/man/man6/nethack-console.6.gz
+usr/lib/games/nethack/nethack-console.sh usr/games/nethack-console
+usr/share/man/man6/nethack.6.gz usr/share/man/man6/nethack-console.6.gz

Index: nethack-qt.links
===================================================================
RCS file: /cvsroot/pkg-nethack/nethack/nethack-qt.links,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- nethack-qt.links	22 Dec 2003 22:56:52 -0000	1.1
+++ nethack-qt.links	26 Dec 2003 09:27:43 -0000	1.2
@@ -1,2 +1,2 @@
-../lib/games/nethack/nethack-qt.sh usr/games/nethack-qt
-nethack.6.gz usr/share/man/man6/nethack-qt.6.gz
+usr/lib/games/nethack/nethack-qt.sh usr/games/nethack-qt
+usr/share/man/man6/nethack.6.gz usr/share/man/man6/nethack-qt.6.gz

Index: rules
===================================================================
RCS file: /cvsroot/pkg-nethack/nethack/rules,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- rules	23 Dec 2003 02:41:47 -0000	1.15
+++ rules	26 Dec 2003 09:27:43 -0000	1.16
@@ -2,9 +2,13 @@
 
 # Nethack build script for Debian
 #
-# Ben Gertzfield (che@debian.org) 29 July 1997
-# Copyright 1997 Ben Gertzfield. This script is released under the
-# GNU General Public License, version 2 or later.
+# 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.
 
 include /usr/share/dpatch/dpatch.make
 
@@ -14,7 +18,7 @@
 	optimize := -O2
 endif
 
-export CFLAGS = $(optimize) -I../include -fomit-frame-pointer -g -Wall -DGCC_WARN
+export CFLAGS = $(optimize) -I../include -g -Wall -DGCC_WARN
 
 build: patch-stamp build-stamp
 build-stamp: Makefile build-lisp build-console build-x11 build-gnome build-qt build-common
@@ -114,37 +118,43 @@
 	dh_testroot
 	dh_clean -k
 	dh_installdirs
+	dh_installinit --no-start -pnethack-common
+	dh_link
 
 	chgrp games debian/nethack-common/usr/lib/games/nethack
 	chgrp -R games debian/nethack-common/var/games/nethack
 	chmod -R 0775 debian/nethack-common/var/games/nethack
-
-	install -m 0755 -o root -g games util/recover \
-	  debian/nethack-common/usr/lib/games/nethack/recover
-
+	
 	install -m 0755 -o root -g root debian/recover-helper \
 	  debian/nethack-common/usr/lib/games/nethack/recover-helper
 
-# install the dgn_comp and lev_comp programs
-	install -m 755 -o root -g games util/dgn_comp \
-	  debian/nethack-common/usr/lib/games/nethack/dgn_comp
-
-	install -m 755 -o root -g games util/lev_comp \
-	  debian/nethack-common/usr/lib/games/nethack/lev_comp
-
-	install -m 755 -o root -g games util/dlb \
-	  debian/nethack-common/usr/lib/games/nethack/dlb
-
 	install -m 0644 -o root -g root dat/nhdat \
 	  debian/nethack-common/usr/lib/games/nethack/nhdat
 
-	install -d debian/nethack-common/usr/share/pixmaps/nethack
-	
+	install -m 0644 -o root -g root debian/nethackrc.tty \
+	  debian/nethack-common/etc/nethack/nethackrc.tty
+
+	install -m 0644 -o root -g root debian/nethack.xpm \
+	  debian/nethack-common/usr/X11R6/include/X11/pixmaps
+
+	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 
+	gzip -9f nh10.pcf
+	install -m 644 nh10.pcf.gz debian/nethack-x11/usr/X11R6/lib/X11/fonts/misc/
+	# all graphics data needed by the graphical front ends
 	for file in x11tiles pet_mark.xbm rip.xpm mapbg.xpm; do \
 	  install -m 0644 -o root -g root dat/$$file \
 	    debian/nethack-common/usr/share/pixmaps/nethack; \
 	done
 
+	# install all utilities
+	for prg in recover dgn_comp lev_comp dlb; do \
+	  install -m 0755 -o root -g games util/$$prg \
+	    debian/nethack-common/usr/lib/games/nethack/$$prg; \
+	done
+
 	# all shell scripts, nethack binaries, and nethackrcs
 	for flavor in console gnome x11 qt lisp; do \
 	  install -m 0755 -o root -g games debian/$$flavor/nethack.sh \
@@ -158,25 +168,8 @@
 	  install -m 2755 -o root -g games debian/$$flavor/nethack \
 	    debian/nethack-$$flavor/usr/lib/games/nethack/nethack-$$flavor; \
 	done
-# spoilers have been split out into nethack-spoilers
-
-# init.d script
-	dh_installinit --no-start -pnethack-common
-
-	install -m 0644 -o root -g root debian/nethackrc.tty \
-	  debian/nethack-common/etc/nethack/nethackrc.tty
 
-	install -m 0644 -o root -g root debian/nethack.xpm \
-	  debian/nethack-common/usr/X11R6/include/X11/pixmaps
-
-	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 
-	install -m 644 nh10.pcf debian/nethack-x11/usr/X11R6/lib/X11/fonts/misc/
-	gzip -9f debian/nethack-x11/usr/X11R6/lib/X11/fonts/misc/nh10.pcf
-
-	dh_link
+# spoilers have been split out into nethack-spoilers
 
 binary-indep: build
 	dh_testdir

Index: nethack-gnome.links
===================================================================
RCS file: /cvsroot/pkg-nethack/nethack/nethack-gnome.links,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- nethack-gnome.links	22 Dec 2003 22:56:52 -0000	1.1
+++ nethack-gnome.links	26 Dec 2003 09:27:43 -0000	1.2
@@ -1,2 +1,2 @@
-../lib/games/nethack/nethack-gnome.sh usr/games/nethack-gnome
-nethack.6.gz usr/share/man/man6/nethack-gnome.6.gz
+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

Index: changelog
===================================================================
RCS file: /cvsroot/pkg-nethack/nethack/changelog,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- changelog	22 Dec 2003 09:49:20 -0000	1.34
+++ changelog	26 Dec 2003 09:27:43 -0000	1.35
@@ -1,3 +1,14 @@
+nethack (3.4.3-3) unstable; urgency=low
+
+  * Joshua Kwan <joshk@triplehelix.org>:
+    - More build system cleanups.
+    - Remove x11/Makefile.src, missed last time.
+    - Remove old warnings and caveats in README.Debian that are obsoleted
+      with 18_overridewin.dpatch. (i.e., stick windowtype:tty into your
+      $NETHACKOPTIONS if you intend to set it)
+
+ -- Joshua Kwan <joshk@triplehelix.org>  Mon, 22 Dec 2003 18:57:17 -0800
+
 nethack (3.4.3-2) unstable; urgency=medium
 
   * Joshua Kwan <joshk@triplehelix.org>:

Index: nethack-common.dirs
===================================================================
RCS file: /cvsroot/pkg-nethack/nethack/nethack-common.dirs,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- nethack-common.dirs	7 Oct 2003 23:35:08 -0000	1.1
+++ nethack-common.dirs	26 Dec 2003 09:27:43 -0000	1.2
@@ -1,4 +1,5 @@
 usr/X11R6/include/X11/pixmaps
+usr/share/pixmaps/nethack
 usr/lib/games/nethack
 var/games/nethack/save
 etc/init.d