Merge lp:~mvo/ubuntu-sso-client/dh_python2 into lp:ubuntu/oneiric/ubuntu-sso-client

[Michael Vogt]

This changes the python helper from python-support to dh_python2 and the build system from cdbs to debhelper7.

[Michael Vogt (mvo)]

For some background on the switch, please see the announcement from Barry:
https://lists.ubuntu.com/archives/ubuntu-devel-announce/2011-June/000857.html

[Charlie_Smotherman (cjsmo)]

Although XS-Python-Version: current is still supported it is strongly suggested to change XS-P-V to X-P-V. I would suggest X-Python-Version: >=2.6. XB-Python-Version should be removed. Just my $0.02

http://wiki.debian.org/Python/PythonSupportToDHPython2

Have a nice day :)

=== modified file 'debian/changelog'
--- debian/changelog	2011-04-26 08:48:51 +0000
+++ debian/changelog	2011-06-10 11:17:05 +0000
@@ -1,3 +1,9 @@
+ubuntu-sso-client (1.2.1-0ubuntu3) oneiric; urgency=low
+
+  * switch to dh_python2 and dh7
+
+ -- Michael Vogt <[e-mail]>  Fri, 10 Jun 2011 13:06:27 +0200
+
 ubuntu-sso-client (1.2.1-0ubuntu2) natty-proposed; urgency=low
 
   * debian/control
 
=== modified file 'debian/compat'
--- debian/compat	2010-06-16 15:11:04 +0000
+++ debian/compat	2011-06-10 11:17:05 +0000
@@ -1,1 +1,1 @@
-6
+7
 
=== modified file 'debian/control'
--- debian/control	2011-04-26 08:48:51 +0000
+++ debian/control	2011-06-10 11:17:05 +0000
@@ -1,10 +1,8 @@
 Source: ubuntu-sso-client
 Section: python
 Priority: extra
-Build-Depends: cdbs (>= 0.4.43),
- debhelper (>= 6),
- python,
- python-support (>= 0.6.4),
+Build-Depends: debhelper (>= 7),
+ python (>= 2.6.6-3~),
  python-distutils-extra (>= 2.10)
 Maintainer: Ubuntu Developers <[e-mail]>
 XSBC-Original-Maintainer: Natalia Bidart <[e-mail]>
 
=== modified file 'debian/rules'
--- debian/rules	2010-06-16 15:11:04 +0000
+++ debian/rules	2011-06-10 11:17:05 +0000
@@ -1,6 +1,4 @@
 #!/usr/bin/make -f
-DEB_PYTHON_SYSTEM := pysupport
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/python-distutils.mk
-include /usr/share/cdbs/1/rules/langpack.mk
+%:
+	dh $@ --with python2
 \ No newline at end of file