[Glibc-bsd-commits] r2465 - trunk/ufsutils/debian

[Guillem Jover]

Author: guillem
Date: 2009-04-18 00:25:27 +0000 (Sat, 18 Apr 2009)
New Revision: 2465

Modified:
   trunk/ufsutils/debian/changelog
   trunk/ufsutils/debian/rules
Log:
Include quilt.make snippet instead of using ad-hoc code


Modified: trunk/ufsutils/debian/changelog
===================================================================
--- trunk/ufsutils/debian/changelog	2009-04-18 00:20:22 UTC (rev 2464)
+++ trunk/ufsutils/debian/changelog	2009-04-18 00:25:27 UTC (rev 2465)
@@ -10,6 +10,7 @@
   * Switch to debhelper compatibility level 7.
   * Use dh_prep instead of “dh_clean -k”.
   * Do not use stamp files for build.
+  * Include quilt.make snippet instead of using ad-hoc code.
 
  -- Guillem Jover <guillem at debian.org>  Sat, 18 Apr 2009 01:47:10 +0200
 

Modified: trunk/ufsutils/debian/rules
===================================================================
--- trunk/ufsutils/debian/rules	2009-04-18 00:20:22 UTC (rev 2464)
+++ trunk/ufsutils/debian/rules	2009-04-18 00:25:27 UTC (rev 2465)
@@ -6,6 +6,8 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+this = $(MAKE) -f debian/rules
+
 ufsutils = ufsutils
 libufs = libufs2
 
@@ -30,11 +32,11 @@
 	CFLAGS += -O2
 endif
 
-build:
+include /usr/share/quilt/quilt.make
+
+build: patch
 	dh_testdir
-
-	QUILT_PATCHES=$(CURDIR)/debian/patches quilt push -a || test $$? = 2
-
+	
 	CFLAGS="$(CFLAGS)" LDADD="$(LDADD)" $(MAKE)
 
 clean:
@@ -42,10 +44,9 @@
 	dh_testroot
 	
 	[ ! -f Makefile ] || $(MAKE) clean
-
-	QUILT_PATCHES=$(CURDIR)/debian/patches quilt pop -a || test $$? = 2
-	rm -rf $(CURDIR)/.pc
-
+	
+	$(this) unpatch
+	
 	dh_clean
 
 install: build