Bug#664307: [PATCH] apr-util: Helping to update to packaging format 3.0
Package: apr-util
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 0089099e5ddc46cbcc0ccd3fcfd022be21d33646 Mon Sep 17 00:00:00 2001
From: Jari Aalto <jari.aalto@cante.net>
Date: Sat, 3 Mar 2012 07:43:16 -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 +-
...h_or_btree => 001_dbm_read_hash_or_btree.patch} | 18 +++++++-------
.../002_configure_in_remove_syspaths.dpatch | 21 ----------------
.../patches/002_configure_in_remove_syspaths.patch | 20 +++++++++++++++
... 003_buildconf_config.guess_sub_location.patch} | 19 +++++++-------
...yout_fix.dpatch => 004_debian_layout_fix.patch} | 8 +----
debian/patches/00list | 10 -------
...dpatch => 010_dont_use_all_pg_build_deps.patch} | 8 +----
...efaut.dpatch => 011_avoid_ldap_by_defaut.patch} | 9 +-----
...nd_apu.m4.dpatch => 013_ship_find_apu.m4.patch} | 18 ++++++-------
...h => 014_apu_config_dont_list_indep_libs.patch} | 24 +++++++++---------
debian/patches/015_disable_expat_buildconf.dpatch | 26 --------------------
debian/patches/015_disable_expat_buildconf.patch | 25 +++++++++++++++++++
...efault.dpatch => 016_avoid_db_by-default.patch} | 8 +----
debian/patches/series | 10 +++++++
debian/rules | 13 ++++------
debian/source/format | 1 +
20 files changed, 120 insertions(+), 151 deletions(-)
delete mode 100644 debian/README.source
rename debian/patches/{001_dbm_read_hash_or_btree => 001_dbm_read_hash_or_btree.patch} (68%)
delete mode 100644 debian/patches/002_configure_in_remove_syspaths.dpatch
create mode 100644 debian/patches/002_configure_in_remove_syspaths.patch
rename debian/patches/{003_buildconf_config.guess_sub_location.dpatch => 003_buildconf_config.guess_sub_location.patch} (56%)
rename debian/patches/{004_debian_layout_fix.dpatch => 004_debian_layout_fix.patch} (73%)
delete mode 100644 debian/patches/00list
rename debian/patches/{010_dont_use_all_pg_build_deps.dpatch => 010_dont_use_all_pg_build_deps.patch} (91%)
rename debian/patches/{011_avoid_ldap_by_defaut.dpatch => 011_avoid_ldap_by_defaut.patch} (77%)
rename debian/patches/{013_ship_find_apu.m4.dpatch => 013_ship_find_apu.m4.patch} (55%)
rename debian/patches/{014_apu_config_dont_list_indep_libs.dpatch => 014_apu_config_dont_list_indep_libs.patch} (50%)
delete mode 100644 debian/patches/015_disable_expat_buildconf.dpatch
create mode 100644 debian/patches/015_disable_expat_buildconf.patch
rename debian/patches/{016_avoid_db_by-default.dpatch => 016_avoid_db_by-default.patch} (87%)
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 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 688ee64..fd779bf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+apr-util (1.4.1-1.1) 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:51:07 -0500
+
apr-util (1.4.1-1) unstable; urgency=low
* New upstream release
diff --git a/debian/compat b/debian/compat
index 1e8b314..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-6
+9
diff --git a/debian/control b/debian/control
index 536e9a1..ed3cda2 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: Stefan Fritsch <sf@debian.org>, Peter Samuelson <peter@p12n.org>
-Build-Depends: debhelper (>> 6.0.7~), autoconf, autotools-dev, mawk, libldap2-dev, libexpat1-dev, libdb-dev, libpcre3-dev, dpatch (>= 1.11), binutils (>= 2.14.90.0.7), libapr1-dev (>= 1.3.2), libsqlite3-dev, libpq-dev, python, libmysqlclient-dev, freetds-dev, unixodbc-dev, doxygen, libssl-dev
-Standards-Version: 3.9.2
+Build-Depends: debhelper (>= 9), autoconf, autotools-dev, mawk, libldap2-dev, libexpat1-dev, libdb-dev, libpcre3-dev, binutils (>= 2.14.90.0.7), libapr1-dev (>= 1.3.2), libsqlite3-dev, libpq-dev, python, libmysqlclient-dev, freetds-dev, unixodbc-dev, doxygen, libssl-dev
+Standards-Version: 3.9.3
Vcs-Browser: http://svn.debian.org/wsvn/pkg-apache/trunk/apr-util
Vcs-svn: svn://svn.debian.org/pkg-apache/trunk/apr-util
Homepage: http://apr.apache.org/
diff --git a/debian/patches/001_dbm_read_hash_or_btree b/debian/patches/001_dbm_read_hash_or_btree.patch
similarity index 68%
rename from debian/patches/001_dbm_read_hash_or_btree
rename to debian/patches/001_dbm_read_hash_or_btree.patch
index 6251367..915d762 100644
--- a/debian/patches/001_dbm_read_hash_or_btree
+++ b/debian/patches/001_dbm_read_hash_or_btree.patch
@@ -1,13 +1,13 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 001_dbm_read_hash_or_btree by Adam Conrad <adconrad@0c3.net>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Be more liberal in the types of DBM files we accept.
+From: Adam Conrad <adconrad@0c3.net>
+Subject: Be more liberal in the types of DBM files we accept.
-@DPATCH@
---- apr-util/dbm/apr_dbm_berkeleydb.c 2004-02-13 02:52:42.000000000 -0700
-+++ apr-util/dbm/apr_dbm_berkeleydb.c 2004-09-28 00:21:37.000000000 -0600
-@@ -172,6 +172,21 @@
+---
+ dbm/apr_dbm_berkeleydb.c | 15 +++++++++++++++
+ 1 file changed, 15 insertions(+)
+
+--- a/dbm/apr_dbm_berkeleydb.c
++++ b/dbm/apr_dbm_berkeleydb.c
+@@ -174,6 +174,21 @@
apr_posix_perms2mode(perm))) != 0) {
/* close the DB handler */
(void) (*file.bdb->close)(file.bdb, 0);
diff --git a/debian/patches/002_configure_in_remove_syspaths.dpatch b/debian/patches/002_configure_in_remove_syspaths.dpatch
deleted file mode 100644
index 68ee126..0000000
--- a/debian/patches/002_configure_in_remove_syspaths.dpatch
+++ /dev/null
@@ -1,21 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 002_configure_in_remove_syspaths.dpatch by <tfheen@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
-@DPATCH@
-
-diff -urNad apr-util1.0-1.2.2~/configure.in apr-util1.0-1.2.2/configure.in
---- apr-util1.0-1.2.2~/configure.in 2005-05-05 21:24:29.000000000 +0200
-+++ apr-util1.0-1.2.2/configure.in 2006-01-27 13:32:04.000000000 +0100
-@@ -153,6 +153,9 @@
- dnl
- APR_ADDTO(APRUTIL_LIBS, [$APR_LIBS])
-
-+APR_REMOVEFROM(APRUTIL_LDFLAGS, [-L/usr/lib])
-+APR_REMOVEFROM(APRUTIL_INCLUDE, [-I/usr/include])
-+
- AC_SUBST(APRUTIL_EXPORT_LIBS)
- AC_SUBST(APRUTIL_PRIV_INCLUDES)
- AC_SUBST(APRUTIL_INCLUDES)
diff --git a/debian/patches/002_configure_in_remove_syspaths.patch b/debian/patches/002_configure_in_remove_syspaths.patch
new file mode 100644
index 0000000..293d3d6
--- /dev/null
+++ b/debian/patches/002_configure_in_remove_syspaths.patch
@@ -0,0 +1,20 @@
+From: Tollef Fog Heen <tfheen@debian.org>
+Subject: Adjust LDFLAGS and INCLUDE
+
+
+---
+ configure.in | 3 +++
+ 1 file changed, 3 insertions(+)
+
+--- a/configure.in
++++ b/configure.in
+@@ -213,6 +213,9 @@
+ dnl
+ APR_ADDTO(APRUTIL_LIBS, [$APR_LIBS])
+
++APR_REMOVEFROM(APRUTIL_LDFLAGS, [-L/usr/lib])
++APR_REMOVEFROM(APRUTIL_INCLUDE, [-I/usr/include])
++
+ AC_SUBST(APRUTIL_EXPORT_LIBS)
+ AC_SUBST(APRUTIL_PRIV_INCLUDES)
+ AC_SUBST(APRUTIL_INCLUDES)
diff --git a/debian/patches/003_buildconf_config.guess_sub_location.dpatch b/debian/patches/003_buildconf_config.guess_sub_location.patch
similarity index 56%
rename from debian/patches/003_buildconf_config.guess_sub_location.dpatch
rename to debian/patches/003_buildconf_config.guess_sub_location.patch
index 1dcf4d8..b9ff0ba 100644
--- a/debian/patches/003_buildconf_config.guess_sub_location.dpatch
+++ b/debian/patches/003_buildconf_config.guess_sub_location.patch
@@ -1,14 +1,13 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 003_buildconf_config.guess_sub_location.dpatch by <tfheen@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+From: Tollef Fog Heen <tfheen@debian.org>
+Subject: Adjust path of config.guess and config.sub
-@DPATCH@
-diff -urNad apr-util-1.2.7~/buildconf apr-util-1.2.7/buildconf
---- apr-util-1.2.7~/buildconf 2006-04-28 22:53:11.000000000 +0200
-+++ apr-util-1.2.7/buildconf 2006-04-28 22:55:02.000000000 +0200
-@@ -56,8 +56,8 @@
+---
+ buildconf | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/buildconf
++++ b/buildconf
+@@ -61,8 +61,8 @@
rm -f build/apr_common.m4 build/find_apr.m4 build/install.sh \
build/config.guess build/config.sub build/get-version.sh
cp -p $apr_src_dir/build/apr_common.m4 $apr_src_dir/build/find_apr.m4 \
diff --git a/debian/patches/004_debian_layout_fix.dpatch b/debian/patches/004_debian_layout_fix.patch
similarity index 73%
rename from debian/patches/004_debian_layout_fix.dpatch
rename to debian/patches/004_debian_layout_fix.patch
index a5097f5..352d9c3 100644
--- a/debian/patches/004_debian_layout_fix.dpatch
+++ b/debian/patches/004_debian_layout_fix.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 004_debian_layout_fix.dpatch by <tfheen@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix the includedir in the Debian layout.
+From: <tfheen@debian.org>
+Subject: Fix the includedir in the Debian layout.
-@DPATCH@
diff -urNad apr-util-1.2.7~/config.layout apr-util-1.2.7/config.layout
--- apr-util-1.2.7~/config.layout 2005-02-09 13:18:43.000000000 +0100
+++ apr-util-1.2.7/config.layout 2006-06-15 14:18:42.000000000 +0200
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 7cb4f40..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,10 +0,0 @@
-001_dbm_read_hash_or_btree
-002_configure_in_remove_syspaths
-003_buildconf_config.guess_sub_location
-004_debian_layout_fix
-010_dont_use_all_pg_build_deps
-011_avoid_ldap_by_defaut.dpatch
-013_ship_find_apu.m4
-014_apu_config_dont_list_indep_libs
-015_disable_expat_buildconf.dpatch
-016_avoid_db_by-default.dpatch
diff --git a/debian/patches/010_dont_use_all_pg_build_deps.dpatch b/debian/patches/010_dont_use_all_pg_build_deps.patch
similarity index 91%
rename from debian/patches/010_dont_use_all_pg_build_deps.dpatch
rename to debian/patches/010_dont_use_all_pg_build_deps.patch
index af66def..a37e395 100644
--- a/debian/patches/010_dont_use_all_pg_build_deps.dpatch
+++ b/debian/patches/010_dont_use_all_pg_build_deps.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 010_dont_use_all_pg_build_deps.dpatch by Ryan Niebur <RyanRyan52@gmail.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+From: Ryan Niebur <RyanRyan52@gmail.com>
+Subject: Link directly to postgresql
-@DPATCH@
diff -urNad aprutil~/build/dbd.m4 aprutil/build/dbd.m4
--- aprutil~/build/dbd.m4 2008-12-26 13:40:37.000000000 -0800
+++ aprutil/build/dbd.m4 2008-12-26 13:43:37.000000000 -0800
diff --git a/debian/patches/011_avoid_ldap_by_defaut.dpatch b/debian/patches/011_avoid_ldap_by_defaut.patch
similarity index 77%
rename from debian/patches/011_avoid_ldap_by_defaut.dpatch
rename to debian/patches/011_avoid_ldap_by_defaut.patch
index 1fd70e1..6ae4eaa 100644
--- a/debian/patches/011_avoid_ldap_by_defaut.dpatch
+++ b/debian/patches/011_avoid_ldap_by_defaut.patch
@@ -1,11 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## avoid-ldap-by-default.dpatch by Ryan Niebur <ryanryan52@gmail.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: by default --avoid-ldap since apache2 is the only user, and we
-## don't want to add extra dependencies to other apr-utils rdepends
+From: Ryan Niebur <ryanryan52@gmail.com>
+Subject: by default --avoid-ldap since apache2 is the only user, and we
-@DPATCH@
diff -urNad apr-util~/apu-config.in apr-util/apu-config.in
--- apr-util~/apu-config.in
+++ apr-util/apu-config.in
diff --git a/debian/patches/013_ship_find_apu.m4.dpatch b/debian/patches/013_ship_find_apu.m4.patch
similarity index 55%
rename from debian/patches/013_ship_find_apu.m4.dpatch
rename to debian/patches/013_ship_find_apu.m4.patch
index 4126aeb..29a3bff 100644
--- a/debian/patches/013_ship_find_apu.m4.dpatch
+++ b/debian/patches/013_ship_find_apu.m4.patch
@@ -1,14 +1,12 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 013_ship_find_apu.m4.dpatch by <tfheen@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+From: Tollef Fog Heen <tfheen@debian.org>
-@DPATCH@
-diff -urNad apr-util~/Makefile.in apr-util/Makefile.in
---- apr-util~/Makefile.in 2008-06-27 14:56:17.000000000 -0700
-+++ apr-util/Makefile.in 2008-06-27 15:33:50.000000000 -0700
-@@ -84,6 +84,12 @@
+---
+ Makefile.in | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -89,6 +89,12 @@
$(INSTALL_DATA) aprutil.exp $(DESTDIR)$(libdir)
$(INSTALL) -m 755 apu-config.out $(DESTDIR)$(bindir)/$(APU_CONFIG)
diff --git a/debian/patches/014_apu_config_dont_list_indep_libs.dpatch b/debian/patches/014_apu_config_dont_list_indep_libs.patch
similarity index 50%
rename from debian/patches/014_apu_config_dont_list_indep_libs.dpatch
rename to debian/patches/014_apu_config_dont_list_indep_libs.patch
index bf28632..2b9f5d4 100644
--- a/debian/patches/014_apu_config_dont_list_indep_libs.dpatch
+++ b/debian/patches/014_apu_config_dont_list_indep_libs.patch
@@ -1,12 +1,13 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## apu-config.dpatch by <peter@p12n.org>
-##
-## DP: Prevent recursive linking of dependent libraries by apr-util users.
+From: Peter Samuelson <peter@p12n.org>
+Subject: Prevent recursive linking of dependent libraries by apr-util users.
-@DPATCH@
-diff -urNad apr-util~/apr-util.pc.in apr-util/apr-util.pc.in
---- apr-util~/apr-util.pc.in 2008-06-27 15:36:07.000000000 -0700
-+++ apr-util/apr-util.pc.in 2008-06-27 16:03:17.000000000 -0700
+---
+ apr-util.pc.in | 5 +++--
+ apu-config.in | 2 +-
+ 2 files changed, 4 insertions(+), 3 deletions(-)
+
+--- a/apr-util.pc.in
++++ b/apr-util.pc.in
@@ -8,6 +8,7 @@
Description: Companion library for APR
Version: @APRUTIL_DOTTED_VERSION@
@@ -17,9 +18,8 @@ diff -urNad apr-util~/apr-util.pc.in apr-util/apr-util.pc.in
+Libs: -L${libdir} -l@APRUTIL_LIBNAME@ @LDADD_ldap@
+Libs.private: @APRUTIL_EXPORT_LIBS@
Cflags: -I${includedir}
-diff -urNad apr-util~/apu-config.in apr-util/apu-config.in
---- apr-util~/apu-config.in 2008-05-23 14:27:59.000000000 -0700
-+++ apr-util/apu-config.in 2008-06-27 16:30:04.000000000 -0700
+--- a/apu-config.in
++++ b/apu-config.in
@@ -27,7 +27,7 @@
libdir="@libdir@"
includedir="@includedir@"
@@ -28,4 +28,4 @@ diff -urNad apr-util~/apu-config.in apr-util/apu-config.in
+LIBS=
INCLUDES="@APRUTIL_INCLUDES@"
LDFLAGS="@APRUTIL_LDFLAGS@"
- LDAP_LIBS="@LDADD_ldap@"
+ ORIG_LDAP_LIBS="@LDADD_ldap@"
diff --git a/debian/patches/015_disable_expat_buildconf.dpatch b/debian/patches/015_disable_expat_buildconf.dpatch
deleted file mode 100644
index 38a2a57..0000000
--- a/debian/patches/015_disable_expat_buildconf.dpatch
+++ /dev/null
@@ -1,26 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 015_disable_expat_buildconf.dpatch by Stefan Fritsch <sf@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: We don't need the bundled expat. This allows us to avoid a build-dep
-## DP: on libtool.
-
-@DPATCH@
-diff -urNad trunk~/buildconf trunk/buildconf
---- trunk~/buildconf 2009-09-12 14:45:13.892735207 +0200
-+++ trunk/buildconf 2009-09-12 14:45:46.560734181 +0200
-@@ -84,14 +84,6 @@
- echo "Generating 'make' outputs ..."
- $apr_src_dir/build/gen-build.py $verbose make
-
--#
--# If Expat has been bundled, then go and configure the thing
--#
--if [ -f xml/expat/buildconf.sh ]; then
-- echo "Invoking xml/expat/buildconf.sh ..."
-- (cd xml/expat; ./buildconf.sh $verbose)
--fi
--
- # Remove autoconf cache again
- rm -rf autom4te*.cache
-
diff --git a/debian/patches/015_disable_expat_buildconf.patch b/debian/patches/015_disable_expat_buildconf.patch
new file mode 100644
index 0000000..1d51af9
--- /dev/null
+++ b/debian/patches/015_disable_expat_buildconf.patch
@@ -0,0 +1,25 @@
+From: Stefan Fritsch <sf@debian.org>
+Subject: We don't need the bundled expat. This allows us to avoid a build-dep
+ on libtool.
+
+---
+ buildconf | 8 --------
+ 1 file changed, 8 deletions(-)
+
+--- a/buildconf
++++ b/buildconf
+@@ -89,14 +89,6 @@
+ echo "Generating 'make' outputs ..."
+ $apr_src_dir/build/gen-build.py $verbose make
+
+-#
+-# If Expat has been bundled, then go and configure the thing
+-#
+-if [ -f xml/expat/buildconf.sh ]; then
+- echo "Invoking xml/expat/buildconf.sh ..."
+- (cd xml/expat; ./buildconf.sh $verbose)
+-fi
+-
+ # Remove autoconf cache again
+ rm -rf autom4te*.cache
+
diff --git a/debian/patches/016_avoid_db_by-default.dpatch b/debian/patches/016_avoid_db_by-default.patch
similarity index 87%
rename from debian/patches/016_avoid_db_by-default.dpatch
rename to debian/patches/016_avoid_db_by-default.patch
index c2810fe..f5c24b0 100644
--- a/debian/patches/016_avoid_db_by-default.dpatch
+++ b/debian/patches/016_avoid_db_by-default.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 016_avoid_db_by-default.dpatch by Stefan Fritsch <sf@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: #622081
+From: Stefan Fritsch <sf@debian.org>
+Subject: Make apu-config not output dbm libs by default. See #622081
-@DPATCH@
diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' trunk~/apu-config.in trunk/apu-config.in
--- trunk~/apu-config.in
+++ trunk/apu-config.in
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..e563865
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,10 @@
+001_dbm_read_hash_or_btree.patch
+002_configure_in_remove_syspaths.patch
+003_buildconf_config.guess_sub_location.patch
+004_debian_layout_fix.patch
+010_dont_use_all_pg_build_deps.patch
+011_avoid_ldap_by_defaut.patch
+013_ship_find_apu.m4.patch
+014_apu_config_dont_list_indep_libs.patch
+015_disable_expat_buildconf.patch
+016_avoid_db_by-default.patch
diff --git a/debian/rules b/debian/rules
index a302d3a..1ff6642 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,9 +7,6 @@ export DH_OPTIONS
# for ppc64 on Ubuntu
export DEB_GCC_NO_O3=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)
@@ -52,9 +49,9 @@ ifeq (hurd, $(DEB_HOST_ARCH_OS))
endif
ifeq ($(DEB_BUILD_ARCH),i386)
- CONFFLAGS=apr_lock_method=USE_PROC_PTHREAD_SERIALIZE
+ CONFFLAGS=apr_lock_method=USE_PROC_PTHREAD_SERIALIZE
else
- CONFFLAGS=ac_cv_func_pthread_mutexattr_setpshared=no ac_cv_func_sem_open=no
+ CONFFLAGS=ac_cv_func_pthread_mutexattr_setpshared=no ac_cv_func_sem_open=no
endif
CONFFLAGS += ac_cv_prog_AWK=mawk
@@ -63,12 +60,12 @@ CONFFLAGS += ac_cv_ldap_set_rebind_proc_style=three
SHELL=/bin/bash
-config.status: configure.in patch-stamp
+config.status: configure.in
dh_testdir
./buildconf --with-apr=$(shell apr-1-config --srcdir)
$(CONFFLAGS) ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --enable-layout=Debian --with-apr=/usr/bin/apr-1-config --with-ldap=yes --with-dbm=db --with-sqlite3 --with-pgsql=/usr --without-gdbm --without-sqlite2 --with-berkeley-db --with-mysql=/usr --with-freetds=/usr --with-odbc=/usr --with-openssl=/usr
-build: patch-stamp build-stamp
+build: build-stamp
build-stamp: config.status
dh_testdir
@@ -81,7 +78,7 @@ build-stamp: config.status
touch $@
-clean: unpatch
+clean:
dh_testdir
dh_testroot
rm -f build-stamp test-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
Reply to: