diff -u snappea-3.0d3/debian/rules snappea-3.0d3/debian/rules
--- snappea-3.0d3/debian/rules
+++ snappea-3.0d3/debian/rules
@@ -48,6 +48,10 @@
 	$(INSTALL_DIR) $(pixmaps)
 	$(INSTALL_FILE) debian/snappea.xpm $(pixmaps)
 
+	# Install desktop file
+	install -d debian/snappea/usr/share/applications
+	install -m644 debian/snappea.desktop debian/snappea/usr/share/applications
+
 # Build architecture-independent files here.
 binary-indep: build install
 # We have nothing to do by default.
diff -u snappea-3.0d3/debian/changelog snappea-3.0d3/debian/changelog
--- snappea-3.0d3/debian/changelog
+++ snappea-3.0d3/debian/changelog
@@ -1,3 +1,13 @@
+snappea (3.0d3-20.1ubuntu1) natty; urgency=low
+
+  * Merge from debian unstable (LP: #688263). Remaining changes:
+    - Added .desktop.
+  * Dropped change:
+    - debian/rules: Remove dh_desktop as it is deprecated
+  * Update .desktop file for latest desktop-file-validate
+
+ -- Angel Abad <angelabad@ubuntu.com>  Thu, 09 Dec 2010 22:15:58 +0100
+
 snappea (3.0d3-20.1) unstable; urgency=low
 
   * Non-maintainer upload.
@@ -7,6 +17,14 @@
 
  -- Ansgar Burchardt <ansgar@debian.org>  Thu, 02 Dec 2010 13:15:42 +0100
 
+snappea (3.0d3-20ubuntu1) hardy; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - Added .desktop.
+  * Make .desktop validate and be more HIG-compliant.
+
+ -- William Grant <william.grant@ubuntu.org.au>  Tue, 30 Oct 2007 11:25:21 +1100
+
 snappea (3.0d3-20) unstable; urgency=low
 
   * Updated for new debian menu layout.  Menu entries have moved from
@@ -18,6 +36,13 @@
 
  -- Ben Burton <bab@debian.org>  Sat, 13 Oct 2007 07:46:20 +1000
 
+snappea (3.0d3-19ubuntu1) feisty; urgency=low
+
+  * Merge from debian unstable. Remaining changes:
+    - Added .desktop.
+
+ -- William Alexander Grant <william.grant@ubuntu.com.au>  Sat,  9 Dec 2006 08:43:12 +1100
+
 snappea (3.0d3-19) unstable; urgency=low
 
   * Updated to new python policy (finally!), using python-central
@@ -29,6 +54,18 @@
 
  -- Ben Burton <bab@debian.org>  Sun, 10 Sep 2006 09:09:20 +1000
 
+snappea (3.0d3-18ubuntu2) edgy; urgency=low
+
+  * Added .desktop. Closes Ubuntu #49665
+
+ -- Vassilis Pandis <pandisv@yahoo.co.uk>  Tue,  8 Aug 2006 20:43:31 +0300
+
+snappea (3.0d3-18ubuntu1) dapper; urgency=low
+
+  * Resynchronise with Debian.
+
+ -- Daniel T Chen <crimsun@fungus.sh.nu>  Tue, 08 Nov 2005 10:25:14 +0000
+
 snappea (3.0d3-18) unstable; urgency=low
 
   * Updated copyright file to include more comprehensive statements
@@ -43,6 +80,25 @@
 
  -- Ben Burton <bab@debian.org>  Tue, 25 Jan 2005 18:30:59 +1100
 
+snappea (3.0d3-17ubuntu3) hoary; urgency=low
+
+  * Fix python include directory.
+
+ -- Matthias Klose <doko@ubuntu.com>  Mon,  4 Apr 2005 12:48:03 +0200
+
+snappea (3.0d3-17ubuntu2) hoary; urgency=low
+
+  * Correct python dependencies.
+
+ -- Matthias Klose <doko@ubuntu.com>  Sun,  3 Apr 2005 20:39:53 +0200
+
+snappea (3.0d3-17ubuntu1) hoary; urgency=low
+
+  * Rebuild for python2.4
+  * Standards Version 3.6.1.1 
+
+ -- Charles Majola <charles@ubuntu.com>  Fri, 18 Feb 2005 15:13:09 +0200
+
 snappea (3.0d3-17) unstable; urgency=low
 
   * Switched from python2.1 to default version of python (in this case 2.3).
diff -u snappea-3.0d3/debian/control snappea-3.0d3/debian/control
--- snappea-3.0d3/debian/control
+++ snappea-3.0d3/debian/control
@@ -1,7 +1,8 @@
 Source: snappea
 Section: math
 Priority: extra
-Maintainer: Ben Burton <bab@debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+xSBC-Original-Maintainer: Ben Burton <bab@debian.org>
 Build-Depends: debhelper (>= 5.0.37.2), python, python-dev, python-central (>= 0.5)
 Standards-Version: 3.7.2.1
 XS-Python-Version: current
only in patch2:
unchanged:
--- snappea-3.0d3.orig/debian/snappea.desktop
+++ snappea-3.0d3/debian/snappea.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=Snappea 3-Manifold Creator
+GenericName=3-Manifold Creator
+Comment=Create and study hyperbolic 3-manifolds
+Exec=snappea
+Icon=snappea
+Type=Application
+Categories=Math;Education;Science;