Merge lp:~mordred/glance/fix-deb-packaging-diablo into lp:~openstack-ubuntu-packagers/glance/diablo

[Monty Taylor]

Fix build for lucid.

[Jay Pipes (jaypipes)]

magic to me...

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2011-09-19 13:12:00 +0000
+++ debian/changelog	2011-09-19 17:09:34 +0000
@@ -1,9 +1,13 @@
 glance (2011.3~rc~20110915.r1007-0ubuntu1) oneiric; urgency=low
 
+  [ Chuck Short ]
   * New upstream release. 
   * debian/rules: Dont fail to build because of broken testsuite.
 
- -- Chuck Short <[e-mail]>  Fri, 16 Sep 2011 09:38:23 -0400
+  [ Monty Taylor ]
+  * Added branch condition to fix build on lucid.
+
+ -- Monty Taylor <[e-mail]>  Mon, 19 Sep 2011 13:03:41 -0400
 
 glance (2011.3~rc~20110908.r1005-0ubuntu1) oneiric; urgency=low
 

=== modified file 'debian/control'
--- debian/control	2011-08-19 23:00:11 +0000
+++ debian/control	2011-09-19 17:09:34 +0000
@@ -3,9 +3,9 @@
 Priority: extra
 Maintainer: Soren Hansen <[e-mail]>
 Build-Depends: debhelper (>= 7.0.50),
- python-all
+ python-all (>= 2.6),
+ python-all-dev (>= 2.6.6-3~) | python-support,
 Build-Depends-Indep:
- python-support,
  python-setuptools,
  python-sphinx,
  python-sqlalchemy-ext | python-sqlalchemy (<< 0.6.3-2),

=== modified file 'debian/rules'
--- debian/rules	2011-09-19 13:12:00 +0000
+++ debian/rules	2011-09-19 17:09:34 +0000
@@ -3,13 +3,10 @@
 # Verbose mode
 #export DH_VERBOSE=1
 
-
-DEB_PYTHON_SYSTEM=pysupport
-
-#export DH_VERBOSE=1
+WITH_PYTHON2 = $(shell test -f /usr/bin/dh_python2 && echo "--with python2")
 
 %:
-	dh $@ --with python2
+	dh $@ ${WITH_PYTHON2}
 
 get-orig-source:
 	uscan --verbose --force-download --rename --destdir=../build-area