Package: liblinux-kernelsort-perl
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

Maximilian, as we spoke before, here is the proposed NMU patch.

Let me know if there is anything that needs adjusting or if it is ok
to upload  with these changes.

Thanks,
Jari

>From 07b51310fba53e77e5d22b31c2518fd724a946a7 Mon Sep 17 00:00:00 2001
From: Jari Aalto <[email protected]>
Date: Wed, 29 Feb 2012 03:44:34 -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/01_fix_doc_parameter_type.patch     |    7 ++-----
 debian/patches/02_fix_missing_semicolons.patch     |    7 ++-----
 .../03_accept_leading_v_in_version_string.patch    |    7 ++-----
 .../patches/04_accept_4_digit_version_string.patch |    7 ++-----
 debian/patches/05_accept_trailing_tree.patch       |    7 ++-----
 debian/patches/06_further_doc_fixes.patch          |    7 ++-----
 debian/patches/{00list => series}                  |    0
 debian/rules                                       |    7 ++-----
 debian/source/format                               |    1 +
 12 files changed, 26 insertions(+), 38 deletions(-)
 rename debian/patches/{00list => series} (100%)
 create mode 100644 debian/source/format

diff --git a/debian/changelog b/debian/changelog
index ee7a0f1..bacfcc4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+liblinux-kernelsort-perl (0.01-2.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 03:43:56 -0500
+
 liblinux-kernelsort-perl (0.01-2) unstable; urgency=low
 
   * Fixed lintian warning 'description-contains-homepage' and moved homepage
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 b92ef95..0027907 100644
--- a/debian/control
+++ b/debian/control
@@ -1,8 +1,8 @@
 Source: liblinux-kernelsort-perl
 Priority: optional
 Maintainer: Maximilian Wilhelm <[email protected]>
-Build-Depends: debhelper (>= 5), perl (>= 5.6.0-16), dpatch
-Standards-Version: 3.7.3
+Build-Depends: debhelper (>= 9), perl (>= 5.6.0-16)
+Standards-Version: 3.9.3
 Section: perl
 
 Package: liblinux-kernelsort-perl
diff --git a/debian/patches/01_fix_doc_parameter_type.patch b/debian/patches/01_fix_doc_parameter_type.patch
index 6e78e2a..f7443ee 100644
--- a/debian/patches/01_fix_doc_parameter_type.patch
+++ b/debian/patches/01_fix_doc_parameter_type.patch
@@ -1,9 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_fix_doc_parameter_type.dpatch by Maximilian Wilhelm <[email protected]>
-##
-## DP: Fix doc parameter
+From: Maximilian Wilhelm <[email protected]>
+Subject: Fix doc parameter
 
-@DPATCH@
 
 --- liblinux-kernelsort-perl-0.01/lib/Linux/KernelSort.pm	2006-11-11 02:24:48.000000000 +0100
 +++ Linuxkernelsort-fixed-paramter-doc/Linux/KernelSort.pm	2006-12-06 23:53:55.000000000 +0100
diff --git a/debian/patches/02_fix_missing_semicolons.patch b/debian/patches/02_fix_missing_semicolons.patch
index 153d033..b0bbd57 100644
--- a/debian/patches/02_fix_missing_semicolons.patch
+++ b/debian/patches/02_fix_missing_semicolons.patch
@@ -1,9 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_fix_missing_semicolons.dpatch by Maximilian Wilhelm <[email protected]>
-##
-## DP: Add missing semicolons
+From: Maximilian Wilhelm <[email protected]>
+Subject: Add missing semicolons
 
-@DPATCH@
 
 --- liblinux-kernelsort-perl-0.01/lib/Linux/KernelSort.pm	2006-12-06 23:55:25.000000000 +0100
 +++ Linuxkernelsort-fixed-missing-semicolons/Linux/KernelSort.pm	2006-12-07 00:05:56.000000000 +0100
diff --git a/debian/patches/03_accept_leading_v_in_version_string.patch b/debian/patches/03_accept_leading_v_in_version_string.patch
index 28feb3c..45a3fc2 100644
--- a/debian/patches/03_accept_leading_v_in_version_string.patch
+++ b/debian/patches/03_accept_leading_v_in_version_string.patch
@@ -1,9 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 03_accept_leading_v_in_version_string.dpatch by Maximilian Wilhelm <[email protected]>
-##
-## DP: Let Linux::KernelSort accept a leading 'v' in the version string
+From: Maximilian Wilhelm <[email protected]>
+Subject: Let Linux::KernelSort accept a leading 'v' in the version string
 
-@DPATCH@
 
 --- liblinux-kernelsort-perl-0.01/lib/Linux/KernelSort.pm	2006-12-06 23:55:25.000000000 +0100
 +++ Linuxkernelsort-allow_leading_v/Linux/KernelSort.pm	2006-12-07 00:11:52.000000000 +0100
diff --git a/debian/patches/04_accept_4_digit_version_string.patch b/debian/patches/04_accept_4_digit_version_string.patch
index a5e35d6..62f5f56 100644
--- a/debian/patches/04_accept_4_digit_version_string.patch
+++ b/debian/patches/04_accept_4_digit_version_string.patch
@@ -1,9 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 04_accept_2.6.19.1_version.dpatch by Maximilian Wilhelm <[email protected]>
-##
-## DP: Let Linux::KernelSort accept a 4 digit version string
+From: Maximilian Wilhelm <[email protected]>
+Subject: Let Linux::KernelSort accept a 4 digit version string
 
-@DPATCH@
 
 --- liblinux-kernelsort-perl-0.01/lib/Linux/KernelSort.pm	2006-12-06 23:55:25.000000000 +0100
 +++ Linuxkernelsort-allow_4digit_version_string/Linux/KernelSort.pm	2006-12-07 00:16:52.000000000 +0100
diff --git a/debian/patches/05_accept_trailing_tree.patch b/debian/patches/05_accept_trailing_tree.patch
index dd9a2d9..1f2ae75 100644
--- a/debian/patches/05_accept_trailing_tree.patch
+++ b/debian/patches/05_accept_trailing_tree.patch
@@ -1,9 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 05_accept_trailing_tree.dpatch by Maximilian Wilhelm <[email protected]>
-##
-## DP: Let Linux::KernelSort accept a trailing '-tree' in version string
+From: Maximilian Wilhelm <[email protected]>
+Subject: Let Linux::KernelSort accept a trailing '-tree' in version string
 
-@DPATCH@
 
 --- liblinux-kernelsort-perl-0.01/lib/Linux/KernelSort.pm	2006-12-07 00:43:42.000000000 +0100
 +++ Linuxkernelsort-allow_trailing_tree_in_version_string/Linux/KernelSort.pm	2006-12-07 00:44:53.000000000 +0100
diff --git a/debian/patches/06_further_doc_fixes.patch b/debian/patches/06_further_doc_fixes.patch
index d9dd417..0b08091 100644
--- a/debian/patches/06_further_doc_fixes.patch
+++ b/debian/patches/06_further_doc_fixes.patch
@@ -1,9 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 06_further_doc_fixes.dpatch by Maximilian Wilhelm <[email protected]>
-##
-## DP: Further fixes for the in .pm documentation
+From: Maximilian Wilhelm <[email protected]>
+Subject: Further fixes for the in .pm documentation
 
-@DPATCH@
 
 --- liblinux-kernelsort-perl-0.01/lib/Linux/KernelSort.pm	2006-12-07 01:31:30.000000000 +0100
 +++ Linuxkernelsort-further_doc_fixes/Linux/KernelSort.pm	2006-12-07 01:23:26.000000000 +0100
diff --git a/debian/patches/00list b/debian/patches/series
similarity index 100%
rename from debian/patches/00list
rename to debian/patches/series
diff --git a/debian/rules b/debian/rules
index 53233b4..eca8c90 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,10 +9,7 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-# Include dpatch magic
-include /usr/share/dpatch/dpatch.make
-
-build: patch-stamp build-stamp
+build: build-stamp
 build-stamp:
 	dh_testdir
 
@@ -22,7 +19,7 @@ build-stamp:
 
 	touch build-stamp
 
-clean: unpatch
+clean:
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp configure-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

Reply via email to