r7269 - packages/trunk/dreamchess/debian

[Cyril Brulebois]

Author: kibi
Date: 2008-06-08 03:35:22 +0000 (Sun, 08 Jun 2008)
New Revision: 7269

Modified:
   packages/trunk/dreamchess/debian/changelog
   packages/trunk/dreamchess/debian/rules
Log:
debian/rules cleanup: Nuke trailing spaces, use quilt.make include.

Modified: packages/trunk/dreamchess/debian/changelog
===================================================================
--- packages/trunk/dreamchess/debian/changelog	2008-06-08 03:29:12 UTC (rev 7268)
+++ packages/trunk/dreamchess/debian/changelog	2008-06-08 03:35:22 UTC (rev 7269)
@@ -1,3 +1,4 @@
+
 dreamchess (0.2.0-2) unstable; urgency=low
 
   * Remove “-p1” from debian/patches/series since it's useless and since
@@ -7,6 +8,11 @@
     keep the Debian diff clean and not to cause an FTBFS with the new
     “3.0 (quilt)” source package format. Thanks to Raphaël Hertzog for the
     notice (Closes: #484970).
+  * debian/rules cleanup:
+     - Nuke trailing spaces.
+     - Use quilt.make include, and appropriate patch/unpatch dependencies
+       for the config.status and clean target, using an additional
+       realclean target for the latter.
 
  -- Cyril Brulebois <kibi at debian.org>  Sun, 08 Jun 2008 05:10:44 +0200
 

Modified: packages/trunk/dreamchess/debian/rules
===================================================================
--- packages/trunk/dreamchess/debian/rules	2008-06-08 03:29:12 UTC (rev 7268)
+++ packages/trunk/dreamchess/debian/rules	2008-06-08 03:35:22 UTC (rev 7269)
@@ -9,6 +9,7 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+include /usr/share/quilt/quilt.make
 
 # These are used for cross-compiling and for saving the configure script
 # from having to guess our platform (since we know it already)
@@ -24,9 +25,8 @@
 	CFLAGS += -O2
 endif
 
-config.status: configure
+config.status: patch configure
 	dh_testdir
-	QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
 ifneq "$(wildcard /usr/share/misc/config.sub)" ""
 	cp -f /usr/share/misc/config.sub config.sub
 endif
@@ -46,24 +46,23 @@
 
 	touch build-stamp
 
-clean:
+clean: realclean unpatch
+realclean:
 	dh_testdir
 	dh_testroot
-	rm -f build-stamp 
+	rm -f build-stamp
 
 	[ ! -f Makefile ] || $(MAKE) distclean
-	QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2
-	rm -rf .pc
 	dh_clean config.guess config.sub
 
 install: build
 	dh_testdir
 	dh_testroot
-	dh_clean -k 
+	dh_clean -k
 	dh_installdirs
 
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
-	
+
 	dh_install -pdreamchess debian/dreamchess.xpm usr/share/pixmaps
 	dh_install -pdreamchess debian/dreamchess.desktop usr/share/applications
 
@@ -101,4 +100,4 @@
 	dh_builddeb -a
 
 binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install 
+.PHONY: build clean binary-indep binary-arch binary install