diff -u wireshark-1.0.7/debian/changelog wireshark-1.0.7/debian/changelog
--- wireshark-1.0.7/debian/changelog
+++ wireshark-1.0.7/debian/changelog
@@ -1,3 +1,11 @@
+wireshark (1.0.7-1ubuntu1) jaunty; urgency=low
+
+  * Merge from Debian unstable, remaining changes (LP: #360661):
+    - replace gksu with menu in Recommends
+    - Add debian/README.source.
+
+ -- Hew McLachlan <hew@ubuntu.com>  Wed, 15 Apr 2009 22:17:14 +1000
+
 wireshark (1.0.7-1) unstable; urgency=low
 
   * New upstream release 1.0.7
diff -u wireshark-1.0.7/debian/control wireshark-1.0.7/debian/control
--- wireshark-1.0.7/debian/control
+++ wireshark-1.0.7/debian/control
@@ -1,7 +1,8 @@
 Source: wireshark
 Section: net
 Priority: optional
-Maintainer: Frederic Peters <fpeters@debian.org>
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Frederic Peters <fpeters@debian.org>
 Uploaders: Joost Yervante Damad <andete@debian.org>
 Standards-Version: 3.8.1
 Build-Depends: libgtk2.0-dev (>=2.4.0-0), libpcap0.8-dev, flex, libz-dev, dpatch, debhelper (>= 6), libtool, python, automake1.9, autoconf, autotools-dev, libadns1-dev, xsltproc, docbook-xsl (>= 1.64.1.0-0), libpcre3-dev, libcap2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], bison, libgnutls-dev, python-support (>= 0.3), portaudio19-dev, libkrb5-dev, liblua5.1-0-dev
@@ -26,7 +27,7 @@
 Package: wireshark
 Architecture: any
 Depends: ${shlibs:Depends}, wireshark-common (= ${binary:Version})
-Recommends: gksu
+Recommends: menu
 Replaces: ethereal (<< 1.0.0-3)
 Conflicts: ethereal (<< 1.0.0-3)
 Description: network traffic analyzer
only in patch2:
unchanged:
--- wireshark-1.0.7.orig/debian/README.source
+++ wireshark-1.0.7/debian/README.source
@@ -0,0 +1,34 @@
+This package uses dpatch in order to apply patches to the upstream 
+source.
+Patches are stored in debian/patches and their filenames usually end in 
+.dpatch .
+For further details, see the man pages for dpatch and dpatch-edit-patch.
+
+All commands described below should be run from the top directory of the 
+package source tree, unless otherwise stated.
+
+ * To generate the fully patched source, in a form ready for
+   editing, that would be built to create Debian packages, run: 
+
+     dpatch apply-all
+
+   Note: This should happen automatically when you run 
+   dpkg-source -x on a dpatch source package.
+
+ * To modify the source and save those modifications so that
+   they will be applied when building the package, pick a
+   suitably informative patch file name, for example
+   01_add_README.source_file.dpatch, and then run:
+
+     dpatch-edit-patch 01_add_README.source_file.dpatch
+
+   This will place you in a new shell in a temporary copy of the 
+   source tree.  Make your desired modifications to it, and then 
+   exit the shell to create the patch file containing them (this 
+   file will appear in debian/patches).
+
+ * To remove source modifications that are currently being
+   applied when building the package, run:
+
+     dpatch unapply-all
+