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

Proposed by David Shorten
Status: Merged
Merged at revision: 9
Proposed branch: lp:~dpshorten/ubuntu/oneiric/libpam-encfs/ftbfs-jam
Merge into: lp:ubuntu/oneiric/libpam-encfs
Diff against target: 43 lines (+11/-3)
2 files modified
debian/changelog (+7/-0)
debian/rules (+4/-3)
To merge this branch: bzr merge lp:~dpshorten/ubuntu/oneiric/libpam-encfs/ftbfs-jam
Reviewer Review Type Date Requested Status
Stefano Rivera Pending
Review via email: mp+67448@code.launchpad.net
To post a comment you must log in.
10. By David Shorten

removed -lc from DEBIAN_LD_FLAGS

11. By David Shorten

added in a line of commenting to debian/rules

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2011-04-12 13:06:10 +0000
3+++ debian/changelog 2011-07-10 11:06:35 +0000
4@@ -1,3 +1,10 @@
5+libpam-encfs (0.1.4.4-3ubuntu1) oneiric; urgency=low
6+
7+ * Changed debian/rules so that the package built with the
8+ ld option --as-needed enabled. (LP: #803183)
9+
10+ -- David Shorten <dpshorten@gmail.com> Sun, 10 Jul 2011 12:16:37 +0200
11+
12 libpam-encfs (0.1.4.4-3) unstable; urgency=low
13
14 * debian/NEWS,README.Debian: Document possible behavior
15
16=== modified file 'debian/rules'
17--- debian/rules 2011-02-28 17:34:22 +0000
18+++ debian/rules 2011-07-10 11:06:35 +0000
19@@ -14,12 +14,13 @@
20 PAM_CONFIG_DIR = $(CURDIR)/debian/libpam-encfs/usr/share/pam-configs
21 PAM_SEC_DIR = $(CURDIR)/debian/libpam-encfs/etc/security
22
23+# Explicitly link to C library (we use ld)
24+DEBIAN_PAMLIB = -lpam -lc
25+
26 # Original upstream value (Check!)
27 DEBIAN_LD_FLAGS = --shared
28 # Delete all local symbols.
29 DEBIAN_LD_FLAGS += -x
30-# Explicitly link to C library (we use ld)
31-DEBIAN_LD_FLAGS += -lc
32 # Check binutils-gold like behavior
33 # DEBIAN_LD_FLAGS += --no-as-needed
34
35@@ -47,7 +48,7 @@
36 dh_testdir
37
38 # Add here commands to compile the package.
39- $(MAKE) LDFLAGS="$(DEBIAN_LD_FLAGS)"
40+ $(MAKE) LDFLAGS="$(DEBIAN_LD_FLAGS)" PAMLIB="$(DEBIAN_PAMLIB)"
41 #docbook-to-man debian/pam-encfs.sgml > pam-encfs.1
42
43 cp -i debian/Upstream.Changelog changelog

Subscribers

People subscribed via source and target branches

to all changes: