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

[dobey]

[Daniel Holbach (dholbach)]

Good work.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2011-07-22 21:27:51 +0000
+++ debian/changelog	2011-07-26 17:14:58 +0000
@@ -1,3 +1,9 @@
+ubuntuone-control-panel (1.1.1-0ubuntu2) oneiric; urgency=low
+
+  * Add pyqt4-dev-tools and python-qt4 to Build-Depends to fix FTBFS
+
+ -- Rodney Dawes <[e-mail]>  Tue, 26 Jul 2011 13:10:41 -0400
+
 ubuntuone-control-panel (1.1.1-0ubuntu1) oneiric; urgency=low
 
   * New upstream release.
 
=== modified file 'debian/control'
--- debian/control	2011-07-22 21:45:30 +0000
+++ debian/control	2011-07-26 17:14:58 +0000
@@ -3,8 +3,10 @@
 Priority: extra
 Build-Depends: cdbs (>= 0.4.90),
  debhelper (>= 7.0.14),
+ pyqt4-dev-tools,
  python (>= 2.6.6),
- python-distutils-extra (>= 2.10)
+ python-distutils-extra (>= 2.10),
+ python-qt4
 Maintainer: Ubuntu Developers <[e-mail]>
 Standards-Version: 3.9.1
 X-Python-Version: >= 2.6