Merge lp:~zulcss/python-heatclient/ftbfs into lp:~ubuntu-server-dev/python-heatclient/havana

Proposed by Chuck Short
Status: Merged
Approved by: Adam Gandelman
Approved revision: 2
Merged at revision: 2
Proposed branch: lp:~zulcss/python-heatclient/ftbfs
Merge into: lp:~ubuntu-server-dev/python-heatclient/havana
Diff against target: 49 lines (+9/-7)
3 files modified
debian/changelog (+9/-1)
debian/control (+0/-1)
debian/rules (+0/-5)
To merge this branch: bzr merge lp:~zulcss/python-heatclient/ftbfs
Reviewer Review Type Date Requested Status
Ubuntu Server Developers Pending
Review via email: mp+177662@code.launchpad.net

Description of the change

Fixes ftbfs.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/changelog'
--- debian/changelog 2013-07-19 16:59:11 +0000
+++ debian/changelog 2013-07-30 18:24:26 +0000
@@ -1,4 +1,12 @@
1python-heatclient (0.2.3-0ubuntu1) UNRELEASED; urgency=low1python-heatclient (0.2.3.8.gcae2c0f-0ubuntu1) UNRELEASED; urgency=low
2
3 * New upstream release.
4 * debian/{control,rules}: Dropped openstack-pkg-tools no longer
5 needed.
6
7 -- Chuck Short <zulcss@ubuntu.com> Tue, 30 Jul 2013 18:01:43 +0000
8
9python-heatclient (0.2.3-0ubuntu1) saucy; urgency=low
210
3 * New upstream release. 11 * New upstream release.
4 * Enabled testsuite.12 * Enabled testsuite.
513
=== modified file 'debian/control'
--- debian/control 2013-07-19 16:59:11 +0000
+++ debian/control 2013-07-30 18:24:26 +0000
@@ -9,7 +9,6 @@
9 Ghe Rivero <ghe.rivero@stackops.com>9 Ghe Rivero <ghe.rivero@stackops.com>
10Build-Depends: debhelper (>= 9), python-all (>= 2.6.6-3~)10Build-Depends: debhelper (>= 9), python-all (>= 2.6.6-3~)
11Build-Depends-Indep: lsb-release,11Build-Depends-Indep: lsb-release,
12 openstack-pkg-tools,
13 python-coverage,12 python-coverage,
14 python-fixtures,13 python-fixtures,
15 python-httplib2,14 python-httplib2,
1615
=== modified file 'debian/rules'
--- debian/rules 2013-07-19 16:59:11 +0000
+++ debian/rules 2013-07-30 18:24:26 +0000
@@ -2,15 +2,10 @@
22
3#export DH_VERBOSE=13#export DH_VERBOSE=1
44
5include /usr/share/openstack-pkg-tools/pkgos.make
65
7%:6%:
8 dh $@ --with python27 dh $@ --with python2
98
10override_dh_auto_configure:
11 echo $(VERSION) > heatclient/versioninfo
12 dh_auto_configure
13
14override_dh_auto_clean:9override_dh_auto_clean:
15 dh_auto_clean10 dh_auto_clean
16 rm -f heatclient/versioninfo11 rm -f heatclient/versioninfo

Subscribers

People subscribed via source and target branches