r9106 - packages/trunk/pingus/debian

[Cyril Brulebois]

Author: kibi
Date: 2009-03-11 18:34:45 +0000 (Wed, 11 Mar 2009)
New Revision: 9106

Modified:
   packages/trunk/pingus/debian/changelog
   packages/trunk/pingus/debian/rules
Log:
Clean up debian/rules.

Modified: packages/trunk/pingus/debian/changelog
===================================================================
--- packages/trunk/pingus/debian/changelog	2009-03-11 18:06:03 UTC (rev 9105)
+++ packages/trunk/pingus/debian/changelog	2009-03-11 18:34:45 UTC (rev 9106)
@@ -11,6 +11,9 @@
         + Add patch: 30_update_nl_translation
      - Spanish, thanks to Javier Fernández-Sanguino Peña (Closes: #482121).
         + Add patch: 30_update_es_translation
+  * Clean up debian/rules:
+     - No need to define CFLAGS, dpkg-buildpackage does it…
+     - Use dpatch.make include, and tweak targets accordingly.
   * Update my mail address.
 
  -- Peter De Wachter <pdewacht at gmail.com>  Sun, 07 Sep 2008 15:39:41 +0200

Modified: packages/trunk/pingus/debian/rules
===================================================================
--- packages/trunk/pingus/debian/rules	2009-03-11 18:06:03 UTC (rev 9105)
+++ packages/trunk/pingus/debian/rules	2009-03-11 18:34:45 UTC (rev 9106)
@@ -3,26 +3,11 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-CFLAGS = -Wall -g
+include /usr/share/quilt/quilt.make
 
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
-
-patch:
-	dh_testdir
-	QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
-
-unpatch:
-	dh_testdir
-	QUILT_PATCHES=debian/patches quilt pop -a -f || test $$? = 2
-
-configure: configure-stamp
+configure: $(QUILT_PATCHFN) configure-stamp
 configure-stamp:
 	dh_testdir
-	$(MAKE) -f /usr/share/quilt/quilt.make patch
 	cat debian/options.cache | sed -e 's/:CFLAGS:/$(CFLAGS)/g' > options.cache
 	touch $@
 
@@ -32,9 +17,14 @@
 	scons prefix=/usr resources_dir=/usr/share/games/pingus lib_dir=$(CURDIR)
 	touch $@
 
-clean:
+clean: clean-patched unpatch
 	dh_testdir
 	dh_testroot
+	dh_clean
+
+clean-patched:
+	dh_testdir
+	dh_testroot
 	rm -f build-stamp configure-stamp
 	-scons -c
 	rm -f `find . -name "*.o"`
@@ -42,8 +32,6 @@
 	rm -f `find . -name "*.so"`
 	rm -f config.log options.cache bt.xml .sconsign.dblite
 	rm -rf .sconf_temp build/release
-	$(MAKE) -f /usr/share/quilt/quilt.make unpatch
-	dh_clean
 
 install: build
 	dh_testdir