[Pkg-kbd-commit] r189 - in people/barbier/kbd/trunk/debian: . patches

[Denis Barbier]

Author: barbier
Date: 2006-07-20 20:50:16 +0000 (Thu, 20 Jul 2006)
New Revision: 189

Added:
   people/barbier/kbd/trunk/debian/patches/quiltrc
Modified:
   people/barbier/kbd/trunk/debian/rules
Log:
Add debian/patches/quiltrc so that everyone uses the
same quilt configuration


Added: people/barbier/kbd/trunk/debian/patches/quiltrc
===================================================================
--- people/barbier/kbd/trunk/debian/patches/quiltrc	2006-07-20 20:37:36 UTC (rev 188)
+++ people/barbier/kbd/trunk/debian/patches/quiltrc	2006-07-20 20:50:16 UTC (rev 189)
@@ -0,0 +1,2 @@
+QUILT_PATCHES="debian/patches"
+QUILT_NO_DIFF_TIMESTAMPS=1

Modified: people/barbier/kbd/trunk/debian/rules
===================================================================
--- people/barbier/kbd/trunk/debian/rules	2006-07-20 20:37:36 UTC (rev 188)
+++ people/barbier/kbd/trunk/debian/rules	2006-07-20 20:50:16 UTC (rev 189)
@@ -16,17 +16,19 @@
 usbindir=${tmpdir}/usr/sbin
 docdir=${tmpdir}/usr/share/doc/${package}
 
+QUILT := quilt --quiltrc=debian/patches/quiltrc
+
 configure-stamp:
 	${topdir}/configure --prefix=/usr \
 		--datadir=/usr/share --mandir=/usr/share/man
-	touch configure-stamp
+	touch $@
 
 build: build-stamp
 build-stamp: patch configure-stamp
 	dh_testdir
 	make CFLAGS="-O2 -g -Wall" ARCH=${ARCH}
 	make CFLAGS="-O2 -g -Wall" ARCH=${ARCH} -C contrib codepage splitfont vcstime
-	touch build-stamp
+	touch $@
 
 clean: clean1 unpatch
 clean1:
@@ -99,13 +101,11 @@
 
 patch: patch-stamp
 patch-stamp:
-	[ -L patches ] || ln -s debian/patches patches
-	quilt push -a || test $$? == 2
-	touch patch-stamp
+	$(QUILT) push -a || test $$? == 2
+	touch $@
 
 unpatch:
-	quilt pop -a || test $$? == 2
-	if [ -L patches ]; then rm -f patches; fi
+	$(QUILT) pop -a || test $$? == 2
 	rm -rf .pc
 	rm -f patch-stamp