Online Accounts: Sign-on daemon

Merge lp:~robru/signon/trunk into lp:signon

  1. trunk
  2. Merge into trunk
Proposed by Robert Bruce Park
Status: Rejected
Rejected by: Alberto Mardegan
Proposed branch: lp:~robru/signon/trunk
Merge into: lp:signon
Diff against target: 263 lines (+57/-57)
7 files modified
debian/control (+42/-39)
debian/libsignon-qt-dev.install (+1/-1)
debian/libsignon-qt5-dev.install (+1/-2)
debian/signon-plugin-password.install (+1/-1)
debian/signon-plugins-dev.install (+3/-3)
debian/signond-dev.install (+6/-8)
debian/signond.install (+3/-3)
To merge this branch: bzr merge lp:~robru/signon/trunk
Reviewer Review Type Date Requested Status
Alberto Mardegan (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Didier Roche-Tolomelli Needs Fixing
Review via email: mp+210917@code.launchpad.net

Commit message

Fix -dev package conflicts and other small cleanups.

To post a comment you must log in.
Revision history for this message
Robert Bruce Park (robru) wrote :

So, the main thing here is introducing libsignon-common-dev to provide the contents of /usr/lib/cmake/, because both -qt-dev and -qt5-dev packages were supplying identical files and conflicting.

I also did a `wrap-and-sort` for cleanliness sake. Sorry for the noise!

Revision history for this message
Robert Bruce Park (robru) wrote :

Whoops, forgot to name my branch so it defaulted to 'trunk'. hehe.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:615
http://jenkins.qa.ubuntu.com/job/signon-ci/55/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/signon-trusty-amd64-ci/15
    SUCCESS: http://jenkins.qa.ubuntu.com/job/signon-trusty-armhf-ci/9
        deb: http://jenkins.qa.ubuntu.com/job/signon-trusty-armhf-ci/9/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/signon-ci/55/rebuild

review: Approve (continuous-integration)
Revision history for this message
Didier Roche-Tolomelli (didrocks) wrote :

I guess the -common-dev package should rather be arch: all?

Otherwise looks good, but add to click on your revision without the wrap and sort to make it clear in my mind :p

IIRC, there was a second package in the same case, I don't see you subscribe me to it?

review: Needs Fixing
Revision history for this message
Alberto Mardegan (mardy) wrote :

Thanks Robert for looking into this! But I think that this is not the best solution: we'll be adding separate CMake files for the -qt4 and -qt5 variants of the -dev packages, upstream.
I think that the correct thing to do for the time being (while the above is not ready) is to ship the current CMake files into the -qt4 package only.

All the other changes look good to me.

review: Needs Fixing
Revision history for this message
Robert Bruce Park (robru) wrote :

Didrocks: I was only aware of this one.

Mardy: Ok, I'll take out -common and put those files only in -qt4 then. Thanks!

lp:~robru/signon/trunk updated
616. By Robert Bruce Park

Put cmake files only in -qt-dev as per mardy.

617. By Robert Bruce Park

Small cleanup

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:616
http://jenkins.qa.ubuntu.com/job/signon-ci/56/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/signon-trusty-amd64-ci/16
    SUCCESS: http://jenkins.qa.ubuntu.com/job/signon-trusty-armhf-ci/10
        deb: http://jenkins.qa.ubuntu.com/job/signon-trusty-armhf-ci/10/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/signon-ci/56/rebuild

review: Approve (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:617
http://jenkins.qa.ubuntu.com/job/signon-ci/57/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/signon-trusty-amd64-ci/17
    SUCCESS: http://jenkins.qa.ubuntu.com/job/signon-trusty-armhf-ci/11
        deb: http://jenkins.qa.ubuntu.com/job/signon-trusty-armhf-ci/11/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/signon-ci/57/rebuild

review: Approve (continuous-integration)
Revision history for this message
Alberto Mardegan (mardy) wrote :

Thanks Rob, LGTM!

review: Approve
Revision history for this message
Robert Bruce Park (robru) wrote :

Hm, just noticed this never got merged. Is it still relevant?

Revision history for this message
Alberto Mardegan (mardy) wrote :

Yes, it's still relevant. We'll try to get it merged soon.

Revision history for this message
Alberto Mardegan (mardy) wrote :

Actually, the CMake issues have already been fixed in trunk.
As for the stylistic changes, we are landing them as part of https://code.launchpad.net/~online-accounts/signon/packaging/+merge/272616

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/control'
2--- debian/control 2014-01-15 09:11:58 +0000
3+++ debian/control 2014-03-14 18:18:56 +0000
4@@ -2,8 +2,9 @@
5 Section: gnome
6 Priority: optional
7 Maintainer: Ubuntu Desktop Team <ubuntu-desktop@lists.ubuntu.com>
8-Build-Depends: debhelper (>= 9),
9- pkg-config,
10+Build-Depends: dbus-test-runner,
11+ debhelper (>= 9),
12+ dh-migrations,
13 doxygen,
14 graphviz,
15 libproxy-dev,
16@@ -11,25 +12,25 @@
17 libqt4-sql-sqlite,
18 libqt5sql5-sqlite,
19 libssl-dev,
20+ pkg-config,
21 qt4-dev-tools,
22 qt4-qmake,
23 qt5-qmake,
24 qtbase5-dev,
25 qtchooser,
26- dh-migrations,
27- dbus-test-runner,
28-Standards-Version: 3.9.4
29+Standards-Version: 3.9.5
30 Homepage: http://code.google.com/p/accounts-sso/
31-# If you aren't a member of ~online-accounts but need to upload packaging changes,
32-# just go ahead. ~online-accounts will notice and sync up the code again.
33-Vcs-Bzr: https://code.launchpad.net/~online-accounts/signon/trunk
34+# if you don't have have commit access to this branch but would like to upload
35+# directly to Ubuntu, don't worry: your changes will be merged back into the
36+# upstream branch
37+Vcs-Bzr: lp:signon
38
39 Package: libsignon-qt1
40 Architecture: any
41 Section: libs
42 Priority: optional
43-Depends: ${shlibs:Depends},
44- ${misc:Depends},
45+Depends: ${misc:Depends},
46+ ${shlibs:Depends},
47 Description: Single Sign On framework
48 Framework to provide credential storage and authentication service.
49
50@@ -37,19 +38,19 @@
51 Architecture: any
52 Priority: optional
53 Section: libdevel
54-Depends: libsignon-qt1 (= ${binary:Version}),
55+Depends: libqt4-dev (>= 4.5),
56+ libsignon-qt1 (= ${binary:Version}),
57+ ${misc:Depends},
58 ${shlibs:Depends},
59- ${misc:Depends},
60- libqt4-dev (>= 4.5),
61 Description: Development files for libsignon-qt
62- Headers and static libraries for the libsignon-qt library
63+ Headers and static libraries for the libsignon-qt library.
64
65 Package: libsignon-qt5-1
66 Architecture: any
67 Section: libs
68 Priority: optional
69-Depends: ${shlibs:Depends},
70- ${misc:Depends},
71+Depends: ${misc:Depends},
72+ ${shlibs:Depends},
73 Description: Single Sign On framework
74 Framework to provide credential storage and authentication service.
75
76@@ -58,9 +59,9 @@
77 Priority: optional
78 Section: libdevel
79 Depends: libsignon-qt5-1 (= ${binary:Version}),
80+ qtbase5-dev,
81+ ${misc:Depends},
82 ${shlibs:Depends},
83- ${misc:Depends},
84- qtbase5-dev,
85 Description: Development files for libsignon-qt
86 Headers and static libraries for the libsignon-qt library
87
88@@ -77,8 +78,8 @@
89 Architecture: any
90 Section: libs
91 Priority: optional
92-Depends: ${shlibs:Depends},
93- ${misc:Depends},
94+Depends: ${misc:Depends},
95+ ${shlibs:Depends},
96 Description: Single Sign On framework
97 Framework to provide credential storage and authentication service.
98
99@@ -86,8 +87,8 @@
100 Architecture: any
101 Section: libs
102 Priority: optional
103-Depends: ${shlibs:Depends},
104- ${misc:Depends},
105+Depends: ${misc:Depends},
106+ ${shlibs:Depends},
107 Description: Single Sign On framework
108 Framework to provide credential storage and authentication service.
109
110@@ -95,12 +96,14 @@
111 Architecture: any
112 Section: gnome
113 Priority: optional
114-Depends: ${shlibs:Depends},
115+Depends: libqt5sql5-sqlite,
116 ${misc:Depends},
117- libqt5sql5-sqlite,
118-Breaks: signon-saslplugin (<< 8.40), signon-plugins
119-Replaces: signon-saslplugin (<< 8.40), signon-plugins
120-Recommends: signon-ui
121+ ${shlibs:Depends},
122+Breaks: signon-plugins,
123+ signon-saslplugin (<< 8.40),
124+Replaces: signon-plugins,
125+ signon-saslplugin (<< 8.40),
126+Recommends: signon-ui,
127 Description: Single Sign On framework
128 Framework to provide credential storage and authentication service.
129
130@@ -108,12 +111,12 @@
131 Architecture: any
132 Priority: optional
133 Section: libdevel
134-Depends: signond (= ${binary:Version}),
135+Depends: qtbase5-dev,
136+ signond (= ${binary:Version}),
137+ ${misc:Depends},
138 ${shlibs:Depends},
139- ${misc:Depends},
140- qtbase5-dev,
141-Breaks: signon-saslplugin-dev (<< 8.40)
142-Replaces: signon-saslplugin-dev (<< 8.40)
143+Breaks: signon-saslplugin-dev (<< 8.40),
144+Replaces: signon-saslplugin-dev (<< 8.40),
145 Description: Development files for Signon client library development
146 Common headers and DBUS interfaces definition files for the Signon Framework.
147
148@@ -131,8 +134,8 @@
149 Section: libdevel
150 Priority: optional
151 Depends: libsignon-qt5-dev,
152+ ${misc:Depends},
153 ${shlibs:Depends},
154- ${misc:Depends},
155 Description: Development files for Single Sign On plugins
156 Headers and static libraries for Single Sign On plugin development.
157
158@@ -149,11 +152,11 @@
159 Architecture: any
160 Section: libs
161 Priority: optional
162-Depends: ${shlibs:Depends},
163+Depends: signond,
164 ${misc:Depends},
165- signond,
166-Replaces: signon-passwordplugin
167-Conflicts: signon-passwordplugin
168+ ${shlibs:Depends},
169+Replaces: signon-passwordplugin,
170+Conflicts: signon-passwordplugin,
171 Description: Plain Password plugin for Single Sign On
172 Password plugin for Single Sign On.
173
174@@ -161,8 +164,8 @@
175 Architecture: any
176 Section: libs
177 Priority: optional
178-Depends: ${shlibs:Depends},
179+Depends: signond,
180 ${misc:Depends},
181- signond,
182+ ${shlibs:Depends},
183 Description: Test plugin for Single Sign On
184 Test plugin for Single Sign On.
185
186=== modified file 'debian/libsignon-qt-dev.install'
187--- debian/libsignon-qt-dev.install 2014-02-13 15:24:17 +0000
188+++ debian/libsignon-qt-dev.install 2014-03-14 18:18:56 +0000
189@@ -1,4 +1,4 @@
190+usr/include/signon-qt/SignOn/*
191 usr/lib/cmake
192 usr/lib/libsignon-qt.so
193 usr/lib/pkgconfig/libsignon-qt.pc
194-usr/include/signon-qt/SignOn/*
195
196=== modified file 'debian/libsignon-qt5-dev.install'
197--- debian/libsignon-qt5-dev.install 2014-02-13 15:24:17 +0000
198+++ debian/libsignon-qt5-dev.install 2014-03-14 18:18:56 +0000
199@@ -1,4 +1,3 @@
200-usr/lib/cmake
201+usr/include/signon-qt5/SignOn/*
202 usr/lib/libsignon-qt5.so
203 usr/lib/pkgconfig/libsignon-qt5.pc
204-usr/include/signon-qt5/SignOn/*
205
206=== modified file 'debian/signon-plugin-password.install'
207--- debian/signon-plugin-password.install 2013-01-21 23:11:25 +0000
208+++ debian/signon-plugin-password.install 2014-03-14 18:18:56 +0000
209@@ -1,1 +1,1 @@
210-usr/lib/signon/libpasswordplugin.so
211\ No newline at end of file
212+usr/lib/signon/libpasswordplugin.so
213
214=== modified file 'debian/signon-plugins-dev.install'
215--- debian/signon-plugins-dev.install 2013-03-26 08:32:30 +0000
216+++ debian/signon-plugins-dev.install 2014-03-14 18:18:56 +0000
217@@ -1,6 +1,6 @@
218+usr/include/signon-plugins/SignOn
219+usr/include/signon-plugins/passwordplugin.h
220 usr/lib/libsignon-plugins.a
221+usr/lib/pkgconfig/signon-plugins-common.pc
222 usr/lib/pkgconfig/signon-plugins.pc
223-usr/lib/pkgconfig/signon-plugins-common.pc
224-usr/include/signon-plugins/SignOn
225-usr/include/signon-plugins/passwordplugin.h
226 usr/share/doc/signon-plugins-dev/example/*
227
228=== modified file 'debian/signond-dev.install'
229--- debian/signond-dev.install 2013-01-21 23:11:25 +0000
230+++ debian/signond-dev.install 2014-03-14 18:18:56 +0000
231@@ -1,11 +1,9 @@
232+usr/include/signon-extension/SignOn/*
233+usr/include/signond/*
234+usr/lib/libsignon-extension.so
235+usr/lib/libsignon-plugins-common.so
236+usr/lib/pkgconfig/SignOnExtension.pc
237 usr/lib/pkgconfig/signond.pc
238-usr/lib/libsignon-plugins-common.so
239-usr/include/signond/*
240 usr/share/dbus-1/interfaces/com.google.code.AccountsSSO.SingleSignOn.AuthService.xml
241+usr/share/dbus-1/interfaces/com.google.code.AccountsSSO.SingleSignOn.AuthSession.xml
242 usr/share/dbus-1/interfaces/com.google.code.AccountsSSO.SingleSignOn.Identity.xml
243-usr/share/dbus-1/interfaces/com.google.code.AccountsSSO.SingleSignOn.AuthSession.xml
244-
245-# extensions
246-usr/include/signon-extension/SignOn/*
247-usr/lib/libsignon-extension.so
248-usr/lib/pkgconfig/SignOnExtension.pc
249
250=== modified file 'debian/signond.install'
251--- debian/signond.install 2013-01-21 23:11:25 +0000
252+++ debian/signond.install 2014-03-14 18:18:56 +0000
253@@ -1,7 +1,7 @@
254+debian/signon-crashdb.conf /etc/apport/crashdb.conf.d/
255+debian/source_signon.py usr/share/apport/package-hooks/
256+etc/signond.conf
257 usr/bin/signond
258 usr/bin/signonpluginprocess
259 usr/share/dbus-1/services/com.google.code.AccountsSSO.SingleSignOn.service
260 usr/share/dbus-1/services/com.nokia.SingleSignOn.Backup.service
261-etc/signond.conf
262-debian/signon-crashdb.conf /etc/apport/crashdb.conf.d/
263-debian/source_signon.py usr/share/apport/package-hooks/

Subscribers

People subscribed via source and target branches

to all changes: