[Pkg-apache-commits] r1399 - in /trunk/apr-util/patches: 011_avoid_ldap_by_defaut.dpatch 016_avoid_db_by-default.dpatch

[sf at alioth.debian.org]

Author: sf
Date: Sun Jan  8 19:14:31 2012
New Revision: 1399

URL: http://svn.debian.org/wsvn/pkg-apache/?sc=1&rev=1399
Log:
Update patches to 1.4.1

Modified:
    trunk/apr-util/patches/011_avoid_ldap_by_defaut.dpatch
    trunk/apr-util/patches/016_avoid_db_by-default.dpatch

Modified: trunk/apr-util/patches/011_avoid_ldap_by_defaut.dpatch
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apr-util/patches/011_avoid_ldap_by_defaut.dpatch?rev=1399&op=diff
==============================================================================
--- trunk/apr-util/patches/011_avoid_ldap_by_defaut.dpatch (original)
+++ trunk/apr-util/patches/011_avoid_ldap_by_defaut.dpatch Sun Jan  8 19:14:31 2012
@@ -7,8 +7,8 @@
 
 @DPATCH@
 diff -urNad apr-util~/apu-config.in apr-util/apu-config.in
---- apr-util~/apu-config.in	2009-03-27 11:30:29.000000000 -0700
-+++ apr-util/apu-config.in	2009-03-27 11:35:15.000000000 -0700
+--- apr-util~/apu-config.in
++++ apr-util/apu-config.in
 @@ -30,7 +30,8 @@
  LIBS="@APRUTIL_EXPORT_LIBS@"
  INCLUDES="@APRUTIL_INCLUDES@"
@@ -19,21 +19,21 @@
  DBM_LIBS="@LDADD_dbm_db@ @LDADD_dbm_gdbm@ @LDADD_dbm_ndbm@"
  
  APRUTIL_LIBNAME="@APRUTIL_LIBNAME@"
-@@ -54,7 +55,7 @@
+@@ -55,7 +56,7 @@
    --includedir      print location where headers are installed
    --ldflags         print linker flags
    --libs            print library information
 -  --avoid-ldap      do not include ldap library information with --libs
 +  --avoid-ldap      do not include ldap library information with --libs (default on Debian)
-   --ldap-libs       print additional library information to link with ldap
-   --srcdir          print APR-util source directory
-   --link-ld         print link switch(es) for linking to APR-util
-@@ -119,7 +120,7 @@
-     flags="$flags $LDAP_LIBS $LIBS"
+   --ldap-libs       print library information to link with ldap
+   --avoid-dbm       do not include DBM library information with --libs
+   --dbm-libs        print additional library information to link with DBM
+@@ -125,7 +126,7 @@
+     flags="$flags $LDAP_LIBS $DBM_LIBS $LIBS"
      ;;
      --ldap-libs)
 -    flags="$flags $LDAP_LIBS"
 +    flags="$flags $ORIG_LDAP_LIBS"
      ;;
-     --includedir)
-     if test "$location" = "installed"; then
+     --dbm-libs)
+     flags="$flags $DBM_LIBS"

Modified: trunk/apr-util/patches/016_avoid_db_by-default.dpatch
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apr-util/patches/016_avoid_db_by-default.dpatch?rev=1399&op=diff
==============================================================================
--- trunk/apr-util/patches/016_avoid_db_by-default.dpatch (original)
+++ trunk/apr-util/patches/016_avoid_db_by-default.dpatch Sun Jan  8 19:14:31 2012
@@ -6,8 +6,8 @@
 
 @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	2011-05-21 21:41:11.239997616 +0200
-+++ trunk/apu-config.in	2011-05-21 21:41:39.687997599 +0200
+--- trunk~/apu-config.in
++++ trunk/apu-config.in
 @@ -32,7 +32,8 @@
  LDFLAGS="@APRUTIL_LDFLAGS@"
  ORIG_LDAP_LIBS="@LDADD_ldap@"
@@ -18,15 +18,17 @@
  
  APRUTIL_LIBNAME="@APRUTIL_LIBNAME@"
  
-@@ -58,7 +59,7 @@
+@@ -58,8 +59,8 @@
    --libs            print library information
    --avoid-ldap      do not include ldap library information with --libs (default on Debian)
-   --ldap-libs       print additional library information to link with ldap
+   --ldap-libs       print library information to link with ldap
 -  --avoid-dbm       do not include DBM library information with --libs
+-  --dbm-libs        print additional library information to link with DBM
 +  --avoid-dbm       do not include DBM library information with --libs (default on Debian)
-   --dbm-libs        print additional library information to link with DBM
++  --dbm-libs        print library information to link with DBM
    --srcdir          print APR-util source directory
    --link-ld         print link switch(es) for linking to APR-util
+   --link-libtool    print the libtool inputs for linking to APR-util
 @@ -129,7 +130,7 @@
      flags="$flags $ORIG_LDAP_LIBS"
      ;;