[Pkg-nethack-devel] nethack nethack-common.links,NONE,1.1 nethack-console.links,NONE,1.1 nethack-gnome.links,NONE,1.1 nethack-lisp.links,NONE,1.1 nethack-qt.links,NONE,1.1 nethack-x11.links,NONE,1.1 rules,1.13,1.14

Joshua Kwan joshk-guest@quantz.debian.org
Mon, 22 Dec 2003 22:56:55 +0000


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

Modified Files:
	rules 
Added Files:
	nethack-common.links nethack-console.links nethack-gnome.links 
	nethack-lisp.links nethack-qt.links nethack-x11.links 
Log Message:
use dh_link to do all our symlinks for us


--- NEW FILE: nethack-common.links ---
../../../share/doc/nethack-common/copyright usr/lib/games/nethack/license

--- NEW FILE: nethack-lisp.links ---
../lib/games/nethack/nethack-lisp.sh usr/games/nethack-lisp
nethack.6.gz usr/share/man/man6/nethack-lisp.6.gz

--- NEW FILE: nethack-x11.links ---
../lib/games/nethack/nethack-x11.sh usr/games/xnethack
nethack.6.gz usr/share/man/man6/xnethack.6.gz


--- NEW FILE: nethack-console.links ---
../lib/games/nethack/nethack-console.sh usr/games/nethack-console
nethack.6.gz usr/share/man/man6/nethack-console.6.gz

--- NEW FILE: nethack-qt.links ---
../lib/games/nethack/nethack-qt.sh usr/games/nethack-qt
nethack.6.gz usr/share/man/man6/nethack-qt.6.gz

Index: rules
===================================================================
RCS file: /cvsroot/pkg-nethack/nethack/rules,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- rules	22 Dec 2003 09:49:20 -0000	1.13
+++ rules	22 Dec 2003 22:56:52 -0000	1.14
@@ -140,12 +140,24 @@
 
 	install -d debian/nethack-common/usr/share/pixmaps/nethack
 	
-	for file in x11tiles pet_mark.xbm rip.xpm mapbg.xpm; \
-	do \
+	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; \
+	    debian/nethack-common/usr/share/pixmaps/nethack; \
 	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 \
+	    debian/nethack-$$flavor/usr/lib/games/nethack/nethack-$$flavor.sh; \
+	  if [ -f "debian/$$flavor/nethack-tty.sh" ]; then \
+	    install -m 0755 -o root -g games debian/$$flavor/nethack-tty.sh \
+	      debian/nethack-$$flavor/usr/lib/games/nethack/nethack-$$flavor-tty.sh; \
+	  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 \
+	    debian/nethack-$$flavor/usr/lib/games/nethack/nethack-$$flavor; \
+	done
 # spoilers have been split out into nethack-spoilers
 
 # init.d script
@@ -157,119 +169,14 @@
 	install -m 0644 -o root -g root debian/nethack.xpm \
 	  debian/nethack-common/usr/X11R6/include/X11/pixmaps
 
-	# This must be here for in-game license viewing to work
-	ln -sf ../../../share/doc/nethack-common/copyright \
-	  debian/nethack-common/usr/lib/games/nethack/license
-
-###
-# install nethack-x11 stuff
-###
-	install -m 0755 -o root -g games \
-	  debian/x11/nethack.sh \
-	  debian/nethack-x11/usr/lib/games/nethack/nethack-x11.sh
-
-	ln -sf ../lib/games/nethack/nethack-x11.sh \
-	  debian/nethack-x11/usr/games/xnethack
-
-	install -m 0755 -o root -g games \
-	  debian/x11/nethack-tty.sh \
-	  debian/nethack-x11/usr/lib/games/nethack/nethack-x11-tty.sh
-
-# system-wide X nethack.rc file, thanks again joey :)
-	install -m 644 -o root -g root debian/x11/nethackrc \
-	  debian/nethack-x11/etc/nethack/nethackrc.x11
 	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
 
