Merge lp:~cjwatson/xorgparser/dh-python2 into lp:xorgparser

[Colin Watson]

Convert to dh_python2 (see bug 788514). As I mentioned on IRC, the existing branch doesn't seem to exactly match the package that's in the archive, so I guess you'll need to sort that out as well.

[Alberto Milone (albertomilone)]

Thanks a lot for your contribution, Colin.

review: Approve

=== modified file 'debian/control'
--- debian/control	2008-08-16 09:23:12 +0000
+++ debian/control	2011-06-27 09:07:52 +0000
@@ -1,15 +1,15 @@
 Source: x-kit
 Section: python
 Priority: optional
-Build-Depends: cdbs (>= 0.4.43), debhelper (>= 5.0.38), python-central (>= 0.5.6), python-dev (>= 2.4), intltool
+Build-Depends: cdbs (>= 0.4.90~), debhelper (>= 5.0.38), python-dev (>= 2.4), intltool
 Maintainer: Alberto Milone (tseliot) <[e-mail]>
 Standards-Version: 3.8.0
-XS-Python-Version: all
+X-Python-Version: >= 2.4
 Vcs-Bzr: https://code.launchpad.net/~albertomilone/xorgparser/main/
 
 Package: python-xkit
 Architecture: all
-XB-Python-Version: ${python:Versions}
 Depends: ${python:Depends}
+Breaks: ${python:Breaks}
 Description: library for the manipulation of the xorg.conf
  X-Kit is library for the manipulation of the xorg.conf.

=== removed file 'debian/pycompat'
--- debian/pycompat	2008-07-24 15:17:24 +0000
+++ debian/pycompat	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-2

=== modified file 'debian/rules'
--- debian/rules	2008-08-14 16:31:52 +0000
+++ debian/rules	2011-06-27 09:07:52 +0000
@@ -1,7 +1,5 @@
 #!/usr/bin/make -f
 
-DEB_PYTHON_SYSTEM := pycentral
-
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/python-distutils.mk