Package: tmexpand
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 6867556a5d5ac83cea429905e30b06ad71501806 Mon Sep 17 00:00:00 2001
From: Jari Aalto <[email protected]>
Date: Mon, 27 Feb 2012 06:34:53 -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 --
debian/patches/{manpage.dpatch => manpage.patch} | 7 ++-----
...les.dpatch => paths-in-example-makefiles.patch} | 10 ++--------
debian/patches/series | 2 ++
debian/rules | 5 ++---
debian/source/format | 1 +
9 files changed, 20 insertions(+), 21 deletions(-)
delete mode 100644 debian/patches/00list
rename debian/patches/{manpage.dpatch => manpage.patch} (94%)
rename debian/patches/{paths-in-example-makefiles.dpatch => paths-in-example-makefiles.patch} (64%)
create mode 100644 debian/patches/series
create mode 100644 debian/source/format
diff --git a/debian/changelog b/debian/changelog
index e4778a7..68d8265 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+tmexpand (0.1.2.0-3.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]> Mon, 27 Feb 2012 06:33:55 -0500
+
tmexpand (0.1.2.0-3) unstable; urgency=low
* debian/control:
diff --git a/debian/compat b/debian/compat
index b8626c4..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-4
+9
diff --git a/debian/control b/debian/control
index 1e21f1e..ed2a10c 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,8 @@ Section: text
Priority: optional
Maintainer: Debian JED Group <[email protected]>
Uploaders: Rafael Laboissiere <[email protected]>, Jörg Sommer <[email protected]>
-Standards-Version: 3.7.3
-Build-Depends: debhelper, dpatch
+Standards-Version: 3.9.3
+Build-Depends: debhelper
Build-Depends-Indep: jed (>= 0.99.17.111-1) | xjed (>= 0.99.17.111-1)
Vcs-Svn: svn://svn.debian.org/svn/pkg-jed/tmexpand/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-jed/tmexpand/
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index f39baf7..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,2 +0,0 @@
-manpage
-paths-in-example-makefiles
diff --git a/debian/patches/manpage.dpatch b/debian/patches/manpage.patch
similarity index 94%
rename from debian/patches/manpage.dpatch
rename to debian/patches/manpage.patch
index c591c2f..97c3f3d 100644
--- a/debian/patches/manpage.dpatch
+++ b/debian/patches/manpage.patch
@@ -1,9 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## manpage.dpatch by Jörg Sommer <[email protected]>
-##
-## DP: Removes - (hypen) by \- (dash) in the manpage.
+From: Jörg Sommer <[email protected]>
+Subject: Removes - (hypen) by - (dash) in the manpage.
-@DPATCH@
diff -urNad trunk~/doc/man/tmexpand.1 trunk/doc/man/tmexpand.1
--- trunk~/doc/man/tmexpand.1 2005-03-26 18:52:50.000000000 +0100
+++ trunk/doc/man/tmexpand.1 2007-05-27 21:56:27.169123393 +0200
diff --git a/debian/patches/paths-in-example-makefiles.dpatch b/debian/patches/paths-in-example-makefiles.patch
similarity index 64%
rename from debian/patches/paths-in-example-makefiles.dpatch
rename to debian/patches/paths-in-example-makefiles.patch
index a894b2c..8a6473d 100644
--- a/debian/patches/paths-in-example-makefiles.dpatch
+++ b/debian/patches/paths-in-example-makefiles.patch
@@ -1,11 +1,5 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## paths-in-example-makefiles.dpatch by Rafael Laboissiere <[email protected]>
-##
-## DP: Change paths in TMEXPAND and MACRODIR make variales such that the
-## DP: Makefiles in examples/ and examples/web worked for the installed
-## DP: package
-
-@DPATCH@
+From: Rafael Laboissiere <[email protected]>
+Subject: Change paths in TMEXPAND and MACRODIR make variales in Makefiles
--- tmexpand-0.1.2.0.orig/doc/examples/web/Makefile
+++ tmexpand-0.1.2.0/doc/examples/web/Makefile
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..b91e7d9
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+manpage.patch
+paths-in-example-makefiles.patch
diff --git a/debian/rules b/debian/rules
index bb45096..1cf95a5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,12 +2,11 @@
#export DH_VERBOSE=1
-include /usr/share/dpatch/dpatch.make
instdir=$(CURDIR)/debian/tmexpand
subdirs=bin doc images macros
-clean: unpatch
+clean:
dh_testdir
dh_clean
for i in $(subdirs); do \
@@ -18,7 +17,7 @@ clean: unpatch
rm -f config.log config.status Makefile
rm -f build-stamp install-stamp
-config.status: patch-stamp
+config.status:
dh_testdir
./configure --prefix=/usr
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
