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 quilt references in debian/README.source.

5 files changed, 9 insertions, 14 deletions

diff --git a/debian/README.source b/debian/README.source
index 1ca4852..bd035e8 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -1,7 +1,3 @@
-This package uses quilt to manage all modifications to the upstream
-source. Please refer to /usr/share/doc/quilt/README.source for more
-information.
-
 There's a script to help generate or update tarballs from git snapshots:
 
 	$ debian/tarball.sh snapshot
diff --git a/debian/changelog b/debian/changelog
index f8280a7..610a76b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,11 @@ inetutils (2:1.8-1) UNRELEASED; urgency=low
     a regression from previous man pages inherited from BSD. Revert the
     removal and disable help2man logic.
     - debian/patches/01_revert_manpage_removal.patch: New file.
+  * 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 quilt references in debian/README.source.
 
  -- Guillem Jover <guillem@debian.org>  Tue, 08 Jun 2010 21:16:04 +0200
 
diff --git a/debian/control.in b/debian/control.in
index bc2814d..8cdf394 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -7,7 +7,7 @@ Standards-Version: 3.8.0
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-inetutils/
 Vcs-Svn: svn://svn.debian.org/pkg-inetutils/trunk/
 Homepage: http://www.gnu.org/software/inetutils/
-Build-Depends: debhelper (>= 7), quilt (>= 0.40), autoconf, automake, texinfo,
+Build-Depends: debhelper (>= 7), autoconf, automake, texinfo,
  bison, libreadline-dev | libreadline6-dev | libreadline5-dev, libpam0g-dev,
  libopie-dev, libwrap0-dev, libshishi-dev
 Build-Conflicts: autoconf2.13, automake1.4
diff --git a/debian/rules b/debian/rules
index e8b72f1..87987e3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -31,8 +31,6 @@ mandir = usr/share/man
 man1dir = $(mandir)/man1
 man8dir = $(mandir)/man8
 
-include /usr/share/quilt/quilt.make
-
 configure: configure.ac
 	dh_testdir
 	
@@ -53,12 +51,7 @@ config.status: configure
 	  --with-wrap \
 	  --with-pam
 
-.PHONY: setup-source
-
-setup-source: patch
-	$(MAKE) -f debian/rules config.status
-
-build: debian/control setup-source
+build: debian/control config.status
 	dh_testdir
 	
 	$(MAKE) CFLAGS="$(CFLAGS)"
@@ -84,7 +77,7 @@ else
 	> debian/control
 endif
 
-clean: unpatch
+clean:
 	dh_testdir
 	dh_testroot
 	
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)