[Pkg-apache-commits] r862 - in /branches/experimental-apr-util: changelog patches/010_dont_use_all_pg_build_deps.dpatch

[ryan52-guest at alioth.debian.org]

Author: ryan52-guest
Date: Fri Dec 26 22:26:12 2008
New Revision: 862

URL: http://svn.debian.org/wsvn/pkg-apache/?sc=1&rev=862
Log:
New upstream version

Modified:
    branches/experimental-apr-util/changelog
    branches/experimental-apr-util/patches/010_dont_use_all_pg_build_deps.dpatch

Modified: branches/experimental-apr-util/changelog
URL: http://svn.debian.org/wsvn/pkg-apache/branches/experimental-apr-util/changelog?rev=862&op=diff
==============================================================================
--- branches/experimental-apr-util/changelog (original)
+++ branches/experimental-apr-util/changelog Fri Dec 26 22:26:12 2008
@@ -1,4 +1,4 @@
-apr-util (1.3.2+dfsg-2) UNRELEASED; urgency=low
+apr-util (1.3.4+dfsg-1) UNRELEASED; urgency=low
 
   [ Ryan Niebur ]
   * add me to Uploaders
@@ -8,8 +8,9 @@
 
   [ Ryan Niebur ]
   * add repack.sh
-
- -- Ryan Niebur <ryanryan52 at gmail.com>  Fri, 26 Dec 2008 13:26:44 -0800
+  * New upstream version
+
+ -- Ryan Niebur <ryanryan52 at gmail.com>  Fri, 26 Dec 2008 13:40:19 -0800
 
 apr-util (1.3.2+dfsg-1) experimental; urgency=low
 

Modified: branches/experimental-apr-util/patches/010_dont_use_all_pg_build_deps.dpatch
URL: http://svn.debian.org/wsvn/pkg-apache/branches/experimental-apr-util/patches/010_dont_use_all_pg_build_deps.dpatch?rev=862&op=diff
==============================================================================
--- branches/experimental-apr-util/patches/010_dont_use_all_pg_build_deps.dpatch (original)
+++ branches/experimental-apr-util/patches/010_dont_use_all_pg_build_deps.dpatch Fri Dec 26 22:26:12 2008
@@ -5,33 +5,60 @@
 ## DP: No description.
 
 @DPATCH@
