Merge lp:~dpshorten/ubuntu/oneiric/libpam-encfs/ftbfs-jam into lp:ubuntu/oneiric/libpam-encfs

[David Shorten]

[lp:~dpshorten/ubuntu/oneiric/libpam-encfs/ftbfs-jam]

10. By David Shorten on 2011-07-10

removed -lc from DEBIAN_LD_FLAGS

11. By David Shorten on 2011-07-10

added in a line of commenting to debian/rules

=== modified file 'debian/changelog'
--- debian/changelog	2011-04-12 13:06:10 +0000
+++ debian/changelog	2011-07-10 11:06:35 +0000
@@ -1,3 +1,10 @@
+libpam-encfs (0.1.4.4-3ubuntu1) oneiric; urgency=low
+
+  * Changed debian/rules so that the package built with the 
+    ld option --as-needed enabled. (LP: #803183)
+
+ -- David Shorten <[e-mail]>  Sun, 10 Jul 2011 12:16:37 +0200
+
 libpam-encfs (0.1.4.4-3) unstable; urgency=low
 
   * debian/NEWS,README.Debian: Document possible behavior
 
=== modified file 'debian/rules'
--- debian/rules	2011-02-28 17:34:22 +0000
+++ debian/rules	2011-07-10 11:06:35 +0000
@@ -14,12 +14,13 @@
 PAM_CONFIG_DIR = $(CURDIR)/debian/libpam-encfs/usr/share/pam-configs
 PAM_SEC_DIR = $(CURDIR)/debian/libpam-encfs/etc/security
 
+# Explicitly link to C library (we use ld)
+DEBIAN_PAMLIB = -lpam -lc
+
 # Original upstream value (Check!)
 DEBIAN_LD_FLAGS  = --shared
 # Delete all local symbols.
 DEBIAN_LD_FLAGS += -x
-# Explicitly link to C library (we use ld)
-DEBIAN_LD_FLAGS += -lc
 # Check binutils-gold like behavior
 # DEBIAN_LD_FLAGS += --no-as-needed
 
@@ -47,7 +48,7 @@
 	dh_testdir
 
 	# Add here commands to compile the package.
-	$(MAKE) LDFLAGS="$(DEBIAN_LD_FLAGS)"
+	$(MAKE) LDFLAGS="$(DEBIAN_LD_FLAGS)" PAMLIB="$(DEBIAN_PAMLIB)"
 	#docbook-to-man debian/pam-encfs.sgml > pam-encfs.1
 
 	cp -i debian/Upstream.Changelog changelog