diff -u vym-1.10.0/debian/control vym-1.10.0/debian/control
--- vym-1.10.0/debian/control
+++ vym-1.10.0/debian/control
@@ -1,7 +1,8 @@
 Source: vym
 Section: kde
 Priority: optional
-Maintainer: Xavier Oswald <x.oswald@free.fr>
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Xavier Oswald <x.oswald@free.fr>
 Build-Depends: debhelper (>= 5), cdbs (>= 0.4.41), libqt4-dev, quilt
 Standards-Version: 3.8.0
 Homepage: http://www.insilmaril.de/vym/
diff -u vym-1.10.0/debian/vym.desktop vym-1.10.0/debian/vym.desktop
--- vym-1.10.0/debian/vym.desktop
+++ vym-1.10.0/debian/vym.desktop
@@ -1,5 +1,4 @@
 [Desktop Entry]
-Encoding=UTF-8
 Type=Application
 Exec=vym
 Name=VYM - View Your Mind
diff -u vym-1.10.0/debian/rules vym-1.10.0/debian/rules
--- vym-1.10.0/debian/rules
+++ vym-1.10.0/debian/rules
@@ -20,6 +20,7 @@
 
 common-install-arch::
 	install -m 644 debian/vym.desktop debian/vym/usr/share/applications/vym.desktop
+	install -m 0644 icons/vym.png $(CURDIR)/debian/vym/usr/share/pixmaps/
 	install -D -m 644 debian/x-vym.desktop debian/vym/usr/share/mimelnk/application/x-vym.desktop
 	mv $(CURDIR)/debian/vym/usr/share/doc/packages/vym/demos $(CURDIR)/debian/vym/usr/share/doc/vym
 	rm -f $(CURDIR)/debian/vym/usr/share/vym/scripts/vym2txt.sh
diff -u vym-1.10.0/debian/changelog vym-1.10.0/debian/changelog
--- vym-1.10.0/debian/changelog
+++ vym-1.10.0/debian/changelog
@@ -1,3 +1,17 @@
+vym (1.10.0-2ubuntu1) intrepid; urgency=low
+
+  * Merge from debian unstable, remaining changes (LP: #243125):
+    - debian/vym.desktop
+      + Make .desktop file freedesktop compliant.
+    - debian/dirs:
+      + Create /usr/share/pixmaps directory
+    - debian/rules:
+      + Install icon.
+    - debian/control:
+      + Update Maintainer field as per spec.
+
+ -- Nathan Handler <nathan.handler@gmail.com>  Wed, 25 Jun 2008 21:11:06 -0500
+
 vym (1.10.0-2) unstable; urgency=high
 
   * Add DM-Upload-Allowed flag
@@ -18,6 +32,20 @@
 
  -- Xavier Oswald <x.oswald@free.fr>  Mon, 16 Jun 2008 13:59:45 +0200
 
+vym (1.10.0-1.1ubuntu1) intrepid; urgency=low
+
+  * Merge from Debian unstable, remaining Ubuntu changes:
+    + debian/vym.desktop:
+      - Make .desktop file freedesktop compliant.
+    + debian/dirs:
+      - Create /usr/share/pixmaps directory
+    + debian/rules:
+      - Install icon.
+    + debian/control:
+      - Update Maintainer field as per spec.
+
+ -- Luca Falavigna <dktrkranz@ubuntu.com>  Sat, 07 Jun 2008 13:44:32 +0200
+
 vym (1.10.0-1.1) unstable; urgency=low
 
   * Non-maintainer upload.
@@ -26,6 +54,25 @@
 
  -- Marc 'HE' Brockschmidt <he@debian.org>  Sat, 05 Apr 2008 18:13:58 +0200
 
+vym (1.10.0-1ubuntu1) hardy; urgency=low
+
+  * Merge from Debian unstable (LP: #159313) remaining changes:
+    - debian/vym.desktop:
+      - removed Encoding field
+      - fixed Icon field
+      - removed Utility from Categories field
+      - fixed Comment field to be HIG compliant
+      - updated Name field
+      - removed unregistered Qt value from Categories field
+    - debian/control:
+      - updated maintainer field
+    - debian/dirs
+      - added default icon installation directory
+    - debian/rules:
+      - installed icon in the default directory
+
+ -- Mario Bonino <mariobonino@ubuntu-it.org>  Thu, 01 Nov 2007 18:03:43 +0100
+
 vym (1.10.0-1) unstable; urgency=low
 
   * New upstream release
@@ -37,6 +84,24 @@
 
  -- Xavier Oswald <x.oswald@free.fr>  Mon, 29 Oct 2007 10:24:40 +0100
 
+vym (1.8.1-5ubuntu1) gutsy; urgency=low
+
+  * debian/vym.desktop:
+    - removed Encoding field
+    - fixed Icon field 
+    - removed Utility from Categories field (LP: #128426)
+    - fixed Comment field to be HIG compliant
+    - updated Name field
+    - removed unregistered Qt value from Categories field
+  * debian/control:
+    - updated maintainer field
+  * debian/dirs
+    - added default icon installation directory
+  * debian/rules:
+    - installed icon in the default directory
+
+ -- Mario Bonino <mariobonino@ubuntu-it.org>  Thu, 04 Oct 2007 17:57:28 +0200
+
 vym (1.8.1-5) unstable; urgency=low
 
   * Make sure that the desktop icon also shows up in !kde
only in patch2:
unchanged:
--- vym-1.10.0.orig/debian/dirs
+++ vym-1.10.0/debian/dirs
@@ -2,3 +2,4 @@
 usr/share
 usr/share/vym
 usr/share/applications
+usr/share/pixmaps