[Pkg-mono-svn-commits] [SCM] mono-tools branch, master, updated. debian/2.6.2-3-23-gb93cda5

[Jo Shields]

The following commit has been merged in the master branch:
commit 8bc1474ce1d18d8c9968036b67499cfa6dd33594
Author: Jo Shields <directhex at apebox.org>
Date:   Mon Apr 25 18:45:21 2011 +0100

    Replace use of external Quilt binary with Debian Source format 3.0's quilt support

diff --git a/debian/control b/debian/control
index 07c2a28..4797a7a 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: devel
 Priority: optional
 Maintainer: Debian Mono Group <pkg-mono-group at lists.alioth.debian.org>
 Uploaders: Mirco Bauer <meebey at debian.org>, Sebastian Dröge <slomo at debian.org>
-Build-Depends: debhelper (>= 7), quilt
+Build-Depends: debhelper (>= 7)
 Build-Depends-Indep: cli-common-dev (>= 0.8~exp2~),
  pkg-config,
  autoconf,
diff --git a/debian/rules b/debian/rules
index 8319a7d..0d48217 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,10 +12,7 @@ DEB_SOURCE_NAME = $(shell dpkg-parsechangelog -l$(DEBIAN_DIR)/changelog | grep ^
 VERSION = $(shell echo $(DEB_VERSION) | cut -d"-" -f1 | sed 's/+dfsg.*//')
 
 
-include /usr/share/quilt/quilt.make
-
-configure: config-stamp
-config-stamp: $(QUILT_STAMPFN)
+configure: 
 	dh_testdir
 	
 	aclocal
@@ -24,16 +21,11 @@ config-stamp: $(QUILT_STAMPFN)
 	
 	./configure --prefix=/usr
 	
-	touch $@
-
-build: build-stamp
-build-stamp: config-stamp
+build: 
 	dh_testdir
 	$(MAKE)
-	touch build-stamp
 
-clean: clean-patched unpatch
-clean-patched:
+clean: 
 	dh_testdir
 	dh_testroot
 	[ ! -f Makefile ] || $(MAKE) distclean
@@ -93,4 +85,7 @@ get-orig-source:
 		--force-download \
 		--rename
 
+%:
+	dh --with quilt $@
+
 .PHONY: build clean clean-patched binary-indep binary install
diff --git a/debian/source/format b/debian/source/format
index d3827e7..163aaf8 100644
--- a/debian/source/format
+++ b/debian/source/format
@@ -1 +1 @@
-1.0
+3.0 (quilt)

-- 
mono-tools