diff -u listen-0.5/debian/control listen-0.5/debian/control
--- listen-0.5/debian/control
+++ listen-0.5/debian/control
@@ -12,12 +12,12 @@
 Homepage: http://www.listen-project.org/
 Vcs-Svn: svn://svn.kirya.net/listen/trunk
 Vcs-Browser: https://svn.kirya.net/listing.php?repname=listen
-XS-DM-Upload-Allowed: yes
+DM-Upload-Allowed: yes
 
 Package: listen
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}, ${python:Depends}, gstreamer0.10-alsa, python-gtk2,
- python-pyogg (>= 1.3-1.1), python-pymad, python-dbus, python-gnome2, python-gnome2-extras,
+ python-ogg (>= 1.3-1.1), python-pymad, python-dbus, python-gnome2, python-gnome2-extras,
  gstreamer0.10-plugins-good, python-gst0.10 (>= 0.10.4-4), gstreamer0.10-plugins-base,
  python-pysqlite2, python-pyvorbis (>= 1.3), python-mutagen (>= 1.8), xulrunner-1.9,
  python-glade2, notification-daemon
diff -u listen-0.5/debian/copyright listen-0.5/debian/copyright
--- listen-0.5/debian/copyright
+++ listen-0.5/debian/copyright
@@ -69,7 +69,7 @@
         Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 	
 On Debian systems, the complete text of the GNU General Public License
-Version 2 can be found in "/usr/share/common-licenses/GPL" file.
+Version 2 can be found in "/usr/share/common-licenses/GPL-2" file.
 
 
 amazon.py:
diff -u listen-0.5/debian/rules listen-0.5/debian/rules
--- listen-0.5/debian/rules
+++ listen-0.5/debian/rules
@@ -17,6 +17,7 @@
 
 binary-install/listen::
 	dh_pycentral
+	dh_desktop
 
 clean::
 	rm -f listen.1
diff -u listen-0.5/debian/changelog listen-0.5/debian/changelog
--- listen-0.5/debian/changelog
+++ listen-0.5/debian/changelog
@@ -1,3 +1,28 @@
+listen (0.5-6ubuntu1) jaunty; urgency=low
+
+  * Merge from debian unstable, remaining changes (LP: #333673):
+    - Build-Depend on xulrunner-1.9-dev instead of iceweasel
+    - Remove libgail-dev Build-Depends
+    - Depend on python-gnome2-extras instead of python-eggtrayicon and
+      python-gtkmozembed
+    - Don't depend on python-elementtree
+    - Depend on xulrunner-1.9
+    - Move serpentine and gstreamer0.10-esd from Recommends to Suggests
+    - Clean up listen.desktop{,.in} files
+    - Add 11_fix_ff+rw.patch and 07_makefile_works.patch 
+
+ -- Nathan Handler <nhandler@ubuntu.com>  Tue, 24 Feb 2009 03:48:00 +0000
+
+listen (0.5-6) unstable; urgency=low
+
+  * Fixed python-ogg dependency - python-pyogg transition
+    (Closes: #494894)
+  * Fixed DM-Upload-Allowed field (removed XS- prefix)
+  * Fixed copyright information to refer to GPL-2 version
+  * Added call to dh_desktop to register listen.desktop
+
+ -- Julien Valroff <julien@kirya.net>  Thu, 19 Feb 2009 07:01:30 +0100
+
 listen (0.5-5ubuntu2) intrepid; urgency=low
 
   * debian/patches/11_fix_ff+rw.patch: