Merge lp:~dobey/ubuntu/oneiric/ubuntuone-control-panel/use-dhpython2 into lp:ubuntu/oneiric/ubuntuone-control-panel

[dobey]

=== modified file 'debian/changelog'
--- debian/changelog	2011-05-17 15:29:16 +0000
+++ debian/changelog	2011-07-19 20:28:33 +0000
@@ -1,3 +1,9 @@
+ubuntuone-control-panel (1.0.0-0ubuntu3) oneiric; urgency=low
+
+  * Convert to dh_python2
+
+ -- Rodney Dawes <[e-mail]>  Tue, 19 Jul 2011 16:21:42 -0400
+
 ubuntuone-control-panel (1.0.0-0ubuntu2) oneiric; urgency=low
 
   * debian/control: ubuntuone-control-panel-gtk depends on python-aptdaemon-gtk
 
=== modified file 'debian/compat'
--- debian/compat	2010-12-06 12:27:11 +0000
+++ debian/compat	2011-07-19 20:28:33 +0000
@@ -1,1 +1,1 @@
-6
+7
 
=== modified file 'debian/control'
--- debian/control	2011-05-11 10:41:48 +0000
+++ debian/control	2011-07-19 20:28:33 +0000
@@ -1,18 +1,16 @@
 Source: ubuntuone-control-panel
 Section: python
 Priority: extra
-Build-Depends: cdbs (>= 0.4.43),
- debhelper (>= 6),
- python,
- python-support (>= 0.6.4),
+Build-Depends: cdbs (>= 0.4.90),
+ debhelper (>= 7.0.14),
+ python (>= 2.6.6),
  python-distutils-extra (>= 2.10)
 Maintainer: Ubuntu Developers <[e-mail]>
 Standards-Version: 3.9.1
-XS-Python-Version: current
+X-Python-Version: >= 2.6
 
 Package: ubuntuone-control-panel
 Architecture: all
-XB-Python-Version: ${python:Versions}
 Depends: ${misc:Depends},
  ${python:Depends},
  python,
@@ -27,7 +25,6 @@
 Package: python-ubuntuone-control-panel
 Section: python
 Architecture: all
-XB-Python-Version: ${python:Versions}
 Depends: ${misc:Depends},
  ${python:Depends},
  gir1.2-soup-2.4,
@@ -45,7 +42,6 @@
 
 Package: ubuntuone-control-panel-gtk
 Architecture: all
-XB-Python-Version: ${python:Versions}
 Depends: ${misc:Depends},
  ${python:Depends},
  python,
@@ -62,3 +58,4 @@
 Provides: ubuntuone-control-panel-gui
 Description: Ubuntu One Control Panel
  GTK+ desktop application to manage a Ubuntu One account.
+
 
=== modified file 'debian/rules'
--- debian/rules	2010-12-06 12:27:11 +0000
+++ debian/rules	2011-07-19 20:28:33 +0000
@@ -1,5 +1,6 @@
 #!/usr/bin/make -f
-DEB_PYTHON_SYSTEM := pysupport
+
+DEB_PYTHON2_MODULE_PACKAGES = python-ubuntuone-control-panel ubuntuone-control-panel-gtk
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/python-distutils.mk