Merge lp:~noskcaj/ubuntu/trusty/python-nosehtmloutput/ftbfs into lp:ubuntu/trusty-proposed/python-nosehtmloutput

Proposed by Jackson Doak
Status: Merged
Merged at revision: 3
Proposed branch: lp:~noskcaj/ubuntu/trusty/python-nosehtmloutput/ftbfs
Merge into: lp:ubuntu/trusty-proposed/python-nosehtmloutput
Diff against target: 36 lines (+10/-2)
2 files modified
debian/changelog (+6/-0)
debian/control (+4/-2)
To merge this branch: bzr merge lp:~noskcaj/ubuntu/trusty/python-nosehtmloutput/ftbfs
Reviewer Review Type Date Requested Status
Ubuntu Development Team Pending
Review via email: mp+194580@code.launchpad.net

Description of the change

Fix 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-28 15:14:42 +0000
3+++ debian/changelog 2013-11-08 19:38:39 +0000
4@@ -1,3 +1,9 @@
5+python-nosehtmloutput (0.0.4-2ubuntu1) trusty; urgency=low
6+
7+ * Add build-dependancy on python-nose. Fixes FTBFS
8+
9+ -- Jackson Doak <noskcaj@ubuntu.com> Sat, 09 Nov 2013 06:28:03 +1100
10+
11 python-nosehtmloutput (0.0.4-2) unstable; urgency=low
12
13 * Cleans nose-*-py*.egg (package can be built twice).
14
15=== modified file 'debian/control'
16--- debian/control 2013-07-28 15:14:42 +0000
17+++ debian/control 2013-11-08 19:38:39 +0000
18@@ -1,14 +1,16 @@
19 Source: python-nosehtmloutput
20 Section: python
21 Priority: optional
22-Maintainer: PKG OpenStack <openstack-devel@lists.alioth.debian.org>
23+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
24+XSBC-Original-Maintainer: PKG OpenStack <openstack-devel@lists.alioth.debian.org>
25 Uploaders: Julien Danjou <acid@debian.org>,
26 Thomas Goirand <zigo@debian.org>,
27 Mehdi Abaakouk <sileht@sileht.net>
28 Build-Depends: debhelper (>= 9),
29 openstack-pkg-tools,
30 python-all (>= 2.6.6-3~),
31- python-setuptools
32+ python-setuptools,
33+ python-nose
34 Standards-Version: 3.9.4
35 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=openstack/python-nosehtmloutput.git
36 Vcs-Git: git://anonscm.debian.org/openstack/python-nosehtmloutput.git

Subscribers

People subscribed via source and target branches

to all changes: