diff -u eikazo-0.5.2/debian/changelog eikazo-0.5.2/debian/changelog
--- eikazo-0.5.2/debian/changelog
+++ eikazo-0.5.2/debian/changelog
@@ -1,3 +1,11 @@
+eikazo (0.5.2-5ubuntu1) lucid; urgency=low
+
+  * Merge from debian testing, remaining changes:  (LP: #493794)
+    - debian/rules:  site-packages -> *-packages
+       http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=559945
+
+ -- Charlie Smotherman <cjsmo@ubuntu.com>  Mon, 07 Dec 2009 16:03:31 -0500
+
 eikazo (0.5.2-5) unstable; urgency=low
 
   * debian/rules:
@@ -7,6 +15,15 @@
 
  -- Julien BLACHE <jblache@debian.org>  Tue, 22 Sep 2009 19:19:33 +0200
 
+eikazo (0.5.2-4ubuntu1) jaunty; urgency=low
+
+  * python 2.6 transition (LP #340059)
+  * debian/rules:
+    + Added --install-layout=deb
+    + site-packages -> *-packages
+
+ -- Savvas Radevic <vicedar@gmail.com>  Mon, 09 Mar 2009 18:32:22 +0100
+
 eikazo (0.5.2-4) unstable; urgency=low
 
   * debian/control:
diff -u eikazo-0.5.2/debian/rules eikazo-0.5.2/debian/rules
--- eikazo-0.5.2/debian/rules
+++ eikazo-0.5.2/debian/rules
@@ -58,7 +58,7 @@
 
 	mv $(CURDIR)/debian/eikazo/usr/lib/python*/*-packages/Eikazo/mo/* \
 		$(CURDIR)/debian/eikazo/usr/share/locale/
-	rmdir $(CURDIR)/debian/eikazo/usr/lib/python*/site-packages/Eikazo/mo
+	rmdir $(CURDIR)/debian/eikazo/usr/lib/python*/*-packages/Eikazo/mo
 
 
 # Build architecture-independent files here.
diff -u eikazo-0.5.2/debian/control eikazo-0.5.2/debian/control
--- eikazo-0.5.2/debian/control
+++ eikazo-0.5.2/debian/control
@@ -1,7 +1,8 @@
 Source: eikazo
 Section: graphics
 Priority: optional
-Maintainer: Julien BLACHE <jblache@debian.org>
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Julien BLACHE <jblache@debian.org>
 Build-Depends: debhelper (>= 5), python-support (>= 0.4), python-dev, python-imaging
 Standards-Version: 3.8.3