Merge lp:~jtaylor/ubuntu/oneiric/cdpr/fix-803174 into lp:ubuntu/oneiric/cdpr

[Julian Taylor]

fix ftbs

=== modified file 'debian/changelog'
--- debian/changelog	2011-05-05 17:42:51 +0000
+++ debian/changelog	2011-08-21 14:29:28 +0000
@@ -1,3 +1,10 @@
+cdpr (2.4-1ubuntu1) oneiric; urgency=low
+
+  * debian/patches/0003-fix-as-needed-build.patch:
+    - fix build with ld --as-needed (LP: #803174)
+
+ -- Julian Taylor <[e-mail]>  Sun, 21 Aug 2011 16:25:51 +0200
+
 cdpr (2.4-1) unstable; urgency=low
 
   * New upstream release, closes: #570916

=== modified file 'debian/control'
--- debian/control	2011-05-05 17:42:51 +0000
+++ debian/control	2011-08-21 14:29:28 +0000
@@ -1,5 +1,6 @@
 Source: cdpr
-Maintainer: Matt Zagrabelny <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Matt Zagrabelny <[e-mail]>
 Section: net
 Priority: extra
 Build-Depends: debhelper (>= 8.0.0), libpcap0.8-dev (>= 1.0.0)

=== added file 'debian/patches/0003-fix-as-needed-build.patch'
--- debian/patches/0003-fix-as-needed-build.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/0003-fix-as-needed-build.patch	2011-08-21 14:29:28 +0000
@@ -0,0 +1,27 @@
+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/cdpr/+bug/803174
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=632665
+--- cdpr-2.4.orig/Makefile
++++ cdpr-2.4/Makefile
+@@ -16,7 +16,7 @@ CFLAGS = -Wall -W -O2
+ # Build for Solaris with the pcap headers/libs one dir up
+ #CFLAGS = -DSOLARIS -Wall -I. -I../libpcap-0.7.1 -L../libpcap-0.7.1 -ggdb
+ 
+-LDFLAGS = -lpcap
++LIBS = -lpcap
+ 
+ # Build for Solaris
+ #LDFLAGS = -lsocket -lnsl -lpcap
+@@ -33,7 +33,7 @@ conffile.o: conffile.c cdp.h cdpr.h
+ 	gcc -c $(CFLAGS) conffile.c
+ 
+ cdpr: cdpr.o cdprs.o conffile.o
+-	gcc $(LDFLAGS) -o cdpr cdpr.o cdprs.o conffile.o
++	gcc $(LDFLAGS) -o cdpr cdpr.o cdprs.o conffile.o $(LIBS)
+ 
+ install: all
+ 	mkdir -p $(DESTDIR)$(prefix)/sbin/

=== modified file 'debian/patches/series'
--- debian/patches/series	2011-05-05 17:42:51 +0000
+++ debian/patches/series	2011-08-21 14:29:28 +0000
@@ -1,2 +1,3 @@
 0001-Spruced-up-Makefile.patch
 0002-remove-pseudo-device-all-from-list-of-interfaces.patch
+0003-fix-as-needed-build.patch