diff -u fail2ban-0.8.3/debian/control fail2ban-0.8.3/debian/control
--- fail2ban-0.8.3/debian/control
+++ fail2ban-0.8.3/debian/control
@@ -1,7 +1,8 @@
 Source: fail2ban
 Section: net
 Priority: optional
-Maintainer: Yaroslav Halchenko <debian@onerussian.com>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Yaroslav Halchenko <debian@onerussian.com>
 Build-Depends: debhelper (>= 5.0.37.2), python
 Build-Depends-Indep: python-central (>= 0.5.6)
 XS-Python-Version: current, >= 2.4
diff -u fail2ban-0.8.3/debian/rules fail2ban-0.8.3/debian/rules
--- fail2ban-0.8.3/debian/rules
+++ fail2ban-0.8.3/debian/rules
@@ -9,6 +9,8 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+include /usr/share/python/python.mk
+
 DESTDIR=$(CURDIR)/debian/fail2ban
 
 configure: configure-stamp
@@ -37,7 +39,7 @@
 	dh_installdirs
 
 	# Install the package into debian/fail2ban.
-	python setup.py install --root=$(DESTDIR) --no-compile
+	python setup.py install --root=$(DESTDIR) --no-compile $(py_setup_install_args)
 	# Install Debian shipped jail file in 1 piece (instead of patching
 	# the shipped one since there are too many changes)
 	install -m 644 debian/jail.conf $(DESTDIR)/etc/fail2ban
diff -u fail2ban-0.8.3/debian/changelog fail2ban-0.8.3/debian/changelog
--- fail2ban-0.8.3/debian/changelog
+++ fail2ban-0.8.3/debian/changelog
@@ -1,3 +1,10 @@
+fail2ban (0.8.3-6ubuntu1) karmic; urgency=low
+
+  * Merge from debian unstable (LP: #402039), remaining changes:
+    - Python 2.6 transition.
+
+ -- Andres Rodriguez <andreserl@ubuntu.com>  Mon, 20 Jul 2009 23:08:35 -0500
+
 fail2ban (0.8.3-6) unstable; urgency=low
 
   * Time to shake the ground with upload to unstable.
@@ -90,6 +97,20 @@
 
  -- Yaroslav Halchenko <debian@onerussian.com>  Sun, 18 Jan 2009 11:31:01 -0500
 
+fail2ban (0.8.3-2sid1ubuntu1) karmic; urgency=low
+
+  * Python 2.6 transition.
+
+ -- Michael Bienia <geser@ubuntu.com>  Sat, 02 May 2009 17:53:48 +0200
+
+fail2ban (0.8.3-2sid1) unstable; urgency=low
+
+  * NF: adding unittests for previous commit
+  * BF: anchoring regex for IP with " *$" at the end + adjust regexp for
+    <HOST> (closes: #514163)
+
+ -- Yaroslav Halchenko <debian@onerussian.com>  Thu, 05 Feb 2009 10:23:12 -0500
+
 fail2ban (0.8.3-2) unstable; urgency=low
 
   * BF in apache-noscript.conf - regexp matched in referer (Closes: #492319).