diff -u drscheme-4.0/debian/control drscheme-4.0/debian/control
--- drscheme-4.0/debian/control
+++ drscheme-4.0/debian/control
@@ -1,7 +1,8 @@
 Source: drscheme
 Section: interpreters
 Priority: optional
-Maintainer: Ari Pollak <ari@debian.org>
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Ari Pollak <ari@debian.org>
 Standards-Version: 3.8.0
 Build-Depends: cdbs, quilt, debhelper (>= 7.0.0), patchutils,
  libfreetype6-dev, libjpeg62-dev, libpng12-dev, libssl-dev, libxaw7-dev,
diff -u drscheme-4.0/debian/changelog drscheme-4.0/debian/changelog
--- drscheme-4.0/debian/changelog
+++ drscheme-4.0/debian/changelog
@@ -1,3 +1,13 @@
+drscheme (2:4.0-1ubuntu1) intrepid; urgency=low
+
+  * Merge from debian unstable, remaining changes (LP: #241060):
+    - Add .desktop file
+    - Modify Maintainer value to match the DebianMaintainerField 
+      specification.
+  * Remove "Encoding" from .desktop file to make it validate
+
+ -- Nathan Handler <nathan.handler@gmail.com>  Wed, 18 Jun 2008 14:52:16 -0500
+
 drscheme (2:4.0-1) unstable; urgency=medium
 
   * New upstream version
@@ -10,6 +20,13 @@
 
  -- Ari Pollak <ari@debian.org>  Sat, 14 Jun 2008 11:17:57 -0400
 
+drscheme (1:372-1ubuntu1) hardy; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - Add .desktop file
+
+ -- Stephan Hermann <sh@sourcecode.de>  Sat, 19 Jan 2008 13:30:23 +0100
+
 drscheme (1:372-1) unstable; urgency=low
 
   [ Artem Baguinski ]
@@ -23,6 +40,14 @@
 
  -- Ari Pollak <ari@debian.org>  Fri, 11 Jan 2008 11:31:50 -0500
 
+drscheme (1:371-1ubuntu1) hardy; urgency=low
+
+  * Merge from Debian unstable. Remaining Ubuntu changes:
+    - Add .desktop file
+    - Comply with Debian Maintainer spec
+
+ -- Albin Tonnerre <lutin@ubuntu.com>  Tue, 11 Dec 2007 22:58:16 +0100
+
 drscheme (1:371-1) unstable; urgency=low
 
   [ Artem Baguinski ]
@@ -45,6 +70,14 @@
 
  -- Ari Pollak <ari@debian.org>  Mon, 26 Nov 2007 11:00:53 -0500
 
+drscheme (1:360-1ubuntu1) gutsy; urgency=low
+
+  * Merge from Debian unstable. Remaining Ubuntu changes:
+    - Add .desktop file
+    - Comply with Debian Maintainer spec
+
+ -- Emmet Hikory <emmet.hikory@gmail.com>  Wed, 09 May 2007 09:53:57 +0900
+
 drscheme (1:360-1) unstable; urgency=low
 
   * Non-maintainer upload with permission of the semi-maintainer.
@@ -64,6 +97,14 @@
 
  -- Christine Spang <christine@debian.org>  Mon, 07 May 2007 16:38:30 -0400
 
+drscheme (1:352-10ubuntu1) feisty; urgency=low
+
+  * Merge from Debian unstable.
+  * Actually install the .desktop file. (LP: #42622)
+  * Comply with new Debian maintainer spec.
+
+ -- William Grant <william.grant@ubuntu.org.au>  Thu,  1 Mar 2007 16:44:19 +1100
+
 drscheme (1:352-10) unstable; urgency=low
 
   * Apply German po-debconf translation update from Matthis Julius
@@ -71,6 +112,12 @@
 
  -- Ari Pollak <ari@debian.org>  Wed, 24 Jan 2007 22:43:03 -0500
 
+drscheme (1:352-9ubuntu1) feisty; urgency=low
+
+  * Restored the .desktop file
+
+ -- Emmet Hikory <emmet.hikory@gmail.com>  Mon,  8 Jan 2007 08:20:57 +0900
+
 drscheme (1:352-9) unstable; urgency=low
 
   * Fix for Spanish debconf translation from Christian Perrier
diff -u drscheme-4.0/debian/drscheme.install drscheme-4.0/debian/drscheme.install
--- drscheme-4.0/debian/drscheme.install
+++ drscheme-4.0/debian/drscheme.install
@@ -1,0 +2 @@
+debian/drscheme.desktop		usr/share/applications/
diff -u drscheme-4.0/debian/drscheme.dirs drscheme-4.0/debian/drscheme.dirs
--- drscheme-4.0/debian/drscheme.dirs
+++ drscheme-4.0/debian/drscheme.dirs
@@ -9,0 +10 @@
+usr/share/applications
only in patch2:
unchanged:
--- drscheme-4.0.orig/debian/drscheme.desktop
+++ drscheme-4.0/debian/drscheme.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Type=Application
+Name=DrScheme
+GenericName=IDE for Scheme
+Comment=DrScheme is an interactive, integrated, graphical programming environment for the Scheme, MzScheme, and MrEd programming Languages.
+Icon=/usr/lib/plt/collects/icons/plt.xpm
+Exec=drscheme
+Terminal=false
+Categories=Development;IDE;