Package: network-config
Severity: wishlist
Tags: patch
Hi,
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. For more information, see:
http://wiki.debian.org/Projects/DebSrc3.0
I had some free time; see attached patch to migrate to new package
format. Note that all files in debian/patches/* are canocalized to
*.patch.
Let me know if there is anything that needs adjusting or if it is ok
to upload this version in a NMU in case you are working on other
issues needing attention.
Thanks,
Jari
>From b9174755c974d7b9e262289020bd812fb7a87c7b Mon Sep 17 00:00:00 2001
From: Jari Aalto <[email protected]>
Date: Wed, 29 Feb 2012 06:05:29 -0500
Subject: [PATCH] format-3.0
Organization: Private
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit
Signed-off-by: Jari Aalto <[email protected]>
---
debian/changelog | 8 ++++++++
debian/compat | 2 +-
debian/control | 4 ++--
debian/patches/00list | 2 --
.../{01-makefile.dpatch => 01-makefile.patch} | 10 +++-------
...twork-config.dpatch => 02-network-config.patch} | 10 +++-------
debian/patches/series | 2 ++
debian/rules | 7 ++-----
debian/source/format | 1 +
9 files changed, 22 insertions(+), 24 deletions(-)
delete mode 100644 debian/patches/00list
rename debian/patches/{01-makefile.dpatch => 01-makefile.patch} (88%)
rename debian/patches/{02-network-config.dpatch => 02-network-config.patch} (89%)
create mode 100644 debian/patches/series
create mode 100644 debian/source/format
diff --git a/debian/changelog b/debian/changelog
index 00715fd..6e1829e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+network-config (0.2-1.1) 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 <[email protected]> Wed, 29 Feb 2012 06:04:12 -0500
+
network-config (0.2-1) unstable; urgency=low
* New upstream release:
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 3777f7e..baedc91 100644
--- a/debian/control
+++ b/debian/control
@@ -2,9 +2,9 @@ Source: network-config
Section: utils
Priority: optional
Maintainer: Marvin Stark <[email protected]>
-Build-Depends: debhelper (>= 5), dpatch
+Build-Depends: debhelper (>= 9)
Homepage: http://network-config.sourceforge.net
-Standards-Version: 3.7.3
+Standards-Version: 3.9.3
Package: network-config
Architecture: all
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 44db9e5..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,2 +0,0 @@
-01-makefile.dpatch
-02-network-config.dpatch
diff --git a/debian/patches/01-makefile.dpatch b/debian/patches/01-makefile.patch
similarity index 88%
rename from debian/patches/01-makefile.dpatch
rename to debian/patches/01-makefile.patch
index 343e368..574917b 100644
--- a/debian/patches/01-makefile.dpatch
+++ b/debian/patches/01-makefile.patch
@@ -1,11 +1,7 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 01-makefile.dpatch by Marvin Stark <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Removed not needed files.
-## DP: Copied network-config.pl to /usr/bin/.
+From: Marvin Stark <[email protected]>
+Subject: Removed not needed files.
+Copied network-config.pl to /usr/bin/.
-@DPATCH@
--- network-config-0.1/Makefile.orig 2007-01-10 12:57:41.000000000 +0000
+++ network-config-0.1/Makefile 2007-01-10 12:59:14.000000000 +0000
diff --git a/debian/patches/02-network-config.dpatch b/debian/patches/02-network-config.patch
similarity index 89%
rename from debian/patches/02-network-config.dpatch
rename to debian/patches/02-network-config.patch
index dcb76d7..16a64fa 100644
--- a/debian/patches/02-network-config.dpatch
+++ b/debian/patches/02-network-config.patch
@@ -1,11 +1,7 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 02-default-icon.dpatch.dpatch by Marvin Stark <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Changed location of default icon.
-## DP: Changed network-config location.
+From: Marvin Stark <[email protected]>
+Subject: Changed location of default icon.
+Changed network-config location.
-@DPATCH@
--- network-config-0.2/network-config.pl.orig 2008-04-07 20:52:43.000000000 +0000
+++ network-config-0.2/network-config.pl 2008-04-07 20:53:51.000000000 +0000
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..6bbfac6
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+01-makefile.patch
+02-network-config.patch
diff --git a/debian/rules b/debian/rules
index 01ed7ff..f5e1d0e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,16 +3,13 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-# Include dpatch.
-include /usr/share/dpatch/dpatch.make
-
-build: patch build-stamp
+build: build-stamp
build-stamp:
dh_testdir
touch $@
-clean: unpatch
+clean:
dh_testdir
dh_testroot
rm -f build-stamp
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)
--
1.7.9
