Package: tcpser
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 9f1c50d4f8d584e5b988fefe85cc02d6987a4530 Mon Sep 17 00:00:00 2001
From: Jari Aalto <[email protected]>
Date: Wed, 29 Feb 2012 11:00:17 -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                              |    1 -
 .../{01-usage-typo.dpatch => 01-usage-typo.patch}  |    8 ++------
 debian/patches/series                              |    1 +
 debian/rules                                       |    8 +++-----
 debian/source/format                               |    1 +
 8 files changed, 18 insertions(+), 15 deletions(-)
 delete mode 100644 debian/patches/00list
 rename debian/patches/{01-usage-typo.dpatch => 01-usage-typo.patch} (74%)
 create mode 100644 debian/patches/series
 create mode 100644 debian/source/format

diff --git a/debian/changelog b/debian/changelog
index 55fe336..f23dd1c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+tcpser (1.0rc12-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 10:56:47 -0500
+
 tcpser (1.0rc12-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 12bc688..35e8f4c 100644
--- a/debian/control
+++ b/debian/control
@@ -2,10 +2,10 @@ Source: tcpser
 Section: net
 Priority: optional
 Maintainer: Peter Collingbourne <[email protected]>
-Build-Depends: debhelper (>= 5), dpatch
+Build-Depends: debhelper (>= 9)
 Homepage: http://www.jbrain.com/pub/linux/serial/
 Vcs-Bzr: http://bzr.debian.org/collab-maint/tcpser/unstable/
-Standards-Version: 3.7.3
+Standards-Version: 3.9.3
 
 Package: tcpser
 Architecture: any
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index d7d8bad..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1 +0,0 @@
-01-usage-typo.dpatch
diff --git a/debian/patches/01-usage-typo.dpatch b/debian/patches/01-usage-typo.patch
similarity index 74%
rename from debian/patches/01-usage-typo.dpatch
rename to debian/patches/01-usage-typo.patch
index 5612203..be071e5 100644
--- a/debian/patches/01-usage-typo.dpatch
+++ b/debian/patches/01-usage-typo.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01-usage-typo.dpatch by  <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: src/init.c: Fixed typo in usage summary
+From: <[email protected]>
+Subject: src/init.c: Fixed typo in usage summary
 
-@DPATCH@
 diff -urNad tcpser-1.0rc12~/src/init.c tcpser-1.0rc12/src/init.c
 --- tcpser-1.0rc12~/src/init.c	2008-02-04 13:48:58.000000000 +0000
 +++ tcpser-1.0rc12/src/init.c	2008-02-04 13:59:00.000000000 +0000
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..f63f693
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01-usage-typo.patch
diff --git a/debian/rules b/debian/rules
index c612918..7c3b042 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,6 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
 
-include /usr/share/dpatch/dpatch.make
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
@@ -16,13 +15,12 @@ endif
 
 build: build-stamp
 
-build-stamp: patch
+build-stamp:
 	dh_testdir
 	$(MAKE) CFLAGS="$(CFLAGS)"
 	touch $@
 
-clean: clean-patched unpatch
-clean-patched:
+clean:
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp
@@ -54,4 +52,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)
-- 
1.7.9

Reply via email to