[pkg-bacula-commits] [bacula] 09/17: refreshed debian/patches/fix-libbaccats-rpath.patch and moved it ahead of fix-mysql-libdir.patch

[Carsten Leonhardt]

This is an automated email from the git hooks/post-receive script.

leo pushed a commit to branch experimental
in repository bacula.

commit e01286539d4c42705148d951c8301309eb228d62
Author: Carsten Leonhardt <leo at debian.org>
Date:   Tue Dec 8 14:20:43 2015 +0100

    refreshed debian/patches/fix-libbaccats-rpath.patch
    and moved it ahead of fix-mysql-libdir.patch
---
 debian/patches/fix-libbaccats-rpath.patch | 12 ++++++------
 debian/patches/series                     |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/debian/patches/fix-libbaccats-rpath.patch b/debian/patches/fix-libbaccats-rpath.patch
index 8df9b56..374ed0d 100644
--- a/debian/patches/fix-libbaccats-rpath.patch
+++ b/debian/patches/fix-libbaccats-rpath.patch
@@ -4,7 +4,7 @@ Last-Update: 2012-06-02
 
 --- a/autoconf/bacula-macros/db.m4
 +++ b/autoconf/bacula-macros/db.m4
-@@ -98,7 +98,7 @@
+@@ -102,7 +102,7 @@
       fi
       DBI_INCLUDE=-I$DBI_INCDIR
       if test x$use_libtool != xno; then
@@ -13,7 +13,7 @@ Last-Update: 2012-06-02
       else
          DBI_LIBS="-L$DBI_LIBDIR -ldbi"
       fi
-@@ -475,7 +475,7 @@
+@@ -479,7 +479,7 @@
       if test -f $MYSQL_LIBDIR/libmysqlclient_r.a \
            -o -f $MYSQL_LIBDIR/libmysqlclient_r.so; then
          if test x$use_libtool != xno; then
@@ -22,7 +22,7 @@ Last-Update: 2012-06-02
          else
             MYSQL_LIBS="-L$MYSQL_LIBDIR -lmysqlclient_r -lz"
          fi
-@@ -601,7 +601,7 @@
+@@ -605,7 +605,7 @@
          fi
       MYSQL_INCLUDE=-I$MYSQL_INCDIR
       if test x$use_libtool != xno; then
@@ -31,7 +31,7 @@ Last-Update: 2012-06-02
       else
          MYSQL_LIBS="-L$MYSQL_LIBDIR -lmysqld -lz -lm -lcrypt"
       fi
-@@ -691,7 +691,7 @@
+@@ -695,7 +695,7 @@
       fi
       INGRES_INCLUDE=-I$INGRES_INCDIR
       if test x$use_libtool != xno; then
@@ -40,7 +40,7 @@ Last-Update: 2012-06-02
       else
          INGRES_LIBS="-L$INGRES_LIBDIR -lq.1 -lcompat.1 -lframe.1"
       fi
-@@ -777,7 +777,7 @@
+@@ -781,7 +781,7 @@
       fi
       SQLITE_INCLUDE=-I$SQLITE_INCDIR
       if test x$use_libtool != xno; then
@@ -49,7 +49,7 @@ Last-Update: 2012-06-02
       else
          SQLITE_LIBS="-L$SQLITE_LIBDIR -lsqlite3"
       fi
-@@ -901,7 +901,7 @@
+@@ -905,7 +905,7 @@
  
       POSTGRESQL_INCLUDE=-I$POSTGRESQL_INCDIR
       if test x$use_libtool != xno; then
diff --git a/debian/patches/series b/debian/patches/series
index d125aef..ef1fabd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,8 +4,8 @@ fix-sql-bindir
 switch-nonfree-sha1-to-openssl.patch
 fix-mysql55-sql-syntax.patch
 remove-upstream-autoconf-log.patch
-fix-mysql-libdir.patch
 fix-libbaccats-rpath.patch
+fix-mysql-libdir.patch
 fix-scriptdir-examples-devices.patch
 ppc64el-libtoolize.patch
 fix-src-tools-make-clean.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-bacula/bacula.git