Merge lp:~jtaylor/ubuntu/oneiric/pads/fix-770979 into lp:ubuntu/oneiric/pads

Proposed by Julian Taylor
Status: Merged
Merged at revision: 5
Proposed branch: lp:~jtaylor/ubuntu/oneiric/pads/fix-770979
Merge into: lp:ubuntu/oneiric/pads
Diff against target: 42 lines (+11/-2)
3 files modified
configure (+2/-1)
debian/changelog (+7/-0)
debian/control (+2/-1)
To merge this branch: bzr merge lp:~jtaylor/ubuntu/oneiric/pads/fix-770979
Reviewer Review Type Date Requested Status
Ubuntu branches Pending
Review via email: mp+72340@code.launchpad.net

Description of the change

fix ftbs

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'configure'
2--- configure 2005-11-05 16:26:57 +0000
3+++ configure 2011-08-21 14:44:23 +0000
4@@ -3679,7 +3679,8 @@
5
6 done
7
8-LDFLAGS="${LDFLAGS} `pcre-config --libs`"
9+#http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=632102
10+LIBS="${LIBS} `pcre-config --libs`"
11 echo "$as_me:$LINENO: checking for pcre_compile in -lpcre" >&5
12 echo $ECHO_N "checking for pcre_compile in -lpcre... $ECHO_C" >&6
13 if test "${ac_cv_lib_pcre_pcre_compile+set}" = set; then
14
15=== modified file 'debian/changelog'
16--- debian/changelog 2011-06-12 18:11:04 +0000
17+++ debian/changelog 2011-08-21 14:44:23 +0000
18@@ -1,3 +1,10 @@
19+pads (1.2-11ubuntu1) oneiric; urgency=low
20+
21+ * patch configure to use LIBS instead of LD_FLAGS
22+ - fixes build with ld --as-needed (LP: #770979)
23+
24+ -- Julian Taylor <jtaylor.debian@googlemail.com> Sun, 21 Aug 2011 16:37:01 +0200
25+
26 pads (1.2-11) unstable; urgency=low
27
28 * Update maintainer's email address
29
30=== modified file 'debian/control'
31--- debian/control 2011-06-12 18:11:04 +0000
32+++ debian/control 2011-08-21 14:44:23 +0000
33@@ -1,7 +1,8 @@
34 Source: pads
35 Section: net
36 Priority: optional
37-Maintainer: David Gil <dgil@telefonica.net>
38+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
39+XSBC-Original-Maintainer: David Gil <dgil@telefonica.net>
40 Uploaders: Javier Fernandez-Sanguino Pen~a <jfs@debian.org>
41 Build-Depends: debhelper (>= 5.0.0), libpcre3-dev, libpcap0.8-dev
42 Standards-Version: 3.7.3

Subscribers

People subscribed via source and target branches

to all changes: