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

[Sebastian Carneiro]

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

Regards.

=== modified file 'Makefile'
--- Makefile	2004-03-04 18:05:41 +0000
+++ Makefile	2011-06-26 00:44:29 +0000
@@ -7,7 +7,7 @@
 all: gtk-led-askpass gtk-led-askpass.1.gz
 
 gtk-led-askpass: gtk-led-askpass.o
-	$(CC) $(cflags) $(CFLAGS) $(ldflags) $(LDFLAGS) $< -o $@
+	$(CC) $(cflags) $(CFLAGS) $< -o $@ $(ldflags) $(LDFLAGS)
 
 gtk-led-askpass.o: gtk-led-askpass.c
 	$(CC) $(cflags) $(CFLAGS) -c $< -o $@
 
=== modified file 'debian/changelog'
--- debian/changelog	2010-03-01 01:24:07 +0000
+++ debian/changelog	2011-06-26 00:44:29 +0000
@@ -1,3 +1,10 @@
+gtk-led-askpass (0.10-2ubuntu2) natty; urgency=low
+
+  * Makefile: Changed order of linker parameters, to avoid build problems in 
+    Oneiric with GCC-4.6 (LP: #770853)
+
+ -- Sebastian Carneiro <[e-mail]>  Sat, 25 Jun 2011 21:33:42 -0300
+
 gtk-led-askpass (0.10-2ubuntu1) lucid; urgency=low
 
   * Fix FTBFS caused by "error: format not a string literal and no format