Bug#664306: [PATCH] fetchexc: Helping to update to packaging format 3.0
Package: fetchexc
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 f1ae4611ad2f6eca3b1e68cb83faf960d26b26c8 Mon Sep 17 00:00:00 2001
From: Jari Aalto <jari.aalto@cante.net>
Date: Sun, 26 Feb 2012 09:10:49 -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.aalto@cante.net>
---
debian/changelog | 8 ++++++++
debian/compat | 2 +-
debian/control | 4 ++--
...uild_changes.dpatch => 001_build_changes.patch} | 8 ++------
..._fetchexc.dpatch => 002_usr_bin_fetchexc.patch} | 8 ++------
debian/patches/00list | 2 --
debian/patches/series | 2 ++
debian/rules | 1 -
debian/source/format | 1 +
9 files changed, 18 insertions(+), 18 deletions(-)
rename debian/patches/{001_build_changes.dpatch => 001_build_changes.patch} (90%)
rename debian/patches/{002_usr_bin_fetchexc.dpatch => 002_usr_bin_fetchexc.patch} (62%)
delete mode 100644 debian/patches/00list
create mode 100644 debian/patches/series
create mode 100644 debian/source/format
diff --git a/debian/changelog b/debian/changelog
index 4def310..2a390c2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+fetchexc (2.0-5) 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.aalto@cante.net> Sun, 26 Feb 2012 09:09:26 -0500
+
fetchexc (2.0-4) unstable; urgency=low
* QA upload.
diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index 70617ed..8653231 100644
--- a/debian/control
+++ b/debian/control
@@ -2,9 +2,9 @@ Source: fetchexc
Section: net
Priority: optional
Maintainer: Debian QA Group <packages@qa.debian.org>
-Build-Depends: cdbs, debhelper (>= 7), dpatch, ant, default-jdk
+Build-Depends: cdbs, debhelper (>= 9), ant, default-jdk
Build-Depends-Indep: libcommons-httpclient-java, xsltproc, docbook-xsl
-Standards-Version: 3.8.3
+Standards-Version: 3.9.3
Vcs-Svn: svn://svn.debian.org/pkg-java/trunk/fetchexc
Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/fetchexc/
Homepage: http://personal.inet.fi/atk/fetchexc/
diff --git a/debian/patches/001_build_changes.dpatch b/debian/patches/001_build_changes.patch
similarity index 90%
rename from debian/patches/001_build_changes.dpatch
rename to debian/patches/001_build_changes.patch
index 8dd3e2b..7da7317 100644
--- a/debian/patches/001_build_changes.dpatch
+++ b/debian/patches/001_build_changes.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## build_changes.dpatch by <ted@midg3t.net>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Changes to allow the library to be built for Debian
+From: <ted@midg3t.net>
+Subject: Changes to allow the library to be built for Debian
-@DPATCH@
--- ../build.xml 2007-03-28 02:35:01.000000000 +1000
+++ ../build.xml 2007-08-05 17:49:42.000000000 +1000
diff --git a/debian/patches/002_usr_bin_fetchexc.dpatch b/debian/patches/002_usr_bin_fetchexc.patch
similarity index 62%
rename from debian/patches/002_usr_bin_fetchexc.dpatch
rename to debian/patches/002_usr_bin_fetchexc.patch
index 3e2ba8e..00c9995 100644
--- a/debian/patches/002_usr_bin_fetchexc.dpatch
+++ b/debian/patches/002_usr_bin_fetchexc.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 002_usr_bin_fetchexc.dpatch by Ted Percival <ted@midg3t.net>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Creates a wrapper script ready for /usr/bin
+From: Ted Percival <ted@midg3t.net>
+Subject: Creates a wrapper script ready for /usr/bin
-@DPATCH@
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ ../src/fetchexc Mon Aug 06 21:18:53 2007 +1000
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index a4a63b2..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,2 +0,0 @@
-001_build_changes
-002_usr_bin_fetchexc
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..d86e76c
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+001_build_changes.patch
+002_usr_bin_fetchexc.patch
diff --git a/debian/rules b/debian/rules
index d040376..33ffca6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,6 @@
#!/usr/bin/make -f
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/ant.mk
-include /usr/share/cdbs/1/rules/dpatch.mk
# Version is everything before the first hyphen, taken from changelog
VERSION=$(shell dpkg-parsechangelog | grep ^Version | sed 's,^Version: \([^-]*\).*,\1,')
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 to: