diff -Nru python-debian-0.1.13/.bzr-builddeb/default.conf python-debian-0.1.13ubuntu1/.bzr-builddeb/default.conf
--- python-debian-0.1.13/.bzr-builddeb/default.conf	2009-04-07 11:02:10.000000000 +0200
+++ python-debian-0.1.13ubuntu1/.bzr-builddeb/default.conf	1970-01-01 01:00:00.000000000 +0100
@@ -1,3 +0,0 @@
-[BUILDDEB]
-native = True
-
diff -Nru python-debian-0.1.13/debian/changelog python-debian-0.1.13ubuntu1/debian/changelog
--- python-debian-0.1.13/debian/changelog	2009-04-07 11:02:10.000000000 +0200
+++ python-debian-0.1.13ubuntu1/debian/changelog	2009-05-05 01:52:09.000000000 +0200
@@ -1,3 +1,11 @@
+python-debian (0.1.13ubuntu1) karmic; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - debian_bundle/deb822.py: _CaseInsensitiveString(): use __new__ instead of
+      __init__ to avoid a warning with Python 2.6;
+
+ -- Krzysztof Klimonda <kklimonda@syntaxhighlighted.com>  Fri, 17 Apr 2009 05:03:31 +0100
+
 python-debian (0.1.13) unstable; urgency=low
 
   [ John Wright ]
@@ -17,6 +25,20 @@
 
  -- Stefano Zacchiroli <zack@debian.org>  Tue, 07 Apr 2009 10:21:04 +0200
 
+python-debian (0.1.12ubuntu2) jaunty; urgency=low
+
+  * debian_bundle/deb822.py: _CaseInsensitiveString(): use __new__ instead of
+    __init__ to avoid a warning with Python 2.6; LP: #339466.
+
+ -- Loic Minier <lool@dooz.org>  Wed, 15 Apr 2009 10:36:34 +0200
+
+python-debian (0.1.12ubuntu1) jaunty; urgency=low
+
+  * Replace sha with hashlib to stop python2.6 warnings (LP: #338524,
+    debian bug 518427).
+
+ -- Kees Cook <kees@ubuntu.com>  Thu, 05 Mar 2009 16:47:20 -0800
+
 python-debian (0.1.12) unstable; urgency=low
 
   [ Filippo Giunchedi ]
@@ -337,3 +359,4 @@
   * Initial release. (Closes: #381599)
 
  -- James Westby <jw+debian@jameswestby.net>  Tue, 15 Aug 2006 18:57:57 +0100
+
diff -Nru python-debian-0.1.13/debian/control python-debian-0.1.13ubuntu1/debian/control
--- python-debian-0.1.13/debian/control	2009-04-07 11:02:10.000000000 +0200
+++ python-debian-0.1.13ubuntu1/debian/control	2009-04-17 06:03:31.000000000 +0200
@@ -1,7 +1,8 @@
 Source: python-debian
 Section: python
 Priority: optional
-Maintainer: Debian python-debian Maintainers <pkg-python-debian-maint@lists.alioth.debian.org>
+Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian python-debian Maintainers <pkg-python-debian-maint@lists.alioth.debian.org>
 Uploaders: Adeodato Simó <dato@net.com.org.es>,
  Enrico Zini <enrico@debian.org>,
  James Westby <jw+debian@jameswestby.net>,
diff -Nru python-debian-0.1.13/debian_bundle/deb822.py python-debian-0.1.13ubuntu1/debian_bundle/deb822.py
--- python-debian-0.1.13/debian_bundle/deb822.py	2009-04-07 11:02:10.000000000 +0200
+++ python-debian-0.1.13ubuntu1/debian_bundle/deb822.py	2009-04-17 06:03:31.000000000 +0200
@@ -1048,10 +1048,11 @@
     """Case insensitive string.
     """
 
-    def __init__(self, str_):
-        str.__init__(self, str_)
-        self.str_lower = str_.lower()
-        self.str_lower_hash = hash(self.str_lower)
+    def __new__(cls, str_):
+        s = str.__new__(cls, str_)
+        s.str_lower = str_.lower()
+        s.str_lower_hash = hash(s.str_lower)
+        return s
 
     def __hash__(self):
         return self.str_lower_hash