Ubuntu
gtk-led-askpass package

Merge lp:~scarneiro/ubuntu/oneiric/gtk-led-askpass/fix-for-770853 into lp:ubuntu/oneiric/gtk-led-askpass

  1. Oneiric (11.10)
  2. fix-for-770853
  3. Merge into oneiric
Proposed by Sebastian Carneiro
Status: Merged
Merged at revision: 5
Proposed branch: lp:~scarneiro/ubuntu/oneiric/gtk-led-askpass/fix-for-770853
Merge into: lp:ubuntu/oneiric/gtk-led-askpass
Diff against target: 27 lines (+8/-1)
2 files modified
Makefile (+1/-1)
debian/changelog (+7/-0)
To merge this branch: bzr merge lp:~scarneiro/ubuntu/oneiric/gtk-led-askpass/fix-for-770853
Reviewer Review Type Date Requested Status
Ubuntu branches Pending
Review via email: mp+65882@code.launchpad.net

Description of the change

Changed order of parameters to fix build problems under GCC-4.6/oneiric.

Regards.

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 'Makefile'
2--- Makefile 2004-03-04 18:05:41 +0000
3+++ Makefile 2011-06-26 00:44:29 +0000
4@@ -7,7 +7,7 @@
5 all: gtk-led-askpass gtk-led-askpass.1.gz
6
7 gtk-led-askpass: gtk-led-askpass.o
8- $(CC) $(cflags) $(CFLAGS) $(ldflags) $(LDFLAGS) $< -o $@
9+ $(CC) $(cflags) $(CFLAGS) $< -o $@ $(ldflags) $(LDFLAGS)
10
11 gtk-led-askpass.o: gtk-led-askpass.c
12 $(CC) $(cflags) $(CFLAGS) -c $< -o $@
13
14=== modified file 'debian/changelog'
15--- debian/changelog 2010-03-01 01:24:07 +0000
16+++ debian/changelog 2011-06-26 00:44:29 +0000
17@@ -1,3 +1,10 @@
18+gtk-led-askpass (0.10-2ubuntu2) natty; urgency=low
19+
20+ * Makefile: Changed order of linker parameters, to avoid build problems in
21+ Oneiric with GCC-4.6 (LP: #770853)
22+
23+ -- Sebastian Carneiro <scarneiro@fibertel.com.ar> Sat, 25 Jun 2011 21:33:42 -0300
24+
25 gtk-led-askpass (0.10-2ubuntu1) lucid; urgency=low
26
27 * Fix FTBFS caused by "error: format not a string literal and no format

Subscribers

People subscribed via source and target branches