-	install -m 2755 -o root -g games debian/x11/nethack \
-	  debian/nethack-x11/usr/lib/games/nethack/nethack-x11
-
-	ln -sf nethack.6.gz debian/nethack-x11/usr/share/man/man6/xnethack.6.gz
-
-###
-# install nethack-qt stuff
-###
-	install -m 644 -o root -g root debian/qt/nethackrc \
-	  debian/nethack-qt/etc/nethack/nethackrc.qt
-
-	install -m 0755 -o root -g games \
-	  debian/qt/nethack.sh \
-	  debian/nethack-qt/usr/lib/games/nethack/nethack-qt.sh
-
-	ln -sf ../lib/games/nethack/nethack-qt.sh \
-	  debian/nethack-qt/usr/games/nethack-qt
-
-	install -m 0755 -o root -g games \
-	  debian/qt/nethack-tty.sh \
-	  debian/nethack-qt/usr/lib/games/nethack/nethack-qt-tty.sh
-
-	install -m 2755 -o root -g games debian/qt/nethack \
-	  debian/nethack-qt/usr/lib/games/nethack/nethack-qt
-
-	ln -sf nethack.6.gz debian/nethack-qt/usr/share/man/man6/nethack-qt.6.gz
-
-###
-# install nethack-console stuff
-###
-	install -m 644 -o root -g root debian/console/nethackrc \
-	  debian/nethack-console/etc/nethack/nethackrc.console
-
-	install -m 0755 -o root -g games \
-	  debian/console/nethack.sh \
-	  debian/nethack-console/usr/lib/games/nethack/nethack-console.sh
-
-	ln -sf ../lib/games/nethack/nethack-console.sh \
-	  debian/nethack-console/usr/games/nethack-console
-
-	install -m 2755 -o root -g games debian/console/nethack \
-	  debian/nethack-console/usr/lib/games/nethack/nethack-console
-
-	ln -sf nethack.6.gz \
-	  debian/nethack-console/usr/share/man/man6/nethack-console.6.gz
-
-# install nethack-lisp stuff
-###
-	install -m 644 -o root -g root debian/lisp/nethackrc \
-	  debian/nethack-lisp/etc/nethack/nethackrc.lisp
-
-	install -m 0755 -o root -g games \
-	  debian/lisp/nethack.sh \
-	  debian/nethack-lisp/usr/lib/games/nethack/nethack-lisp.sh
-
-	ln -sf ../lib/games/nethack/nethack-lisp.sh \
-	  debian/nethack-lisp/usr/games/nethack-lisp
-
-	install -m 2755 -o root -g games debian/lisp/nethack \
-	  debian/nethack-lisp/usr/lib/games/nethack/nethack-lisp
-
-	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/gnome/nethackrc \
-	  debian/nethack-gnome/etc/nethack/nethackrc.gnome
-
-	install -m 0755 -o root -g games \
-	  debian/gnome/nethack.sh \
-	  debian/nethack-gnome/usr/lib/games/nethack/nethack-gnome.sh
-
-	ln -sf ../lib/games/nethack/nethack-gnome.sh \
-	  debian/nethack-gnome/usr/games/nethack-gnome
-
-	install -m 0755 -o root -g games \
-	  debian/gnome/nethack-tty.sh \
-	  debian/nethack-gnome/usr/lib/games/nethack/nethack-gnome-tty.sh
-
-	install -m 2755 -o root -g games debian/gnome/nethack \
-	  debian/nethack-gnome/usr/lib/games/nethack/nethack-gnome
-
-	ln -sf nethack.6.gz \
-	  debian/nethack-gnome/usr/share/man/man6/nethack-gnome.6.gz
+	dh_link
 
 binary-indep: build
 	dh_testdir

--- NEW FILE: nethack-gnome.links ---
../lib/games/nethack/nethack-gnome.sh usr/games/nethack-gnome
nethack.6.gz usr/share/man/man6/nethack-gnome.6.gz