Merge lp:~dobey/ubuntu/oneiric/ubuntuone-control-panel/fix-ftbfs into lp:ubuntu/oneiric/ubuntuone-control-panel

Proposed by dobey
Status: Merged
Merged at revision: 27
Proposed branch: lp:~dobey/ubuntu/oneiric/ubuntuone-control-panel/fix-ftbfs
Merge into: lp:ubuntu/oneiric/ubuntuone-control-panel
Diff against target: 29 lines (+9/-1)
2 files modified
debian/changelog (+6/-0)
debian/control (+3/-1)
To merge this branch: bzr merge lp:~dobey/ubuntu/oneiric/ubuntuone-control-panel/fix-ftbfs
Reviewer Review Type Date Requested Status
Daniel Holbach Approve
Ubuntu branches Pending
Review via email: mp+69331@code.launchpad.net
To post a comment you must log in.
Daniel Holbach (dholbach) wrote :

Good work.

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-07-22 21:27:51 +0000
3+++ debian/changelog 2011-07-26 17:14:58 +0000
4@@ -1,3 +1,9 @@
5+ubuntuone-control-panel (1.1.1-0ubuntu2) oneiric; urgency=low
6+
7+ * Add pyqt4-dev-tools and python-qt4 to Build-Depends to fix FTBFS
8+
9+ -- Rodney Dawes <rodney.dawes@ubuntu.co> Tue, 26 Jul 2011 13:10:41 -0400
10+
11 ubuntuone-control-panel (1.1.1-0ubuntu1) oneiric; urgency=low
12
13 * New upstream release.
14
15=== modified file 'debian/control'
16--- debian/control 2011-07-22 21:45:30 +0000
17+++ debian/control 2011-07-26 17:14:58 +0000
18@@ -3,8 +3,10 @@
19 Priority: extra
20 Build-Depends: cdbs (>= 0.4.90),
21 debhelper (>= 7.0.14),
22+ pyqt4-dev-tools,
23 python (>= 2.6.6),
24- python-distutils-extra (>= 2.10)
25+ python-distutils-extra (>= 2.10),
26+ python-qt4
27 Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
28 Standards-Version: 3.9.1
29 X-Python-Version: >= 2.6

Subscribers

People subscribed via source and target branches

to all changes: