Package: libgcgi
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 072bde0b64b94534e98fa51012dd46efe6cc5fbd Mon Sep 17 00:00:00 2001
From: Jari Aalto <[email protected]>
Date: Wed, 25 Apr 2012 08:25:44 +0300
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/README.source | 26 --------------------
debian/changelog | 9 +++++++
debian/compat | 2 +-
debian/control | 4 +--
debian/patches/00list | 1 -
...date_libtool.dpatch => 01-update-libtool.patch} | 8 ++----
debian/patches/series | 1 +
debian/rules | 7 ++----
debian/source/format | 2 +-
9 files changed, 18 insertions(+), 42 deletions(-)
delete mode 100644 debian/README.source
delete mode 100644 debian/patches/00list
rename debian/patches/{01_update_libtool.dpatch => 01-update-libtool.patch} (99%)
create mode 100644 debian/patches/series
diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index b59f078..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,26 +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 70208ff..9867c93 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+libgcgi (0.9.5.dfsg-7.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.
+ * Add build-arch and build-indep targets; use dh_prep in rules file.
+
+ -- Jari Aalto <[email protected]> Wed, 25 Apr 2012 08:22:49 +0300
+
libgcgi (0.9.5.dfsg-7) unstable; urgency=low
* debian/watch: Removed as upstream website is gone
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 e348ce3..c97efe1 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,8 @@ Source: libgcgi
Priority: optional
Section: libs
Maintainer: Jeremy T. Bouse <[email protected]>
-Build-Depends: debhelper (>= 7), libssl-dev, dpatch
-Standards-Version: 3.9.2
+Build-Depends: debhelper (>= 9), libssl-dev
+Standards-Version: 3.9.3
Homepage: http://www.catchen.org/gcgi/
Vcs-Git: git://git.debian.org/collab-maint/libgcgi.git
Vcs-Browser: http://git.debian.org/?p=collab-maint/libgcgi.git
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index d078464..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1 +0,0 @@
-01_update_libtool.dpatch
diff --git a/debian/patches/01_update_libtool.dpatch b/debian/patches/01-update-libtool.patch
similarity index 99%
rename from debian/patches/01_update_libtool.dpatch
rename to debian/patches/01-update-libtool.patch
index add2c63..535b9dd 100644
--- a/debian/patches/01_update_libtool.dpatch
+++ b/debian/patches/01-update-libtool.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_update_libtool.dpatch by <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Update libtool of package to newer version than upstream
+From: <[email protected]>
+Subject: Update libtool of package to newer version than upstream
-@DPATCH@
diff -urNad libgcgi~/Makefile.in libgcgi/Makefile.in
--- libgcgi~/Makefile.in 2009-11-30 00:15:57.000000000 +0000
+++ libgcgi/Makefile.in 2009-11-30 00:29:48.000000000 +0000
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..d88e7c8
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01-update-libtool.patch
diff --git a/debian/rules b/debian/rules
index acb30f8..817bfd5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,7 +9,6 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-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)
@@ -37,7 +36,7 @@ major=2
#major=`ls src/.libs/lib*.so.* | \
# awk '{if (match($$0,/\.so\.[0-9]+$$/)) print substr($$0,RSTART+4)}'`
-config.status: patch-stamp configure
+config.status: configure
dh_testdir
find . \( -type f -a -name "Makefile.am" -prune -exec touch {} \; \)
find . \( -type f -a -name "Makefile.in" -prune -exec touch {} \; \)
@@ -56,9 +55,7 @@ build-stamp: config.status
touch build-stamp
-clean: clean-patched unpatch
-
-clean-patched:
+clean:
dh_testdir
dh_testroot
dh_auto_clean
diff --git a/debian/source/format b/debian/source/format
index d3827e7..163aaf8 100644
--- a/debian/source/format
+++ b/debian/source/format
@@ -1 +1 @@
-1.0
+3.0 (quilt)
--
1.7.10
