Merge lp:~scarneiro/ubuntu/oneiric/osptoolkit/fix-for-756018 into lp:ubuntu/oneiric/osptoolkit

[Sebastian Carneiro]

Added ssl libraries to Makefile on enroll target to fix FTBFS when using ld --as-needed.

Upon approval of this proposal, I will submit it to Debian.

[Stefano Rivera (stefanor)]

Looks like there's something else we should deal with while we are here:

E: libosptk3-dev: non-empty-dependency_libs-in-la-file usr/lib/libosptk.la

$ lintian-info --tags non-empty-dependency_libs-in-la-file
N: non-empty-dependency_libs-in-la-file
N:
N: The dependency_libs field in the .la file has not been cleared. It has
N: long been a release goal to get rid of unneeded .la files and clearing
N: the dependency_libs field from the rest of them.
N:
N: A non-empty dependency_libs field will also stall the Multi-Arch
N: conversation.
N:
N: The in itself .la file may be useful, if the library is loaded
N: dynamically via libltdl.
N:
N: Refer to http://wiki.debian.org/ReleaseGoals/LAFileRemoval,
N: http://lists.debian.org/debian-devel/2011/05/msg01003.html, and
N: http://lists.debian.org/debian-devel/2011/05/msg01146.html for
N: details.
N:
N: Severity: serious, Certainty: certain
N:
N: Check: shared-libs, Type: binary, udeb
N:

review: Needs Fixing

[lp:~scarneiro/ubuntu/oneiric/osptoolkit/fix-for-756018]

5. By Sebastian Carneiro on 2011-07-11

debian/rules modified to clear the dependency_libs field of .la files
on install target.

[Sebastian Carneiro (scarneiro)]

Modified debian/rules to clear dependency_libs field of .la files on install target.

Best regards.

[Chris Coulson (chrisccoulson)]

Looks good, thanks!

review: Approve

[Sebastian Carneiro (scarneiro)]

Thanks yo you. Patch forwarded to Debian. http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=555877

[Sebastian Carneiro (scarneiro)]

Forwarded upstream: https://sourceforge.net/tracker/?func=detail&aid=3363718&group_id=187299&atid=920742

=== modified file 'Makefile'
--- Makefile	2007-12-30 20:37:26 +0000
+++ Makefile	2011-07-11 03:34:25 +0000
@@ -119,7 +119,7 @@
 
 enroll: $(ENREXEC)
 $(ENREXEC): $(ENROBJS) $(OSPLIB)
-	libtool --mode=link $(CC) -o $(@) $(^)
+	libtool --mode=link $(CC) -o $(@) $(^) $(SSLLIBS)
 
 test: $(EXPEXEC)
 $(EXPEXEC): $(EXPOBJS) $(OSPLIB)

=== modified file 'debian/changelog'
--- debian/changelog	2007-12-30 20:37:26 +0000
+++ debian/changelog	2011-07-11 03:34:25 +0000
@@ -1,3 +1,12 @@
+osptoolkit (3.4.2-1ubuntu1) oneiric; urgency=low
+
+  * Makefile: Added ssl libraries to enroll target, to fix FTBFS when using 
+    ld --as-needed (LP: #756018)
+  * debian/rules: modified to clear the dependency_libs field of .la files
+    on install target.
+
+ -- Sebastian Carneiro <[e-mail]>  Mon, 11 Jul 2011 00:28:42 -0300
+
 osptoolkit (3.4.2-1) unstable; urgency=low
 
   * Initial Release (Closes: Bug#468110).

=== modified file 'debian/control'
--- debian/control	2007-12-30 20:37:26 +0000
+++ debian/control	2011-07-11 03:34:25 +0000
@@ -1,5 +1,6 @@
 Source: osptoolkit
-Maintainer: TransNexus, Inc. <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: TransNexus, Inc. <[e-mail]>
 Uploaders: Di-Shi Sun <[e-mail]>
 Section: utils
 Priority: optional

=== modified file 'debian/rules'
--- debian/rules	2007-12-30 20:37:26 +0000
+++ debian/rules	2011-07-11 03:34:25 +0000
@@ -68,6 +68,8 @@
 
 	# Add here commands to install the package into debian/libosptk-dev
 	$(MAKE) VERSION="$(version)" MAJOR="$(major)" DESTDIR=$(CURDIR)/debian/libosptk$(major)-dev install-dev
+	find $(CURDIR)/debian/libosptk$(major)-dev -name "*.la" -exec \
+		sed -i -e "s,^dependency_libs=.*,dependency_libs=''," {} +
 
 	# Add here commands to install the package into debian/osptoolkit
 	$(MAKE) VERSION="$(version)" MAJOR="$(major)" DESTDIR=$(CURDIR)/debian/osptoolkit install-bin