diff -u rpl-1.5.5/debian/changelog rpl-1.5.5/debian/changelog
--- rpl-1.5.5/debian/changelog
+++ rpl-1.5.5/debian/changelog
@@ -1,3 +1,17 @@
+rpl (1.5.5-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Build using dh-python instead of python-support.  Closes: #786109
+  * Build-depend on python instead of python-dev, since it builds only one
+    arch:all package.
+  * Add dependency on ${misc:Depends}, so debhelper can do its work.
+  * Move Homepage field to the source stanza.
+  * Remove long useless debian/pycompat file.
+  * Recode author name in setup.py in UTF-8, otherwise dh_python2 choke on it.
+    And also because UTF-8 <=> \o/, everything else <=> /o\.
+
+ -- Mattia Rizzolo <mattia@debian.org>  Mon, 14 Dec 2015 23:36:10 +0000
+
 rpl (1.5.5-1) unstable; urgency=low
 
   * Uploaded original source files to SourceForge (rpl) in order to convert
diff -u rpl-1.5.5/debian/control rpl-1.5.5/debian/control
--- rpl-1.5.5/debian/control
+++ rpl-1.5.5/debian/control
@@ -5,14 +5,11 @@
-Build-Depends: debhelper (>= 5), cdbs (>= 0.4.43), python-dev, python-support (>= 0.5.3)
-XS-Python-Version: all
+Build-Depends: debhelper (>= 5), cdbs (>= 0.4.43), python, dh-python
 Standards-Version: 3.7.2
+Homepage: http://rpl.sourceforge.net/
 
 Package: rpl
 Architecture: all
-Depends: ${python:Depends}
-XB-Python-Version: ${python:Versions}
+Depends: ${python:Depends}, ${misc:Depends}
 Description: intelligent recursive search/replace utility
  rpl is a text replacement utility. It will replace strings with new strings
  in multiple text files. It can work recursively over directories and supports
  limiting the search to specific file suffixes.
- .
-  Homepage: http://rpl.sourceforge.net/
reverted:
--- rpl-1.5.5/debian/pycompat
+++ rpl-1.5.5.orig/debian/pycompat
@@ -1 +0,0 @@
-2
diff -u rpl-1.5.5/debian/rules rpl-1.5.5/debian/rules
--- rpl-1.5.5/debian/rules
+++ rpl-1.5.5/debian/rules
@@ -1,4 +1,4 @@
 #!/usr/bin/make -f
-DEB_PYTHON_SYSTEM=pysupport
+DEB_PYTHON2_MODULE_PACKAGES := rpl
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/python-distutils.mk
only in patch2:
unchanged:
--- rpl-1.5.5.orig/setup.py
+++ rpl-1.5.5/setup.py
@@ -8,7 +8,7 @@
 setup(name='rpl',
 	  version='1.5.5',
 	  description=DESC,
-	  author='Gośran Weinholt',
+	  author='GĂśran Weinholt',
 	  author_email='weinholt@debian.org',
 	  url='http:/rpl.sf.net',
 	  license='GPL v2 or later',