r4707 - packages/trunk/kanatest/debian

[Barry deFreese]

Author: bddebian-guest
Date: 2007-11-19 01:32:29 +0000 (Mon, 19 Nov 2007)
New Revision: 4707

Modified:
   packages/trunk/kanatest/debian/changelog
   packages/trunk/kanatest/debian/rules
Log:

* Include quilt.make and fix rules to patch/unpatch


Modified: packages/trunk/kanatest/debian/changelog
===================================================================
--- packages/trunk/kanatest/debian/changelog	2007-11-19 01:27:45 UTC (rev 4706)
+++ packages/trunk/kanatest/debian/changelog	2007-11-19 01:32:29 UTC (rev 4707)
@@ -20,6 +20,7 @@
     + Thanks to Cyril Brulebois for the patch
   * Add myself to uploaders
   * Remove deprecated Encoding field from desktop and fix categories
+  * Include quilt.make and fix rules to patch/unpatch
 
   [ Mike O'Connor ]
   * make sure docs/*.pmo are built (Closes: #441711)

Modified: packages/trunk/kanatest/debian/rules
===================================================================
--- packages/trunk/kanatest/debian/rules	2007-11-19 01:27:45 UTC (rev 4706)
+++ packages/trunk/kanatest/debian/rules	2007-11-19 01:32:29 UTC (rev 4707)
@@ -5,6 +5,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)
@@ -23,9 +24,8 @@
 	INSTALL_PROGRAM += -s
 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)" ""
 	mv config.sub config.sub.bak
 	cp -f /usr/share/misc/config.sub config.sub
@@ -42,7 +42,7 @@
 	$(MAKE)
 	touch build-stamp
 
-clean:
+clean: unpatch
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp