diff -u pycha-0.5.2/debian/changelog pycha-0.5.2/debian/changelog
--- pycha-0.5.2/debian/changelog
+++ pycha-0.5.2/debian/changelog
@@ -1,3 +1,11 @@
+pycha (0.5.2-1ubuntu1) lucid; urgency=low
+
+  * Merge with Debian (LP: #521317).
+  * debian/runtests.py:
+    - Fix FTBFS with python2.6 as default Python version.
+
+ -- Leo Iannacone <l3on@ubuntu.com>  Sat, 13 Feb 2010 10:55:50 +0100
+
 pycha (0.5.2-1) unstable; urgency=low
 
   * New upstream release
@@ -6,6 +14,12 @@
 
  -- Vincent Bernat <bernat@debian.org>  Sun, 27 Sep 2009 15:14:27 +0200
 
+pycha (0.5.0-1ubuntu1) karmic; urgency=low
+
+  * Disable tests to prevent FTBFS.
+
+ -- Alessio Treglia <quadrispro@ubuntu.com>  Wed, 27 May 2009 08:56:19 +0200
+
 pycha (0.5.0-1) unstable; urgency=low
 
   * New upstream version
diff -u pycha-0.5.2/debian/control pycha-0.5.2/debian/control
--- pycha-0.5.2/debian/control
+++ pycha-0.5.2/debian/control
@@ -1,7 +1,8 @@
 Source: pycha
 Section: python
 Priority: optional
-Maintainer: Vincent Bernat <bernat@debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Vincent Bernat <bernat@debian.org>
 Uploaders: Debian Python Modules Team <python-modules-team@lists.alioth.debian.org>
 Standards-Version: 3.8.3
 Build-Depends: debhelper (>= 5.0.37.2), cdbs (>= 0.4.43), python-all-dev (>= 2.3.5-11), python-support (>= 0.6.4), python-setuptools (>= 0.6b3)
diff -u pycha-0.5.2/debian/runtests.py pycha-0.5.2/debian/runtests.py
--- pycha-0.5.2/debian/runtests.py
+++ pycha-0.5.2/debian/runtests.py
@@ -8,7 +8,7 @@
 
 _path = sys.path[:]
 sys.path[:] = []
-addsitedir(join(root, site_packages[1:]))
+addsitedir(join(root, site_packages[1:].replace("dist-packages", "site-packages")))
 sys.path.extend(_path)
 sys.path.append("tests")