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

Proposed by Monty Taylor on 2011-09-16
Status: Merged
Merged at revision: 49
Proposed branch: lp:~mordred/swift/build-on-lucid
Merge into: lp:~openstack-ubuntu-packagers/swift/diablo
Diff against target: 45 lines (+13/-2)
3 files modified
debian/changelog (+6/-0)
debian/control (+2/-1)
debian/rules (+5/-1)
To merge this branch: bzr merge lp:~mordred/swift/build-on-lucid
Reviewer Review Type Date Requested Status
Clint Byrum (community) 2011-09-16 Approve on 2011-09-16
Review via email: mp+75802@code.launchpad.net

Description of the change

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

To post a comment you must log in.
Clint Byrum (clint-fewbar) wrote :

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

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2011-09-02 18:10:30 +0000
3+++ debian/changelog 2011-09-16 19:48:24 +0000
4@@ -1,3 +1,9 @@
5+swift (1.4.3-0ubuntu1) oneiric; urgency=low
6+
7+ * Work around dh_python2 for lucid. (LP: #848971)
8+
9+ -- Monty Taylor <mordred@inaugust.com> Fri, 16 Sep 2011 15:40:19 -0400
10+
11 swift (1.4.3~20110902.354-0ubuntu1) oneiric; urgency=low
12
13 * New upstream release.
14
15=== modified file 'debian/control'
16--- debian/control 2011-08-02 17:45:09 +0000
17+++ debian/control 2011-09-16 19:48:24 +0000
18@@ -9,7 +9,8 @@
19 Michael Barton <michael.barton@rackspace.com>,
20 Thomas Goirand <zigo@debian.org>
21 Build-Depends: debhelper (>= 7.0.50~),
22- python-all-dev (>= 2.6.6-3~),
23+ python-all (>= 2.6),
24+ python-all-dev (>= 2.6.6-3~) | python-support,
25 python-openssl,
26 python-setuptools,
27 python-webob,
28
29=== modified file 'debian/rules'
30--- debian/rules 2011-08-02 17:45:09 +0000
31+++ debian/rules 2011-09-16 19:48:24 +0000
32@@ -3,8 +3,12 @@
33 # Verbose mode
34 #export DH_VERBOSE=1
35
36+# Lucid does not have dh_python2, but we would like to be able to use this
37+# rules file to build on lucid as well. Thus the branching logic.
38+WITH_PYTHON2 = $(shell test -f /usr/bin/dh_python2 && echo "--with python2")
39+
40 %:
41- dh $@ -with python2
42+ dh $@ ${WITH_PYTHON2}
43
44 # clean sphinx build output
45 override_dh_clean:

Subscribers

People subscribed via source and target branches