[ace-of-penguins] 77/141: debian/rules: Change to DEB_*_MAINT_APPEND variables. Clean up rules

[Markus Koschany]

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

apo-guest pushed a commit to branch master
in repository ace-of-penguins.

commit 0433e5c4003222484335223278ed3a53e26d13c0
Author: Jari Aalto <jari.aalto at cante.net>
Date:   Mon Mar 5 04:24:39 2012 -0500

    debian/rules: Change to DEB_*_MAINT_APPEND variables. Clean up rules
---
 debian/rules | 47 +++++++++++++++++++++--------------------------
 1 file changed, 21 insertions(+), 26 deletions(-)

diff --git a/debian/rules b/debian/rules
index 6cc66d3..ad3da1f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,33 +1,32 @@
 #!/usr/bin/make -f
 
 PACKAGE		= ace-of-penguins
-PRGPREFIX 	= ace-
-ICON_NAME 	= penguin-pegged.png
-ICON_SRC 	= debian/penguin-pegged.png
+PRGPREFIX	= ace-
+ICON_NAME	= penguin-pegged.png
+ICON_SRC	= debian/penguin-pegged.png
 
 # list of programs taken from games/Makefile
 PROGS = \
-        canfield \
-        freecell \
-        golf \
-        mastermind \
-        merlin \
-        minesweeper \
-        pegged \
-        solitaire \
+	canfield \
+	freecell \
+	golf \
+	mastermind \
+	merlin \
+	minesweeper \
+	pegged \
+	solitaire \
 	spider \
-        taipedit \
-        taipei \
-        thornq
+	taipedit \
+	taipei \
+	thornq
 
 CONFFLAGS = --prefix=/usr --bindir=/usr/games
 
 include debian/debian-vars.mk
 
 # NOTE: The sources won't compile with -pedantic
-include /usr/share/dpkg/buildflags.mk
-CFLAGS  += -Wall
-LDFLAGS += -Wl,--as-needed
+export DEB_CFLAGS_MAINT_APPEND	= -Wall
+export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
 
 MANDIR = $(MANROOTDIR)/man6
 
@@ -61,15 +60,15 @@ build-man: man
 	# target: build-man - link pages to master page
 	for NAME in $(PROGS); \
 	do \
-	  man=debian/$(PRGPREFIX)$$NAME.6; \
-	  echo ".so man6/ace-of-penguins.6" > $$man; \
+	    man=debian/$(PRGPREFIX)$$NAME.6; \
+	    echo ".so man6/ace-of-penguins.6" > $$man; \
 	done
 
 override_dh_auto_test:
 	# nothing to test
 
 override_dh_clean: clean-man
-	#  You may safely ignore message "invalid host type"
+	#  target: clean - You may safely ignore message "invalid host type"
 	if [ -f Makefile ]; then \
 	    $(MAKE) \
 		to_srcdir="$(TOPDIR)" \
@@ -83,22 +82,18 @@ override_dh_clean: clean-man
 	dh_clean
 
 override_dh_auto_configure:
-	./configure $(CONFFLAGS) CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)"
+	dh_auto_configure -- $(CONFFLAGS)
 
 override_dh_auto_build: build-man
-	# # Compile the package
-	# $(MAKE) to_srcdir="$(TOPDIR)" top_builddir="$(TOPDIR)" \
-	#	 $(MAKE_FLAGS) CFLAGS="$(CFLAGS)"
+	dh_auto_build
 
 override_dh_installman:
 	dh_installman
-
 	# Check that all is in order
 	echo "PWD: pwd"
 	( cd $(MANDIR) && ls -l )
 
 override_dh_auto_install:
-	# $(MAKE) install DESTDIR="$(PKGDIR)"
 	dh_auto_install
 
 	# rename programs to start with prefix

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