diff -u gproftpd-8.3.2/debian/control gproftpd-8.3.2/debian/control
--- gproftpd-8.3.2/debian/control
+++ gproftpd-8.3.2/debian/control
@@ -1,7 +1,8 @@
 Source: gproftpd
 Section: admin
 Priority: optional
-Maintainer: Daniel Baumann <daniel@debian.org>
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Daniel Baumann <daniel@debian.org>
 Build-Depends: debhelper (>= 5), dpatch, autotools-dev, libgtk2.0-dev
 Standards-Version: 3.7.2
 
diff -u gproftpd-8.3.2/debian/patches/03-desktop.dpatch gproftpd-8.3.2/debian/patches/03-desktop.dpatch
--- gproftpd-8.3.2/debian/patches/03-desktop.dpatch
+++ gproftpd-8.3.2/debian/patches/03-desktop.dpatch
@@ -16,6 +16,6 @@
-+Exec=su-to-root -X -c gproftpd
++Exec=gksu gproftpd
  Icon=gproftpd.png
  Terminal=false
  Type=Application
 -Categories=Application;Network;X-Red-Hat-ServerConfig;X-Red-Hat-Base;
-+Categories=Application;GTK;System;
++Categories=Application;X-GNOME-NetworkSettings;Settings;System;
diff -u gproftpd-8.3.2/debian/changelog gproftpd-8.3.2/debian/changelog
--- gproftpd-8.3.2/debian/changelog
+++ gproftpd-8.3.2/debian/changelog
@@ -1,3 +1,13 @@
+gproftpd (8.3.2-1ubuntu1) hardy; urgency=low
+
+  * Merge from debian unstable (LP: #175979), remaining changes:
+    + debian/patches/03-desktop.dpatch:
+      - use gksu and move the item to administration menu.
+    + debian/control:
+      - Modified Maintainer value to match Debian-Maintainer-Field Spec.
+
+ -- Miguel Ruiz <mruiz@ubuntu.com>  Wed, 12 Dec 2007 18:13:52 -0300
+
 gproftpd (8.3.2-1) unstable; urgency=medium
 
   * New upstream release.
@@ -5,6 +15,21 @@
 
  -- Daniel Baumann <daniel@debian.org>  Sun,  1 Jul 2007 20:58:00 +0200
 
+gproftpd (8.3.2-0ubuntu1) gutsy; urgency=low
+
+  * New upstream version.
+
+ -- Miguel Ruiz <mruiz@ubuntu.com>  Tue, 26 Jun 2007 03:05:04 +1000
+
+gproftpd (8.3.1-3ubuntu1) gutsy; urgency=low
+
+  * Merge from Debian unstable. Remaining Ubuntu changes:
+    + debian/patches/03-desktop.dpatch:
+      - use gksu and move the item to administration menu (Ubuntu: #71759)
+  * Modify Maintainer value to match Debian-Maintainer-Field Spec
+
+ -- Stephan Hermann <sh@sourcecode.de>  Sat,  5 May 2007 13:22:56 +0200
+
 gproftpd (8.3.1-3) unstable; urgency=medium
 
   * Updated icon fix.
@@ -42,6 +67,13 @@
 
  -- Daniel Baumann <daniel@debian.org>  Thu, 28 Dec 2006 01:53:00 +0100
 
+gproftpd (8.2.8-2ubuntu1) feisty; urgency=low
+
+  * debian/patches/03-desktop.dpatch:
+    - use gksu and move the item to administration menu (Ubuntu: #71759)
+
+ -- Sebastien Bacher <seb128@canonical.com>  Tue, 20 Mar 2007 13:42:04 +0100
+
 gproftpd (8.2.8-2) unstable; urgency=medium
 
   * Adjusting the proftpd.conf location (Closes: #400351).
@@ -95,0 +128 @@
+
diff -u gproftpd-8.3.2/config.sub gproftpd-8.3.2/config.sub
--- gproftpd-8.3.2/config.sub
+++ gproftpd-8.3.2/config.sub
@@ -4,7 +4,7 @@
 #   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
 #   Inc.
 
-timestamp='2007-01-18'
+timestamp='2007-06-28'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -475,8 +475,8 @@
 		basic_machine=craynv-cray
 		os=-unicosmp
 		;;
-	cr16c)
-		basic_machine=cr16c-unknown
+	cr16)
+		basic_machine=cr16-unknown
 		os=-elf
 		;;
 	crds | unos)
@@ -683,6 +683,10 @@
 		basic_machine=i386-pc
 		os=-mingw32
 		;;
+	mingw32ce)
+		basic_machine=arm-unknown
+		os=-mingw32ce
+		;;
 	miniframe)
 		basic_machine=m68000-convergent
 		;;
diff -u gproftpd-8.3.2/config.guess gproftpd-8.3.2/config.guess
--- gproftpd-8.3.2/config.guess
+++ gproftpd-8.3.2/config.guess
@@ -4,7 +4,7 @@
 #   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
 #   Inc.
 
-timestamp='2007-03-06'
+timestamp='2007-07-22'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -330,7 +330,7 @@
     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
 	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit ;;
-    i86pc:SunOS:5.*:*)
+    i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
 	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit ;;
     sun4*:SunOS:6*:*)
@@ -793,7 +793,7 @@
 	exit ;;
     *:Interix*:[3456]*)
     	case ${UNAME_MACHINE} in
-	    x86) 
+	    x86)
 		echo i586-pc-interix${UNAME_RELEASE}
 		exit ;;
 	    EM64T | authenticamd)