[pkg-bacula-commits] [bacula] 02/05: Refreshed patches and dropped fix-mysql-libdir.patch as upstream implemented a similar change
Carsten Leonhardt
leo at moszumanska.debian.org
Mon Jul 11 11:28:45 UTC 2016
This is an automated email from the git hooks/post-receive script.
leo pushed a commit to branch master
in repository bacula.
commit 69b4a30edaf66346a968038bf2addc5561a1c5e6
Author: Carsten Leonhardt <leo at debian.org>
Date: Mon Jul 11 12:08:47 2016 +0200
Refreshed patches and dropped fix-mysql-libdir.patch
as upstream implemented a similar change
---
debian/changelog | 8 ++++++
debian/patches/fix-libbaccats-rpath.patch | 26 +++++++++----------
debian/patches/fix-mysql-libdir.patch | 42 -------------------------------
debian/patches/fix-sql-bindir | 2 +-
debian/patches/series | 1 -
5 files changed, 22 insertions(+), 57 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index efa2bfb..f077713 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+bacula (7.4.2+dfsg-1) unstable; urgency=low
+
+ * New upstream release
+ * Refreshed debian patches and dropped fix-mysql-libdir.patch as it's no
+ longer needed
+
+ --
+
bacula (7.4.1~dfsg-1) unstable; urgency=high
* New upstream release
diff --git a/debian/patches/fix-libbaccats-rpath.patch b/debian/patches/fix-libbaccats-rpath.patch
index 374ed0d..aebeae9 100644
--- a/debian/patches/fix-libbaccats-rpath.patch
+++ b/debian/patches/fix-libbaccats-rpath.patch
@@ -13,16 +13,16 @@ Last-Update: 2012-06-02
else
DBI_LIBS="-L$DBI_LIBDIR -ldbi"
fi
-@@ -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
-- MYSQL_LIBS="-R $MYSQL_LIBDIR -L$MYSQL_LIBDIR -lmysqlclient_r -lz"
-+ MYSQL_LIBS="-L$MYSQL_LIBDIR -lmysqlclient_r -lz"
- else
- MYSQL_LIBS="-L$MYSQL_LIBDIR -lmysqlclient_r -lz"
- fi
-@@ -605,7 +605,7 @@
+@@ -494,7 +494,7 @@
+ elif test -f $MYSQL_LIBDIR/libmysqlclient_r.a \
+ -o -f $MYSQL_LIBDIR/libmysqlclient_r.so; then
+ if test x$use_libtool != xno; then
+- MYSQL_LIBS="-R $MYSQL_LIBDIR -L$MYSQL_LIBDIR -lmysqlclient_r -lz"
++ MYSQL_LIBS="-L$MYSQL_LIBDIR -lmysqlclient_r -lz"
+ else
+ MYSQL_LIBS="-L$MYSQL_LIBDIR -lmysqlclient_r -lz"
+ fi
+@@ -625,7 +625,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
-@@ -695,7 +695,7 @@
+@@ -715,7 +715,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
-@@ -781,7 +781,7 @@
+@@ -801,7 +801,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
-@@ -905,7 +905,7 @@
+@@ -925,7 +925,7 @@
POSTGRESQL_INCLUDE=-I$POSTGRESQL_INCDIR
if test x$use_libtool != xno; then
diff --git a/debian/patches/fix-mysql-libdir.patch b/debian/patches/fix-mysql-libdir.patch
deleted file mode 100644
index d7c75a8..0000000
--- a/debian/patches/fix-mysql-libdir.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-Description: fix detection of mysql libdir
- To support "older systems" the author disabled modern code to detect
- where mysql libs should be found. We enable that to support
- GNU/kFreeBSD and GNU/Hurd.
-Author: Carsten Leonhardt <leo at debian.org>
-Bug: http://bugs.bacula.org/view.php?id=2156
-Last-Update: 2015-12-08
---- a/autoconf/bacula-macros/db.m4
-+++ b/autoconf/bacula-macros/db.m4
-@@ -344,20 +344,20 @@
- #
- # This code is very broken on older systems
- #
--# MYSQL_CONFIG=`which mysql_config 2>/dev/null`
--# if test "x${MYSQL_CONFIG}" != x; then
--# MYSQL_BINDIR="${MYSQL_CONFIG%/*}"
--# ${MYSQL_CONFIG} --variable=pkglibdir > /dev/null 2>&1
--# if test $? = 0 ; then
--# MYSQL_LIBDIR=`${MYSQL_CONFIG} --variable=pkglibdir`
--# MYSQL_INCDIR=`${MYSQL_CONFIG} --variable=pkgincludedir`
--# else
--# MYSQL_LIBDIR=`${MYSQL_CONFIG} --libs_r | sed -e 's/.*-L//' -e 's/ .*//'`
--# MYSQL_INCDIR=`${MYSQL_CONFIG} --include | sed -e 's/-I//'`
--# fi
-+ MYSQL_CONFIG=`which mysql_config 2>/dev/null`
-+ if test "x${MYSQL_CONFIG}" != x; then
-+ MYSQL_BINDIR="${MYSQL_CONFIG%/*}"
-+ ${MYSQL_CONFIG} --variable=pkglibdir > /dev/null 2>&1
-+ if test $? = 0 ; then
-+ MYSQL_LIBDIR=`${MYSQL_CONFIG} --variable=pkglibdir`
-+ MYSQL_INCDIR=`${MYSQL_CONFIG} --variable=pkgincludedir`
-+ else
-+ MYSQL_LIBDIR=`${MYSQL_CONFIG} --libs_r | sed -e 's/.*-L//' -e 's/ .*//'`
-+ MYSQL_INCDIR=`${MYSQL_CONFIG} --include | sed -e 's/-I//'`
-+ fi
- # fi
- # if [ "x${MYSQL_LIB}" = x -o "x${MYSQL_INCDIR}" = x ]; then
-- if test -f /usr/local/mysql/include/mysql/mysql.h; then
-+ elif test -f /usr/local/mysql/include/mysql/mysql.h; then
- MYSQL_INCDIR=/usr/local/mysql/include/mysql
- if test -f /usr/local/mysql/lib64/mysql/libmysqlclient_r.a \
- -o -f /usr/local/mysql/lib64/mysql/libmysqlclient_r.so; then
diff --git a/debian/patches/fix-sql-bindir b/debian/patches/fix-sql-bindir
index 6f23c7e..7f2b95a 100644
--- a/debian/patches/fix-sql-bindir
+++ b/debian/patches/fix-sql-bindir
@@ -15,7 +15,7 @@ Last-Update: 2012-06-28
POSTGRESQL_LIBDIR=`"$PG_CONFIG" --libdir`
elif test -f /usr/local/bin/psql; then
POSTGRESQL_BINDIR=/usr/local/bin
-@@ -847,7 +847,7 @@
+@@ -867,7 +867,7 @@
if test -n "$PG_CONFIG"; then
POSTGRESQL_INCDIR=`"$PG_CONFIG" --includedir`
POSTGRESQL_LIBDIR=`"$PG_CONFIG" --libdir`
diff --git a/debian/patches/series b/debian/patches/series
index 77011cc..fda1104 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,6 +5,5 @@ switch-nonfree-sha1-to-openssl.patch
fix-mysql55-sql-syntax.patch
remove-upstream-autoconf-log.patch
fix-libbaccats-rpath.patch
-fix-mysql-libdir.patch
fix-scriptdir-examples-devices.patch
enable-hardening-for-bat.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-bacula/bacula.git
More information about the pkg-bacula-commits
mailing list