-diff -urNad apr-util~/build/dbd.m4 apr-util/build/dbd.m4
---- apr-util~/build/dbd.m4	2008-06-13 02:27:19.000000000 -0700
-+++ apr-util/build/dbd.m4	2008-07-07 18:56:03.000000000 -0700
-@@ -35,7 +35,7 @@
+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
+@@ -44,7 +44,7 @@
+         AC_CHECK_LIB(pq, PQsendQueryPrepared, [apu_have_pgsql=1],[
+         if test "x$PGSQL_CONFIG" != 'x'; then
+           unset ac_cv_lib_pq_PQsendQueryPrepared
+-          pgsql_LIBS="`$PGSQL_CONFIG --libs`"
++          pgsql_LIBS="-lpq"
+           APR_ADDTO(LIBS, [$pgsql_LIBS])
+           AC_CHECK_LIB(pq, PQsendQueryPrepared, [apu_have_pgsql=1])
+         fi
+@@ -55,7 +55,7 @@
+           AC_CHECK_LIB(pq, PQsendQueryPrepared, [apu_have_pgsql=1],[
+           if test "x$PGSQL_CONFIG" != 'x'; then
+             unset ac_cv_lib_pq_PQsendQueryPrepared
+-            pgsql_LIBS="`$PGSQL_CONFIG --libs`"
++            pgsql_LIBS="-lpq"
+             APR_ADDTO(LIBS, [$pgsql_LIBS])
+             AC_CHECK_LIB(pq, PQsendQueryPrepared, [apu_have_pgsql=1])
+           fi
+@@ -85,7 +85,7 @@
+         AC_CHECK_LIB(pq, PQsendQueryPrepared, [apu_have_pgsql=1],[
+         if test "x$PGSQL_CONFIG" != 'x'; then
+           unset ac_cv_lib_pq_PQsendQueryPrepared
+-          pgsql_LIBS="`$PGSQL_CONFIG --libs`"
++          pgsql_LIBS="-lpq"
+           APR_ADDTO(LIBS, [$pgsql_LIBS])
+           AC_CHECK_LIB(pq, PQsendQueryPrepared, [apu_have_pgsql=1])
+         fi
+@@ -96,7 +96,7 @@
+           AC_CHECK_LIB(pq, PQsendQueryPrepared, [apu_have_pgsql=1],[
+           if test "x$PGSQL_CONFIG" != 'x'; then
+             unset ac_cv_lib_pq_PQsendQueryPrepared
+-            pgsql_LIBS="`$PGSQL_CONFIG --libs`"
++            pgsql_LIBS="-lpq"
+             APR_ADDTO(LIBS, [$pgsql_LIBS])
+             AC_CHECK_LIB(pq, PQsendQueryPrepared, [apu_have_pgsql=1])
+           fi
+@@ -121,7 +121,7 @@
+       AC_CHECK_LIB(pq, PQsendQueryPrepared, [apu_have_pgsql=1],[
        if test "x$PGSQL_CONFIG" != 'x'; then
-         pgsql_CPPFLAGS="-I`$PGSQL_CONFIG --includedir`"
-         pgsql_LDFLAGS="-L`$PGSQL_CONFIG --libdir`"
+         unset ac_cv_lib_pq_PQsendQueryPrepared
 -        pgsql_LIBS="`$PGSQL_CONFIG --libs`"
 +        pgsql_LIBS="-lpq"
- 
-         APR_ADDTO(CPPFLAGS, [$pgsql_CPPFLAGS])
-         APR_ADDTO(LDFLAGS, [$pgsql_LDFLAGS])
-@@ -56,7 +56,7 @@
-       if test "x$PGSQL_CONFIG" != 'x'; then
-         pgsql_CPPFLAGS="-I`$PGSQL_CONFIG --includedir`"
-         pgsql_LDFLAGS="-L`$PGSQL_CONFIG --libdir`"
--        pgsql_LIBS="`$PGSQL_CONFIG --libs`"
-+        pgsql_LIBS="-lpq"
-       else
-         pgsql_CPPFLAGS="-I$withval/include"
-         pgsql_LDFLAGS="-L$withval/lib "
-@@ -80,7 +80,7 @@
-     if test "x$PGSQL_CONFIG" != 'x'; then
-       pgsql_CPPFLAGS="-I`$PGSQL_CONFIG --includedir`"
-       pgsql_LDFLAGS="-L`$PGSQL_CONFIG --libdir`"
--      pgsql_LIBS="`$PGSQL_CONFIG --libs`"
-+      pgsql_LIBS="-lpq"
- 
-       APR_ADDTO(CPPFLAGS, [$pgsql_CPPFLAGS])
-       APR_ADDTO(LDFLAGS, [$pgsql_LDFLAGS])
+         APR_ADDTO(LIBS, [$pgsql_LIBS])
+         AC_CHECK_LIB(pq, PQsendQueryPrepared, [apu_have_pgsql=1])
+       fi
+@@ -132,7 +132,7 @@
+         AC_CHECK_LIB(pq, PQsendQueryPrepared, [apu_have_pgsql=1],[
+         if test "x$PGSQL_CONFIG" != 'x'; then
+           unset ac_cv_lib_pq_PQsendQueryPrepared
+-          pgsql_LIBS="`$PGSQL_CONFIG --libs`"
++          pgsql_LIBS="-lpq"
+           APR_ADDTO(LIBS, [$pgsql_LIBS])
+           AC_CHECK_LIB(pq, PQsendQueryPrepared, [apu_have_pgsql=1])
+         fi