diff -Nru ldaptor-0.0.43+debian1/debian/changelog ldaptor-0.0.43+debian1/debian/changelog
--- ldaptor-0.0.43+debian1/debian/changelog	2011-12-31 02:04:38.000000000 +0000
+++ ldaptor-0.0.43+debian1/debian/changelog	2012-01-02 07:48:28.000000000 +0000
@@ -1,3 +1,19 @@
+ldaptor (0.0.43+debian1-6ubuntu1) precise; urgency=low
+
+  * Merge with Debian; remaining changes:
+
+ -- Matthias Klose <doko@ubuntu.com>  Mon, 02 Jan 2012 08:46:34 +0100
+
+ldaptor (0.0.43+debian1-6) unstable; urgency=low
+
+  * debian/control:
+    - remove unneeded Breaks: ${python:Breaks}
+    - bump Standards-Version to 3.9.2 (no changes needed)
+  * remove deprecated webui test in debian/rules (dh_override_auto_clean)
+    (Closes: #653869)
+
+ -- Jan Dittberner <jandd@debian.org>  Sat, 31 Dec 2011 20:49:34 +0100
+
 ldaptor (0.0.43+debian1-4ubuntu2) precise; urgency=low
 
   * Rebuild to drop python2.6 dependencies.
diff -Nru ldaptor-0.0.43+debian1/debian/control ldaptor-0.0.43+debian1/debian/control
--- ldaptor-0.0.43+debian1/debian/control	2011-02-13 23:20:42.000000000 +0000
+++ ldaptor-0.0.43+debian1/debian/control	2012-01-02 07:48:28.000000000 +0000
@@ -4,7 +4,7 @@
 Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
 XSBC-Original-Maintainer: Debian Python Modules Team <python-modules-team@lists.alioth.debian.org>
 Uploaders: Jan Dittberner <jandd@debian.org>
-Standards-Version: 3.9.1
+Standards-Version: 3.9.2
 Build-Depends-Indep: docbook-slides (>= 3.2.0), xsltproc,
  source-highlight, python-epydoc, dia (>= 0.93-2), python-docutils,
  python-twisted-core, python-twisted-names, python-twisted-mail,
@@ -18,7 +18,6 @@
 Package: ldaptor-utils
 Architecture: all
 Depends: ${python:Depends}, ${misc:Depends}, python-ldaptor
-Breaks: ${python:Breaks}
 Description: command-line LDAP utilities
  A set of LDAP utilities for use from the command line, including:
  .
diff -Nru ldaptor-0.0.43+debian1/debian/rules ldaptor-0.0.43+debian1/debian/rules
--- ldaptor-0.0.43+debian1/debian/rules	2011-02-13 23:20:42.000000000 +0000
+++ ldaptor-0.0.43+debian1/debian/rules	2012-01-02 07:48:08.000000000 +0000
@@ -7,11 +7,10 @@
   py_libdir = /usr/lib/python$(subst python,,$(1))/site-packages
 endif
 
-#DEB_PYTHON_SYSTEM=pysupport
 PYDEFAULT=$(shell pyversions -d)
 
 %:
-	dh --with python2 $@
+	dh --with python2 --buildsystem=python_distutils $@
 
 override_dh_install:
 	dh_install
@@ -35,4 +34,5 @@
 	make -C doc clean
 	rm -f doc-stamp
 	rm -rf _trial_temp
+	rm -f ldaptor/test/test_webui.py
 	for pot in po/*.pot ; do test -s $$pot || rm -fv $$pot ; done