diff -Nru python-crypto-2.6/debian/changelog python-crypto-2.6/debian/changelog
--- python-crypto-2.6/debian/changelog	2012-12-06 12:29:49.000000000 +0000
+++ python-crypto-2.6/debian/changelog	2013-03-21 14:57:12.000000000 +0000
@@ -1,26 +1,25 @@
-python-crypto (2.6-2build3~ubuntu12.04.1~grizzly0) precise; urgency=low
+python-crypto (2.6-4~ubuntu12.04.1~grizzly0) precise; urgency=low
 
   * No-change backport to precise
 
- -- Openstack Ubuntu Testing Bot <openstack-testing-bot@ubuntu.com>  Thu, 06 Dec 2012 07:29:49 -0500
+ -- Openstack Ubuntu Testing Bot <openstack-testing-bot@ubuntu.com>  Thu, 21 Mar 2013 10:57:12 -0400
 
-python-crypto (2.6-2build3) raring; urgency=low
+python-crypto (2.6-4) unstable; urgency=low
 
-  * Rebuild to drop python3.2 provides.
+  * debian/python-crypto-dbg.preinst: Add preinst script to handle symlink to
+    directory conversion for /usr/share/doc/python-crypto-dbg. Thanks to
+    Andreas Beckmann for the report. (Closes: #700778)
 
- -- Matthias Klose <doko@ubuntu.com>  Wed, 07 Nov 2012 22:59:52 +0000
+ -- Sebastian Ramacher <sramacher@debian.org>  Sun, 17 Feb 2013 16:24:21 +0100
 
-python-crypto (2.6-2build2) raring; urgency=low
+python-crypto (2.6-3) unstable; urgency=low
 
-  * No-change upload to rebuild python3-crypto-dbg for python3.3.
-
- -- Dmitrijs Ledkovs <dmitrij.ledkov@ubuntu.com>  Fri, 26 Oct 2012 20:08:50 +0100
-
-python-crypto (2.6-2build1) raring; urgency=low
-
-  * No-change upload to build for python3.3.
+  * debian/{control,copyright}: Update my mail address.
+  * debian/control:
+    - Remove DM-Upload-Allowed.
+    - Add Breaks python{,3}-keyring (<= 0.7.1-1) to python{,3}-crypto.
 
- -- Matthias Klose <doko@ubuntu.com>  Mon, 22 Oct 2012 17:38:26 +0200
+ -- Sebastian Ramacher <sramacher@debian.org>  Thu, 03 Jan 2013 00:32:03 +0100
 
 python-crypto (2.6-2) unstable; urgency=low
 
diff -Nru python-crypto-2.6/debian/control python-crypto-2.6/debian/control
--- python-crypto-2.6/debian/control	2012-05-28 10:08:15.000000000 +0000
+++ python-crypto-2.6/debian/control	2013-01-02 23:44:44.000000000 +0000
@@ -1,7 +1,7 @@
 Source: python-crypto
 Section: python
 Priority: optional
-Maintainer: Sebastian Ramacher <s.ramacher@gmx.at>
+Maintainer: Sebastian Ramacher <sramacher@debian.org>
 Uploaders: Andreas Rottmann <rotty@debian.org>,
  Debian Python Modules Team <python-modules-team@lists.alioth.debian.org>
 Build-Depends:
@@ -19,7 +19,6 @@
 Vcs-Svn: svn://svn.debian.org/svn/python-modules/packages/python-crypto/trunk/
 Vcs-Browser: http://anonscm.debian.org/viewvc/python-modules/packages/python-crypto/trunk/
 Homepage: http://www.pycrypto.org/
-DM-Upload-Allowed: yes
 
 Package: python-crypto
 Architecture: any
@@ -28,6 +27,7 @@
 Replaces: python2.3-crypto, python2.4-crypto
 Provides: ${python:Provides}
 Suggests: python-crypto-dbg, python-crypto-doc
+Breaks: python-keyring (<= 0.7.1-1)
 Description: cryptographic algorithms and protocols for Python
  A collection of cryptographic algorithms and protocols, implemented
  for use from Python. Among the contents of the package:
@@ -58,6 +58,7 @@
 Depends: ${python3:Depends}, ${shlibs:Depends}, ${misc:Depends}
 Provides: ${python3:Provides}
 Suggests: python3-crypto-dbg, python-crypto-doc
+Breaks: python3-keyring (<= 0.7.1-1)
 Description: cryptographic algorithms and protocols for Python 3
  A collection of cryptographic algorithms and protocols, implemented
  for use from Python 3. Among the contents of the package:
diff -Nru python-crypto-2.6/debian/copyright python-crypto-2.6/debian/copyright
--- python-crypto-2.6/debian/copyright	2012-04-20 07:56:26.000000000 +0000
+++ python-crypto-2.6/debian/copyright	2012-11-15 23:14:25.000000000 +0000
@@ -42,7 +42,7 @@
  source code may be subject to regulation in your jurisdiction.
 
 Files: debian/*
-Copyright: 2011 Sebastian Ramacher <s.ramacher@gmx.at>
+Copyright: 2011 Sebastian Ramacher <sramacher@debian.org>
 License: BSD-3-clause
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions
diff -Nru python-crypto-2.6/debian/python-crypto-dbg.preinst python-crypto-2.6/debian/python-crypto-dbg.preinst
--- python-crypto-2.6/debian/python-crypto-dbg.preinst	1970-01-01 00:00:00.000000000 +0000
+++ python-crypto-2.6/debian/python-crypto-dbg.preinst	2013-02-17 15:19:35.000000000 +0000
@@ -0,0 +1,10 @@
+#!/bin/sh
+set -e
+
+# handle symlink to directory conversion (#700778)
+DOCDIR=/usr/share/doc/python-crypto-dbg
+if [ -L $DOCDIR ] ; then
+  rm $DOCDIR
+fi
+
+#DEBHELPER#