Merge lp:~barry/ubuntu/natty/apache-openid/bug-747236 into lp:ubuntu/natty/apache-openid

[Barry Warsaw]

I just went ahead and got rid of python-central and cdbs. This simplifies the build rules and fixes the ftbfs. It would be good if someone from ISD could test the build and make sure it works. I'll put a version in my PPA to make that easier.

[Barry Warsaw (barry)]

Natty PPA: https://launchpad.net/~barry/+archive/python/+packages

=== modified file 'debian/changelog'
--- debian/changelog	2010-03-07 15:24:00 +0000
+++ debian/changelog	2011-04-07 20:41:05 +0000
@@ -1,3 +1,10 @@
+apache-openid (2.0.1-0ubuntu2) natty; urgency=low
+
+  * Convert to from python-central to dh_python2 and get rid of cdbs to 
+    simplify the build and fix the FTBFS. (LP: #747236)
+
+ -- Barry Warsaw <[e-mail]>  Thu, 07 Apr 2011 16:16:28 -0400
+
 apache-openid (2.0.1-0ubuntu1) lucid; urgency=low
 
   * Initial release for Ubuntu 10.04. (LP: #532637)

=== modified file 'debian/control'
--- debian/control	2010-03-07 15:24:00 +0000
+++ debian/control	2011-04-07 20:41:05 +0000
@@ -1,21 +1,19 @@
 Source: apache-openid
 Section: python
 Priority: extra
-Build-Depends: cdbs (>= 0.4.43),
+Build-Depends:
  debhelper (>= 7),
- python,
- python-central (>= 0.6),
+ python (>= 2.6.6-3~),
  python-setuptools
 Maintainer: Ubuntu Developers <[e-mail]>
 XSBC-Original-Maintainer: Canonical ISD Hackers <[e-mail]>
-Standards-Version: 3.8.4
-XS-Python-Version: current
+Standards-Version: 3.9.1
+X-Python-Version: >= 2.6
 
 Package: python-apache-openid
 Architecture: all
 Conflicts: apache-openid
 Replaces: apache-openid
-XB-Python-Version: ${python:Versions}
 Depends: ${misc:Depends},
  ${python:Depends},
  libapache2-mod-python,

=== modified file 'debian/rules'
--- debian/rules	2010-03-07 15:24:00 +0000
+++ debian/rules	2011-04-07 20:41:05 +0000
@@ -1,6 +1,4 @@
 #!/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
+%:
+	dh $@ --with python2