[Pkg-nethack-devel] nethack changelog,1.33,1.34 rules,1.12,1.13

[Joshua Kwan]

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

Modified Files:
	changelog rules 
Log Message:
More build system unclutterage. thanks in part to aaronl


Index: changelog
===================================================================
RCS file: /cvsroot/pkg-nethack/nethack/changelog,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- changelog	22 Dec 2003 03:04:08 -0000	1.33
+++ changelog	22 Dec 2003 09:49:20 -0000	1.34
@@ -1,7 +1,13 @@
-nethack (3.4.3-2) unstable; urgency=low
+nethack (3.4.3-2) unstable; urgency=medium
 
-  * Sponsor was using a buggy source package, which broke nethack-gnome and
-    nethack-qt. So, trying again...
+  * Joshua Kwan <joshk@triplehelix.org>:
+    - Fix busted PIXMAPDIR that broke nethack-qt and nethack-gnome.
+      Was actually in CVS but not applied to the uploaded source.
+    - Lose t32-1024.xpm because it belongs to jnethack and doesn't work
+      with gnomehack.
+    - Clean up the build system by removing redundant Makefile.src's.
+      + 05_build_cflags.dpatch replaced by 05_makefile_logic.dpatch;
+        thanks Aaron Lehmann <aaronl@vitelus.com>
 
  -- Joshua Kwan <joshk@triplehelix.org>  Sun, 21 Dec 2003 18:27:07 -0800
 

Index: rules
===================================================================
RCS file: /cvsroot/pkg-nethack/nethack/rules,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- rules	18 Nov 2003 05:06:22 -0000	1.12
+++ rules	22 Dec 2003 09:49:20 -0000	1.13
@@ -31,11 +31,8 @@
 	dh_installdirs
 
 	touch include/config.h
-	
-	rm -f src/Makefile
-	cp debian/console/Makefile.src src/Makefile
 
-	$(MAKE) nethack CFLAGS='$(CFLAGS)'
+	$(MAKE) nethack WIN=tty
 
 	cp src/nethack debian/console
 
@@ -48,10 +45,7 @@
 
 	touch include/config.h
 
-	rm -f src/Makefile
-	cp debian/lisp/Makefile.src src/Makefile
-
-	$(MAKE) nethack CFLAGS='$(CFLAGS) -DLISP_GRAPHICS -DDEFAULT_WINDOW_SYS=\"lisp\"'
+	$(MAKE) nethack WIN=lisp
 	
 	cp src/nethack debian/lisp
 
@@ -64,10 +58,7 @@
 
 	touch include/config.h
 	
-	rm -f src/Makefile
-	cp debian/x11/Makefile.src src/Makefile
-
-	$(MAKE) nethack CFLAGS='$(CFLAGS) -I/usr/X11R6/include -DX11_GRAPHICS' LFLAGS='-L/usr/X11R6/lib' 
+	$(MAKE) nethack WIN=x11
 
 	cp src/nethack debian/x11
 
@@ -79,10 +70,8 @@
 	-$(MAKE) clean
 
 	touch include/config.h
-# build GNOME interface
-	cp debian/gnome/Makefile.src src/Makefile
 
-	$(MAKE) nethack CFLAGS='$(CFLAGS) -I/usr/X11R6/include -DGNOME_GRAPHICS' LFLAGS='-L/usr/X11R6/lib' 
+	$(MAKE) nethack WIN=gnome
 
 	cp src/nethack debian/gnome
 	touch build-gnome-stamp
@@ -92,10 +81,8 @@
 	-$(MAKE) clean
 
 	touch include/config.h
-# build QT interface
-	cp debian/qt/Makefile.src src/Makefile
 
-	$(MAKE) nethack CFLAGS='$(CFLAGS) -I/usr/X11R6/include -DQT_GRAPHICS' LFLAGS='-L/usr/X11R6/lib' 
+	$(MAKE) nethack WIN=qt
 
 	cp src/nethack debian/qt
 	touch build-qt-stamp
@@ -261,13 +248,9 @@
 	ln -sf nethack.6.gz \
 	  debian/nethack-lisp/usr/share/man/man6/nethack-lisp.6.gz
 
-
 ###
 # install nethack-gnome stuff
 ###
-	install -m 644 -o root -g root debian/t32-1024.xpm \
-	  debian/nethack-gnome/usr/share/pixmaps/nethack/
-	  
 	install -m 644 -o root -g root debian/gnome/nethackrc \
 	  debian/nethack-gnome/etc/nethack/nethackrc.gnome