diff -u python-adodb-2.10/debian/changelog python-adodb-2.10/debian/changelog
--- python-adodb-2.10/debian/changelog
+++ python-adodb-2.10/debian/changelog
@@ -1,3 +1,11 @@
+python-adodb (2.10-1ubuntu1) karmic; urgency=low
+
+  * Merge from debian unstable, remaining changes: (LP: #392116)
+    - debian/control
+      - also conflict/replace python2.4-adodb
+
+ -- Andreas Moog <amoog@ubuntu.com>  Thu, 25 Jun 2009 15:18:23 +0200
+
 python-adodb (2.10-1) unstable; urgency=low
 
   * New upstream release:
@@ -13,6 +21,14 @@
 
  -- David Gil <dgil@telefonica.net>  Wed, 30 Jul 2008 16:06:16 +0200
 
+python-adodb (2.02b-1ubuntu1) hardy; urgency=low
+
+  * add missing conflicts/replaces on python2.4-adodb
+  * Modify Maintainer value to match the DebianMaintainerField
+    specification.
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 08 Apr 2008 22:18:21 +0200
+
 python-adodb (2.02b-1) unstable; urgency=low
 
   * New upstream release:
diff -u python-adodb-2.10/debian/control python-adodb-2.10/debian/control
--- python-adodb-2.10/debian/control
+++ python-adodb-2.10/debian/control
@@ -1,7 +1,8 @@
 Source: python-adodb
 Section: python
 Priority: optional
-Maintainer: David Gil <dgil@telefonica.net>
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: David Gil <dgil@telefonica.net>
 Uploaders: Javier Fernandez-Sanguino Pen~a <jfs@computer.org>
 Build-Depends: debhelper (>= 5.0.37.2), python-support (>= 0.6), python-all-dev
 Standards-Version: 3.8.0
@@ -10,8 +11,8 @@
 Package: python-adodb
 Architecture: all
 Depends: ${python:Depends}
-Replaces: python2.3-adodb (<< 2.01-2), python2.3-adodb (<< 2.01-2)
-Conflicts: python2.3-adodb (<< 2.01-2), python2.3-adodb (<< 2.01-2)
+Replaces: python2.3-adodb (<< 2.01-2), python2.3-adodb (<< 2.01-2), python2.4-adodb
+Conflicts: python2.3-adodb (<< 2.01-2), python2.3-adodb (<< 2.01-2), python2.4-adodb
 Provides: ${python:Provides}
 Recommends: python-mysqldb, python-psycopg, python-pysqlite2
 Description: A database abstraction library for python