diff -u python-crypto-2.1.0/debian/changelog python-crypto-2.1.0/debian/changelog
--- python-crypto-2.1.0/debian/changelog
+++ python-crypto-2.1.0/debian/changelog
@@ -1,3 +1,15 @@
+python-crypto (2.1.0-2ubuntu1) natty; urgency=low
+
+  * Merge from Debian unstable (LP: #662883). Remaining changes:
+    - Install the -dbg build using --install-layout=deb.
+  * Droppped changes, superseded in Debian:
+    - The md5 module is deprecated in Python 2.6, use hashlib when possible.
+    - Explicitly use python2.5 to build the docs; the old doc tools are not
+      included in python2.6 anymore.
+  * Ported to dh_python2.
+
+ -- Stefano Rivera <stefanor@ubuntu.com>  Wed, 20 Oct 2010 22:22:07 +0200
+
 python-crypto (2.1.0-2) unstable; urgency=low
 
   * Added missing .install file (closes: #576478)
@@ -31,6 +43,22 @@
   
  -- Andreas Rottmann <rotty@debian.org>  Thu, 11 Feb 2010 00:45:34 +0100
 
+python-crypto (2.0.1+dfsg1-4ubuntu2) lucid; urgency=low
+
+  * Build-depend on python-old-doctools instead of python2.5-dev.
+
+ -- Matthias Klose <doko@ubuntu.com>  Mon, 01 Feb 2010 18:38:00 +0100
+
+python-crypto (2.0.1+dfsg1-4ubuntu1) karmic; urgency=low
+
+  * Merge from debian unstable (LP: #388002), remaining changes:
+    - Install the -dbg build using --install-layout=deb.
+    - The md5 module is deprecated in Python 2.6, use hashlib when possible.
+    - Explicitly use python2.5 to build the docs; the old doc tools are not
+      included in python2.6 anymore.
+
+ -- Muharem Hrnjadovic <muharem@ubuntu.com>  Tue, 16 Jun 2009 16:15:28 +0200
+
 python-crypto (2.0.1+dfsg1-4) unstable; urgency=low
 
   * Switched to quilt patches:
@@ -78,6 +106,43 @@
 
  -- Andreas Rottmann <rotty@debian.org>  Fri, 20 Mar 2009 17:10:55 +0100
 
+python-crypto (2.0.1+dfsg1-2.3ubuntu5) jaunty; urgency=low
+
+  * No-change rebuild to fix lpia shared library dependencies.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Thu, 19 Mar 2009 00:47:11 +0000
+
+python-crypto (2.0.1+dfsg1-2.3ubuntu4) jaunty; urgency=low
+
+  [ Martin Pool ]
+  * Take patch from upstream to avoid deprecation warnings under python 2.6.
+    (LP: #337073)
+
+ -- James Westby <james.westby@ubuntu.com>  Tue, 10 Mar 2009 16:12:48 +1000
+
+python-crypto (2.0.1+dfsg1-2.3ubuntu3) jaunty; urgency=low
+
+  * Explicitely use python2.5 to build the docs; the old doc tools are not
+    included in python2.6 anymore.
+
+ -- Matthias Klose <doko@ubuntu.com>  Sun, 01 Mar 2009 10:38:38 +0100
+
+python-crypto (2.0.1+dfsg1-2.3ubuntu2) jaunty; urgency=low
+
+  * Merge from Debian lenny:
+  * Apply fix for CVE-2009-0544 (Buffer overflow in the ARC2 module), and
+    a stand-alone version of the associated testcase (see
+    http://www.openwall.com/lists/oss-security/2009/02/07/1).
+
+ -- Matthias Klose <doko@ubuntu.com>  Sat, 28 Feb 2009 07:55:10 +0100
+
+python-crypto (2.0.1+dfsg1-2.3ubuntu1) jaunty; urgency=low
+
+  * Rebuild to include python2.6 build.
+  * Install the -dbg build using --install-layout=deb.
+
+ -- Matthias Klose <doko@ubuntu.com>  Sat, 21 Feb 2009 18:32:05 +0100
+
 python-crypto (2.0.1+dfsg1-2.3) unstable; urgency=low
 
   * NMU.
@@ -273,0 +339 @@
+
diff -u python-crypto-2.1.0/debian/control python-crypto-2.1.0/debian/control
--- python-crypto-2.1.0/debian/control
+++ python-crypto-2.1.0/debian/control
@@ -1,9 +1,10 @@
 Source: python-crypto
 Section: python
 Priority: optional
-Maintainer: James Cook <zealcook@gmail.com>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: James Cook <zealcook@gmail.com>
 Uploaders: Andreas Rottmann <rotty@debian.org>
-Build-Depends: cdbs (>= 0.4.41), debhelper (>= 5.0.37.1), quilt, python-central (>= 0.4.17), python-all-dev (>= 2.3.5-9), python-all-dbg, ed, libgmp3-dev (>= 4.1.4-10), python-epydoc
+Build-Depends: cdbs (>= 0.4.41), debhelper (>= 5.0.37.1), quilt, python-all-dev (>= 2.3.5-9), python-all-dbg, ed, libgmp3-dev (>= 4.1.4-10), python-epydoc
 XS-Python-Version: all
 Standards-Version: 3.8.4
 Homepage: http://www.pycrypto.org/
diff -u python-crypto-2.1.0/debian/rules python-crypto-2.1.0/debian/rules
--- python-crypto-2.1.0/debian/rules
+++ python-crypto-2.1.0/debian/rules
@@ -1,12 +1,15 @@
 #!/usr/bin/make -f
 
-DEB_PYTHON_SYSTEM=pycentral
+DEB_PYTHON_SYSTEM=python2
 
 include /usr/share/cdbs/1/rules/buildcore.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include /usr/share/cdbs/1/class/python-distutils.mk
 
+# cdbs doesn't support dh_python2 yet:
+cdbs_python_system=python2
+
 pyver := $(shell pyversions -vd)
 
 common-build-arch::
@@ -31,7 +34,7 @@
 
 install/python-crypto-dbg::
 	for i in $(cdbs_python_build_versions); do \
-	  python$$i-dbg ./setup.py install --root $(CURDIR)/debian/python-crypto-dbg; \
+	  python$$i-dbg ./setup.py install --root $(CURDIR)/debian/python-crypto-dbg --install-layout=deb; \
 	done
 	find debian/python-crypto-dbg \
 		! -type d ! -name '*_d.so' | xargs rm -f