diff -Nru gnarwl-3.6.dfsg/debian/changelog gnarwl-3.6.dfsg/debian/changelog
--- gnarwl-3.6.dfsg/debian/changelog	2012-09-11 03:04:12.000000000 +0530
+++ gnarwl-3.6.dfsg/debian/changelog	2012-11-02 21:32:37.000000000 +0530
@@ -1,3 +1,10 @@
+gnarwl (3.6.dfsg-6.1ubuntu1) raring; urgency=low
+
+  * Merge from Debian unstable (LP: #1074403).  Remaining changes:
+    - Fix FTBFS with ld --as-needed (LP: #771112)
+
+ -- Vibhav Pant <vibhavp@gmail.com>  Fri, 02 Nov 2012 21:32:27 +0530
+
 gnarwl (3.6.dfsg-6.1) unstable; urgency=low
 
   * Non-maintainer upload to fix pending l10n issues.
@@ -8,6 +15,12 @@
 
  -- David Prévot <taffit@debian.org>  Mon, 10 Sep 2012 17:33:43 -0400
 
+gnarwl (3.6.dfsg-6ubuntu1) oneiric; urgency=low
+
+  * Fix FTBFS with ld --as-needed (LP: #771112) 
+
+ -- Mitsuya Shibata <mty.shibata@gmail.com>  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 )
@@ -201,3 +214,4 @@
   * Initial release. (Closes: #170546)
 
  -- Cajus Pollmeier <cajus@debian.org>  Sun, 24 Nov 2002 10:18:39 +0100
+
diff -Nru gnarwl-3.6.dfsg/debian/control gnarwl-3.6.dfsg/debian/control
--- gnarwl-3.6.dfsg/debian/control	2010-08-06 20:44:28.000000000 +0530
+++ gnarwl-3.6.dfsg/debian/control	2012-09-16 08:38:17.000000000 +0530
@@ -1,7 +1,8 @@
 Source: gnarwl
 Section: mail
 Priority: optional
-Maintainer: Francesco Zanolin <francesco.zanolin@ingv.it>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Francesco Zanolin <francesco.zanolin@ingv.it>
 Uploaders: Alessandro De Zorzi <lota@nonlontano.it>
 Build-Depends: debhelper (>= 7), libldap2-dev, libgdbm-dev, po-debconf, quilt
 Standards-Version: 3.9.0
diff -Nru gnarwl-3.6.dfsg/debian/patches/fix-gcc4.6.patch gnarwl-3.6.dfsg/debian/patches/fix-gcc4.6.patch
--- gnarwl-3.6.dfsg/debian/patches/fix-gcc4.6.patch	1970-01-01 05:30:00.000000000 +0530
+++ gnarwl-3.6.dfsg/debian/patches/fix-gcc4.6.patch	2011-09-16 16:29:48.000000000 +0530
@@ -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)
diff -Nru gnarwl-3.6.dfsg/debian/patches/series gnarwl-3.6.dfsg/debian/patches/series
--- gnarwl-3.6.dfsg/debian/patches/series	2010-04-06 14:15:44.000000000 +0530
+++ gnarwl-3.6.dfsg/debian/patches/series	2012-09-16 08:38:17.000000000 +0530
@@ -1,3 +1,4 @@
 doc.patch
 dbaccess.patch
 data-makefile.patch
+fix-gcc4.6.patch
diff -Nru gnarwl-3.6.dfsg/debian/po/it.po gnarwl-3.6.dfsg/debian/po/it.po
--- gnarwl-3.6.dfsg/debian/po/it.po	2012-09-11 03:03:28.000000000 +0530
+++ gnarwl-3.6.dfsg/debian/po/it.po	2012-09-16 08:38:17.000000000 +0530
@@ -53,8 +53,8 @@
 "In order to access the LDAP server, please specify the base gnarwl should "
 "use for LDAP queries."
 msgstr ""
-"Per accedere al server LDAP è necessario specificare quale base usare per "
-"le interrogazioni di gnarwl."
+"Per accedere al server LDAP è necessario specificare quale base usare per le "
+"interrogazioni di gnarwl."
 
 #. Type: string
 #. Description