diff -Nru zodb-3.9.7/debian/changelog zodb-3.9.7/debian/changelog
--- zodb-3.9.7/debian/changelog	2011-08-03 15:38:38.000000000 +0000
+++ zodb-3.9.7/debian/changelog	2011-11-08 13:53:42.000000000 +0000
@@ -1,10 +1,27 @@
-zodb (1:3.9.7-0ubuntu2) oneiric; urgency=low
+zodb (1:3.9.7-2) unstable; urgency=low
 
+  * Team upload.
+  * debian/clean: remove to make sure all files are installed.
+  * debian/source/options: ignore .egg-info directory.
+
+ -- Arnaud Fontaine <arnau@debian.org>  Tue, 08 Nov 2011 22:53:37 +0900
+
+zodb (1:3.9.7-1) unstable; urgency=low
+
+  * Team upload.
+
+  [ Arnaud Fontaine ]
+  * debian/control: add Vcs-Browser.
+  * debian/copyright: use versioned URL for DEP5 specification.
+  * Add debian/clean to get rid of egg-info/* to prevent FTBFS if
+    built twice.
+
+  [ Gediminas Paulauskas ]
   * Switch to 3.0 (quilt) source format.
   * Use dh_python2 instead of python-central (Closes: #617157).
   * debian/patches/lp_135108.patch: put the security fix in a patch.
 
- -- Gediminas Paulauskas <menesis@pov.lt>  Wed, 03 Aug 2011 18:38:11 +0300
+ -- Arnaud Fontaine <arnau@debian.org>  Wed, 19 Oct 2011 00:01:41 +0900
 
 zodb (1:3.9.7-0ubuntu1) natty; urgency=low
 
@@ -199,7 +216,7 @@
 
 zodb3.4 (3.4.1-2) unstable; urgency=low
 
-  * debian/control: build-depends on python (required by dh_python). 
+  * debian/control: build-depends on python (required by dh_python).
     (Closes: #324578)
 
  -- Fabio Tranchitella <kobold@debian.org>  Tue, 23 Aug 2005 09:10:29 +0000
diff -Nru zodb-3.9.7/debian/control zodb-3.9.7/debian/control
--- zodb-3.9.7/debian/control	2011-05-30 19:55:56.000000000 +0000
+++ zodb-3.9.7/debian/control	2011-10-21 05:24:36.000000000 +0000
@@ -1,25 +1,28 @@
 Source: zodb
 Section: zope
 Priority: extra
-Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
-XSBC-Original-Maintainer: Debian/Ubuntu Zope Team <pkg-zope-developers@lists.alioth.debian.org>
-Uploaders: Brian Sutherland <brian@vanguardistas.net>, Fabio Tranchitella <kobold@debian.org>
+Maintainer: Debian/Ubuntu Zope Team <pkg-zope-developers@lists.alioth.debian.org>
+Uploaders: Brian Sutherland <brian@vanguardistas.net>,
+           Fabio Tranchitella <kobold@debian.org>
 Build-Depends: debhelper (>= 7.0.50~),
                python-all-dev (>= 2.6.6-3~),
                python-setuptools,
                python-van.pydeb (>= 1.3.0-4)
 Standards-Version: 3.9.2
 X-Python-Version: >= 2.4
-XS-Vcs-Svn: svn://svn.debian.org/pkg-zope/zodb/trunk
+Vcs-Svn: svn://svn.debian.org/pkg-zope/zodb/trunk
+Vcs-Browser: http://svn.debian.org/viewsvn/pkg-zope/zodb/trunk
 Homepage: http://zodb.org/
 
 Package: python-zodb
 Architecture: any
-Depends: ${pydeb:Depends}, ${python:Depends}, ${misc:Depends}, ${shlibs:Depends}
+Depends: ${pydeb:Depends},
+         ${python:Depends},
+         ${misc:Depends},
+         ${shlibs:Depends}
 Provides: ${pydeb:Provides}, ${python:Provides}
 Suggests: ${pydeb:Suggests}
 Conflicts: zope3
-XB-Python-Version: ${python:Versions}
 Description: Zope Object Database (ZODB)
  The Zope Object Database is an object-oriented database for Python that
  provides a high-degree of transparency. Applications can take advantage of
diff -Nru zodb-3.9.7/debian/copyright zodb-3.9.7/debian/copyright
--- zodb-3.9.7/debian/copyright	2011-05-30 19:04:20.000000000 +0000
+++ zodb-3.9.7/debian/copyright	2011-10-21 05:24:36.000000000 +0000
@@ -1,4 +1,4 @@
-Format: http://dep.debian.net/deps/dep5/
+Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=174
 Upstream-Name: ZODB3
 Upstream-Contact: Zope Foundation and Contributors <zope-dev@zope.org>
 Source: http://pypi.python.org/pypi/ZODB3
diff -Nru zodb-3.9.7/debian/source/options zodb-3.9.7/debian/source/options
--- zodb-3.9.7/debian/source/options	1970-01-01 00:00:00.000000000 +0000
+++ zodb-3.9.7/debian/source/options	2011-11-08 13:53:37.000000000 +0000
@@ -0,0 +1 @@
+extend-diff-ignore = "\.egg-info"