diff -u gparted-0.4.5/debian/control gparted-0.4.5/debian/control
--- gparted-0.4.5/debian/control
+++ gparted-0.4.5/debian/control
@@ -1,7 +1,8 @@
 Source: gparted
 Section: gnome
 Priority: optional
-Maintainer: Anibal Monsalve Salazar <anibal@debian.org>
+Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Anibal Monsalve Salazar <anibal@debian.org>
 Uploaders: Alan Baghumian <alan@technotux.org>, Otavio Salvador <otavio@debian.org>
 Build-Depends: quilt,
                debhelper (>= 7),
@@ -21,7 +22,8 @@
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-         hal
+         hal,
+         gksu
 Recommends: yelp, kpartx, dmraid, dmsetup
 Suggests: xfsprogs, reiserfsprogs, reiser4progs, jfsutils, ntfsprogs, dosfstools
 Description: GNOME partition editor
diff -u gparted-0.4.5/debian/copyright gparted-0.4.5/debian/copyright
--- gparted-0.4.5/debian/copyright
+++ gparted-0.4.5/debian/copyright
@@ -27,0 +28 @@
+
diff -u gparted-0.4.5/debian/changelog gparted-0.4.5/debian/changelog
--- gparted-0.4.5/debian/changelog
+++ gparted-0.4.5/debian/changelog
@@ -1,3 +1,15 @@
+gparted (0.4.5-1ubuntu1) karmic; urgency=low
+
+  * Merge from debian unstable (LP: #383628), remaining changes:
+    - Go back to using gksu rather than su-to-root (since menu isn't
+      in Ubuntu main)
+      + debian/control
+      + debian/patches/01_fix-desktop.patch
+  * Mention application name in the menu entry (LP: #383612)
+    - debian/patches/01_fix-desktop.patch
+
+ -- Felix Geyer <debfx-pkg@fobos.de>  Thu, 04 Jun 2009 16:58:06 +0200
+
 gparted (0.4.5-1) unstable; urgency=low
 
   * New upstream release 
@@ -349,0 +362 @@
+
diff -u gparted-0.4.5/debian/patches/01_fix-desktop.patch gparted-0.4.5/debian/patches/01_fix-desktop.patch
--- gparted-0.4.5/debian/patches/01_fix-desktop.patch
+++ gparted-0.4.5/debian/patches/01_fix-desktop.patch
@@ -1,13 +1,13 @@
-diff -urN gparted-0.4.1/gparted.desktop.in.in gparted-0.4.1.new/gparted.desktop.in.in
---- gparted-0.4.1/gparted.desktop.in.in	2008-11-29 09:55:40.000000000 -0800
-+++ gparted-0.4.1.new/gparted.desktop.in.in	2008-12-15 20:16:47.000000000 -0800
-@@ -1,9 +1,10 @@
+--- a/gparted.desktop.in.in
++++ b/gparted.desktop.in.in
+@@ -1,9 +1,11 @@
  [Desktop Entry]
 -_Name=GParted Partition Editor
-+_Name=Partition Editor
++_Name=GParted
++GenericName=Partition Editor
  _Comment=Create, reorganize, and delete partitions
 -Exec=@gksuprog@ @installdir@/gparted %f
-+Exec=su-to-root -X -c /usr/sbin/gparted %f
++Exec=gksu /usr/sbin/gparted
  Icon=gparted
  Terminal=false
  Type=Application