Package: contextfree
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
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 a8271e0bd0b85dfb2828f66e01e2522a3a7707eb Mon Sep 17 00:00:00 2001
From: Jari Aalto <[email protected]>
Date: Mon, 27 Feb 2012 12:39:41 -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 | 3 ---
..._libagg.dpatch => 01_use_external_libagg.patch} | 13 +++++--------
...bz.dpatch => 02_do_not_link_against_libz.patch} | 9 ++-------
...inst_libm.dpatch => 03_link_against_libm.patch} | 8 ++------
debian/patches/series | 3 +++
debian/rules | 5 ++---
9 files changed, 25 insertions(+), 30 deletions(-)
delete mode 100644 debian/patches/00list
rename debian/patches/{01_use_external_libagg.dpatch => 01_use_external_libagg.patch} (72%)
rename debian/patches/{02_do_not_link_against_libz.dpatch => 02_do_not_link_against_libz.patch} (60%)
rename debian/patches/{03_link_against_libm.dpatch => 03_link_against_libm.patch} (70%)
create mode 100644 debian/patches/series
diff --git a/debian/changelog b/debian/changelog
index fb528cd..f19e8f8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+contextfree (2.2+dfsg1-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]> Mon, 27 Feb 2012 12:36:39 -0500
+
contextfree (2.2+dfsg1-2) unstable; urgency=low
* Added patch 03_link_against_libm to fix FTBFS with --no-add-needed, which
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 d2cd675..5d9944b 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,8 @@ Section: graphics
Priority: extra
Maintainer: Bram Senders <[email protected]>
Uploaders: Paul van Tilburg <[email protected]>
-Build-Depends: debhelper (>= 5), dpatch, flex, bison, libpng12-dev, libagg-dev
-Standards-Version: 3.9.1
+Build-Depends: debhelper (>= 9), flex, bison, libpng12-dev, libagg-dev
+Standards-Version: 3.9.3
Homepage: http://contextfreeart.org/
Package: contextfree
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 1adeea8..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,3 +0,0 @@
-01_use_external_libagg
-02_do_not_link_against_libz
-03_link_against_libm
diff --git a/debian/patches/01_use_external_libagg.dpatch b/debian/patches/01_use_external_libagg.patch
similarity index 72%
rename from debian/patches/01_use_external_libagg.dpatch
rename to debian/patches/01_use_external_libagg.patch
index 71c4555..b461cee 100644
--- a/debian/patches/01_use_external_libagg.dpatch
+++ b/debian/patches/01_use_external_libagg.patch
@@ -1,12 +1,9 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_use_external_libagg.dpatch by Bram Senders <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Do not compile and link to src-agg/src/*.cpp sources, but link to
-## DP: /usr/lib/libagg.a from the libagg-dev package instead. The agg headers
-## DP: used are still from the internal copy, as they have been modified.
+From: Bram Senders <[email protected]>
+Subject: Do not compile and link to src-agg/src/*.cpp sources
+ Link to /usr/lib/libagg.a from the libagg-dev package instead. The
+ agg headers used are still from the internal copy, as they have been
+ modified.
-@DPATCH@
diff -urNad contextfree-2.2~/Makefile contextfree-2.2/Makefile
--- contextfree-2.2~/Makefile 2009-02-07 21:46:29.000000000 +0100
+++ contextfree-2.2/Makefile 2009-02-07 21:47:25.000000000 +0100
diff --git a/debian/patches/02_do_not_link_against_libz.dpatch b/debian/patches/02_do_not_link_against_libz.patch
similarity index 60%
rename from debian/patches/02_do_not_link_against_libz.dpatch
rename to debian/patches/02_do_not_link_against_libz.patch
index 9b53c3a..638f764 100644
--- a/debian/patches/02_do_not_link_against_libz.dpatch
+++ b/debian/patches/02_do_not_link_against_libz.patch
@@ -1,11 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_do_not_link_against_libz.dpatch by Bram Senders <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: While building dpkg-shlibdeps says that linking against libz is not
-## DP: required, so do not do so.
+From: Bram Senders <[email protected]>
+Subject: dpkg-shlibdeps says linking against libz is not required
-@DPATCH@
diff -urNad contextfree-2.2~/Makefile contextfree-2.2/Makefile
--- contextfree-2.2~/Makefile 2009-02-09 22:43:02.000000000 +0100
+++ contextfree-2.2/Makefile 2009-02-09 22:43:03.000000000 +0100
diff --git a/debian/patches/03_link_against_libm.dpatch b/debian/patches/03_link_against_libm.patch
similarity index 70%
rename from debian/patches/03_link_against_libm.dpatch
rename to debian/patches/03_link_against_libm.patch
index 3d45637..4909abf 100644
--- a/debian/patches/03_link_against_libm.dpatch
+++ b/debian/patches/03_link_against_libm.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 03_link_against_libm.dpatch by Ilya Barygin <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Add missing library to fix FTBFS with --no-add-needed.
+From: Ilya Barygin <[email protected]>
+Subject: Add missing library to fix FTBFS with --no-add-needed.
-@DPATCH@
diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' contextfree-2.2+dfsg1~/Makefile contextfree-2.2+dfsg1/Makefile
--- contextfree-2.2+dfsg1~/Makefile 2011-01-14 19:55:35.000000000 +0100
+++ contextfree-2.2+dfsg1/Makefile 2011-01-14 19:56:47.000000000 +0100
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..60512a1
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,3 @@
+01_use_external_libagg.patch
+02_do_not_link_against_libz.patch
+03_link_against_libm.patch
diff --git a/debian/rules b/debian/rules
index 07438a2..3bfab39 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,15 +9,14 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-include /usr/share/dpatch/dpatch.make
build: build-stamp
-build-stamp: patch-stamp
+build-stamp:
dh_testdir
$(MAKE)
touch $@
-clean: unpatch
+clean:
dh_testdir
dh_testroot
rm -f build-stamp
--
1.7.9
