diff -u drgeo-1.1.0/debian/control drgeo-1.1.0/debian/control
--- drgeo-1.1.0/debian/control
+++ drgeo-1.1.0/debian/control
@@ -1,7 +1,8 @@
 Source: drgeo
 Section: math
 Priority: extra
-Maintainer: Hilaire Fernandes <hilaire@ofset.org>
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Hilaire Fernandes <hilaire@ofset.org>
 Build-Depends: debhelper (>> 5.0.0), libglib2.0-dev, libgtk2.0-dev, libglade2-dev, libxml2-dev, guile-1.6-dev, libguile-ltdl-1, intltool, libxml-parser-perl, dpatch
 Standards-Version: 3.8.0.1
 
diff -u drgeo-1.1.0/debian/changelog drgeo-1.1.0/debian/changelog
--- drgeo-1.1.0/debian/changelog
+++ drgeo-1.1.0/debian/changelog
@@ -1,3 +1,11 @@
+drgeo (1.1.0-1.1ubuntu1) jaunty; urgency=low
+
+  * Merge from debian unstable, remaining changes (LP: #301136):
+    - Added icon in /usr/share/pixmaps/gnome-drgenius.xpm so that the menu 
+      entry has an icon. 
+
+ -- Nick Ellery <nick.ellery@ubuntu.com>  Sat, 22 Nov 2008 17:10:59 -0800
+
 drgeo (1.1.0-1.1) unstable; urgency=low
 
   * Non-maintainer upload.
@@ -24,6 +32,27 @@
 
  -- Francisco Garcia <franciscomanuel.garcia@hispalinux.es>  Sat, 01 Nov 2008 11:58:59 +0100
 
+drgeo (1.1.0-1ubuntu3) jaunty; urgency=low
+
+  * Fix drgeoFigure::preferedUndoLevel in drgeo_figure.cc (LP: #257797)
+  * Thanks to chpe (launchpad.net/~chpe) for this patch.
+
+ -- Pietro Battiston <toobaz@email.it>  Wed, 12 Nov 2008 22:55:46 +0100
+
+drgeo (1.1.0-1ubuntu2) intrepid; urgency=low
+
+  * Modify Maintainer value to match the DebianMaintainerField
+    specification. (LP: #230350)
+
+ -- Andrea Colangelo <warp10@ubuntu.com>  Wed, 21 May 2008 10:57:43 +0200
+
+drgeo (1.1.0-1ubuntu1) feisty; urgency=low
+
+  * Added icon in /usr/share/pixmaps/gnome-drgenius.xpm so that the menu entry has an icon. Closes Malone #49660
+  * Thanks to Vassilis Pandis for this patch.
+
+ -- Sarah Hobbs <hobbsee@ubuntu.com>  Fri, 22 Dec 2006 21:40:48 +1100
+
 drgeo (1.1.0-1) unstable; urgency=low
 
   * New upstream release. Closes #313694
diff -u drgeo-1.1.0/debian/rules drgeo-1.1.0/debian/rules
--- drgeo-1.1.0/debian/rules
+++ drgeo-1.1.0/debian/rules
@@ -42,6 +42,7 @@
 	dh_clean -k
 	dh_installdirs
 	$(MAKE) install prefix=`pwd`/debian/drgeo/usr
+	dh_link usr/share/drgeo/glade/drgeo.xpm usr/share/pixmaps/gnome-drgenius.xpm
 	rmdir -p --ignore-fail-on-non-empty `pwd`/debian/drgeo/usr/X11R6/include/X11/pixmaps/
 	install -m 644 `pwd`/debian/drgeo_32x32.xpm `pwd`/debian/drgeo/usr/share/pixmaps
 #	dh_movefiles