Merge lp:~cosmos-door/ubuntu/oneiric/gnarwl/fix-ftbfs-lp771112 into lp:ubuntu/oneiric/gnarwl

[Mitsuya Shibata]

Fix FTBFS with GCC4.6 (LP: #771112)

This patch move $(LFLAGS) includes -l options to after
source code and object files list within $(CC) statement.

[Matthias Klose (doko)]

it's no GCC-4.6 error, it's the linking order which is wrong. Uploaded with an updated changelog

review: Approve

=== modified file '.pc/applied-patches'
--- .pc/applied-patches	2010-04-19 19:07:39 +0000
+++ .pc/applied-patches	2011-09-15 15:13:57 +0000
@@ -1,3 +1,4 @@
 doc.patch
 dbaccess.patch
 data-makefile.patch
+fix-gcc4.6.patch
 
=== added directory '.pc/fix-gcc4.6.patch'
=== added file '.pc/fix-gcc4.6.patch/.timestamp'
=== added directory '.pc/fix-gcc4.6.patch/src'
=== added file '.pc/fix-gcc4.6.patch/src/Makefile'
--- .pc/fix-gcc4.6.patch/src/Makefile	1970-01-01 00:00:00 +0000
+++ .pc/fix-gcc4.6.patch/src/Makefile	2011-09-15 15:13:57 +0000
@@ -0,0 +1,20 @@
+OBJ=config.o dbaccess.o util.o mailhandler.o
+SOBJ=config.o dbaccess.o util.o
+
+catch:
+	$(MAKE) -C ..
+
+all: clean compile
+
+compile: $(OBJ) $(SOBJ)
+	$(CC) $(CFLAGS) $(LFLAGS) -o $(BIN) gnarwl.c $(OBJ)
+	$(CC) $(CFLAGS) $(LFLAGS) -o $(SBIN) damnit.c $(SOBJ)
+
+clean:
+	rm -f DEADJOE *.o *~ $(BIN) $(SBIN)
+
+install:
+	mkdir -m 755 -p $(BINDIR) $(SBINDIR)
+	install -m 755 -s $(BIN) $(BINDIR)
+	install -m 755 -s $(SBIN) $(SBINDIR)
+
 
=== modified file 'debian/changelog'
--- debian/changelog	2010-08-04 06:54:49 +0000
+++ debian/changelog	2011-09-15 15:13:57 +0000
@@ -1,3 +1,9 @@
+gnarwl (3.6.dfsg-6ubuntu1) oneiric; urgency=low
+
+  * Fix FTBFS with GCC-4.6 (LP: #771112) 
+
+ -- Mitsuya Shibata <[e-mail]>  Thu, 15 Sep 2011 16:25:10 +0900
+
 gnarwl (3.6.dfsg-6) unstable; urgency=low
 
   * Added package ed to list of dependecies ( Closes: #591598 )
 
=== modified file 'debian/control'
--- debian/control	2010-08-04 06:54:49 +0000
+++ debian/control	2011-09-15 15:13:57 +0000
@@ -1,7 +1,8 @@
 Source: gnarwl
 Section: mail
 Priority: optional
-Maintainer: Francesco Zanolin <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Francesco Zanolin <[e-mail]>
 Uploaders: Alessandro De Zorzi <[e-mail]>
 Build-Depends: debhelper (>= 7), libldap2-dev, libgdbm-dev, po-debconf, quilt
 Standards-Version: 3.9.0
 
=== added file 'debian/patches/fix-gcc4.6.patch'
--- debian/patches/fix-gcc4.6.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/fix-gcc4.6.patch	2011-09-15 15:13:57 +0000
@@ -0,0 +1,16 @@
+Fix FTBFS with GCC-4.6 (LP: #771112)
+Index: gnarwl/src/Makefile
+===================================================================
+--- gnarwl.orig/src/Makefile	2011-09-15 16:21:11.912681045 +0900
++++ gnarwl/src/Makefile	2011-09-15 16:22:10.022701535 +0900
+@@ -7,8 +7,8 @@
+ all: clean compile
+ 
+ compile: $(OBJ) $(SOBJ)
+-	$(CC) $(CFLAGS) $(LFLAGS) -o $(BIN) gnarwl.c $(OBJ)
+-	$(CC) $(CFLAGS) $(LFLAGS) -o $(SBIN) damnit.c $(SOBJ)
++	$(CC) $(CFLAGS) -o $(BIN) gnarwl.c $(OBJ) $(LFLAGS)
++	$(CC) $(CFLAGS) -o $(SBIN) damnit.c $(SOBJ) $(LFLAGS)
+ 
+ clean:
+ 	rm -f DEADJOE *.o *~ $(BIN) $(SBIN)
 
=== modified file 'debian/patches/series'
--- debian/patches/series	2010-03-20 06:33:26 +0000
+++ debian/patches/series	2011-09-15 15:13:57 +0000
@@ -1,3 +1,4 @@
 doc.patch
 dbaccess.patch
 data-makefile.patch
+fix-gcc4.6.patch
 
=== modified file 'src/Makefile'
--- src/Makefile	2004-05-28 19:43:08 +0000
+++ src/Makefile	2011-09-15 15:13:57 +0000
@@ -7,8 +7,8 @@
 all: clean compile
 
 compile: $(OBJ) $(SOBJ)
-	$(CC) $(CFLAGS) $(LFLAGS) -o $(BIN) gnarwl.c $(OBJ)
-	$(CC) $(CFLAGS) $(LFLAGS) -o $(SBIN) damnit.c $(SOBJ)
+	$(CC) $(CFLAGS) -o $(BIN) gnarwl.c $(OBJ) $(LFLAGS)
+	$(CC) $(CFLAGS) -o $(SBIN) damnit.c $(SOBJ) $(LFLAGS)
 
 clean:
 	rm -f DEADJOE *.o *~ $(BIN) $(SBIN)