python-heatclient

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

  1. ftbfs
  2. Merge into 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
1=== modified file 'debian/changelog'
2--- debian/changelog 2013-07-19 16:59:11 +0000
3+++ debian/changelog 2013-07-30 18:24:26 +0000
4@@ -1,4 +1,12 @@
5-python-heatclient (0.2.3-0ubuntu1) UNRELEASED; urgency=low
6+python-heatclient (0.2.3.8.gcae2c0f-0ubuntu1) UNRELEASED; urgency=low
7+
8+ * New upstream release.
9+ * debian/{control,rules}: Dropped openstack-pkg-tools no longer
10+ needed.
11+
12+ -- Chuck Short <zulcss@ubuntu.com> Tue, 30 Jul 2013 18:01:43 +0000
13+
14+python-heatclient (0.2.3-0ubuntu1) saucy; urgency=low
15
16 * New upstream release.
17 * Enabled testsuite.
18
19=== modified file 'debian/control'
20--- debian/control 2013-07-19 16:59:11 +0000
21+++ debian/control 2013-07-30 18:24:26 +0000
22@@ -9,7 +9,6 @@
23 Ghe Rivero <ghe.rivero@stackops.com>
24 Build-Depends: debhelper (>= 9), python-all (>= 2.6.6-3~)
25 Build-Depends-Indep: lsb-release,
26- openstack-pkg-tools,
27 python-coverage,
28 python-fixtures,
29 python-httplib2,
30
31=== modified file 'debian/rules'
32--- debian/rules 2013-07-19 16:59:11 +0000
33+++ debian/rules 2013-07-30 18:24:26 +0000
34@@ -2,15 +2,10 @@
35
36 #export DH_VERBOSE=1
37
38-include /usr/share/openstack-pkg-tools/pkgos.make
39
40 %:
41 dh $@ --with python2
42
43-override_dh_auto_configure:
44- echo $(VERSION) > heatclient/versioninfo
45- dh_auto_configure
46-
47 override_dh_auto_clean:
48 dh_auto_clean
49 rm -f heatclient/versioninfo

Subscribers

People subscribed via source and target branches