Merge lp:~jtaylor/ubuntu/oneiric/undertaker/fix-803209 into lp:ubuntu/oneiric/undertaker

[Julian Taylor]

fix ftbs

=== modified file 'debian/changelog'
--- debian/changelog	2011-06-25 16:04:36 +0000
+++ debian/changelog	2011-08-21 15:26:26 +0000
@@ -1,3 +1,10 @@
+undertaker (1.1-2ubuntu1) oneiric; urgency=low
+
+  * debian/patches/fix-as-needed-build.patch:
+    - fix build with ld --as-needed (LP: #803209)
+
+ -- Julian Taylor <[e-mail]>  Sun, 21 Aug 2011 17:05:37 +0200
+
 undertaker (1.1-2) unstable; urgency=low
 
   * Apply patch from Konstantinos Margaritis for building against newer

=== modified file 'debian/control'
--- debian/control	2011-02-10 22:26:20 +0000
+++ debian/control	2011-08-21 15:26:26 +0000
@@ -1,7 +1,8 @@
 Source: undertaker
 Section: devel
 Priority: optional
-Maintainer: Christoph Egger <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Christoph Egger <[e-mail]>
 Uploaders: Reinhard Tartler <[e-mail]>
 Build-Depends: debhelper (>= 7.0.50~),
  picosat (>= 913-4~),

=== added file 'debian/patches/fix-as-needed-build.patch'
--- debian/patches/fix-as-needed-build.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/fix-as-needed-build.patch	2011-08-21 15:26:26 +0000
@@ -0,0 +1,30 @@
+Description: fix build with ld --as-needed
+ when building with ld --as-needed libraries must be placed
+ after object files needing them on the command line so the symbols
+ of the libraries are registered as needed.
+Author: Julian Taylor <[e-mail]>
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/undertaker/+bug/803209
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=632297
+
+--- undertaker-1.1.orig/ziz/Makefile
++++ undertaker-1.1/ziz/Makefile
+@@ -13,7 +13,7 @@ all: zizler
+ Zizler.o: Zizler.cpp $(HEADERS)
+ 
+ zizler: Zizler.o libziz.a
+-	$(LDXX) -o $@ $(LDLIBS) $^
++	$(LDXX) -o $@ $^ $(LDLIBS)
+ 
+ $(ZIZOBJ): $(HEADERS)
+ libziz.a: $(ZIZOBJ) $(HEADERS)
+--- undertaker-1.1.orig/undertaker/Makefile
++++ undertaker-1.1/undertaker/Makefile
+@@ -12,7 +12,7 @@ CXXFLAGS = $(CFLAGS)
+ 
+ LDFLAGS =
+ # LDCOV = -coverage
+-LDLIBS = -lstdc++ -lboost_system -lboost_regex -lboost_filesystem libparser.a ../ziz/libziz.a  -lpicosat -lboost_wave-mt $(LDCOV)
++LDLIBS = libparser.a ../ziz/libziz.a -lstdc++ -lboost_system -lboost_regex -lboost_filesystem -lpicosat -lboost_wave-mt $(LDCOV)
+ 
+ PARSEROBJ = CloudContainer.o RsfReader.o KconfigWhitelist.o ConfigurationModel.o	\
+ 	    ModelContainer.o SatChecker.o CodeSatStream.o BlockDefectAnalyzer.o

=== modified file 'debian/patches/series'
--- debian/patches/series	2011-06-25 16:04:36 +0000
+++ debian/patches/series	2011-08-21 15:26:26 +0000
@@ -1,1 +1,2 @@
 boots-1.46.patch
+fix-as-needed-build.patch