Merge lp:~mordred/swift/build-on-lucid into lp:~openstack-ubuntu-packagers/swift/diablo

[Monty Taylor]

Puts in a branching condition as to whether or not to add --with python2. Also relaxes the hard depend on 2.6.6-3~

[Clint Byrum (clint-fewbar)]

+1 from me, makes it use dh_python2 when available, but still leaves the package backportable.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2011-09-02 18:10:30 +0000
+++ debian/changelog	2011-09-16 19:48:24 +0000
@@ -1,3 +1,9 @@
+swift (1.4.3-0ubuntu1) oneiric; urgency=low
+
+  * Work around dh_python2 for lucid. (LP: #848971)
+
+ -- Monty Taylor <[e-mail]>  Fri, 16 Sep 2011 15:40:19 -0400
+
 swift (1.4.3~20110902.354-0ubuntu1) oneiric; urgency=low
 
   * New upstream release.
 
=== modified file 'debian/control'
--- debian/control	2011-08-02 17:45:09 +0000
+++ debian/control	2011-09-16 19:48:24 +0000
@@ -9,7 +9,8 @@
  Michael Barton <[e-mail]>,
  Thomas Goirand <[e-mail]>
 Build-Depends: debhelper (>= 7.0.50~),
- python-all-dev (>= 2.6.6-3~),
+ python-all (>= 2.6),
+ python-all-dev (>= 2.6.6-3~) | python-support,
  python-openssl,
  python-setuptools,
  python-webob,
 
=== modified file 'debian/rules'
--- debian/rules	2011-08-02 17:45:09 +0000
+++ debian/rules	2011-09-16 19:48:24 +0000
@@ -3,8 +3,12 @@
 # Verbose mode
 #export DH_VERBOSE=1
 
+# Lucid does not have dh_python2, but we would like to be able to use this
+# rules file to build on lucid as well. Thus the branching logic.
+WITH_PYTHON2 = $(shell test -f /usr/bin/dh_python2 && echo "--with python2")
+
 %:
-	dh $@  -with python2
+	dh $@ ${WITH_PYTHON2}
 
 # clean sphinx build output
 override_dh_clean: