Merge lp:~kim0/ubuntu/natty/bacula/ftbfs-fix into lp:ubuntu/natty/bacula

[Ahmed Kamal]

[Jonathan Riddell (jr)]

Shouldn't this be a patch? Otherwise it'll get lost in the next version upgrade.

[Ahmed Kamal (kim0)]

Bacula does not use a proper patch system. In the diff.gz file there's a lot of direct patching of the source anyway

=== modified file 'debian/changelog'
--- debian/changelog	2010-12-09 16:43:46 +0000
+++ debian/changelog	2010-12-10 10:12:58 +0000
@@ -1,3 +1,10 @@
+bacula (5.0.2-2ubuntu3) natty; urgency=low
+
+  * Added libssl explicit build dependency in src/lib/Makefile.in for libbac.
+  Closes: (LP: #687968)
+
+ -- Ahmed Kamal <[e-mail]>  Fri, 10 Dec 2010 10:30:04 +0200
+
 bacula (5.0.2-2ubuntu2) natty; urgency=low
 
   * Rebuild with python 2.7 as the python default.

=== modified file 'src/lib/Makefile.in'
--- src/lib/Makefile.in	2010-03-03 08:38:35 +0000
+++ src/lib/Makefile.in	2010-12-10 10:12:58 +0000
@@ -126,7 +126,7 @@
 
 libbac.la: Makefile $(LIBBAC_LOBJS)
 	@echo "Making $@ ..."
-	$(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBAC_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBAC_LT_CURRENT).$(LIBBAC_LT_REVISION).$(LIBBAC_LT_AGE) $(WRAPLIBS) $(CAP_LIBS)
+	$(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -lssl -o $@ $(LIBBAC_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBAC_LT_CURRENT).$(LIBBAC_LT_REVISION).$(LIBBAC_LT_AGE) $(WRAPLIBS) $(CAP_LIBS)
 
 libbaccfg.a: $(LIBBACCFG_OBJS) 
 	@echo "Making $@ ..."