[koules] 06/10: Use short dh style

Stephen Kitt skitt at moszumanska.debian.org
Sat Oct 7 21:06:02 UTC 2017


This is an automated email from the git hooks/post-receive script.

skitt pushed a commit to branch master
in repository koules.

commit 3646631ceedf55f4fdc73da11f240e961536a8b9
Author: Stephen Kitt <steve at sk2.org>
Date:   Tue Sep 19 20:39:25 2017 +0200

    Use short dh style
---
 debian/changelog                |  1 +
 debian/clean                    |  1 +
 debian/copyright                |  8 ++--
 debian/patches/114_destdir.diff | 94 +++++++++++++++++++++++++++++++++++++++++
 debian/patches/series           |  1 +
 debian/rules                    | 70 ++++--------------------------
 6 files changed, 109 insertions(+), 66 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 496f2e8..e8389e5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ koules (1.4-24) UNRELEASED; urgency=medium
   * Drop obsolete postinst and prerm, they dealt with the /usr/share/doc
     migration.
   * Update spelling fixes.
+  * Use short dh style.
 
  -- Stephen Kitt <skitt at debian.org>  Fri, 22 Jan 2016 19:01:49 +0100
 
diff --git a/debian/clean b/debian/clean
new file mode 100644
index 0000000..39e9e70
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1 @@
+xkoules.man
diff --git a/debian/copyright b/debian/copyright
index e8467c0..34a685f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -9,10 +9,10 @@ Copyright: 1995, 1996 Jan Hubicka, Kamil Toman, Ludvik Tesar,
 License: GPL-2+
 
 Files: debian/*
-Copyright: 2006-2009 Alexander Reiche-Schmehl
-           2006      Sam Hocevar
-	   2007-2009 Barry deFreese
-	   2012-2015 Stephen Kitt
+Copyright: 2006-2009       Alexander Reiche-Schmehl
+           2006            Sam Hocevar
+	   2007-2009       Barry deFreese
+	   2012-2015, 2017 Stephen Kitt
 License: GPL-2+
 
 License: GPL-2+
diff --git a/debian/patches/114_destdir.diff b/debian/patches/114_destdir.diff
new file mode 100644
index 0000000..7633fbf
--- /dev/null
+++ b/debian/patches/114_destdir.diff
@@ -0,0 +1,94 @@
+Description: Use $(DESTDIR) for all installed artifacts
+Author: Stephen Kitt <skitt at debian.org>
+
+--- a/Imakefile
++++ b/Imakefile
+@@ -103,23 +103,23 @@
+ 	@echo "Koules directory is " $(KOULESDIR)
+ 	@:
+ 	@echo "Instalin man page to " $(MANDIR)
+-	@mkdirhier $(MANDIR)
+-	$(INSTALL) -c $(INSTBINFLAGS) xkoules.6 $(MANDIR);
++	@mkdirhier $(DESTDIR)$(MANDIR)
++	$(INSTALL) -c $(INSTBINFLAGS) xkoules.6 $(DESTDIR)$(MANDIR);
+ 	@:
+ 	@echo "Creating directory " $(KOULESDIR)
+-	@if [ ! -d $(KOULESDIR) ]; then mkdirhier $(KOULESDIR); fi
++	@if [ ! -d $(DESTDIR)$(KOULESDIR) ]; then mkdirhier $(DESTDIR)$(KOULESDIR); fi
+ 	@:
+ 	@if [ "$(INSTALLSOUND)" = "True" ]; 				\
+ 	 then								\
+ 		echo "Creating directory " $(SOUNDDIR); 		\
+-		if [ ! -d $(SOUNDDIR) ]; then mkdirhier $(SOUNDDIR); fi;    \
++		if [ ! -d $(DESTDIR)$(SOUNDDIR) ]; then mkdirhier $(DESTDIR)$(SOUNDDIR); fi;    \
+ 		echo "Copying sound server to directory " $(SOUNDDIR); \
+-		$(INSTALL) -c -s $(INSTBINFLAGS) $(SOUNDSERVER) $(SOUNDDIR); \
++		$(INSTALL) -c -s $(INSTBINFLAGS) $(SOUNDSERVER) $(DESTDIR)$(SOUNDDIR); \
+ 		echo "Copying sound files into directory " $(SOUNDDIR); \
+ 		cd ./sounds; set -x;					\
+ 		for file in *.raw; do                                   \
+ 		    auconvert -raw linu8 1 -rate 8000 -volume 40 $$file -file snd `basename $$file .raw`.au ; \
+-		    $(INSTALL) -c $(INSTDATFLAGS) `basename $$file .raw`.au $(SOUNDDIR); \
++		    $(INSTALL) -c $(INSTDATFLAGS) `basename $$file .raw`.au $(DESTDIR)$(SOUNDDIR); \
+ 		done;                                                   \
+ 	 fi
+ 	@echo
+@@ -131,23 +131,23 @@
+ 	@echo "Koules directory is " $(KOULESDIR)
+ 	@:
+ 	@echo "Instalin man page to " $(MANDIR)
+-	@mkdirhier $(MANDIR)
+-	$(INSTALL) -c $(INSTBINFLAGS) xkoules.6 $(MANDIR);
++	@mkdirhier $(DESTDIR)$(MANDIR)
++	$(INSTALL) -c $(INSTBINFLAGS) xkoules.6 $(DESTDIR)$(MANDIR);
+ 	@:
+ 	@echo "Creating directory " $(KOULESDIR)
+-	@if [ ! -d $(KOULESDIR) ]; then mkdirhier $(KOULESDIR); fi
++	@if [ ! -d $(DESTDIR)$(KOULESDIR) ]; then mkdirhier $(DESTDIR)$(KOULESDIR); fi
+ 	@:
+ 	@if [ "$(INSTALLSOUND)" = "True" ]; 				\
+ 	 then								\
+ 		echo "Creating directory " $(SOUNDDIR); 		\
+-		if [ ! -d $(SOUNDDIR) ]; then mkdirhier $(SOUNDDIR); fi;    \
++		if [ ! -d $(DESTDIR)$(SOUNDDIR) ]; then mkdirhier $(DESTDIR)$(SOUNDDIR); fi;    \
+ 		echo "Copying sound server to directory " $(SOUNDDIR); \
+-		$(INSTALL) -c -s $(INSTBINFLAGS) $(SOUNDSERVER) $(SOUNDDIR); \
++		$(INSTALL) -c -s $(INSTBINFLAGS) $(SOUNDSERVER) $(DESTDIR)$(SOUNDDIR); \
+ 		echo "Copying sound files into directory " $(SOUNDDIR); \
+ 		cd ./sounds; set -x;					\
+ 		for file in *.raw; do                                   \
+ 		    sh ../myauconvert $$file `basename $$file .raw`.au ; \
+-		    $(INSTALL) -c $(INSTDATFLAGS) `basename $$file .raw`.au $(SOUNDDIR); \
++		    $(INSTALL) -c $(INSTDATFLAGS) `basename $$file .raw`.au $(DESTDIR)$(SOUNDDIR); \
+ 		done;                                                   \
+ 	 fi
+ 	@echo
+@@ -161,22 +161,22 @@
+ 	@echo "Koules directory is " $(KOULESDIR)
+ 	@:
+ 	@echo "Instalin man page to " $(MANDIR)
+-	@mkdirhier $(MANDIR)
+-	$(INSTALL) -c $(INSTBINFLAGS) xkoules.6 $(MANDIR);
++	@mkdirhier $(DESTDIR)$(MANDIR)
++	$(INSTALL) -c $(INSTBINFLAGS) xkoules.6 $(DESTDIR)$(MANDIR);
+ 	@:
+ 	@echo "Creating directory " $(KOULESDIR)
+-	@if [ ! -d $(KOULESDIR) ]; then mkdirhier $(KOULESDIR); fi
++	@if [ ! -d $(DESTDIR)$(KOULESDIR) ]; then mkdirhier $(DESTDIR)$(KOULESDIR); fi
+ 	@:
+ 	@if [ "$(INSTALLSOUND)" = "True" ]; 				\
+ 	 then								\
+ 		echo "Creating directory " $(SOUNDDIR); 		\
+-		if [ ! -d $(SOUNDDIR) ]; then mkdirhier $(SOUNDDIR); fi;    \
++		if [ ! -d $(DESTDIR)$(SOUNDDIR) ]; then mkdirhier $(DESTDIR)$(SOUNDDIR); fi;    \
+ 		echo "Copying sound server to directory " $(SOUNDDIR); \
+-		$(INSTALL) -c -s $(INSTBINFLAGS) $(SOUNDSERVER) $(SOUNDDIR); \
++		$(INSTALL) -c -s $(INSTBINFLAGS) $(SOUNDSERVER) $(DESTDIR)$(SOUNDDIR); \
+ 		echo "Copying sound files into directory " $(SOUNDDIR); \
+ 		cd ./sounds; set -x;					\
+ 		for file in *.raw; do					\
+-		    $(INSTALL) -c $(INSTDATFLAGS) $$file $(SOUNDDIR);	\
++		    $(INSTALL) -c $(INSTDATFLAGS) $$file $(DESTDIR)$(SOUNDDIR);	\
+ 		done;   						\
+ 	 fi
+ 	@echo
diff --git a/debian/patches/series b/debian/patches/series
index bc54a19..a442f9d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -16,3 +16,4 @@
 111_font_unsigned_char.diff
 112_unsigned_control.diff
 113_spelling_fixes.diff
+114_destdir.diff
diff --git a/debian/rules b/debian/rules
index a2513d7..123fd6e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,70 +4,16 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-include /usr/share/dpkg/buildflags.mk
-export CDEBUGFLAGS = $(CFLAGS)
-export LOCAL_LDFLAGS = $(LDFLAGS)
-export EXTRA_DEFINES = $(CPPFLAGS)
+%:
+	dh $@
 
-configure: configure-stamp
-configure-stamp:
-	dh_testdir
-	xmkmf
-	make Makefile
-	make Makefiles
-	touch configure-stamp
+override_dh_auto_configure:
+	xmkmf -a
 
-build: build-indep build-arch
-build-indep:
-build-arch: build-arch-stamp
-
-build-arch-stamp: configure-stamp 
-	dh_testdir
-	# new xmkmf stuff does strange things with the manpage
-	# this is a workaround
+override_dh_auto_build:
 	if [ ! -s xkoules.man ]; then ln -sf xkoules.6 xkoules.man; fi
-	$(MAKE) KOULESDIR=/usr/games SOUNDDIR=/usr/lib/games/koules MANDIR=/usr/share/man/man6
-	touch $@
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-arch-stamp configure-stamp xkoules.man
-	[ ! -f Makefile ] || $(MAKE) distclean
-	dh_clean
+	dh_auto_build -- KOULESDIR=/usr/games SOUNDDIR=/usr/lib/games/koules MANDIR=/usr/share/man/man6
 
-install-indep:
-install-arch: build-arch
-	dh_testdir
-	dh_testroot
-	dh_prep
-	dh_installdirs
-	$(MAKE) install KOULESDIR=$(CURDIR)/debian/koules/usr/games SOUNDDIR=$(CURDIR)/debian/koules/usr/lib/games/koules MANDIR=$(CURDIR)/debian/koules/usr/share/man/man6
-	dh_install
+override_dh_auto_install:
+	dh_auto_install -- KOULESDIR=/usr/games SOUNDDIR=/usr/lib/games/koules MANDIR=/usr/share/man/man6
 	for file in debian/koules/usr/lib/games/koules/*.raw; do if [ -f $$file ]; then mv $$file debian/koules/usr/share/games/koules/; fi; done
-	dh_link
-
-# Build architecture-independent files here.
-binary-indep: build-indep install-indep
-
-# Build architecture-dependent files here.
-binary-arch: build-arch install-arch
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs ChangeLog
-	dh_installdocs
-	dh_installmenu
-	dh_installexamples
-	dh_installman
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/koules.git



More information about the Pkg-games-commits mailing list