Bug#664299: [PATCH] apr: Helping to update to packaging format 3.0
Package: apr
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 2b30f88c055e8d0f151cf2224b2a5c66dabe6d2e Mon Sep 17 00:00:00 2001
From: Jari Aalto <jari.aalto@cante.net>
Date: Sat, 3 Mar 2012 04:55:12 -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.aalto@cante.net>
---
debian/README.source | 17 -----
debian/changelog | 10 +++
debian/compat | 2 +-
debian/control | 4 +-
debian/patches/00list | 10 ---
..._apr-config.dpatch => 011_fix_apr-config.patch} | 17 ++---
...nd_apr.m4.dpatch => 013_ship_find_apr.m4.patch} | 19 +++---
debian/patches/014_fix-apr.pc.dpatch | 19 -----
debian/patches/014_fix-apr.pc.patch | 18 +++++
..._sendfile_lfs.dpatch => 015_sendfile_lfs.patch} | 73 ++++++++++----------
...endfile_hurd.dpatch => 016_sendfile_hurd.patch} | 15 ++--
debian/patches/022_hurd_path_max.dpatch | 20 ------
debian/patches/022_hurd_path_max.patch | 19 +++++
...23_fix_doxygen.dpatch => 023_fix_doxygen.patch} | 31 ++++----
...earlier.dpatch => 025_GNU_SOURCE_earlier.patch} | 10 +--
debian/patches/026_omit_extra_libs.dpatch | 19 -----
debian/patches/026_omit_extra_libs.patch | 18 +++++
...patch => 027_mmap-allocator-fix-pagesize.patch} | 10 +--
debian/patches/series | 10 +++
debian/rules | 11 +--
debian/source/format | 2 +-
21 files changed, 165 insertions(+), 189 deletions(-)
delete mode 100644 debian/README.source
delete mode 100644 debian/patches/00list
rename debian/patches/{011_fix_apr-config.dpatch => 011_fix_apr-config.patch} (68%)
rename debian/patches/{013_ship_find_apr.m4.dpatch => 013_ship_find_apr.m4.patch} (58%)
delete mode 100644 debian/patches/014_fix-apr.pc.dpatch
create mode 100644 debian/patches/014_fix-apr.pc.patch
rename debian/patches/{015_sendfile_lfs.dpatch => 015_sendfile_lfs.patch} (87%)
rename debian/patches/{016_sendfile_hurd.dpatch => 016_sendfile_hurd.patch} (61%)
delete mode 100644 debian/patches/022_hurd_path_max.dpatch
create mode 100644 debian/patches/022_hurd_path_max.patch
rename debian/patches/{023_fix_doxygen.dpatch => 023_fix_doxygen.patch} (60%)
rename debian/patches/{025_GNU_SOURCE_earlier.dpatch => 025_GNU_SOURCE_earlier.patch} (57%)
delete mode 100644 debian/patches/026_omit_extra_libs.dpatch
create mode 100644 debian/patches/026_omit_extra_libs.patch
rename debian/patches/{027_mmap-allocator-fix-pagesize.dpatch => 027_mmap-allocator-fix-pagesize.patch} (56%)
create mode 100644 debian/patches/series
diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index f9b5b30..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,17 +0,0 @@
-Debian-apache uses dpatch to make changes to the upstream source.
-
-To apply all of the patches run:
-./debian/rules patch
-
-To unapply all of the patches run:
-./debian/rules unpatch
-
-To add (or edit) a patch run:
-dpatch-edit-patch name_of_patch_goes_here
-#make your changes
-exit
-
-dpatch will make a new patch in debian/patches/ if one with that name doesn't already exist, otherwise it will change the existing one.
-To make it get used add it to debian/patches/00list .
-
-To make a patch not get used remove it from debian/patches/00list .
diff --git a/debian/changelog b/debian/changelog
index 480cd93..72d9dec 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+apr (1.4.5-1.2) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Remove deprecated dpatch and upgrade to packaging format "3.0 quilt".
+ Note: some patches were updated with "quilt refresh" to make
+ them apply cleanly.
+ * Update to Standards-Version to 3.9.3 and debhelper to 9.
+
+ -- Jari Aalto <jari.aalto@cante.net> Sat, 03 Mar 2012 04:47:38 -0500
+
apr (1.4.5-1.1) unstable; urgency=low
* Non-maintainer upload.
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 992541a..e21681c 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,8 @@ Section: libs
Priority: optional
Maintainer: Debian Apache Maintainers <debian-apache@lists.debian.org>
Uploaders: Tollef Fog Heen <tfheen@debian.org>, Peter Samuelson <peter@p12n.org>, Stefan Fritsch <sf@debian.org>, Ryan Niebur <ryanryan52@gmail.com>
-Build-Depends: debhelper (>> 6.0.7), autoconf, autotools-dev, dpatch, mawk, uuid-dev, doxygen, netbase, net-tools, libtool (>= 2), python
-Standards-Version: 3.9.2
+Build-Depends: debhelper (>= 9), autoconf, autotools-dev, mawk, uuid-dev, doxygen, netbase, net-tools, libtool (>= 2), python
+Standards-Version: 3.9.3
Vcs-Browser: http://svn.debian.org/wsvn/pkg-apache/trunk/apr
Vcs-svn: svn://svn.debian.org/pkg-apache/trunk/apr
Homepage: http://apr.apache.org/
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index e4d703d..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,10 +0,0 @@
-011_fix_apr-config
-013_ship_find_apr.m4
-014_fix-apr.pc
-015_sendfile_lfs
-016_sendfile_hurd
-022_hurd_path_max.dpatch
-023_fix_doxygen.dpatch
-025_GNU_SOURCE_earlier.dpatch
-026_omit_extra_libs.dpatch
-027_mmap-allocator-fix-pagesize.dpatch
diff --git a/debian/patches/011_fix_apr-config.dpatch b/debian/patches/011_fix_apr-config.patch
similarity index 68%
rename from debian/patches/011_fix_apr-config.dpatch
rename to debian/patches/011_fix_apr-config.patch
index 43ef5e4..c92dc5f 100644
--- a/debian/patches/011_fix_apr-config.dpatch
+++ b/debian/patches/011_fix_apr-config.patch
@@ -1,14 +1,13 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 011_fix_apr-config.dpatch by <tfheen@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+From: <tfheen@debian.org>
+Subject: No description.
+
+---
+ apr-config.in | 8 ++------
+ 1 file changed, 2 insertions(+), 6 deletions(-)
-@DPATCH@
-Index: apr-config.in
--- a/apr-config.in
+++ b/apr-config.in
-@@ -38,7 +38,7 @@
+@@ -39,7 +39,7 @@
LIBS="@EXTRA_LIBS@"
EXTRA_INCLUDES="@EXTRA_INCLUDES@"
SHLIBPATH_VAR="@shlibpath_var@"
@@ -17,7 +16,7 @@ Index: apr-config.in
APR_BUILD_DIR="@apr_builddir@"
APR_SO_EXT="@so_ext@"
APR_LIB_TARGET="@export_lib_target@"
-@@ -222,11 +222,7 @@
+@@ -223,11 +223,7 @@
exit 0
;;
--apr-libtool)
diff --git a/debian/patches/013_ship_find_apr.m4.dpatch b/debian/patches/013_ship_find_apr.m4.patch
similarity index 58%
rename from debian/patches/013_ship_find_apr.m4.dpatch
rename to debian/patches/013_ship_find_apr.m4.patch
index 34377b7..7fd3971 100644
--- a/debian/patches/013_ship_find_apr.m4.dpatch
+++ b/debian/patches/013_ship_find_apr.m4.patch
@@ -1,14 +1,13 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 013_ship_find_apr.m4.dpatch by Tollef Fog Heen <tfheen@err.no>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Install a set of random build files too
+From: Tollef Fog Heen <tfheen@err.no>
+Subject: Install a set of random build files too
-@DPATCH@
-diff -urNad apr1.0-1.2.2~/Makefile.in apr1.0-1.2.2/Makefile.in
---- apr1.0-1.2.2~/Makefile.in 2005-02-04 12:55:44.000000000 +0100
-+++ apr1.0-1.2.2/Makefile.in 2006-01-26 20:19:44.000000000 +0100
-@@ -85,6 +85,15 @@
+---
+ Makefile.in | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -87,6 +87,15 @@
done
$(INSTALL_DATA) build/apr_rules.out $(DESTDIR)$(installbuilddir)/apr_rules.mk
$(INSTALL) -m 755 apr-config.out $(DESTDIR)$(bindir)/$(APR_CONFIG)
diff --git a/debian/patches/014_fix-apr.pc.dpatch b/debian/patches/014_fix-apr.pc.dpatch
deleted file mode 100644
index f01fb62..0000000
--- a/debian/patches/014_fix-apr.pc.dpatch
+++ /dev/null
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 014_fix-apr.pc.dpatch by <tfheen@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
-@DPATCH@
-diff -urNad apr1.0-1.2.2~/apr.pc.in apr1.0-1.2.2/apr.pc.in
---- apr1.0-1.2.2~/apr.pc.in 2006-01-27 17:28:12.000000000 +0100
-+++ apr1.0-1.2.2/apr.pc.in 2006-01-27 17:31:18.000000000 +0100
-@@ -7,5 +7,6 @@
- Name: APR
- Description: The Apache Portable Runtime library
- Version: @APR_DOTTED_VERSION@
--Libs: -L${libdir} -l@APR_LIBNAME@ @EXTRA_LIBS@
--Cflags: @EXTRA_CPPFLAGS@ @EXTRA_CFLAGS@ -I${includedir}
-+Libs: -L${libdir} -l@APR_LIBNAME@
-+Libs.private: @EXTRA_LIBS@
-+Cflags: @EXTRA_CPPFLAGS@ -I${includedir}
diff --git a/debian/patches/014_fix-apr.pc.patch b/debian/patches/014_fix-apr.pc.patch
new file mode 100644
index 0000000..f2a6cd8
--- /dev/null
+++ b/debian/patches/014_fix-apr.pc.patch
@@ -0,0 +1,18 @@
+From: <tfheen@debian.org>
+Subject: No description.
+
+---
+ apr.pc.in | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+--- a/apr.pc.in
++++ b/apr.pc.in
+@@ -7,5 +7,6 @@
+ Name: APR
+ Description: The Apache Portable Runtime library
+ Version: @APR_DOTTED_VERSION@
+-Libs: -L${libdir} -l@APR_LIBNAME@ @EXTRA_LIBS@
+-Cflags: @EXTRA_CPPFLAGS@ @EXTRA_CFLAGS@ -I${includedir}
++Libs: -L${libdir} -l@APR_LIBNAME@
++Libs.private: @EXTRA_LIBS@
++Cflags: @EXTRA_CPPFLAGS@ -I${includedir}
diff --git a/debian/patches/015_sendfile_lfs.dpatch b/debian/patches/015_sendfile_lfs.patch
similarity index 87%
rename from debian/patches/015_sendfile_lfs.dpatch
rename to debian/patches/015_sendfile_lfs.patch
index 050ada9..c9f6be2 100644
--- a/debian/patches/015_sendfile_lfs.dpatch
+++ b/debian/patches/015_sendfile_lfs.patch
@@ -1,13 +1,13 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 015_sendfile_lfs.dpatch by <thom@debian.org> <peter@p12n.org>
-##
-## DP: Detect sendfile64() at runtime (not present on 2.4 kernels.)
+From: <thom@debian.org> <peter@p12n.org>
+Subject: Detect sendfile64() at runtime (not present on 2.4 kernels.)
+
+---
+ network_io/unix/sendrecv.c | 98 ++++++++++++++++++++++++++++++---------------
+ 1 file changed, 66 insertions(+), 32 deletions(-)
-@DPATCH@
-Index: network_io/unix/sendrecv.c
--- a/network_io/unix/sendrecv.c
+++ b/network_io/unix/sendrecv.c
-@@ -243,39 +243,77 @@
+@@ -247,39 +247,77 @@
#if defined(__linux__) && defined(HAVE_WRITEV)
@@ -24,32 +24,43 @@ Index: network_io/unix/sendrecv.c
{
- int rv, nbytes = 0, total_hdrbytes, i;
- apr_status_t arv;
+-
+-#if APR_HAS_LARGE_FILES && defined(HAVE_SENDFILE64)
+- apr_off_t off = *offset;
+-#define sendfile sendfile64
+-
+-#elif APR_HAS_LARGE_FILES && SIZEOF_OFF_T == 4
+- /* 64-bit apr_off_t but no sendfile64(): fail if trying to send
+- * past the 2Gb limit. */
+- off_t off;
+-
+- if ((apr_int64_t)*offset + *len > INT_MAX) {
+- return EINVAL;
+- }
+-
+- off = *offset;
+-
+#if !APR_HAS_LARGE_FILES
+ ssize_t ret;
+ do
+ ret = sendfile(out, in, off, len);
+ while (ret == -1 && errno == EINTR);
+ return ret;
-+#else
-
--#if APR_HAS_LARGE_FILES && defined(HAVE_SENDFILE64)
-- apr_off_t off = *offset;
--#define sendfile sendfile64
+ #else
+- off_t off = *offset;
++
+#ifdef HAVE_SENDFILE64
+ static int sendfile64_enosys; /* sendfile64() syscall not found */
+#endif
+ off_t offtmp;
+ ssize_t ret;
--#elif APR_HAS_LARGE_FILES && SIZEOF_OFF_T == 4
-- /* 64-bit apr_off_t but no sendfile64(): fail if trying to send
-- * past the 2Gb limit. */
-- off_t off;
--
-- if ((apr_int64_t)*offset + *len > INT_MAX) {
-- return EINVAL;
-+ /* Multiple reports have shown sendfile failing with EINVAL if
-+ * passed a >=2Gb count value on some 64-bit kernels. It won't
+ /* Multiple reports have shown sendfile failing with EINVAL if
+ * passed a >=2Gb count value on some 64-bit kernels. It won't
+- * noticably hurt performance to limit each call to <2Gb at a
+- * time, so avoid that issue here: */
+- if (sizeof(off_t) == 8 && *len > INT_MAX) {
+- *len = INT_MAX;
+ * noticably hurt performance to limit each call to <2Gb at a time,
+ * so avoid that issue here. (Round down to a common page size.) */
+ if (sizeof(off_t) == 8 && len > INT_MAX)
@@ -62,25 +73,15 @@ Index: network_io/unix/sendrecv.c
+ ret = sendfile(out, in, &offtmp, len);
+ while (ret == -1 && errno == EINTR);
+ return ret;
- }
--
-- off = *offset;
-
--#else
-- off_t off = *offset;
++ }
++
+ /* From here down we know it's a 32-bit runtime */
+#ifdef HAVE_SENDFILE64
+ if (!sendfile64_enosys) {
+ do
+ ret = sendfile64(out, in, off, len);
+ while (ret == -1 && errno == EINTR);
-
-- /* Multiple reports have shown sendfile failing with EINVAL if
-- * passed a >=2Gb count value on some 64-bit kernels. It won't
-- * noticably hurt performance to limit each call to <2Gb at a
-- * time, so avoid that issue here: */
-- if (sizeof(off_t) == 8 && *len > INT_MAX) {
-- *len = INT_MAX;
++
+ if (ret != -1 || errno != ENOSYS)
+ return ret;
+
@@ -110,7 +111,7 @@ Index: network_io/unix/sendrecv.c
if (!hdtr) {
hdtr = &no_hdtr;
-@@ -321,12 +359,10 @@
+@@ -325,12 +363,10 @@
goto do_select;
}
@@ -124,7 +125,7 @@ Index: network_io/unix/sendrecv.c
while ((rv == -1) && (errno == EAGAIN || errno == EWOULDBLOCK)
&& (sock->timeout > 0)) {
-@@ -337,12 +373,10 @@
+@@ -341,12 +377,10 @@
return arv;
}
else {
diff --git a/debian/patches/016_sendfile_hurd.dpatch b/debian/patches/016_sendfile_hurd.patch
similarity index 61%
rename from debian/patches/016_sendfile_hurd.dpatch
rename to debian/patches/016_sendfile_hurd.patch
index 3d470d7..e950acb 100644
--- a/debian/patches/016_sendfile_hurd.dpatch
+++ b/debian/patches/016_sendfile_hurd.patch
@@ -1,14 +1,13 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 016_sendfile_hurd.dpatch by <tfheen@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+From: <tfheen@debian.org>
+Subject: No description.
+
+---
+ network_io/unix/sendrecv.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
-@DPATCH@
-Index: network_io/unix/sendrecv.c
--- a/network_io/unix/sendrecv.c
+++ b/network_io/unix/sendrecv.c
-@@ -238,7 +238,7 @@
+@@ -245,7 +245,7 @@
/* Define a structure to pass in when we have a NULL header value */
static apr_hdtr_t no_hdtr;
diff --git a/debian/patches/022_hurd_path_max.dpatch b/debian/patches/022_hurd_path_max.dpatch
deleted file mode 100644
index c89805c..0000000
--- a/debian/patches/022_hurd_path_max.dpatch
+++ /dev/null
@@ -1,20 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 022_hurd_path_max.dpatch by Stefan Fritsch <sf@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: #349418
-
-@DPATCH@
-diff -urNad apr-1.2.11~/include/apr.h.in apr-1.2.11/include/apr.h.in
---- apr-1.2.11~/include/apr.h.in 2007-07-25 05:12:02.000000000 +0200
-+++ apr-1.2.11/include/apr.h.in 2007-09-12 22:08:30.464437530 +0200
-@@ -389,7 +389,8 @@
- #elif defined(_POSIX_PATH_MAX)
- #define APR_PATH_MAX _POSIX_PATH_MAX
- #else
--#error no decision has been made on APR_PATH_MAX for your platform
-+#warning no decision has been made on APR_PATH_MAX for your platform
-+#define APR_PATH_MAX 4096
- #endif
-
- /** @} */
diff --git a/debian/patches/022_hurd_path_max.patch b/debian/patches/022_hurd_path_max.patch
new file mode 100644
index 0000000..e21040b
--- /dev/null
+++ b/debian/patches/022_hurd_path_max.patch
@@ -0,0 +1,19 @@
+From: Stefan Fritsch <sf@debian.org>
+Subject: #349418
+
+---
+ include/apr.h.in | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- a/include/apr.h.in
++++ b/include/apr.h.in
+@@ -594,7 +594,8 @@
+ #elif defined(_POSIX_PATH_MAX)
+ #define APR_PATH_MAX _POSIX_PATH_MAX
+ #else
+-#error no decision has been made on APR_PATH_MAX for your platform
++#warning no decision has been made on APR_PATH_MAX for your platform
++#define APR_PATH_MAX 4096
+ #endif
+
+ #define APR_DSOPATH "@shlibpath_var@"
diff --git a/debian/patches/023_fix_doxygen.dpatch b/debian/patches/023_fix_doxygen.patch
similarity index 60%
rename from debian/patches/023_fix_doxygen.dpatch
rename to debian/patches/023_fix_doxygen.patch
index b8f199e..5942864 100644
--- a/debian/patches/023_fix_doxygen.dpatch
+++ b/debian/patches/023_fix_doxygen.patch
@@ -1,13 +1,13 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 023_fix_doxygen.dpatch by Stefan Fritsch <sf@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix generation of docs for out-of-tree builds and newer doxygen versions
+From: Stefan Fritsch <sf@debian.org>
+Subject: Fix generation of docs for out-of-tree builds and newer doxygen versions
-@DPATCH@
-diff -urNad apr~/docs/doxygen.conf apr/docs/doxygen.conf
---- apr~/docs/doxygen.conf 2005-02-07 15:12:15.000000000 -0800
-+++ apr/docs/doxygen.conf 2008-06-27 20:11:39.000000000 -0700
+---
+ docs/doxygen.conf | 2 +-
+ include/apr.h.in | 24 ++++++++++++------------
+ 2 files changed, 13 insertions(+), 13 deletions(-)
+
+--- a/docs/doxygen.conf
++++ b/docs/doxygen.conf
@@ -1,6 +1,6 @@
PROJECT_NAME="Apache Portable Runtime"
@@ -16,10 +16,9 @@ diff -urNad apr~/docs/doxygen.conf apr/docs/doxygen.conf
QUIET=YES
RECURSIVE=YES
FILE_PATTERNS=*.h
-diff -urNad apr~/include/apr.h.in apr/include/apr.h.in
---- apr~/include/apr.h.in 2008-05-29 08:47:52.000000000 -0700
-+++ apr/include/apr.h.in 2008-06-27 20:17:17.000000000 -0700
-@@ -374,11 +374,11 @@
+--- a/include/apr.h.in
++++ b/include/apr.h.in
+@@ -445,11 +445,11 @@
/**
* Thread callbacks from APR functions must be declared with APR_THREAD_FUNC,
* so that they follow the platform's calling convention.
@@ -33,9 +32,9 @@ diff -urNad apr~/include/apr.h.in apr/include/apr.h.in
- * </PRE>
+ * @endcode
*/
- #define APR_THREAD_FUNC
+ #define APR_THREAD_FUNC @apr_thread_func@
-@@ -410,11 +410,11 @@
+@@ -481,11 +481,11 @@
* APR_DECLARE_NONSTD(), as they must follow the C language calling convention.
* @see APR_DECLARE @see APR_DECLARE_DATA
* @remark Both the declaration and implementations must use the same macro.
@@ -51,7 +50,7 @@ diff -urNad apr~/include/apr.h.in apr/include/apr.h.in
*/
#define APR_DECLARE_NONSTD(type) type
-@@ -425,12 +425,12 @@
+@@ -496,12 +496,12 @@
* @remark Note that the declaration and implementations use different forms,
* but both must include the macro.
*
diff --git a/debian/patches/025_GNU_SOURCE_earlier.dpatch b/debian/patches/025_GNU_SOURCE_earlier.patch
similarity index 57%
rename from debian/patches/025_GNU_SOURCE_earlier.dpatch
rename to debian/patches/025_GNU_SOURCE_earlier.patch
index d2c9509..025df8f 100644
--- a/debian/patches/025_GNU_SOURCE_earlier.dpatch
+++ b/debian/patches/025_GNU_SOURCE_earlier.patch
@@ -1,11 +1,7 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 025_define_GNU_SOURCE_earlier.dpatch by Stefan Fritsch <sf@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: _GNU_SOURCE needs to be #defined before #including stuff
-## DP: (causing FTBFS on hurd, #530286)
+From: Stefan Fritsch <sf@debian.org>
+Subject: _GNU_SOURCE needs to be #defined before #including stuff
+(causing FTBFS on hurd, #530286)
-@DPATCH@
diff -urNad trunk~/include/apr.h.in trunk/include/apr.h.in
--- trunk~/include/apr.h.in 2009-06-07 19:10:19.000000000 +0200
+++ trunk/include/apr.h.in 2009-06-07 20:50:52.261954142 +0200
diff --git a/debian/patches/026_omit_extra_libs.dpatch b/debian/patches/026_omit_extra_libs.dpatch
deleted file mode 100644
index 2418bca..0000000
--- a/debian/patches/026_omit_extra_libs.dpatch
+++ /dev/null
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 026_omit_extra_libs.dpatch by Stefan Fritsch <sf@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: #463399
-
-@DPATCH@
-diff -urNad trunk~/apr-config.in trunk/apr-config.in
---- trunk~/apr-config.in 2009-06-07 21:08:49.000000000 +0200
-+++ trunk/apr-config.in 2009-06-07 21:10:50.573842471 +0200
-@@ -36,7 +36,7 @@
- CPPFLAGS="@EXTRA_CPPFLAGS@"
- CFLAGS="@EXTRA_CFLAGS@"
- LDFLAGS="@EXTRA_LDFLAGS@"
--LIBS="@EXTRA_LIBS@"
-+LIBS=""
- EXTRA_INCLUDES="@EXTRA_INCLUDES@"
- SHLIBPATH_VAR="@shlibpath_var@"
- APR_SOURCE_DIR="@apr_srcdir@"
diff --git a/debian/patches/026_omit_extra_libs.patch b/debian/patches/026_omit_extra_libs.patch
new file mode 100644
index 0000000..b8b23f0
--- /dev/null
+++ b/debian/patches/026_omit_extra_libs.patch
@@ -0,0 +1,18 @@
+From: Stefan Fritsch <sf@debian.org>
+Subject: #463399
+
+---
+ apr-config.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/apr-config.in
++++ b/apr-config.in
+@@ -36,7 +36,7 @@
+ CPPFLAGS="@EXTRA_CPPFLAGS@"
+ CFLAGS="@EXTRA_CFLAGS@"
+ LDFLAGS="@EXTRA_LDFLAGS@"
+-LIBS="@EXTRA_LIBS@"
++LIBS=""
+ EXTRA_INCLUDES="@EXTRA_INCLUDES@"
+ SHLIBPATH_VAR="@shlibpath_var@"
+ APR_SOURCE_DIR="$(cd @installbuilddir@/.. ; pwd)"
diff --git a/debian/patches/027_mmap-allocator-fix-pagesize.dpatch b/debian/patches/027_mmap-allocator-fix-pagesize.patch
similarity index 56%
rename from debian/patches/027_mmap-allocator-fix-pagesize.dpatch
rename to debian/patches/027_mmap-allocator-fix-pagesize.patch
index b1f235f..0fd68d4 100644
--- a/debian/patches/027_mmap-allocator-fix-pagesize.dpatch
+++ b/debian/patches/027_mmap-allocator-fix-pagesize.patch
@@ -1,11 +1,7 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## by Lifeng Sun <lifongsun@gmail.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: fix allocator using mmap crashes on non-4k-page platforms
-## DP: #627532
+From: Lifeng Sun <lifongsun@gmail.com>
+Subject: fix allocator using mmap crashes on non-4k-page platforms
+#627532
-@DPATCH@
diff --git a/memory/unix/apr_pools.c b/memory/unix/apr_pools.c
--- a/memory/unix/apr_pools.c
+++ b/memory/unix/apr_pools.c
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..d608552
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,10 @@
+011_fix_apr-config.patch
+013_ship_find_apr.m4.patch
+014_fix-apr.pc.patch
+015_sendfile_lfs.patch
+016_sendfile_hurd.patch
+022_hurd_path_max.patch
+023_fix_doxygen.patch
+025_GNU_SOURCE_earlier.patch
+026_omit_extra_libs.patch
+027_mmap-allocator-fix-pagesize.patch
diff --git a/debian/rules b/debian/rules
index 077b3cf..26a2d87 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,14 +3,11 @@
# Turn on VERBOSE output
#export DH_VERBOSE=1
-#enable 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)
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
+DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
DEB_BUILD_ARCH_OS ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS)
BUILDDIR := build-$(DEB_BUILD_ARCH)
@@ -76,7 +73,7 @@ endif
SHELL=/bin/bash
-$(BUILDDIR)/config.status: patch-stamp
+$(BUILDDIR)/config.status:
dh_testdir
mkdir -p $(BUILDDIR)/docs
./buildconf
@@ -108,7 +105,7 @@ ifeq (linux, $(DEB_BUILD_ARCH_OS))
fi
endif
-build: patch-stamp build-stamp
+build: build-stamp
build-stamp: $(BUILDDIR)/config.status
dh_testdir
@@ -118,7 +115,7 @@ build-stamp: $(BUILDDIR)/config.status
touch $@
-clean: unpatch
+clean:
dh_testdir
dh_testroot
rm -f build-stamp test-stamp debian/ino_t_test
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.9
Reply to: