diff -u rdiff-backup-1.2.8/debian/control rdiff-backup-1.2.8/debian/control
--- rdiff-backup-1.2.8/debian/control
+++ rdiff-backup-1.2.8/debian/control
@@ -1,7 +1,7 @@
 Source: rdiff-backup
 Section: utils
 Priority: optional
-Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
 XSBC-Original-Maintainer: Daniel Baumann <daniel@debian.org>
 Build-Depends: debhelper (>= 7), python-support, python-dev, python-pylibacl, python-pyxattr, librsync-dev (>= 0.9.7-4), dpatch
 Standards-Version: 3.8.0
diff -u rdiff-backup-1.2.8/debian/changelog rdiff-backup-1.2.8/debian/changelog
--- rdiff-backup-1.2.8/debian/changelog
+++ rdiff-backup-1.2.8/debian/changelog
@@ -1,3 +1,9 @@
+rdiff-backup (1.2.8-1ubuntu2) karmic; urgency=low
+
+  * Handling Python 2.6 deprecation (LP: #436035)
+
+ -- Andreas Olsson <andol@ubuntu.com>  Sat, 03 Oct 2009 19:37:30 +0200
+
 rdiff-backup (1.2.8-1ubuntu1) karmic; urgency=low
 
   * Merge from debian unstable (LP: #339799), remaining changes:
diff -u rdiff-backup-1.2.8/debian/patches/00list rdiff-backup-1.2.8/debian/patches/00list
--- rdiff-backup-1.2.8/debian/patches/00list
+++ rdiff-backup-1.2.8/debian/patches/00list
@@ -1,0 +2 @@
+02_python_2.6_deprecationwarning.dpatch
only in patch2:
unchanged:
--- rdiff-backup-1.2.8.orig/debian/patches/02_python_2.6_deprecationwarning.dpatch
+++ rdiff-backup-1.2.8/debian/patches/02_python_2.6_deprecationwarning.dpatch
@@ -0,0 +1,23 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02_python_2.6_deprecationwarning.dpatch by  <andreas@pc13267v15.midgard.liu.se>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+diff -urNad rdiff-backup-1.2.8~/rdiff_backup/SetConnections.py rdiff-backup-1.2.8/rdiff_backup/SetConnections.py
+--- rdiff-backup-1.2.8~/rdiff_backup/SetConnections.py	2009-03-16 15:36:21.000000000 +0100
++++ rdiff-backup-1.2.8/rdiff_backup/SetConnections.py	2009-10-03 19:27:54.935647306 +0200
+@@ -135,10 +135,10 @@
+ 	if not remote_cmd: return Globals.local_connection
+ 
+ 	Log("Executing " + remote_cmd, 4)
+-	if os.name == "nt":
++	if map(int, sys.version.split()[0].split('.')[:2]) >= [2, 6]:
+ 		import subprocess
+ 		try:
+-			process = subprocess.Popen(remote_cmd, shell=False, bufsize=0,
++			process = subprocess.Popen(remote_cmd, shell=True, bufsize=0,
+ 								stdin=subprocess.PIPE, 
+ 								stdout=subprocess.PIPE)
+ 			(stdin, stdout) = (process.stdin, process.stdout)