Package: ser2net
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 9b0cfb7354849b2153af132c9f72d47e6f10725e Mon Sep 17 00:00:00 2001
From: Jari Aalto <jari.aa...@cante.net>
Date: Wed, 29 Feb 2012 10:42:37 -0500
Subject: [PATCH] format-3.0
Organization: Private
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit

Signed-off-by: Jari Aalto <jari.aa...@cante.net>
---
 debian/changelog                                   |    8 ++++++++
 debian/compat                                      |    2 +-
 debian/control                                     |    4 ++--
 debian/patches/00list                              |    1 -
 ...-531733.dpatch => 50-timeout-docs-531733.patch} |   10 +++-------
 debian/patches/series                              |    1 +
 debian/rules                                       |    1 -
 debian/source/format                               |    1 +
 8 files changed, 16 insertions(+), 12 deletions(-)
 delete mode 100644 debian/patches/00list
 rename debian/patches/{50-timeout-docs-531733.dpatch => 50-timeout-docs-531733.patch} (89%)
 create mode 100644 debian/patches/series
 create mode 100644 debian/source/format

diff --git a/debian/changelog b/debian/changelog
index 0c30094..bc337cd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+ser2net (2.6-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 <jari.aa...@cante.net>  Wed, 29 Feb 2012 10:38:34 -0500
+
 ser2net (2.6-1) unstable; urgency=low
 
   * New upstream version.
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 7c09ddc..235f392 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,8 @@ Source: ser2net
 Section: utils
 Priority: optional
 Maintainer: Marc Haber <mh+debian-packa...@zugschlus.de>
-Build-Depends: cdbs, dpatch, debhelper, libwrap0-dev
-Standards-Version: 3.8.2
+Build-Depends: cdbs, debhelper, libwrap0-dev
+Standards-Version: 3.9.3
 
 Package: ser2net
 Architecture: any
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 94ac83a..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1 +0,0 @@
-50-timeout-docs-531733
diff --git a/debian/patches/50-timeout-docs-531733.dpatch b/debian/patches/50-timeout-docs-531733.patch
similarity index 89%
rename from debian/patches/50-timeout-docs-531733.dpatch
rename to debian/patches/50-timeout-docs-531733.patch
index 035acc0..cca3716 100644
--- a/debian/patches/50-timeout-docs-531733.dpatch
+++ b/debian/patches/50-timeout-docs-531733.patch
@@ -1,11 +1,7 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 50-timeout-docs-531733.dpatch by Marc Haber <mh+debian-packa...@zugschlus.de>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: add timeout description to README, fix cosmetic issues.
-## DP: thanks to Geoff Simmons, #531733
+From: Marc Haber <mh+debian-packa...@zugschlus.de>
+Subject: add timeout description to README, fix cosmetic issues.
+ Thanks to Geoff Simmons, #531733
 
-@DPATCH@
 diff -urNad trunk~/README trunk/README
 --- trunk~/README	2003-10-14 18:09:43.000000000 +0200
 +++ trunk/README	2009-07-16 12:50:26.000000000 +0200
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..30ae31c
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+50-timeout-docs-531733.patch
diff --git a/debian/rules b/debian/rules
index b69b1b3..2003809 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,6 +5,5 @@
 
 # automatic debian/control generation disabled, cdbs bug #311724.
 
-include /usr/share/cdbs/1/rules/dpatch.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
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