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

Proposed by dobey on 2011-07-26
Status: Merged
Merged at revision: 35
Proposed branch: lp:~dobey/ubuntu/oneiric/ubuntu-sso-client/fix-ftbfs
Merge into: lp:ubuntu/oneiric/ubuntu-sso-client
Diff against target: 56 lines (+21/-3)
3 files modified
debian/changelog (+7/-0)
debian/control (+5/-2)
debian/rules (+9/-1)
To merge this branch: bzr merge lp:~dobey/ubuntu/oneiric/ubuntu-sso-client/fix-ftbfs
Reviewer Review Type Date Requested Status
Daniel Holbach Approve on 2011-07-27
Ubuntu branches 2011-07-26 Pending
Review via email: mp+69330@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-25 19:23:44 +0000
3+++ debian/changelog 2011-07-26 17:14:57 +0000
4@@ -1,3 +1,10 @@
5+ubuntu-sso-client (1.3.2-0ubuntu2) oneiric; urgency=low
6+
7+ * Require python-qt4 to build, as distutils doesn't have optional deps
8+ * Don't install the qt port in the binary package yet, as it's not ready
9+
10+ -- Rodney Dawes <rodney.dawes@ubuntu.com> Tue, 26 Jul 2011 09:56:31 -0400
11+
12 ubuntu-sso-client (1.3.2-0ubuntu1) oneiric; urgency=low
13
14 * New upstream release.
15
16=== modified file 'debian/control'
17--- debian/control 2011-06-29 14:55:35 +0000
18+++ debian/control 2011-07-26 17:14:57 +0000
19@@ -1,9 +1,11 @@
20 Source: ubuntu-sso-client
21 Section: python
22 Priority: extra
23-Build-Depends: debhelper (>= 7),
24+Build-Depends: debhelper (>= 7.0.50~),
25+ pyqt4-dev-tools,
26 python (>= 2.6.6-3~),
27- python-distutils-extra (>= 2.10)
28+ python-distutils-extra (>= 2.10),
29+ python-qt4
30 Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
31 XSBC-Original-Maintainer: Natalia Bidart <natalia.bidart@canonical.com>
32 Standards-Version: 3.9.1
33@@ -25,3 +27,4 @@
34 Description: Ubuntu Single Sign-On client
35 Desktop service to allow applications to sign into Ubuntu services via
36 SSO
37+
38
39=== modified file 'debian/rules'
40--- debian/rules 2011-06-10 11:10:54 +0000
41+++ debian/rules 2011-07-26 17:14:57 +0000
42@@ -1,4 +1,12 @@
43 #!/usr/bin/make -f
44
45 %:
46- dh $@ --with python2
47\ No newline at end of file
48+ dh $@ --with python2
49+
50+override_dh_install:
51+ dh_install
52+ # We're not shipping the full qt pieces yet, so remove them for now
53+ # When it's ready, we'll make a separate binary package
54+ rm -rf debian/*/usr/lib/python2.*/*-packages/*/ubuntu_sso/qt
55+ rm -rf debian/*/usr/share/ubuntu-sso-client/qt
56+

Subscribers

People subscribed via source and target branches

to all changes: