Switch to source format 3.0 (quilt)

* Switch to source format 3.0 (quilt)
  - Add debian/source/format.
  - Drop Build-Depends on quilt.
  - Remove debian/README.source.
  - Remove /usr/share/quilt/quilt.make include from debian/rules.

5 files changed, 9 insertions, 10 deletions

diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index 96fb271..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,3 +0,0 @@
-This package uses the quilt patch management system.
-
-Please refer to /usr/share/doc/quilt/README.source for further information.
diff --git a/debian/changelog b/debian/changelog
index 6dbc94c..2437590 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,11 @@ rsyslog (4.6.3-1) UNRELEASED; urgency=low
   * New upstream release.
   * debian/patches/02-set-correct-default-for-buffered-writing.patch
     - Removed, merged upstream.
+  * Switch to source format 3.0 (quilt)
+    - Add debian/source/format.
+    - Drop Build-Depends on quilt.
+    - Remove debian/README.source.
+    - Remove /usr/share/quilt/quilt.make include from debian/rules.
 
  -- Michael Biebl <biebl@debian.org>  Wed, 07 Jul 2010 15:40:46 +0200
 
diff --git a/debian/control b/debian/control
index a2dd531..999a2df 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: rsyslog
 Section: admin
 Priority: important
 Maintainer: Michael Biebl <biebl@debian.org>
-Build-Depends: debhelper (>= 7.0.9), quilt, autotools-dev, zlib1g-dev, libmysqlclient-dev, libpq-dev, libkrb5-dev, libgnutls-dev, librelp-dev, pkg-config
+Build-Depends: debhelper (>= 7.0.9), autotools-dev, zlib1g-dev, libmysqlclient-dev, libpq-dev, libkrb5-dev, libgnutls-dev, librelp-dev, pkg-config
 Standards-Version: 3.8.4
 Vcs-Git: git://git.debian.org/git/collab-maint/rsyslog.git
 Vcs-Browser: http://git.debian.org/?p=collab-maint/rsyslog.git;a=summary
diff --git a/debian/rules b/debian/rules
index bf9f253..a2655ae 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,9 +9,6 @@
 # This has to be exported to make some magic below work.
 export DH_OPTIONS
 
-# For quilt patch management.
-include /usr/share/quilt/quilt.make
-
 # These are used for cross-compiling and for saving the configure script
 # from having to guess our platform (since we know it already)
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
@@ -60,8 +57,7 @@ build-stamp: config.status
 
 	touch $@
 
-clean: clean-source unpatch
-clean-source:
+clean:
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp 
@@ -70,7 +66,7 @@ clean-source:
 	[ ! -f Makefile ] || $(MAKE) distclean
 	rm -f config.sub config.guess
 
-	dh_clean 
+	dh_clean
 
 install: build
 	dh_testdir
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)