diff -u extremetuxracer-0.4/debian/rules extremetuxracer-0.4/debian/rules
--- extremetuxracer-0.4/debian/rules
+++ extremetuxracer-0.4/debian/rules
@@ -74,8 +74,8 @@
 	## extremetuxracer-gimp-dev
 	##
 	# the scripts and paletes for the gimp-dev package
-	#dh_install -pextremetuxracer-gimp-dev contrib/palettes/* /usr/share/gimp/2.0/palettes/
-	#dh_install -pextremetuxracer-gimp-dev contrib/script-fu/* /usr/share/gimp/2.0/scripts/
+	dh_install -pextremetuxracer-gimp-dev contrib/palettes/* /usr/share/gimp/2.0/palettes/
+	dh_install -pextremetuxracer-gimp-dev contrib/script-fu/* /usr/share/gimp/2.0/scripts/
 	##
 	## extremetuxracer-data
 	##
@@ -114,6 +114,7 @@
 	dh_installmenu
 	dh_desktop
 	dh_icons
+	dh_link usr/share/games/extremetuxracer usr/share/games/etracer # needed for hardy->intrepid transition
 	dh_strip --dbg-package=extremetuxracer-dbg
 	dh_compress
 	dh_fixperms
diff -u extremetuxracer-0.4/debian/extremetuxracer.6.sgml extremetuxracer-0.4/debian/extremetuxracer.6.sgml
--- extremetuxracer-0.4/debian/extremetuxracer.6.sgml
+++ extremetuxracer-0.4/debian/extremetuxracer.6.sgml
@@ -145,8 +145,8 @@
   <!--refsect1>
     <title>SEE ALSO</title>
 
-    <para>The programs are documented fully by <citetitle>READMA</citetitle> available via the
-      <file>/usr/share/doc/planetpenguin-racer/README</para>
+    <para>The programs are documented fully by <citetitle>README</citetitle> available via the
+      <file>/usr/share/doc/extremetuxracer/README</para>
   </refsect1-->
   <refsect1>
     <title>AUTHOR</title>
diff -u extremetuxracer-0.4/debian/extremetuxracer.menu extremetuxracer-0.4/debian/extremetuxracer.menu
--- extremetuxracer-0.4/debian/extremetuxracer.menu
+++ extremetuxracer-0.4/debian/extremetuxracer.menu
@@ -3,5 +3,5 @@
 	section="Games/Action" \
 	title="etracer" \
-	longtitle="Extreme Tux racer" \
+	longtitle="Extreme Tux Racer" \
 	command="/usr/games/etracer" \
 	icon="/usr/share/pixmaps/etracer.xpm"
diff -u extremetuxracer-0.4/debian/control extremetuxracer-0.4/debian/control
--- extremetuxracer-0.4/debian/control
+++ extremetuxracer-0.4/debian/control
@@ -2,12 +2,13 @@
 Section: games
 Priority: optional
 Homepage: http://www.extremetuxracer.com/
-Maintainer: Debian Games Team <pkg-games-devel@lists.alioth.debian.org>
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian Games Team <pkg-games-devel@lists.alioth.debian.org>
 Uploaders: Alexander Reichle-Schmehl <tolimar@debian.org>, Gonéri Le Bouder <goneri@rulezlan.org>
-Build-Depends: debhelper (>= 5.0.51~), tcl8.5-dev, libxmu-dev, libpng12-dev, libsdl1.2-dev, libsdl-mixer1.2-dev, libfreetype6-dev, docbook-to-man, sharutils, libgl1-mesa-dev, libxi-dev, quilt, pkg-config, autotools-dev
+Build-Depends: debhelper (>= 5.0.51~), tcl8.5-dev, libxmu-dev, libpng12-dev, libsdl-mixer1.2-dev, libfreetype6-dev, docbook-to-man, sharutils, libgl1-mesa-dev, libxi-dev, quilt, pkg-config, autotools-dev
 Standards-Version: 3.8.1
-Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/extremetuxracer/
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/extremetuxracer/?op=log
+Vcs-Bzr: lp:~smarter/etracer/ubuntu
+Vcs-Browser: http://bazaar.launchpad.net/~smarter/etracer/ubuntu/files
 
 Package: extremetuxracer
 Architecture: any
@@ -66,16 +67,18 @@
 
-#Package: extremetuxracer-gimp-dev
-#Architecture: all
-#Depends: gimp
-#Recommends: extremetuxracer-racer
-#Description: plugins for GIMP for easy development of etracer courses
-# The courses of Extreme Tux Racer, or etracer as it is called for
-# short, are quite easy to create.  They consist of three graphic files
-# and one textfile.
-# .
-# This package contains some scripts and colour palettes, which make it
-# easy to create the graphic files of etracer courses with the GIMP.
-# .
-# Details on how to create courses can be found at
-# http://www.extremetuxracer.com/wiki/index.php?title=Creating_Courses
+Package: extremetuxracer-gimp-dev
+Architecture: all
+Depends: gimp
+Conflicts: planetpenguin-racer-gimp-dev
+Replaces: planetpenguin-racer-gimp-dev
+Recommends: extremetuxracer
+Description: plugins for GIMP for easy development of ppracer courses
+ The courses of Extreme Tux Racer, or etracer as it is called for
+ short, are quite easy to create.  They consist of three graphic files
+ and one textfile.
+ .
+ This package contains some scripts and colour palettes, which make it
+ easy to create the graphic files of etracer courses with the GIMP.
+ .
+ Details on how to create courses can be found at
+ http://www.extremetuxracer.com/wiki/index.php?title=Creating_Courses
 
diff -u extremetuxracer-0.4/debian/extremetuxracer.6.de.sgml extremetuxracer-0.4/debian/extremetuxracer.6.de.sgml
--- extremetuxracer-0.4/debian/extremetuxracer.6.de.sgml
+++ extremetuxracer-0.4/debian/extremetuxracer.6.de.sgml
@@ -92,8 +92,8 @@
   <!--refsect1>
     <title>SEE ALSO</title>
 
-    <para>The programs are documented fully by <citetitle>READMA</citetitle> available via the
-      <file>/usr/share/doc/planetpenguin-racer/README</para>
+    <para>The programs are documented fully by <citetitle>README</citetitle> available via the
+      <file>/usr/share/doc/extremetuxracer/README</para>
   </refsect1-->
   <refsect1>
     <title>AUTHOR</title>
diff -u extremetuxracer-0.4/debian/copyright extremetuxracer-0.4/debian/copyright
--- extremetuxracer-0.4/debian/copyright
+++ extremetuxracer-0.4/debian/copyright
@@ -58,12 +58,9 @@
-On Debian systems, the complete text of the GNU General
-Public License can be found in '/usr/share/common-licenses/GPL-2'.
-
-src/quadtree.cpp license, by Thatcher Ulrich:
-
+    src/quadtree.cpp license, by Thatcher Ulrich <tu@tulrich.com> :
     This code may be freely modified and redistributed.  I make no
     warrantees about it; use at your own risk.  If you do incorporate
     this code into a project, I'd appreciate a mention in the credits.
 
 The Debian packaging is Copyright 2005-2008 by Alexander Schmehl
 <tolimar@debian.org> and published under the Terms of the GNU General
-Public Licence Version 2 or (at your option) any later version, see above.
+Public Licence Version 2 or (at your option) any later version
+see '/usr/share/common-licenses/GPL-2'.
diff -u extremetuxracer-0.4/debian/changelog extremetuxracer-0.4/debian/changelog
--- extremetuxracer-0.4/debian/changelog
+++ extremetuxracer-0.4/debian/changelog
@@ -1,3 +1,21 @@
+extremetuxracer (0.4-2ubuntu1) karmic; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - debian/control:
+      + don't build-depend on libsdl-mixer1.2-dev.
+      + use Launchpad Vcs-Bzr/Browser
+      + add extremetuxracer-gimp-dev binary package.
+    - debian/rules:
+      + added a link from usr/share/games/extremetuxracer to 
+      usr/share/games/etracer for upgrade from hardy to intrepid
+      + install extremetuxracer-gimp-dev
+    - debian/extremetuxracer.6.sgml & extremetuxracer.6.de.sgml 
+      + change link to documentation to extremetuxracer
+    - debian/extremetuxracer.menu:
+      + capitalized "Racer" in the longtitle field "Extreme Tux Racer"
+
+ -- Nick Ellery <nick.ellery@ubuntu.com>  Sat, 16 May 2009 23:15:26 -0700
+
 extremetuxracer (0.4-2) unstable; urgency=low
 
   [ Alexander Schmehl ]
@@ -31,5 +49,54 @@
+extremetuxracer (0.4-1ubuntu1) intrepid; urgency=low
+
+  * Merged from Debian, remaining changes:
+    - debian/control:
+      + removed implicit build-deps on libglu1-xorg-dev and libsdl1.2-dev
+      + replaced "planetpenguin-racer" by "extremetuxracer"
+        in the Description fields
+      + added back extremetuxracer-gimp-dev
+    - debian/copyright:
+      + replaced "Upstream Author" by "Upstream Authors"
+      + added more complete list of authors
+      + changed the Copyright field to a License field, moved src/quadtree.cpp
+        license there and changed the GPLv2 text to the standard Debian text
+      + added a real Copyright field
+      + added a link to the complete GPLv2 text
+    - debian/patches/20_german_translation.diff and 30_G++4.1-fix.diff:
+      + removed, applied upstream
+    - debian/patches/fix_cups_cheat.diff:
+      + removed, fixed upstream
+    - debian/extremetuxracer.desktop:
+      + removed extension from Icon field to comply with desktop file policy
+  * debian/extremetuxracer.6[.de].sgml:
+    - replaced READMA by README and planetpenguin-racer by extremetuxracer
+  * removed debian/etracer[.de].6, they are generated by debian/rules
+  * debian/control:
+    - added Vcs-* fields
+    - added Conflicts/Replaces on planetpenguin-racer-gimp-dev for
+      extremetuxracer-gimp-dev (LP: #237830)
+    - bumped Standards-Version to 3.8.0
+  * debian/planetpenguin-racer-dbg:
+    - removed
+  * debian/rules:
+    - added a link from usr/share/games/extremetuxracer
+      to usr/share/games/etracer
+      for upgrade from hardy to intrepid
+    - fixed lintian warning "debhelper-script-needs-versioned-build-depends
+      dh_icons (>= 5.0.51~)"
+  * debian/extremetuxracer.menu:
+    - capitalized "Racer" in the longtitle field "Extreme Tux Racer"
+
+ -- Guillaume Martres <smarter@ubuntu.com>  Sun, 25 May 2008 22:56:48 +0200
+
 extremetuxracer (0.4-1) unstable; urgency=low
 
   * Initial release (Closes: #465660, #461911, #435288)
 
  -- Alexander Schmehl <tolimar@debian.org>  Wed, 13 Feb 2008 18:47:03 +0100
+
+extremetuxracer (0.4-0ubuntu1) hardy; urgency=low
+
+  * Initial release (LP: #53299)
+
+ -- Guillaume Martres <smarter@ubuntu.com>  Sun, 03 Feb 2008 19:06:30 +0100
+