Package: poco
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 003fc82e5f24125f14606ab038f8bcb1abb6e8e3 Mon Sep 17 00:00:00 2001
From: Jari Aalto <jari.aa...@cante.net>
Date: Fri, 24 Feb 2012 14:27:04 -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.aa...@cante.net>
---
debian/README.source | 27 --------------------
debian/changelog | 8 ++++++
debian/compat | 2 +-
debian/control | 4 +-
debian/patches/00list | 1 -
...disable-rpath.dpatch => 10_disable-rpath.patch} | 7 +---
debian/patches/series | 1 +
debian/rules | 8 +----
debian/source/format | 1 +
9 files changed, 17 insertions(+), 42 deletions(-)
delete mode 100644 debian/README.source
delete mode 100644 debian/patches/00list
rename debian/patches/{10_disable-rpath.dpatch => 10_disable-rpath.patch} (96%)
create mode 100644 debian/patches/series
create mode 100644 debian/source/format
diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index f6a9643..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,27 +0,0 @@
-This package uses dpatch to manage all modifications to the upstream
-source. Changes are stored in the source package as diffs in
-debian/patches and applied during the build.
-
-To get the fully patched source after unpacking the source package, cd
-to the root level of the source package and run:
-
- debian/rules patch
-
-Removing a patch is as simple as removing its entry from the
-debian/patches/00list file, and please also remove the patch file
-itself.
-
-Creating a new patch is done with "dpatch-edit-patch patch XX_patchname"
-where you should replace XX with a new number and patchname with a
-descriptive shortname of the patch. You can then simply edit all the
-files your patch wants to edit, and then simply "exit 0" from the shell
-to actually create the patch file.
-
-To tweak an already existing patch, call "dpatch-edit-patch XX_patchname"
-and replace XX_patchname with the actual filename from debian/patches
-you want to use.
-
-To clean up afterwards again, "debian/rules unpatch" will do the
-work for you - or you can of course choose to call
-"fakeroot debian/rules clean" all together.
-
diff --git a/debian/changelog b/debian/changelog
index 12ee41a..75bb04c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+poco (1.3.6p1-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Remove dpatch and upgrade to packaging format "3.0 quilt".
+ * Update to Standards-Version to 3.9.3 and debhelper to 9.
+
+ -- Jari Aalto <jari.aa...@cante.net> Fri, 24 Feb 2012 13:57:44 -0500
+
poco (1.3.6p1-1) unstable; urgency=low
* New Upstream Version
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 97f5e09..09e5eab 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,8 @@ Source: poco
Priority: optional
Maintainer: Krzysztof Burghardt <krzysz...@burghardt.pl>
Uploaders: Patrick Gansterer <par...@paroga.com>
-Build-Depends: debhelper (>= 5), dpatch, libexpat1-dev, libmysqlclient-dev, libpcre3-dev (>= 7.8), libsqlite3-dev (>= 3.6.13), libssl-dev (>= 0.9.8), unixodbc-dev, zlib1g-dev
-Standards-Version: 3.8.3
+Build-Depends: debhelper (>= 9), libexpat1-dev, libmysqlclient-dev, libpcre3-dev (>= 7.8), libsqlite3-dev (>= 3.6.13), libssl-dev (>= 0.9.8), unixodbc-dev, zlib1g-dev
+Standards-Version: 3.9.3
Section: libs
Homepage: http://poco.sourceforge.net/
Vcs-Browser: http://git.debian.org/?p=collab-maint/poco.git
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 37812e0..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1 +0,0 @@
-10_disable-rpath.dpatch
diff --git a/debian/patches/10_disable-rpath.dpatch b/debian/patches/10_disable-rpath.patch
similarity index 96%
rename from debian/patches/10_disable-rpath.dpatch
rename to debian/patches/10_disable-rpath.patch
index fc8da18..201dcd8 100644
--- a/debian/patches/10_disable-rpath.dpatch
+++ b/debian/patches/10_disable-rpath.patch
@@ -1,9 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 10_disable-rpath.dpatch by Krzysztof Burghardt <krzysz...@burghardt.pl>
-##
-## DP: Disables use of RPATH.
+From: Krzysztof Burghardt <krzysz...@burghardt.pl>
+Subject: Disables use of RPATH.
-@DPATCH@
diff -urNad poco-1.3.5~/build/config/ARM-Linux poco-1.3.5/build/config/ARM-Linux
--- poco-1.3.5~/build/config/ARM-Linux 2009-05-12 20:22:09.000000000 +0200
+++ poco-1.3.5/build/config/ARM-Linux 2009-05-23 16:33:20.189721725 +0200
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..1ccbd91
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+10_disable-rpath.patch
diff --git a/debian/rules b/debian/rules
index cd5785a..234daae 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,9 +4,6 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-# Include dpatch
-include /usr/share/dpatch/dpatch.make
-
# These are used for cross-compiling and for saving the configure script
# from having to guess our platform (since we know it already)
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
@@ -19,7 +16,7 @@ ifeq ($(shell dpkg --print-architecture),arm)
CONFFLAGS += --no-fpenvironment
endif
-config.status: patch configure
+config.status: configure
dh_testdir
./configure $(CONFFLAGS)
@@ -30,8 +27,7 @@ build-stamp: config.status
$(MAKE)
touch $@
-clean: clean-patched unpatch
-clean-patched:
+clean:
dh_testdir
dh_testroot
rm -f build-stamp
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
