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

[Luca Capello]

The following commit has been merged in the master branch:
commit 263d7a506700a11314daac46f66413457873e877
Author: Alexander Golovko <alexandro at ankalagon.ru>
Date:   Sun May 13 13:00:47 2012 +0400

    Fix linking with binutils-gold
    
    Closes: #553956

diff --git a/debian/changelog b/debian/changelog
index ff9a0cd..a9adf38 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -31,6 +31,8 @@ bacula (5.0.3-2) UNRELEASED; urgency=low
   * debian/patches/switch-nonfree-sha1-to-openssl.patch
     (Closes: #658326):
     + switch from upstream nonfree SHA1 implementation to openssl
+  * debian/patches/fix-binutils-gold-linking.patch (Closes: #553956)
+    + fix linking with binutils-gold
 
  --
 
diff --git a/debian/patches/fix-binutils-gold-linking.patch b/debian/patches/fix-binutils-gold-linking.patch
new file mode 100644
index 0000000..4e5ef1c
--- /dev/null
+++ b/debian/patches/fix-binutils-gold-linking.patch
@@ -0,0 +1,16 @@
+Description: Fix linking with binutils-gold
+Bug-Debian: 553956
+Author: Alexander Golovko <alexandro at ankalagon.ru>
+Last-Update: 2012-05-13
+
+--- a/src/lib/Makefile.in	2012-05-09 21:41:20.000000000 +0400
++++ b/src/lib/Makefile.in	2012-05-13 12:58:33.004628289 +0400
+@@ -119,7 +119,7 @@
+ 
+ libbac.la: Makefile $(LIBBAC_LOBJS)
+ 	@echo "Making $@ ..."
+-	$(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBAC_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBAC_LT_RELEASE) $(WRAPLIBS) $(CAP_LIBS) $(ZLIBS)
++	$(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -ldl -o $@ $(LIBBAC_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBAC_LT_RELEASE) $(WRAPLIBS) $(CAP_LIBS) $(ZLIBS)
+ 
+ libbaccfg.a: $(LIBBACCFG_OBJS) 
+ 	@echo "Making $@ ..."
diff --git a/debian/patches/series b/debian/patches/series
index 5b9feb6..cb1ef54 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ upstream-1623_debian-591293___file_jpfid_idx.patch
 fix-default-config
 fix-sql-bindir
 switch-nonfree-sha1-to-openssl.patch
+fix-binutils-gold-linking.patch

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