Switch to source format '3.0 (quilt)'

Remove quilt from Build-Depends.
Remove quilt.make include from debian/rules.
Remove patch and unpatch targets from debian/rules.
Remove now unneeded debian/README.source.

5 files changed, 10 insertions, 17 deletions

diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index fda3c25..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,3 +0,0 @@
-This package uses quilt to manage all modifications to the upstream
-source. Please refer to /usr/share/doc/quilt/README.source for more
-information.
diff --git a/debian/changelog b/debian/changelog
index b9de0ab..666bde5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,11 @@ gnumach (2:1.3.99.dfsg.git20091114-1) UNRELEASED; urgency=low
     - debian/patches/14_alloc_params.patch: Remove, merged upstream.
     - debian/patches/16_ide_multsect.patch: Likewise.
     - debian/patches/05_halt_on_panic_flag.patch: Refresh.
+  * Switch to source format “3.0 (quilt)”:
+    - Remove quilt from Build-Depends.
+    - Remove quilt.make include from debian/rules.
+    - Remove patch and unpatch targets from debian/rules.
+    - Remove now unneeded debian/README.source.
 
  -- Guillem Jover <guillem@debian.org>  Sat, 14 Nov 2009 05:33:52 +0100
 
diff --git a/debian/control b/debian/control
index d750b7a..82d6b2f 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Uploaders: Marcus Brinkmann <brinkmd@debian.org>,
 Homepage: http://www.gnu.org/software/hurd/gnumach.html
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-hurd/gnumach/
 Vcs-Svn: svn://svn.debian.org/pkg-hurd/gnumach/trunk/
-Build-Depends: debhelper (>= 7), quilt (>= 0.40), mig, sharutils,
+Build-Depends: debhelper (>= 7), mig, sharutils,
  autoconf, automake
 Standards-Version: 3.8.3
 
diff --git a/debian/rules b/debian/rules
index 244bd2c..5a7b15f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -26,8 +26,6 @@ endif
 drivers := \
 	--enable-sis900
 
-include /usr/share/quilt/quilt.make
-
 configure: configure.ac
 	autoreconf -fi
 
@@ -50,16 +48,9 @@ build-dbg/config.status: configure
 		--build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE) \
 		--exec-prefix=/
 
-# Serialize to support parallel make
-pre-patch-std: patch
-	$(MAKE) -f debian/rules build/config.status
-
-pre-patch-dbg: patch
-	$(MAKE) -f debian/rules build-dbg/config.status
-
 build: build-gnumach-std build-gnumach-dbg
 
-build-gnumach-std: pre-patch-std
+build-gnumach-std: build/config.status
 	dh_testdir
 	
 ifneq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
@@ -68,7 +59,7 @@ else
 	$(MAKE) -C build check
 endif
 
-build-gnumach-dbg: pre-patch-dbg
+build-gnumach-dbg: build-dbg/config.status
 	dh_testdir
 	
 ifneq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
@@ -77,7 +68,7 @@ else
 	$(MAKE) -C build-dbg check
 endif
 
-clean: unpatch
+clean:
 	dh_testdir
 	
 	rm -f machine
@@ -132,6 +123,5 @@ binary-arch: install
 	dh_builddeb -a
 
 .PHONY: build build-gnumach-std build-gnumach-dbg clean
-.PHONY: pre-patch-std pre-patch-dbg
 .PHONY: install binary binary-indep binary-arch
 
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)