diff -Nru starplot-0.95.4/debian/changelog starplot-0.95.4/debian/changelog
--- starplot-0.95.4/debian/changelog	2008-01-12 22:56:59.000000000 +0100
+++ starplot-0.95.4/debian/changelog	2008-01-12 22:56:59.000000000 +0100
@@ -1,3 +1,14 @@
+starplot (0.95.4-2ubuntu1) hardy; urgency=low
+ 
+  * Merge from Debian unstable (LP: #182380), remaining Ubuntu changes:
+    - debian/rules:
+      + Install an icon and a .desktop file.
+    - debian/control:
+      + update Maintainer field as per spec.
+  * debian/starplot.desktop: fix warning for desktop-file-validate.
+
+ -- Paolo Naldini <hattory@ubuntu.com>  Sat, 12 Jan 2008 20:08:51 +0100
+
 starplot (0.95.4-2) unstable; urgency=low
 
   * Patched source code to fix compile error with GCC 4.3.
@@ -18,6 +29,19 @@
 
  -- Francisco Garcia <franciscomanuel.garcia@hispalinux.es>  Thu, 03 May 2007 00:07:53 +0200
 
+starplot (0.95.3-2ubuntu2) feisty; urgency=low
+
+  * Rebuild for ldbl128 change (powerpc, sparc).
+  * Set Ubuntu maintainer address.
+
+ -- Matthias Klose <doko@ubuntu.com>  Thu,  1 Mar 2007 22:56:10 +0000
+
+starplot (0.95.3-2ubuntu1) dapper; urgency=low
+
+  * Add desktop file from Phil Bull and install icon file.  (Closes Malone: #36441)
+
+ -- Barry deFreese <bddebian@comcast.net>  Mon, 10 Apr 2006 22:00:39 -0400
+
 starplot (0.95.3-2) unstable; urgency=low
 
   * Fixed an error with POSIX sh string equality "=" in 
diff -Nru /tmp/sfKCeByLI4/starplot-0.95.4/debian/control /tmp/TBKeuVDClV/starplot-0.95.4/debian/control
--- starplot-0.95.4/debian/control	2008-01-12 22:56:59.000000000 +0100
+++ starplot-0.95.4/debian/control	2008-01-12 22:56:59.000000000 +0100
@@ -1,7 +1,8 @@
 Source: starplot
 Section: science
 Priority: optional
-Maintainer: Francisco Garcia <franciscomanuel.garcia@hispalinux.es>
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Francisco Garcia <franciscomanuel.garcia@hispalinux.es>
 Uploaders: Javier Fernandez-Sanguino Pen~a <jfs@computer.org>, Kevin B. McCarty <kmccarty@debian.org>
 Build-Depends: debhelper (>> 5.0.0), libgtk2.0-dev
 Standards-Version: 3.7.2.2
diff -Nru /tmp/sfKCeByLI4/starplot-0.95.4/debian/rules /tmp/TBKeuVDClV/starplot-0.95.4/debian/rules
--- starplot-0.95.4/debian/rules	2008-01-12 22:56:59.000000000 +0100
+++ starplot-0.95.4/debian/rules	2008-01-12 22:56:59.000000000 +0100
@@ -89,6 +89,9 @@
 	dh_installmenu
 	dh_installman
 	dh_installchangelogs ChangeLog
+	dh_install src/gui/starplot.xpm usr/share/pixmaps
+	dh_install debian/starplot.desktop usr/share/applications
+	dh_desktop
 	dh_link
 	dh_strip
 	dh_compress
diff -Nru /tmp/sfKCeByLI4/starplot-0.95.4/debian/starplot.desktop /tmp/TBKeuVDClV/starplot-0.95.4/debian/starplot.desktop
--- starplot-0.95.4/debian/starplot.desktop	1970-01-01 01:00:00.000000000 +0100
+++ starplot-0.95.4/debian/starplot.desktop	2008-01-12 22:56:59.000000000 +0100
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Version=1.0
+Name=Starplot Star Chart Viewer
+GenericName=Star Chart Viewer
+Comment=View detailed star charts in 3D
+Type=Application
+Exec=starplot
+Icon=starplot
+Categories=Education;Science;Astronomy;