Package: libapache-mod-fastcgi
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 111af63dafafe7e67be7ea937f84debe13d850b8 Mon Sep 17 00:00:00 2001
From: Jari Aalto <jari.aa...@cante.net>
Date: Tue, 28 Feb 2012 14:03:25 -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/changelog | 12 ++++++++----
debian/control | 4 ++--
debian/patches/00list | 4 ----
...v-on-load.dpatch => apache2-segv-on-load.patch} | 10 +++-------
...pache2.2-authn.dpatch => apache2.2-authn.patch} | 9 ++-------
...che2.2-compat.dpatch => apache2.2-compat.patch} | 10 ++--------
...isc-typo-fix.dpatch => doc-misc-typo-fix.patch} | 10 +++-------
debian/patches/series | 4 ++++
debian/rules | 1 -
debian/source/format | 1 +
10 files changed, 25 insertions(+), 40 deletions(-)
delete mode 100644 debian/patches/00list
rename debian/patches/{apache2-segv-on-load.dpatch => apache2-segv-on-load.patch} (72%)
rename debian/patches/{apache2.2-authn.dpatch => apache2.2-authn.patch} (92%)
rename debian/patches/{apache2.2-compat.dpatch => apache2.2-compat.patch} (84%)
rename debian/patches/{doc-misc-typo-fix.dpatch => doc-misc-typo-fix.patch} (75%)
create mode 100644 debian/patches/series
create mode 100644 debian/source/format
diff --git a/debian/changelog b/debian/changelog
index 286655d..4939e9c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+libapache-mod-fastcgi (2.4.7~0910052141-1.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 <jari.aa...@cante.net> Tue, 28 Feb 2012 14:01:30 -0500
+
libapache-mod-fastcgi (2.4.7~0910052141-1) unstable; urgency=low
* New upstream release
@@ -238,7 +246,3 @@ libapache-mod-fastcgi (2.1b1-1) unstable; urgency=low
* Lintian 0.9.5 satisfied.
-- Milan Zamazal <p...@debian.org> Thu, 14 Jan 1999 12:16:50 +0100
-
-Local variables:
-mode: debian-changelog
-End:
diff --git a/debian/control b/debian/control
index 052a4b8..b24a3e8 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,8 @@ Source: libapache-mod-fastcgi
Section: non-free/web
Priority: optional
Maintainer: Tatsuki Sugiura <s...@nemui.org>
-Standards-Version: 3.9.1
-Build-Depends: debhelper (>> 5.0.0), cdbs, apache2-threaded-dev (>= 2.2.4) | apache2-prefork-dev (>= 2.2.4), dpatch (>= 2.0.0), libtool, libapr1-dev, pkg-config
+Standards-Version: 3.9.3
+Build-Depends: debhelper (>= 9), cdbs, apache2-threaded-dev (>= 2.2.4) | apache2-prefork-dev (>= 2.2.4), libtool, libapr1-dev, pkg-config
Uploaders: Taku YASUI <t...@debian.or.jp>
Homepage: http://www.fastcgi.com/
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 2bc2a94..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,4 +0,0 @@
-#apache2-segv-on-load.dpatch # fixed
-#apache2.2-authn.dpatch # fixed
-#apache2.2-compat.dpatch # fixed
-doc-misc-typo-fix.dpatch
diff --git a/debian/patches/apache2-segv-on-load.dpatch b/debian/patches/apache2-segv-on-load.patch
similarity index 72%
rename from debian/patches/apache2-segv-on-load.dpatch
rename to debian/patches/apache2-segv-on-load.patch
index c0e49ab..e270594 100644
--- a/debian/patches/apache2-segv-on-load.dpatch
+++ b/debian/patches/apache2-segv-on-load.patch
@@ -1,11 +1,7 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## apache2-segv-on-load.dpatch by <s...@nemui.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: See the URL for details.
-## DP: http://www.fastcgi.com/archives/fastcgi-developers/2005-April/003673.html
+From: <s...@nemui.org>
+Subject: See the URL for details.
+ http://www.fastcgi.com/archives/fastcgi-developers/2005-April/003673.html
-@DPATCH@
diff -urNad libapache-mod-fastcgi~/mod_fastcgi.c libapache-mod-fastcgi/mod_fastcgi.c
--- libapache-mod-fastcgi~/mod_fastcgi.c 2005-08-06 14:09:11.000000000 +0900
+++ libapache-mod-fastcgi/mod_fastcgi.c 2006-10-06 20:52:46.368480801 +0900
diff --git a/debian/patches/apache2.2-authn.dpatch b/debian/patches/apache2.2-authn.patch
similarity index 92%
rename from debian/patches/apache2.2-authn.dpatch
rename to debian/patches/apache2.2-authn.patch
index ebf2f3a..ceec0c1 100644
--- a/debian/patches/apache2.2-authn.dpatch
+++ b/debian/patches/apache2.2-authn.patch
@@ -1,11 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## apache2.2-authn.dpatch by <s...@nemui.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: mod_fastcgi works as AUTHN provider for apache 2.2
-##
+From: <s...@nemui.org>
+Subject: mod_fastcgi works as AUTHN provider for apache 2.2
-@DPATCH@
diff -urNad libapache-mod-fastcgi~/mod_fastcgi.c libapache-mod-fastcgi/mod_fastcgi.c
--- libapache-mod-fastcgi~/mod_fastcgi.c 2006-10-06 21:55:39.000000000 +0900
+++ libapache-mod-fastcgi/mod_fastcgi.c 2007-08-25 16:51:25.000000000 +0900
diff --git a/debian/patches/apache2.2-compat.dpatch b/debian/patches/apache2.2-compat.patch
similarity index 84%
rename from debian/patches/apache2.2-compat.dpatch
rename to debian/patches/apache2.2-compat.patch
index 4c33c0b..2a4209d 100644
--- a/debian/patches/apache2.2-compat.dpatch
+++ b/debian/patches/apache2.2-compat.patch
@@ -1,12 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## apache2.2-compat.dpatch by daniel.smertnig at gmail.com
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: compat for Apache 2.2
-## downlowded from: http://www.fastcgi.com/archives/fastcgi-developers/2005-December/004060.html
-##
+From: daniel.smertnig at gmail.com
+Subject: compat for Apache 2.2
-@DPATCH@
diff -ruN mod_fastcgi-2.4.2/fcgi.h mod_fastcgi-2.4.2-ap22/fcgi.h
--- mod_fastcgi-2.4.2/fcgi.h 2003-02-04 00:07:37.000000000 +0100
+++ mod_fastcgi-2.4.2-ap22/fcgi.h 2005-12-07 21:05:55.000000000 +0100
diff --git a/debian/patches/doc-misc-typo-fix.dpatch b/debian/patches/doc-misc-typo-fix.patch
similarity index 75%
rename from debian/patches/doc-misc-typo-fix.dpatch
rename to debian/patches/doc-misc-typo-fix.patch
index 389c75b..417d722 100644
--- a/debian/patches/doc-misc-typo-fix.dpatch
+++ b/debian/patches/doc-misc-typo-fix.patch
@@ -1,11 +1,7 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## by Troestler Christophe <christophe.troest...@umh.ac.be>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: fix for document dead link
-## DP: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=288270
+From: Troestler Christophe <christophe.troest...@umh.ac.be>
+Subject: fix for document dead link
+ http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=288270
-@DPATCH@
--- libapache-mod-fastcgi-2.4.6.orig/docs/mod_fastcgi.html
+++ libapache-mod-fastcgi-2.4.6/docs/mod_fastcgi.html
@@ -67,7 +67,7 @@
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..d5c2566
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,4 @@
+#apache2-segv-on-load.patch # fixed
+#apache2.2-authn.patch # fixed
+#apache2.2-compat.patch # fixed
+doc-misc-typo-fix.patch
diff --git a/debian/rules b/debian/rules
index ab29099..4259a1f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,6 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/langcore.mk
include /usr/share/cdbs/1/class/makefile-vars.mk
-include /usr/share/cdbs/1/rules/dpatch.mk
APACHE2_VERSION=`dpkg -s apache2-prefork-dev apache2-threaded-dev 2>/dev/null |grep Version: | awk '{print $$2}'`
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
