Package: libapache2-mod-fcgid
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 599bdce74c12bd59a2e661f8d28921ac11f83147 Mon Sep 17 00:00:00 2001
From: Jari Aalto <[email protected]>
Date: Tue, 28 Feb 2012 14:11:55 -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/README.source | 38 --------------------
debian/changelog | 8 ++++
debian/compat | 2 +-
debian/control | 4 +-
debian/docs | 1 -
debian/patches/00list | 1 -
...lt_path.dpatch => 10_debian_default_path.patch} | 8 +---
debian/patches/series | 1 +
debian/rules | 1 -
9 files changed, 14 insertions(+), 50 deletions(-)
delete mode 100644 debian/README.source
delete mode 100644 debian/patches/00list
rename debian/patches/{10_debian_default_path.dpatch => 10_debian_default_path.patch} (75%)
create mode 100644 debian/patches/series
diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index fc98b3d..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,38 +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.
-
-
----
-
-this documentation is part of dpatch package, and may be used by
-packages using dpatch to comply with policy on README.source. This
-documentation is meant to be useful to users who are not proficient in
-dpatch in doing work with dpatch-based packages. Please send any
-improvements to the BTS of dpatch package.
-
-original text by Gerfried Fuchs, edited by Junichi Uekawa <[email protected]>
-10 Aug 2008.
diff --git a/debian/changelog b/debian/changelog
index e04f3fa..7ce3a99 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+libapache2-mod-fcgid (1:2.3.6-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 <[email protected]> Tue, 28 Feb 2012 14:09:24 -0500
+
libapache2-mod-fcgid (1:2.3.6-1) unstable; urgency=low
* New upstream release (Closes: #595276)
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 215c0f2..8de058d 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,8 @@ Source: libapache2-mod-fcgid
Section: httpd
Priority: optional
Maintainer: Tatsuki Sugiura <[email protected]>
-Build-Depends: debhelper (>= 5.0.0), apache2-threaded-dev (>= 2.2.3-2), libtool, cdbs, libapr1-dev, pkg-config, dpatch
-Standards-Version: 3.9.1
+Build-Depends: debhelper (>= 9), apache2-threaded-dev (>= 2.2.3-2), libtool, cdbs, libapr1-dev, pkg-config
+Standards-Version: 3.9.3
Uploaders: Taku YASUI <[email protected]>
Homepage: http://httpd.apache.org/mod_fcgid/
diff --git a/debian/docs b/debian/docs
index 5f6c57f..f170f62 100644
--- a/debian/docs
+++ b/debian/docs
@@ -1,4 +1,3 @@
-debian/README.source
README-FCGID
STATUS-FCGID
docs/manual/mod/mod_fcgid.xml.meta
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index e01e453..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1 +0,0 @@
-10_debian_default_path.dpatch
diff --git a/debian/patches/10_debian_default_path.dpatch b/debian/patches/10_debian_default_path.patch
similarity index 75%
rename from debian/patches/10_debian_default_path.dpatch
rename to debian/patches/10_debian_default_path.patch
index a4df0f6..dae3971 100644
--- a/debian/patches/10_debian_default_path.dpatch
+++ b/debian/patches/10_debian_default_path.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 10_debian_default_sockprefix.dpatch by <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Change default socket and shm path to compt with debian layout.
+From: <[email protected]>
+Subject: Change default socket and shm path to compt with debian layout.
-@DPATCH@
diff -urNad libapache2-mod-fcgid~/modules/fcgid/fcgid_conf.c libapache2-mod-fcgid/modules/fcgid/fcgid_conf.c
--- libapache2-mod-fcgid~/modules/fcgid/fcgid_conf.c 2010-02-01 05:15:22.000000000 +0900
+++ libapache2-mod-fcgid/modules/fcgid/fcgid_conf.c 2010-02-01 05:19:23.281304519 +0900
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..f09626e
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+10_debian_default_path.patch
diff --git a/debian/rules b/debian/rules
index 6fe73a7..48c26a1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,6 @@
#!/usr/bin/make -f
# -*- makefile -*-
include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/dpatch.mk
DEB_FIXPERMS_EXCLUDE = var/lib/apache2/fcgid/sock
CUR_PKGDEST=$(CURDIR)/debian/$(cdbs_curpkg)
--
1.7.9
