[nethack] 12/31: Convert build system to dh, and use .install files
James Cowgill
jcowgill-guest at moszumanska.debian.org
Mon Mar 7 17:54:20 UTC 2016
This is an automated email from the git hooks/post-receive script.
jcowgill-guest pushed a commit to branch master
in repository nethack.
commit dc80425dbf351c7a73a38942b865521b218abbb2
Author: James Cowgill <james410 at cowgill.org.uk>
Date: Fri Mar 4 00:05:34 2016 +0000
Convert build system to dh, and use .install files
---
debian/console/{nethack.sh => nethack-console.sh} | 0
debian/console/{nethackrc => nethackrc.console} | 0
debian/lisp/{nethack.sh => nethack-lisp.sh} | 0
debian/lisp/{nethackrc => nethackrc.lisp} | 0
debian/nethack-common.docs | 1 +
debian/nethack-common.install | 15 +++
debian/nethack-console.install | 3 +
debian/nethack-lisp.install | 3 +
debian/nethack-x11.examples | 1 +
debian/nethack-x11.install | 8 +-
debian/recover-all | 0
debian/recover-helper | 0
debian/rules | 118 ++++------------------
debian/x11/{NetHack.ad => NetHack} | 0
debian/x11/{nethack-tty.sh => nethack-x11-tty.sh} | 0
debian/x11/{nethack.sh => nethack-x11.sh} | 0
debian/x11/{nethackrc => nethackrc.x11} | 0
17 files changed, 49 insertions(+), 100 deletions(-)
diff --git a/debian/console/nethack.sh b/debian/console/nethack-console.sh
old mode 100644
new mode 100755
similarity index 100%
rename from debian/console/nethack.sh
rename to debian/console/nethack-console.sh
diff --git a/debian/console/nethackrc b/debian/console/nethackrc.console
similarity index 100%
rename from debian/console/nethackrc
rename to debian/console/nethackrc.console
diff --git a/debian/lisp/nethack.sh b/debian/lisp/nethack-lisp.sh
old mode 100644
new mode 100755
similarity index 100%
rename from debian/lisp/nethack.sh
rename to debian/lisp/nethack-lisp.sh
diff --git a/debian/lisp/nethackrc b/debian/lisp/nethackrc.lisp
similarity index 100%
rename from debian/lisp/nethackrc
rename to debian/lisp/nethackrc.lisp
diff --git a/debian/nethack-common.docs b/debian/nethack-common.docs
index d528522..e7aab63 100644
--- a/debian/nethack-common.docs
+++ b/debian/nethack-common.docs
@@ -1 +1,2 @@
+debian/README.patches
doc/Guidebook.txt
diff --git a/debian/nethack-common.install b/debian/nethack-common.install
new file mode 100644
index 0000000..d5f36b1
--- /dev/null
+++ b/debian/nethack-common.install
@@ -0,0 +1,15 @@
+debian/nethackrc.tty etc/nethack
+debian/recover-all usr/lib/games/nethack
+debian/recover-helper usr/lib/games/nethack
+dat/nhdat usr/lib/games/nethack
+dat/hh usr/lib/games/nethack
+util/dgn_comp usr/lib/games/nethack
+util/dlb usr/lib/games/nethack
+util/lev_comp usr/lib/games/nethack
+util/recover usr/lib/games/nethack
+debian/nethack.xpm usr/share/pixmaps
+dat/mapbg.xpm usr/share/pixmaps/nethack
+dat/pet_mark.xbm usr/share/pixmaps/nethack
+dat/pilemark.xbm usr/share/pixmaps/nethack
+dat/rip.xpm usr/share/pixmaps/nethack
+dat/x11tiles usr/share/pixmaps/nethack
diff --git a/debian/nethack-console.install b/debian/nethack-console.install
new file mode 100644
index 0000000..18b7b6a
--- /dev/null
+++ b/debian/nethack-console.install
@@ -0,0 +1,3 @@
+debian/console/nethackrc.console etc/nethack
+debian/console/nethack-console.sh usr/lib/games/nethack
+src/nethack-console usr/lib/games/nethack
diff --git a/debian/nethack-lisp.install b/debian/nethack-lisp.install
new file mode 100644
index 0000000..3aadbbb
--- /dev/null
+++ b/debian/nethack-lisp.install
@@ -0,0 +1,3 @@
+debian/lisp/nethackrc.lisp etc/nethack
+debian/lisp/nethack-lisp.sh usr/lib/games/nethack
+src/nethack-lisp usr/lib/games/nethack
diff --git a/debian/nethack-x11.examples b/debian/nethack-x11.examples
new file mode 100644
index 0000000..a251ed7
--- /dev/null
+++ b/debian/nethack-x11.examples
@@ -0,0 +1 @@
+debian/x11/NetHack
diff --git a/debian/nethack-x11.install b/debian/nethack-x11.install
index 04aa3b2..e2171dd 100644
--- a/debian/nethack-x11.install
+++ b/debian/nethack-x11.install
@@ -1 +1,7 @@
-debian/nethack-x11.desktop usr/share/applications
+debian/x11/NetHack etc/X11/app-defaults
+debian/x11/nethackrc.x11 etc/nethack
+debian/x11/nethack-x11.sh usr/lib/games/nethack
+debian/x11/nethack-x11-tty.sh usr/lib/games/nethack
+src/nethack-x11 usr/lib/games/nethack
+debian/nethack-x11.desktop usr/share/applications
+debian/nh10.pcf.gz usr/share/fonts/X11/misc
diff --git a/debian/recover-all b/debian/recover-all
old mode 100644
new mode 100755
diff --git a/debian/recover-helper b/debian/recover-helper
old mode 100644
new mode 100755
diff --git a/debian/rules b/debian/rules
index bd5143e..3fcb333 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,17 +13,16 @@ DEB_LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS)
CFLAGS = $(DEB_CPPFLAGS) $(DEB_CFLAGS) -I../include -Wall -DGCC_WARN
LFLAGS = $(DEB_CFLAGS) $(DEB_LDFLAGS)
-build-arch: build-arch-stamp
-build-arch-stamp: Makefile
+override_dh_auto_build: Makefile
+$(call build_target,console)
+$(call build_target,x11)
+$(call build_target,lisp)
- touch src/nethack.dummy ; sleep 2
+ touch src/nethack-dummy ; sleep 2
$(MAKE) -j1 LFLAGS='$(LFLAGS)' CFLAGS='$(CFLAGS) -DUSE_XPM' \
- GAME=src/nethack.dummy \
+ GAME=src/nethack-dummy \
VARDATND="x11tiles NetHack.ad pet_mark.xbm pilemark.xbm rip.xpm mapbg.xpm" \
all
- touch $@
+ /usr/bin/bdftopcf win/X11/nh10.bdf | gzip -9f > debian/nh10.pcf.gz
TARGETS = console lisp x11
@@ -33,8 +32,8 @@ define build_target
sleep 2
$(MAKE) LFLAGS='$(LFLAGS)' CFLAGS='$(CFLAGS) $(EXTRACPP_$1)' \
WINSRC='$(SRC_$1)' WINOBJ='$(OBJ_$1)' WINLIB='$(LIB_$1)' \
- LINK='$$(CC)' $(EXTRA_$1) GAME='nethack.$1' \
- -C src 'nethack.$1'
+ LINK='$$(CC)' $(EXTRA_$1) GAME='nethack-$1' \
+ -C src 'nethack-$1'
endef
SRC_console = $$(WINTTYSRC) $$(WINCURSESSRC)
OBJ_console = $$(WINTTYOBJ) $$(WINCURSESOBJ)
@@ -54,105 +53,26 @@ Makefile:
# setup.sh creates all the Makefiles.
sh sys/unix/setup.sh
-clean:
- dh_testdir
- dh_testroot
- rm -f build-arch-stamp
- rm -f nh10.pcf*
- rm -f $(patsubst %,src/nethack.%,$(TARGETS) dummy)
+override_dh_auto_install:
+
+override_dh_auto_clean:
+ rm -f debian/nh10.pcf.gz
+ 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
-
-build-indep:
-binary-indep:
-# Ye olde no-op.
-
-binary-arch: build-arch-stamp
- dh_testdir
- dh_testroot
- dh_prep
- dh_installdirs
+override_dh_installinit:
dh_installinit --no-start -pnethack-common -- 'start 18 2 3 4 5 .'
- dh_link
- chgrp games debian/nethack-common/usr/lib/games/nethack
+override_dh_fixperms:
+ dh_fixperms
+ chgrp games debian/nethack-common/usr/lib/games/nethack/recover
chgrp -R games debian/nethack-common/var/games/nethack
chmod -R 2775 debian/nethack-common/var/games/nethack
-
- install -m 0755 -o root -g root debian/recover-helper \
- debian/nethack-common/usr/lib/games/nethack/recover-helper
- install -m 0755 -o root -g root debian/recover-all \
- debian/nethack-common/usr/lib/games/nethack/recover-all
-
- install -m 0644 -o root -g root dat/nhdat \
- debian/nethack-common/usr/lib/games/nethack/nhdat
- install -m 0644 -o root -g root dat/hh \
- debian/nethack-common/usr/lib/games/nethack/hh
-
- 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/share/pixmaps
-
- install -m 644 debian/x11/NetHack.ad \
- debian/nethack-x11/etc/X11/app-defaults/NetHack
-
- /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
- 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 dgn_comp lev_comp dlb; do \
- install -m 0755 -o root -g root util/$$prg \
- debian/nethack-common/usr/lib/games/nethack/$$prg; \
- done
-
- # may become setgid games
- install -m 0755 -o root -g games util/recover \
- debian/nethack-common/usr/lib/games/nethack/recover; \
-
- # all shell scripts, nethack binaries, and nethackrcs
for flavor in $(TARGETS); do \
- install -m 0755 -o root -g root 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 root 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 src/nethack.$$flavor \
- debian/nethack-$$flavor/usr/lib/games/nethack/nethack-$$flavor; \
+ chgrp games debian/nethack-$$flavor/usr/lib/games/nethack/nethack-$$flavor; \
+ chmod 2755 debian/nethack-$$flavor/usr/lib/games/nethack/nethack-$$flavor; \
done
- dh_installdocs -a -A 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
- dh_installman -a
- dh_installchangelogs -a
- dh_installxfonts -a
- dh_lintian -a
- dh_strip -a
- dh_compress -a
- dh_fixperms -a -Xnethack
- dh_installdeb -a
- dh_shlibdeps -a
- dh_gencontrol -a
- dh_md5sums -a
- dh_builddeb -a
-
-binary: binary-indep binary-arch
-build: build-arch build-indep
-
-.PHONY: build build-arch build-indep clean binary-indep binary-arch binary
+%:
+ dh $@
diff --git a/debian/x11/NetHack.ad b/debian/x11/NetHack
similarity index 100%
rename from debian/x11/NetHack.ad
rename to debian/x11/NetHack
diff --git a/debian/x11/nethack-tty.sh b/debian/x11/nethack-x11-tty.sh
old mode 100644
new mode 100755
similarity index 100%
rename from debian/x11/nethack-tty.sh
rename to debian/x11/nethack-x11-tty.sh
diff --git a/debian/x11/nethack.sh b/debian/x11/nethack-x11.sh
old mode 100644
new mode 100755
similarity index 100%
rename from debian/x11/nethack.sh
rename to debian/x11/nethack-x11.sh
diff --git a/debian/x11/nethackrc b/debian/x11/nethackrc.x11
similarity index 100%
rename from debian/x11/nethackrc
rename to debian/x11/nethackrc.x11
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/nethack.git
More information about the Pkg-games-commits
mailing list