[Pkg-apache-commits] [SCM] Debian packaging for the apr-util (Apache Portable Runtime util library) package branch, master, updated. 84c51390d0152172ad8a9ca07ff6d2303d95ccb0

Stefan Fritsch sf at sfritsch.de
Sat May 19 21:02:46 UTC 2012 

The following commit has been merged in the master branch:
commit 1fbb6a86202f3776b5d6f76c1553d640f1ed3a07
Author: Stefan Fritsch <sf at sfritsch.de>
Date:   Sat May 19 22:23:51 2012 +0200

    refresh all patches

diff --git a/debian/patches/001_dbm_read_hash_or_btree.patch b/debian/patches/001_dbm_read_hash_or_btree.patch
old mode 100755
new mode 100644
index 915d762..cdaee76
--- a/debian/patches/001_dbm_read_hash_or_btree.patch
+++ b/debian/patches/001_dbm_read_hash_or_btree.patch
@@ -5,8 +5,10 @@ Subject: Be more liberal in the types of DBM files we accept.
  dbm/apr_dbm_berkeleydb.c |   15 +++++++++++++++
  1 file changed, 15 insertions(+)
 
---- a/dbm/apr_dbm_berkeleydb.c
-+++ b/dbm/apr_dbm_berkeleydb.c
+Index: trunk/dbm/apr_dbm_berkeleydb.c
+===================================================================
+--- trunk.orig/dbm/apr_dbm_berkeleydb.c
++++ trunk/dbm/apr_dbm_berkeleydb.c
 @@ -174,6 +174,21 @@
                                             apr_posix_perms2mode(perm))) != 0) {
                  /* close the DB handler */
diff --git a/debian/patches/002_configure_in_remove_syspaths.patch b/debian/patches/002_configure_in_remove_syspaths.patch
index 293d3d6..f67f4da 100644
--- a/debian/patches/002_configure_in_remove_syspaths.patch
+++ b/debian/patches/002_configure_in_remove_syspaths.patch
@@ -6,8 +6,10 @@ Subject: Adjust LDFLAGS and INCLUDE
  configure.in |    3 +++
  1 file changed, 3 insertions(+)
 
---- a/configure.in
-+++ b/configure.in
+Index: trunk/configure.in
+===================================================================
+--- trunk.orig/configure.in
++++ trunk/configure.in
 @@ -213,6 +213,9 @@
  dnl
  APR_ADDTO(APRUTIL_LIBS, [$APR_LIBS])
diff --git a/debian/patches/003_buildconf_config.guess_sub_location.patch b/debian/patches/003_buildconf_config.guess_sub_location.patch
old mode 100755
new mode 100644
index b9ff0ba..366c147
--- a/debian/patches/003_buildconf_config.guess_sub_location.patch
+++ b/debian/patches/003_buildconf_config.guess_sub_location.patch
@@ -5,8 +5,10 @@ Subject: Adjust path of config.guess and config.sub
  buildconf |    4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
---- a/buildconf
-+++ b/buildconf
+Index: trunk/buildconf
+===================================================================
+--- trunk.orig/buildconf
++++ trunk/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
diff --git a/debian/patches/004_debian_layout_fix.patch b/debian/patches/004_debian_layout_fix.patch
old mode 100755
new mode 100644
index 352d9c3..861a9b4
--- a/debian/patches/004_debian_layout_fix.patch
+++ b/debian/patches/004_debian_layout_fix.patch
@@ -1,9 +1,10 @@
 From: <tfheen at debian.org>
 Subject: Fix the includedir in the Debian layout.
 
-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
+Index: trunk/config.layout
+===================================================================
+--- trunk.orig/config.layout
++++ trunk/config.layout
 @@ -223,7 +223,7 @@
      libexecdir:    ${exec_prefix}/lib/apr/modules
      mandir:        ${exec_prefix}/share/man
diff --git a/debian/patches/010_dont_use_all_pg_build_deps.patch b/debian/patches/010_dont_use_all_pg_build_deps.patch
index a37e395..5692fb8 100644
--- a/debian/patches/010_dont_use_all_pg_build_deps.patch
+++ b/debian/patches/010_dont_use_all_pg_build_deps.patch
@@ -1,9 +1,10 @@
 From: Ryan Niebur <RyanRyan52 at gmail.com>
 Subject: Link directly to postgresql
 
-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
+Index: trunk/build/dbd.m4
+===================================================================
+--- trunk.orig/build/dbd.m4
++++ trunk/build/dbd.m4
 @@ -44,7 +44,7 @@
          AC_CHECK_LIB(pq, PQsendQueryPrepared, [apu_have_pgsql=1],[
          if test "x$PGSQL_CONFIG" != 'x'; then
diff --git a/debian/patches/011_avoid_ldap_by_defaut.patch b/debian/patches/011_avoid_ldap_by_defaut.patch
old mode 100755
new mode 100644
index 8f23775..2d25e4d
--- a/debian/patches/011_avoid_ldap_by_defaut.patch
+++ b/debian/patches/011_avoid_ldap_by_defaut.patch
@@ -2,9 +2,10 @@ From: Ryan Niebur <ryanryan52 at gmail.com>
 Subject: by default --avoid-ldap since apache2 is the only user, and we don't
  want to add extra dependencies to other apr-utils rdepends
 
-diff -urNad apr-util~/apu-config.in apr-util/apu-config.in
---- apr-util~/apu-config.in
-+++ apr-util/apu-config.in
+Index: trunk/apu-config.in
+===================================================================
+--- trunk.orig/apu-config.in
++++ trunk/apu-config.in
 @@ -30,7 +30,8 @@
  LIBS="@APRUTIL_EXPORT_LIBS@"
  INCLUDES="@APRUTIL_INCLUDES@"
diff --git a/debian/patches/013_ship_find_apu.m4.patch b/debian/patches/013_ship_find_apu.m4.patch
old mode 100755
new mode 100644
index 29a3bff..1003adf
--- a/debian/patches/013_ship_find_apu.m4.patch
+++ b/debian/patches/013_ship_find_apu.m4.patch
@@ -4,8 +4,10 @@ From: Tollef Fog Heen <tfheen at debian.org>
  Makefile.in |    6 ++++++
  1 file changed, 6 insertions(+)
 
---- a/Makefile.in
-+++ b/Makefile.in
+Index: trunk/Makefile.in
+===================================================================
+--- trunk.orig/Makefile.in
++++ trunk/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.patch b/debian/patches/014_apu_config_dont_list_indep_libs.patch
old mode 100755
new mode 100644
index 2b9f5d4..d9e6e2f
--- a/debian/patches/014_apu_config_dont_list_indep_libs.patch
+++ b/debian/patches/014_apu_config_dont_list_indep_libs.patch
@@ -6,8 +6,10 @@ Subject: Prevent recursive linking of dependent libraries by apr-util users.
  apu-config.in  |    2 +-
  2 files changed, 4 insertions(+), 3 deletions(-)
 
---- a/apr-util.pc.in
-+++ b/apr-util.pc.in
+Index: trunk/apr-util.pc.in
+===================================================================
+--- trunk.orig/apr-util.pc.in
++++ trunk/apr-util.pc.in
 @@ -8,6 +8,7 @@
  Description: Companion library for APR
  Version: @APRUTIL_DOTTED_VERSION@
@@ -18,8 +20,10 @@ Subject: Prevent recursive linking of dependent libraries by apr-util users.
 +Libs: -L${libdir} -l at APRUTIL_LIBNAME@ @LDADD_ldap@
 +Libs.private: @APRUTIL_EXPORT_LIBS@
  Cflags: -I${includedir}
---- a/apu-config.in
-+++ b/apu-config.in
+Index: trunk/apu-config.in
+===================================================================
+--- trunk.orig/apu-config.in
++++ trunk/apu-config.in
 @@ -27,7 +27,7 @@
  libdir="@libdir@"
  includedir="@includedir@"
diff --git a/debian/patches/015_disable_expat_buildconf.patch b/debian/patches/015_disable_expat_buildconf.patch
index 1d51af9..5b527cf 100644
--- a/debian/patches/015_disable_expat_buildconf.patch
+++ b/debian/patches/015_disable_expat_buildconf.patch
@@ -6,8 +6,10 @@ Subject: We don't need the bundled expat. This allows us to avoid a build-dep
  buildconf |    8 --------
  1 file changed, 8 deletions(-)
 
---- a/buildconf
-+++ b/buildconf
+Index: trunk/buildconf
+===================================================================
+--- trunk.orig/buildconf
++++ trunk/buildconf
 @@ -89,14 +89,6 @@
  echo "Generating 'make' outputs ..."
  $apr_src_dir/build/gen-build.py $verbose make
diff --git a/debian/patches/016_avoid_db_by-default.patch b/debian/patches/016_avoid_db_by-default.patch
old mode 100755
new mode 100644
index f5c24b0..c1104ad
--- a/debian/patches/016_avoid_db_by-default.patch
+++ b/debian/patches/016_avoid_db_by-default.patch
@@ -1,8 +1,9 @@
 From: Stefan Fritsch <sf at debian.org>
 Subject: Make apu-config not output dbm libs by default. See #622081
 
-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
+Index: trunk/apu-config.in
+===================================================================
+--- trunk.orig/apu-config.in
 +++ trunk/apu-config.in
 @@ -32,7 +32,8 @@
  LDFLAGS="@APRUTIL_LDFLAGS@"

-- 
Debian packaging for the apr-util (Apache Portable Runtime util library) package

More information about the Pkg-apache-commits mailing list