Merge lp:~dobey/ubuntu/oneiric/ubuntu-sso-client/fix-ftbfs into lp:ubuntu/oneiric/ubuntu-sso-client

[dobey]

[Daniel Holbach (dholbach)]

Good work.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2011-07-25 19:23:44 +0000
+++ debian/changelog	2011-07-26 17:14:57 +0000
@@ -1,3 +1,10 @@
+ubuntu-sso-client (1.3.2-0ubuntu2) oneiric; urgency=low
+
+  * Require python-qt4 to build, as distutils doesn't have optional deps
+  * Don't install the qt port in the binary package yet, as it's not ready
+
+ -- Rodney Dawes <[e-mail]>  Tue, 26 Jul 2011 09:56:31 -0400
+
 ubuntu-sso-client (1.3.2-0ubuntu1) oneiric; urgency=low
 
   * New upstream release.
 
=== modified file 'debian/control'
--- debian/control	2011-06-29 14:55:35 +0000
+++ debian/control	2011-07-26 17:14:57 +0000
@@ -1,9 +1,11 @@
 Source: ubuntu-sso-client
 Section: python
 Priority: extra
-Build-Depends: debhelper (>= 7),
+Build-Depends: debhelper (>= 7.0.50~),
+ pyqt4-dev-tools,
  python (>= 2.6.6-3~),
- python-distutils-extra (>= 2.10)
+ python-distutils-extra (>= 2.10),
+ python-qt4
 Maintainer: Ubuntu Developers <[e-mail]>
 XSBC-Original-Maintainer: Natalia Bidart <[e-mail]>
 Standards-Version: 3.9.1
@@ -25,3 +27,4 @@
 Description: Ubuntu Single Sign-On client
  Desktop service to allow applications to sign into Ubuntu services via
  SSO
+
 
=== modified file 'debian/rules'
--- debian/rules	2011-06-10 11:10:54 +0000
+++ debian/rules	2011-07-26 17:14:57 +0000
@@ -1,4 +1,12 @@
 #!/usr/bin/make -f
 
 %:
-	dh $@ --with python2
 \ No newline at end of file
+	dh $@ --with python2
+
+override_dh_install:
+	dh_install
+	# We're not shipping the full qt pieces yet, so remove them for now
+	# When it's ready, we'll make a separate binary package
+	rm -rf debian/*/usr/lib/python2.*/*-packages/*/ubuntu_sso/qt
+	rm -rf debian/*/usr/share/ubuntu-sso-client/qt
+