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

[Luca Capello]

The following commit has been merged in the master branch:
commit fef55e9b0003e7dd651320a885a17c6d99ff7e9b
Author: Luca Capello <luca at pca.it>
Date:   Sat Jun 2 14:15:51 2012 +0200

    debian/patches/fix-binutils-gold-linking.patch: more tweaks
    
    1) 440819e added autoconf/libtool/ltdl.m4, so no more need to
       Build-Depends: on automake and libltdl-dev and also
       autoconf/Make.common.in should include that file.
    
    2) add more DEP-3 informations: 2 upstream bugs and commits.

diff --git a/debian/changelog b/debian/changelog
index 6226aaa..c1603ea 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -95,8 +95,6 @@ bacula (5.0.3+dfsgreal-1) UNRELEASED; urgency=low
   * debian/bacula-director-*.postinst:
     - remove path for sh call (thanks to lintian).
   * debian/control:
-    + add automake and libltdl-dev to Build-Depends: for binutils-gold
-      upstream patch.
     + add bsd-mailx as alternative for mailx (thanks to lintian).
   * debian/copyright:
     + add current maintainer.
diff --git a/debian/control b/debian/control
index f7dd942..2cad992 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: admin
 Priority: optional
 Maintainer: Debian Bacula Team <pkg-bacula-devel at lists.alioth.debian.org>
 Uploaders: Jan Hauke Rahm <jhr at debian.org>
-Build-Depends: autotools-dev, autoconf, automake, libltdl-dev, debhelper (>= 8.1.3), po-debconf,
+Build-Depends: autotools-dev, autoconf, debhelper (>= 8.1.3), po-debconf,
  zlib1g-dev, libreadline-dev, libsqlite3-dev, libmysqlclient-dev, libpq-dev
  (>= 9.1), postgresql-server-dev-all, libwrap0-dev, python-dev, libgtk2.0-dev,
  libgnome2-dev, libacl1-dev, libkrb5-dev, libgnomeui-dev, libx11-dev, mtx, bc,
diff --git a/debian/patches/fix-binutils-gold-linking.patch b/debian/patches/fix-binutils-gold-linking.patch
index 5d66abe..c0488ff 100644
--- a/debian/patches/fix-binutils-gold-linking.patch
+++ b/debian/patches/fix-binutils-gold-linking.patch
@@ -1,19 +1,20 @@
-Description: Fix bug #1870 GNU binutils-gold build failure.
- Use some extra libtool magic to determine what lib to use
- to get dlopen and friends for loading plugins from libbac.
+Description: Fix linking with binutils-gold
+ 1) commit:ddd5c96759c994dee2c8b0d20dff38b7e7853148
+    Fix bug #1870 GNU binutils-gold build failure.
+
+    Use some extra libtool magic to determine what lib to use
+    to get dlopen and friends for loading plugins from libbac.
+
+ 2) commit:e72fe7a6a2b65b907f5a89f77117ffa28404a95a
+    Fix bug #1880 ltdl.m4 missing for new feature.
 Bug-Debian: 553956
 Bug: http://bugs.bacula.org/view.php?id=1870
+Bug: http://bugs.bacula.org/view.php?id=1880
+Origin: upstream
 Author: Marco van Wieringen <mvw at planets.elm.net>
 Reviewed-by: Luca Capello <luca at pca.it>
 Reviewed-by: Alexander Golovko <alexandro at ankalagon.ru>
-Last-Update: 2012-06-01
-
----
- bacula/autoconf/Make.common.in |    1 +
- bacula/autoconf/aclocal.m4     |    1 +
- bacula/autoconf/configure.in   |    1 +
- bacula/src/lib/Makefile.in     |    2 +-
- 4 files changed, 4 insertions(+), 1 deletions(-)
+Last-Update: 2012-06-02
 
 --- a/autoconf/Make.common.in
 +++ b/autoconf/Make.common.in
@@ -31,7 +32,7 @@ Last-Update: 2012-06-01
  m4_include([libtool/ltsugar.m4])
  m4_include([libtool/ltversion.m4])
  m4_include([libtool/lt~obsolete.m4])
-+m4_include([/usr/share/aclocal/ltdl.m4])
++m4_include([libtool/ltdl.m4])
  m4_include([gettext-macros/codeset.m4])
  m4_include([gettext-macros/gettext.m4])
  m4_include([gettext-macros/glibc2.m4])

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