diff -u ndisgtk-0.8.1/debian/changelog ndisgtk-0.8.1/debian/changelog
--- ndisgtk-0.8.1/debian/changelog
+++ ndisgtk-0.8.1/debian/changelog
@@ -1,3 +1,13 @@
+ndisgtk (0.8.1-1ubuntu1) hardy; urgency=low
+
+  * Merge from debian unstable (LP: #191848), remaining changes:
+    - Use gksu/kdesu in .desktop files
+    - Do not depend on menu
+    - Adhere to DebianMaintainerField
+  * Fix the kdesu call (LP: #174018)
+
+ -- Julian Andres Klode <juliank@ubuntu.com>  Thu, 14 Feb 2008 15:53:06 +0100
+
 ndisgtk (0.8.1-1) unstable; urgency=low
 
   * New upstream releases 0.8.0 and 0.8.1
@@ -17,6 +27,13 @@
 
  -- Julian Andres Klode <jak@jak-linux.org>  Fri, 04 Jan 2008 23:04:11 +0100
 
+ndisgtk (0.7.2-1ubuntu1) gutsy; urgency=low
+
+  * Merged from Debian
+  * Using gksu and kdesu in .desktop files, dropped dependency on menu
+
+ -- Julian Andres Klode <jak@jak-linux.org>  Fri,  8 Jun 2007 12:39:36 +0200
+
 ndisgtk (0.7.2-1) unstable; urgency=low
 
   * New release
@@ -25,6 +42,12 @@
 
  -- Julian Andres Klode <jak@jak-linux.org>  Fri,  8 Jun 2007 12:36:06 +0200
 
+ndisgtk (0.7.1-3ubuntu1) gutsy; urgency=low
+
+  * Upload for Ubuntu
+
+ -- Julian Andres Klode <jak@jak-linux.org>  Sat,  2 Jun 2007 13:56:21 +0200
+
 ndisgtk (0.7.1-3) unstable; urgency=low
 
   * Build with Binary-arch instead of binary-indep
@@ -115,0 +139 @@
+
diff -u ndisgtk-0.8.1/debian/control ndisgtk-0.8.1/debian/control
--- ndisgtk-0.8.1/debian/control
+++ ndisgtk-0.8.1/debian/control
@@ -1,7 +1,8 @@
 Source: ndisgtk
 Section: net
 Priority: optional
-Maintainer: Julian Andres Klode <jak@jak-linux.org>
+Maintainer: Julian Andres Klode <juliank@ubuntu.com>
+XSBC-Original-Maintainer: Julian Andres Klode <jak@jak-linux.org>
 Build-Depends: debhelper (>= 5), gettext, intltool
 Standards-Version: 3.7.3
 Homepage: http://jak-linux.org/projects/ndisgtk/
@@ -11,7 +12,7 @@
 
 Package: ndisgtk
 Architecture: i386 amd64
-Depends: ${misc:Depends}, python (>= 2.4), ndiswrapper-utils-1.9, python-gtk2, python-glade2, menu
+Depends: ${misc:Depends}, python (>= 2.4), ndiswrapper-utils-1.9, python-gtk2, python-glade2
 Description: graphical frontend for ndiswrapper (installation of Windows WiFi drivers)
  ndisgtk is a GTK based frontend for ndiswrapper, allowing an easy way to
  install Windows wireless drivers.
only in patch2:
unchanged:
--- ndisgtk-0.8.1.orig/ndisgtk.desktop.in
+++ ndisgtk-0.8.1/ndisgtk.desktop.in
@@ -1,7 +1,7 @@
 [Desktop Entry]
 _Name=Windows Wireless Drivers
 _Comment=Ndiswrapper driver installation tool
-Exec=su-to-root -X -c /usr/sbin/ndisgtk
+Exec=gksu /usr/sbin/ndisgtk
 NotShowIn=KDE;
 Icon=ndisgtk.png
 Terminal=false
only in patch2:
unchanged:
--- ndisgtk-0.8.1.orig/ndisgtk-kde.desktop.in
+++ ndisgtk-0.8.1/ndisgtk-kde.desktop.in
@@ -1,7 +1,7 @@
 [Desktop Entry]
 _Name=Windows Wireless Drivers
 _Comment=Ndiswrapper driver installation tool
-Exec=su-to-root -X -c /usr/sbin/ndisgtk --kde
+Exec=kdesu /usr/sbin/ndisgtk -- --kde
 Icon=ndisgtk.png
 Terminal=false
 Type=Application