Update to packaging format 3.0

The dpatch patch management system has been deprecated for some time.
The Lintian currently flags use of dpatch packages as an error. The
new 3.0 packaging format is an improved version which, among other
things, contains patch management built-in.

Signed-off-by: Jari Aalto <jari.aalto@cante.net>
Signed-off-by: Andrew Shadura <andrew.shadura@collabora.co.uk>

14 files changed, 39 insertions, 59 deletions

diff --git a/debian/changelog b/debian/changelog
index 0e05396..aff5bfa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+ifplugd (0.28-19.2) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Remove deprecated dpatch and upgrade to packaging format "3.0 quilt".
+  * Update to Standards-Version to 3.9.3 and debhelper to 9.
+
+ -- Jari Aalto <jari.aalto@cante.net>  Tue, 28 Feb 2012 13:38:06 -0500
+
 ifplugd (0.28-19.1) unstable; urgency=medium
 
   * Non-maintainer upload.
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+9
diff --git a/debian/control b/debian/control
index b449d72..fd42b20 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,8 @@ Source: ifplugd
 Section: net
 Priority: optional
 Maintainer: Walter Franzini <walter.franzini@gmail.com>
-Build-Depends: debhelper (>= 5), dpatch, autotools-dev, libdaemon-dev (>= 0.7), pkg-config, po-debconf
-Standards-Version: 3.9.2
+Build-Depends: debhelper (>= 9), autotools-dev, libdaemon-dev (>= 0.7), pkg-config, po-debconf
+Standards-Version: 3.9.3
 Homepage: http://0pointer.de/lennart/projects/ifplugd/
 
 Package: ifplugd
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index ca8a301..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,7 +0,0 @@
-01_loff_t_dev_t_conflict
-02_manpage_paths_and_typos
-03_split_README_ChangeLog_FAQ
-04_up_down_beep_options
-05_396895_HOTPLUG_conf_man
-06_509015_better_delays
-07_add_fractional_delays.dpatch
diff --git a/debian/patches/01_loff_t_dev_t_conflict.dpatch b/debian/patches/01_loff_t_dev_t_conflict.patch
index f28b9f3..ce292e8 100644
--- a/debian/patches/01_loff_t_dev_t_conflict.dpatch
+++ b/debian/patches/01_loff_t_dev_t_conflict.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_loff_t_dev_t_conflict.dpatch by Jeremie Corbier <jcorbier@ubuntu.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fixes FTBFS: Conflict between sys/types.h linux/types.h loff_t/dev_t
+From: Jeremie Corbier <jcorbier@ubuntu.com>
+Subject: Fixes FTBFS: Conflict between sys/types.h linux/types.h loff_t/dev_t
 
-@DPATCH@
 diff -urNad ifplugd-0.28~/src/interface.c ifplugd-0.28/src/interface.c
 --- ifplugd-0.28~/src/interface.c	2005-01-04 16:25:31.000000000 -0800
 +++ ifplugd-0.28/src/interface.c	2007-01-12 19:19:14.000000000 -0800
diff --git a/debian/patches/02_manpage_paths_and_typos.dpatch b/debian/patches/02_manpage_paths_and_typos.patch
index 3e7017c..d5bc417 100644
--- a/debian/patches/02_manpage_paths_and_typos.dpatch
+++ b/debian/patches/02_manpage_paths_and_typos.patch
@@ -1,11 +1,8 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_manpage_paths_and_typos.dpatch by Y Giridhar Appaji Nag <giridhar@appaji.net>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Path and typo fixes made a dpatch, fix lintian W: hyphen-used-as-minus-sign
-## DP: Fix ifplugd.8 -w option retval, thanks Jérémie Corbier <jcorbier@ubuntu.com>
+From: Y Giridhar Appaji Nag <giridhar@appaji.net>
+Subject: Path and typo fixes made a dpatch
+ Fix lintian W: hyphen-used-as-minus-sign
+ Fix ifplugd.8 -w option retval, thanks Jérémie Corbier <jcorbier@ubuntu.com>
 
-@DPATCH@
 diff -urNad ifplugd-0.28~/doc/README ifplugd-0.28/doc/README
 --- ifplugd-0.28~/doc/README	2008-03-07 07:33:56.000000000 +0530
 +++ ifplugd-0.28/doc/README	2008-03-07 17:59:17.000000000 +0530
diff --git a/debian/patches/03_split_README_ChangeLog_FAQ.dpatch b/debian/patches/03_split_README_ChangeLog_FAQ.patch
index 9aacff3..36c65f7 100644
--- a/debian/patches/03_split_README_ChangeLog_FAQ.dpatch
+++ b/debian/patches/03_split_README_ChangeLog_FAQ.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 03_split_README_ChangeLog_FAQ.dpatch by Y Giridhar Appaji Nag <giridhar@appaji.net>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Split README into README, ChangeLog and FAQ because they were hidden
+From: Y Giridhar Appaji Nag <giridhar@appaji.net>
+Subject: Split README into README, ChangeLog and FAQ because they were hidden
 
-@DPATCH@
 diff -urNad ifplugd-0.28~/doc/ChangeLog ifplugd-0.28/doc/ChangeLog
 --- ifplugd-0.28~/doc/ChangeLog	1970-01-01 05:30:00.000000000 +0530
 +++ ifplugd-0.28/doc/ChangeLog	2008-03-07 19:00:50.000000000 +0530
