Ubuntu

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

Proposed by Ahmed Kamal on 2010-12-10
Status: Merged
Merged at revision: 60
Proposed branch: lp:~kim0/ubuntu/natty/bacula/ftbfs-fix
Merge into: lp:ubuntu/natty/bacula
Diff against target: 27 lines (+8/-1) 2 files modified
To merge this branch: bzr merge lp:~kim0/ubuntu/natty/bacula/ftbfs-fix
Reviewer Review Type Date Requested Status
Ubuntu branches 2010-12-10 Pending
Review via email: mp+43327@code.launchpad.net
To post a comment you must log in.
Jonathan Riddell (jr) wrote :

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

Ahmed Kamal (kim0) wrote :

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

Preview Diff

1=== modified file 'debian/changelog'
2--- debian/changelog 2010-12-09 16:43:46 +0000
3+++ debian/changelog 2010-12-10 10:12:58 +0000
4@@ -1,3 +1,10 @@
5+bacula (5.0.2-2ubuntu3) natty; urgency=low
6+
7+ * Added libssl explicit build dependency in src/lib/Makefile.in for libbac.
8+ Closes: (LP: #687968)
9+
10+ -- Ahmed Kamal <kim0@ubuntu.com> Fri, 10 Dec 2010 10:30:04 +0200
11+
12 bacula (5.0.2-2ubuntu2) natty; urgency=low
13
14 * Rebuild with python 2.7 as the python default.
15
16=== modified file 'src/lib/Makefile.in'
17--- src/lib/Makefile.in 2010-03-03 08:38:35 +0000
18+++ src/lib/Makefile.in 2010-12-10 10:12:58 +0000
19@@ -126,7 +126,7 @@
20
21 libbac.la: Makefile $(LIBBAC_LOBJS)
22 @echo "Making $@ ..."
23- $(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)
24+ $(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)
25
26 libbaccfg.a: $(LIBBACCFG_OBJS)
27 @echo "Making $@ ..."

Subscribers

People subscribed via source and target branches

to all changes: