diff -pruN 20090531-3.1/debian/changelog 20090531-3.1ubuntu1/debian/changelog
--- 20090531-3.1/debian/changelog	2015-07-31 14:41:22.000000000 +0000
+++ 20090531-3.1ubuntu1/debian/changelog	2015-07-31 14:41:24.283724000 +0000
@@ -1,3 +1,10 @@
+python-repoze.what-plugins (20090531-3.1ubuntu1) UNRELEASED; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - SUMMARISE HERE
+
+ -- Ubuntu Merge-o-Matic <mom@ubuntu.com>  Fri, 31 Jul 2015 14:41:24 +0000
+
 python-repoze.what-plugins (20090531-3.1) unstable; urgency=medium
 
   * Team upload.
@@ -5,6 +12,20 @@ python-repoze.what-plugins (20090531-3.1
 
  -- Thomas Goirand <zigo@debian.org>  Mon, 13 Jul 2015 08:18:45 +0000
 
+python-repoze.what-plugins (20090531-3ubuntu2) wily; urgency=medium
+
+  * No change rebuild with SQLAlchemy 1.0.6.
+
+ -- James Page <james.page@ubuntu.com>  Fri, 24 Jul 2015 16:27:44 +0100
+
+python-repoze.what-plugins (20090531-3ubuntu1) utopic; urgency=medium
+
+  * Merge from Debian unstable. Remaining changes:
+    - Deal with sqlalchemy.exceptions -> sqlalchemy.exc name change in
+      sqlalchemy 0.7.
+
+ -- Logan Rosen <logan@ubuntu.com>  Thu, 22 May 2014 21:40:42 -0400
+
 python-repoze.what-plugins (20090531-3) unstable; urgency=low
 
   [ Jakub Wilk ]
@@ -18,6 +39,13 @@ python-repoze.what-plugins (20090531-3)
 
  -- Dimitri John Ledkov <xnox@ubuntu.com>  Sun, 20 Apr 2014 14:55:15 +0100
 
+python-repoze.what-plugins (20090531-2ubuntu1) precise; urgency=low
+
+  * deal with sqlalchemy.exceptions -> sqlalchemy.exc name change
+    in sqlalchemy 0.7
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 30 Mar 2012 09:32:05 +0200
+
 python-repoze.what-plugins (20090531-2) unstable; urgency=low
 
   [ Stefano Zacchiroli ]
@@ -36,3 +64,4 @@ python-repoze.what-plugins (20090531-1)
   * First release (Closes: #531208)
 
  -- Stefano Zacchiroli <zack@debian.org>  Sun, 31 May 2009 00:33:09 +0200
+
diff -pruN 20090531-3.1/debian/control 20090531-3.1ubuntu1/debian/control
--- 20090531-3.1/debian/control	2015-07-31 14:41:22.000000000 +0000
+++ 20090531-3.1ubuntu1/debian/control	2015-07-31 14:41:23.547704000 +0000
@@ -1,7 +1,8 @@
 Source: python-repoze.what-plugins
 Section: python
 Priority: optional
-Maintainer: Debian Python Modules Team <python-modules-team@lists.alioth.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian Python Modules Team <python-modules-team@lists.alioth.debian.org>
 Uploaders:
  Stefano Zacchiroli <zack@debian.org>,
  Piotr Ożarowski <piotr@debian.org>
diff -pruN 20090531-3.1/repoze.what.plugins.sql/repoze/what/plugins/sql/adapters.py 20090531-3.1ubuntu1/repoze.what.plugins.sql/repoze/what/plugins/sql/adapters.py
--- 20090531-3.1/repoze.what.plugins.sql/repoze/what/plugins/sql/adapters.py	2009-01-27 18:11:00.000000000 +0000
+++ 20090531-3.1ubuntu1/repoze.what.plugins.sql/repoze/what/plugins/sql/adapters.py	2015-07-31 14:41:23.771710000 +0000
@@ -60,7 +60,10 @@ field and table names involved:
 
 """
 
-from sqlalchemy.exceptions import SQLAlchemyError
+try:
+    from sqlalchemy.exceptions import SQLAlchemyError
+except ImportError:
+    from sqlalchemy.exc import SQLAlchemyError
 from sqlalchemy.orm.exc import NoResultFound
 
 from repoze.what.adapters import BaseSourceAdapter, SourceError
diff -pruN 20090531-3.1/repoze.what.plugins.sql-1.0rc1/repoze/what/plugins/sql/adapters.py 20090531-3.1ubuntu1/repoze.what.plugins.sql-1.0rc1/repoze/what/plugins/sql/adapters.py
--- 20090531-3.1/repoze.what.plugins.sql-1.0rc1/repoze/what/plugins/sql/adapters.py	2009-01-27 18:11:00.000000000 +0000
+++ 20090531-3.1ubuntu1/repoze.what.plugins.sql-1.0rc1/repoze/what/plugins/sql/adapters.py	2015-07-31 14:41:23.771710000 +0000
@@ -60,7 +60,10 @@ field and table names involved:
 
 """
 
-from sqlalchemy.exceptions import SQLAlchemyError
+try:
+    from sqlalchemy.exceptions import SQLAlchemyError
+except ImportError:
+    from sqlalchemy.exc import SQLAlchemyError
 from sqlalchemy.orm.exc import NoResultFound
 
 from repoze.what.adapters import BaseSourceAdapter, SourceError