diff --git a/debian/patches/04_up_down_beep_options.dpatch b/debian/patches/04_up_down_beep_options.patch
index 8ddcf88..40ac9f2 100644
--- a/debian/patches/04_up_down_beep_options.dpatch
+++ b/debian/patches/04_up_down_beep_options.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 04_up_down_beep_options.dpatch by Y Giridhar Appaji Nag <giridhar@appaji.net>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Implement --no-beep-up and --no-beep-down options
+From: Y Giridhar Appaji Nag <giridhar@appaji.net>
+Subject: Implement --no-beep-up and --no-beep-down options
 
-@DPATCH@
 diff -urNad ifplugd-0.28~/man/ifplugd.8 ifplugd-0.28/man/ifplugd.8
 --- ifplugd-0.28~/man/ifplugd.8	2008-04-04 16:30:15.000000000 +0530
 +++ ifplugd-0.28/man/ifplugd.8	2008-04-04 16:30:53.000000000 +0530
diff --git a/debian/patches/05_396895_HOTPLUG_conf_man.dpatch b/debian/patches/05_396895_HOTPLUG_conf_man.patch
index e2535af..763d315 100644
--- a/debian/patches/05_396895_HOTPLUG_conf_man.dpatch
+++ b/debian/patches/05_396895_HOTPLUG_conf_man.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 05_396895_HOTPLUG_conf_man.dpatch by Y Giridhar Appaji Nag <giridhar@appaji.net>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Explain HOTPLUG_INTERFACES in the ifplugd.conf(5) manpage.
+From: Y Giridhar Appaji Nag <giridhar@appaji.net>
+Subject: Explain HOTPLUG_INTERFACES in the ifplugd.conf(5) manpage.
 
-@DPATCH@
 diff -urNad ifplugd-0.28~/man/ifplugd.conf.5 ifplugd-0.28/man/ifplugd.conf.5
 --- ifplugd-0.28~/man/ifplugd.conf.5	2008-04-20 12:47:01.000000000 +0530
 +++ ifplugd-0.28/man/ifplugd.conf.5	2008-04-20 12:48:24.000000000 +0530
diff --git a/debian/patches/06_509015_better_delays.dpatch b/debian/patches/06_509015_better_delays.patch
index 64ddb6e..939ebf6 100644
--- a/debian/patches/06_509015_better_delays.dpatch
+++ b/debian/patches/06_509015_better_delays.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 06_509015_better_delays.dpatch by Michel Lespinasse <walken@zoy.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Don't wait for more than specified delays, fix for #509015
+From: Michel Lespinasse <walken@zoy.org>
+Subject: Don't wait for more than specified delays, fix for #509015
 
-@DPATCH@
 diff -urNad ifplugd-0.28~/src/ifplugd.c ifplugd-0.28/src/ifplugd.c
 --- ifplugd-0.28~/src/ifplugd.c	2008-09-30 17:48:51.000000000 +0530
 +++ ifplugd-0.28/src/ifplugd.c	2009-03-02 12:05:11.000000000 +0530
diff --git a/debian/patches/07_add_fractional_delays.dpatch b/debian/patches/07_add_fractional_delays.patch
index deeed44..4ca9ac4 100644
--- a/debian/patches/07_add_fractional_delays.dpatch
+++ b/debian/patches/07_add_fractional_delays.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 07_add_fractional_delays.dpatch by  <root@cvt-xs6>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+From: <root@cvt-xs6>
+Subject: No description.
 
-@DPATCH@
 diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' ifplugd-0.28~/man/ifplugd.8 ifplugd-0.28/man/ifplugd.8
 --- ifplugd-0.28~/man/ifplugd.8	2011-08-22 17:20:53.000000000 +0400
 +++ ifplugd-0.28/man/ifplugd.8	2011-08-22 17:22:09.000000000 +0400
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..963bb4f
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,7 @@
+01_loff_t_dev_t_conflict.patch
+02_manpage_paths_and_typos.patch
+03_split_README_ChangeLog_FAQ.patch
+04_up_down_beep_options.patch
+05_396895_HOTPLUG_conf_man.patch
+06_509015_better_delays.patch
+07_add_fractional_delays.patch
diff --git a/debian/rules b/debian/rules
index f371fb1..33eb6c6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,6 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-include /usr/share/dpatch/dpatch.make
 
 # These are used for cross-compiling and for saving the configure script
 # from having to guess our platform (since we know it already)
@@ -25,7 +24,7 @@ confopts = --disable-subversion \
 	--disable-xmltoman \
 	--disable-lynx
 
-config.status: patch configure-stamp
+config.status: configure-stamp
 configure-stamp:
 	dh_testdir
 	[ ! -f ifplugd.spec ] || mv -f ifplugd.spec ifplugd.spec.ups
@@ -40,13 +39,12 @@ endif
 	touch $@
 
 build: build-stamp
-build-stamp: patch-stamp config.status
+build-stamp: config.status
 	dh_testdir
 	$(MAKE)
 	touch $@
 
-clean: clean-patched unpatch
-clean-patched:
+clean:
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp configure-stamp
@@ -95,4 +93,4 @@ binary-arch: build install
 	dh_builddeb
 
 binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install patch unpatch
+.PHONY: build clean binary-indep binary-arch binary install
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)