Package: tapecalc
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
Carl, 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 81bee4452f8192524c9099a89c71589ead471672 Mon Sep 17 00:00:00 2001
From: Jari Aalto <[email protected]>
Date: Wed, 29 Feb 2012 10:57:23 -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 -
.../{00rel-path.dpatch => 00rel-path.patch} | 8 ++------
.../{01name-change.dpatch => 01name-change.patch} | 8 ++------
debian/patches/series | 1 +
debian/rules | 1 -
debian/source/format | 1 +
9 files changed, 17 insertions(+), 17 deletions(-)
delete mode 100644 debian/patches/00list
rename debian/patches/{00rel-path.dpatch => 00rel-path.patch} (87%)
rename debian/patches/{01name-change.dpatch => 01name-change.patch} (96%)
create mode 100644 debian/patches/series
create mode 100644 debian/source/format
diff --git a/debian/changelog b/debian/changelog
index 1f96bb5..bc5337e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+tapecalc (20070214-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 10:54:29 -0500
+
tapecalc (20070214-2) unstable; urgency=low
* Adding libncurses5-dev to Build-Depends (closes: #435221)
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 4a4bca8..635d995 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,8 @@ Source: tapecalc
Section: math
Priority: optional
Maintainer: Carl Fürstenberg <[email protected]>
-Build-Depends: cdbs, debhelper (>= 5), autotools-dev, dpatch, libncurses5-dev
-Standards-Version: 3.7.2
+Build-Depends: cdbs, debhelper (>= 9), autotools-dev, libncurses5-dev
+Standards-Version: 3.9.3
Package: tapecalc
Architecture: any
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index d33824d..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1 +0,0 @@
-00rel-path.dpatch 01name-change.dpatch
diff --git a/debian/patches/00rel-path.dpatch b/debian/patches/00rel-path.patch
similarity index 87%
rename from debian/patches/00rel-path.dpatch
rename to debian/patches/00rel-path.patch
index 4c269db..f038985 100644
--- a/debian/patches/00rel-path.dpatch
+++ b/debian/patches/00rel-path.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## rel-path.dpatch by Carl Fürstenberg <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Patch to relocate add.hlp to datadir instead of bindir.
+From: Carl Fürstenberg <[email protected]>
+Subject: Patch to relocate add.hlp to datadir instead of bindir.
-@DPATCH@
diff -urNad add-20070214~/add.c add-20070214/add.c
--- add-20070214~/add.c 2007-07-25 22:37:49.000000000 +0200
+++ add-20070214/add.c 2007-07-25 22:38:29.000000000 +0200
diff --git a/debian/patches/01name-change.dpatch b/debian/patches/01name-change.patch
similarity index 96%
rename from debian/patches/01name-change.dpatch
rename to debian/patches/01name-change.patch
index f64b317..6954f17 100644
--- a/debian/patches/01name-change.dpatch
+++ b/debian/patches/01name-change.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## name-change.dpatch by Carl Fürstenberg <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: As "add" is a bit ambigious, a namechange to tapecalc is in order.
+From: Carl Fürstenberg <[email protected]>
+Subject: As "add" is a bit ambigious, a namechange to tapecalc is in order.
-@DPATCH@
diff -urNad tapecalc-20070214~/add.1 tapecalc-20070214/add.1
--- tapecalc-20070214~/add.1 2007-02-15 00:34:33.000000000 +0100
+++ tapecalc-20070214/add.1 2007-07-25 23:03:51.000000000 +0200
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..cbefe42
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+00rel-path.patch 01name-change.dpatch
diff --git a/debian/rules b/debian/rules
index 97a4912..4bee969 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,6 +2,5 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/autotools.mk
-include /usr/share/cdbs/1/rules/dpatch.mk
# Add here any variable or target overrides you need.
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
