diff -u gsambad-0.1.8/debian/control gsambad-0.1.8/debian/control
--- gsambad-0.1.8/debian/control
+++ gsambad-0.1.8/debian/control
@@ -1,7 +1,8 @@
 Source: gsambad
 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 gsambad-0.1.8/debian/patches/03-desktop.dpatch gsambad-0.1.8/debian/patches/03-desktop.dpatch
--- gsambad-0.1.8/debian/patches/03-desktop.dpatch
+++ gsambad-0.1.8/debian/patches/03-desktop.dpatch
@@ -11,11 +11,18 @@
-@@ -15,8 +15,8 @@
+@@ -1,5 +1,4 @@
+ [Desktop Entry]
+-Encoding=UTF-8
+ Name=GSAMBAD
+ Name[de]=GSAMBAD
+ Name[es]=GSAMBAD
+@@ -15,8 +14,8 @@
  Name[zh_TW]=GSAMBAD
  GenericName=GSAMBAD
  Comment=SAMBA file, print and domain server administration
 -Exec=gsambad
-+Exec=su-to-root -X -c gsambad
- Icon=gsambad.png
+-Icon=gsambad.png
++Exec=gksu gsambad
++Icon=gsambad
  Terminal=false
  Type=Application
 -Categories=Application;Network;X-Red-Hat-ServerConfig;X-Red-Hat-Base;
-+Categories=Application;GTK;System;
++Categories=GTK;System;
diff -u gsambad-0.1.8/debian/changelog gsambad-0.1.8/debian/changelog
--- gsambad-0.1.8/debian/changelog
+++ gsambad-0.1.8/debian/changelog
@@ -1,3 +1,18 @@
+gsambad (0.1.8-1ubuntu1) hardy; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - debian/patches/03-desktop.dpatch:
+      + Remove obsolete fields and clean-up Categories.
+      + Use gksu for root access when launching app instead of
+        su-to-root.
+      + Leave icon extension out of icon field per specs.
+    - debian/control:
+      + Set Maintainer fields by specs.
+    - Dropped 04-cve-2007-2838: Applied upstream.
+    - Closes (LP: #173155)
+
+ -- Kenneth Drake <kd.drake@ou.edu>  Wed, 21 Nov 2007 18:49:29 +0000
+
 gsambad (0.1.8-1) unstable; urgency=low
 
   * New upstream release.
@@ -10,6 +25,22 @@
 
  -- Daniel Baumann <daniel@debian.org>  Wed,  8 Jul 2007 00:02:00 +0200
 
+gsambad (0.1.6-2ubuntu2) gutsy; urgency=low
+
+  * Fixed .desktop exec field (LP: #106112)
+
+ -- Saïvann Carignan (evolution) <mertiki@gmail.com>  Tue, 25 Sep 2007 10:32:56 -0400
+
+gsambad (0.1.6-2ubuntu1) gutsy; urgency=low
+
+  * debian/patches/04-cve-2007-2838.dpatch:
+    This is an improved version of the debian patch, use it instead of
+    04-tempfile.dpatch (LP: #124629)
+  * debian/control: Modify Maintainer value to match
+    DebianMaintainerField spec.
+
+ -- Michael Bienia <geser@ubuntu.com>  Tue, 17 Jul 2007 18:59:24 +0200
+
 gsambad (0.1.6-2) unstable; urgency=high
 
   [ Steve Kemp ]
@@ -94,0 +126 @@
+