[pkg-bacula-commits] [SCM] Bacula, a network backup, recovery and verification program branch, master, updated. debian/5.0.3-1-43-geac3ea4

[Alexander Golovko]

The following commit has been merged in the master branch:
commit 0f4409a468a6749837e6b852024b6a52f93c74cb
Author: Alexander Golovko <alexandro at ankalagon.ru>
Date:   Sat May 19 01:47:04 2012 +0400

    Fix regression in SQL_BINDIR for postgresql patch
    
    This patch was incorrect since begin of configure regeneration with autoconf
    We can't now patch configure file directly and must patch configure.in
    template

diff --git a/debian/patches/fix-sql-bindir b/debian/patches/fix-sql-bindir
index 0afc034..cece580 100644
--- a/debian/patches/fix-sql-bindir
+++ b/debian/patches/fix-sql-bindir
@@ -1,15 +1,8 @@
---- a/configure
-+++ b/configure
-@@ -27993,7 +27993,7 @@
-           if test -n "$PG_CONFIG";then
-               POSTGRESQL_INCDIR=`"$PG_CONFIG" --includedir`
-               POSTGRESQL_LIBDIR=`"$PG_CONFIG" --libdir`
--              POSTGRESQL_BINDIR=`"$PG_CONFIG" --bindir`
-+              POSTGRESQL_BINDIR=/usr/bin
-           elif test -f /usr/local/include/libpq-fe.h; then
-               POSTGRESQL_INCDIR=/usr/local/include
-               if test -d /usr/local/lib64; then
-@@ -28880,7 +28880,7 @@
+Last-Update: 2012-05-19
+
+--- a/autoconf/bacula-macros/db.m4
++++ b/autoconf/bacula-macros/db.m4
+@@ -195,7 +195,7 @@ AC_HELP_STRING([--with-dbi-driver@<:@=DRIVER@:>@], [Suport for DBI driver. DRIVE
             db_prog="postgresql"
             PG_CONFIG=`which pg_config`
             if test -n "$PG_CONFIG"; then
@@ -18,3 +11,12 @@
                SQL_LIBDIR=`"$PG_CONFIG" --libdir`
             elif test -f /usr/local/bin/psql; then
                SQL_BINDIR=/usr/local/bin
+@@ -684,7 +684,7 @@ AC_HELP_STRING([--with-postgresql@<:@=DIR@:>@], [Include PostgreSQL support. DIR
+           if test -n "$PG_CONFIG";then
+               POSTGRESQL_INCDIR=`"$PG_CONFIG" --includedir`
+               POSTGRESQL_LIBDIR=`"$PG_CONFIG" --libdir`
+-              POSTGRESQL_BINDIR=`"$PG_CONFIG" --bindir`
++              POSTGRESQL_BINDIR=/usr/bin
+           elif test -f /usr/local/include/libpq-fe.h; then
+               POSTGRESQL_INCDIR=/usr/local/include
+               if test -d /usr/local/lib64; then

-- 
Bacula, a network backup, recovery and verification program