Merge experimental.

diff --cc debian/changelog
index bb0b5e7c5eeeaaf8bc08197c8999c8308fd2fbbb,d9f52993df18985fc165a5dda7a876d76807e144..2c859565b851eefcd4de3e1301d869593494a15a
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,20 +1,20 @@@
- tdb (1.2.1-3) UNRELEASED; urgency=low
 -tdb (1.2.3~git20100819-1) experimental; urgency=low
++tdb (1.2.3~git20100819-1) UNRELEASED; urgency=low
  
-   * Switch to Bazaar.
+   * New upstream snapshot.
    * Bump standards version to 3.9.1 (no changes).
+   * Switch to bzr.
+ 
+  -- Jelmer Vernooij <jelmer@debian.org>  Sun, 22 Aug 2010 14:21:07 +0200
+ 
+ tdb (1.2.2~git20100507-1) experimental; urgency=low
+ 
+   * New upstream snapshot.
+   * Build with standard system python. Closes: #577435
+   * Remove `tdb_transaction_recover` symbol which was also removed upstream. 
+     This symbol was never intended to be public and would have been hard to 
+     use anyway.
  
-  -- Jelmer Vernooij <jelmer@debian.org>  Sun, 22 Aug 2010 14:43:31 +0200
+  -- Jelmer Vernooij <jelmer@debian.org>  Thu, 13 May 2010 18:42:16 +0200
  
  tdb (1.2.1-2) unstable; urgency=low
  

diff --cc debian/control
index 15b2c43b5ef12e9e5dd61bb7e2539bfd390bb82c,e746b662cb70e3089f80681fd72bb1d293949305..0ce2b52191eaaf60e351c1c37ab2b081d1153179
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -2,10 -2,10 +2,10 @@@ Source: td
  Section: devel
  Priority: optional
  Maintainer: Jelmer Vernooij <jelmer@debian.org>
- Build-Depends: debhelper (>> 5.0.0), quilt (>= 0.40), python-central (>= 0.5.6), python-dev, xsltproc, docbook-xsl
+ Build-Depends: debhelper (>> 5.0.0), python-central (>= 0.5.6), python-dev, xsltproc, docbook-xsl
  Homepage: http://tdb.samba.org/
  Standards-Version: 3.9.1
 -Vcs-Svn: http://bzr.debian.org/pkg-samba/tdb/experimental
 +Vcs-Svn: http://bzr.debian.org/pkg-samba/tdb/unstable
  XS-Python-Version: all
  
  Package: libtdb1

diff --cc debian/libtdb1.symbols
index a62073855c2adea63730626ecdcff9aae97b3511,b9c79afa98ff309515a806ee244641e950415101..56ca19c605dc10482a4117aa59c4652153e81d1d
--- 1/debian/libtdb1.symbols
--- 2/debian/libtdb1.symbols
+++ b/debian/libtdb1.symbols
@@@ -52,8 -52,8 +52,8 @@@ libtdb.so.1 libtdb1 #MINVER
   tdb_transaction_cancel@Base 1.1.0
   tdb_transaction_commit@Base 1.1.0
   tdb_transaction_prepare_commit@Base 1.1.5
-  tdb_transaction_recover@Base 1.1.0
   tdb_transaction_start@Base 1.1.0
 - tdb_transaction_start_nonblock@Base 1.2.2~git20100507
++ tdb_transaction_start_nonblock@Base 1.2.2
   tdb_traverse@Base 1.0.6
   tdb_traverse_read@Base 1.1.0
   tdb_unlockall@Base 1.0.6