Merge lp:~online-accounts/signon/packaging into lp:signon

Proposed by Alberto Mardegan
Status: Merged
Approved by: David Barth
Approved revision: no longer in the source branch.
Merged at revision: 628
Proposed branch: lp:~online-accounts/signon/packaging
Merge into: lp:signon
Diff against target: 363 lines (+94/-61)
14 files modified
README (+0/-1)
README.md (+23/-0)
common-vars.pri (+1/-1)
debian/changelog (+9/-0)
debian/control (+42/-39)
debian/docs (+1/-1)
debian/libsignon-qt-dev.install (+1/-1)
debian/libsignon-qt5-dev.install (+1/-1)
debian/signon-plugin-password.install (+1/-1)
debian/signon-plugins-dev.install (+2/-2)
debian/signond-dev.install (+6/-8)
debian/signond.install (+3/-3)
lib/SignOn/identityimpl.cpp (+1/-1)
lib/plugins/SignOn/uisessiondata.h (+3/-2)
To merge this branch: bzr merge lp:~online-accounts/signon/packaging
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Online Accounts Pending
Review via email: mp+272616@code.launchpad.net

Commit message

New upstream release

- Add a couple of error codes for SignOn UI (network and SSL errors)
- lib: remove unnecessary semicolon after namespace
  Fixes a GCC warning with -Wpedantic.

Description of the change

New upstream release

- Add a couple of error codes for SignOn UI (network and SSL errors)
- lib: remove unnecessary semicolon after namespace
  Fixes a GCC warning with -Wpedantic.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
lp:~online-accounts/signon/packaging updated
628. By Alberto Mardegan on 2015-10-28

New upstream release

- Add a couple of error codes for SignOn UI (network and SSL errors)
- lib: remove unnecessary semicolon after namespace
  Fixes a GCC warning with -Wpedantic.
 Fixes: #1415492
Approved by: PS Jenkins bot

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== removed file 'README'
2--- README 2010-04-01 11:58:48 +0000
3+++ README 1970-01-01 00:00:00 +0000
4@@ -1,1 +0,0 @@
5-
6
7=== added file 'README.md'
8--- README.md 1970-01-01 00:00:00 +0000
9+++ README.md 2015-10-01 10:44:18 +0000
10@@ -0,0 +1,23 @@
11+SignOn daemon
12+=============
13+
14+The SignOn daemon is a D-Bus service which performs user authentication on
15+behalf of its clients. There are currently authentication plugins for OAuth 1.0
16+and 2.0, SASL, Digest-MD5, and plain username/password combination.
17+
18+
19+License
20+-------
21+
22+See COPYING file.
23+
24+
25+Build instructions
26+------------------
27+
28+This project depends on Qt 5. To build it, run
29+```
30+qmake
31+make
32+make install
33+```
34
35=== modified file 'common-vars.pri'
36--- common-vars.pri 2014-08-25 14:33:29 +0000
37+++ common-vars.pri 2015-10-01 10:44:18 +0000
38@@ -14,7 +14,7 @@
39 # Project version
40 # remember to update debian/* files if you changes this
41 #-----------------------------------------------------------------------------
42-PROJECT_VERSION = 8.57
43+PROJECT_VERSION = 8.58
44
45 #-----------------------------------------------------------------------------
46 # Library version
47
48=== modified file 'debian/changelog'
49--- debian/changelog 2015-06-16 11:34:22 +0000
50+++ debian/changelog 2015-10-01 10:44:18 +0000
51@@ -1,3 +1,12 @@
52+signon (8.58-0ubuntu1) UNRELEASED; urgency=medium
53+
54+ * New upstream release
55+ - Add a couple of error codes for SignOn UI (network and SSL errors)
56+ - lib: remove unnecessary semicolon after namespace
57+ Fixes a GCC warning with -Wpedantic.
58+
59+ -- Alberto Mardegan <alberto.mardegan@canonical.com> Mon, 28 Sep 2015 17:49:43 +0300
60+
61 signon (8.57+15.10.20150616-0ubuntu1) wily; urgency=medium
62
63 [ Alberto Mardegan ]
64
65=== modified file 'debian/control'
66--- debian/control 2015-02-02 09:45:36 +0000
67+++ debian/control 2015-10-01 10:44:18 +0000
68@@ -2,8 +2,9 @@
69 Section: gnome
70 Priority: optional
71 Maintainer: Ubuntu Desktop Team <ubuntu-desktop@lists.ubuntu.com>
72-Build-Depends: debhelper (>= 9),
73- pkg-config,
74+Build-Depends: dbus-test-runner,
75+ debhelper (>= 9),
76+ dh-migrations,
77 doxygen,
78 graphviz,
79 libdbus-1-dev,
80@@ -12,25 +13,25 @@
81 libqt4-sql-sqlite,
82 libqt5sql5-sqlite,
83 libssl-dev,
84+ pkg-config,
85 qt4-dev-tools,
86 qt4-qmake,
87 qt5-qmake,
88 qtbase5-dev,
89 qtchooser,
90- dh-migrations,
91- dbus-test-runner,
92-Standards-Version: 3.9.4
93+Standards-Version: 3.9.5
94 Homepage: http://code.google.com/p/accounts-sso/
95-# If you aren't a member of ~online-accounts but need to upload packaging changes,
96-# just go ahead. ~online-accounts will notice and sync up the code again.
97-Vcs-Bzr: https://code.launchpad.net/~online-accounts/signon/trunk
98+# if you don't have have commit access to this branch but would like to upload
99+# directly to Ubuntu, don't worry: your changes will be merged back into the
100+# upstream branch
101+Vcs-Bzr: lp:signon
102
103 Package: libsignon-qt1
104 Architecture: any
105 Section: libs
106 Priority: optional
107-Depends: ${shlibs:Depends},
108- ${misc:Depends},
109+Depends: ${misc:Depends},
110+ ${shlibs:Depends},
111 Multi-Arch: same
112 Description: Single Sign On framework
113 Framework to provide credential storage and authentication service.
114@@ -39,19 +40,19 @@
115 Architecture: any
116 Priority: optional
117 Section: libdevel
118-Depends: libsignon-qt1 (= ${binary:Version}),
119+Depends: libqt4-dev (>= 4.5),
120+ libsignon-qt1 (= ${binary:Version}),
121+ ${misc:Depends},
122 ${shlibs:Depends},
123- ${misc:Depends},
124- libqt4-dev (>= 4.5),
125 Description: Development files for libsignon-qt
126- Headers and static libraries for the libsignon-qt library
127+ Headers and static libraries for the libsignon-qt library.
128
129 Package: libsignon-qt5-1
130 Architecture: any
131 Section: libs
132 Priority: optional
133-Depends: ${shlibs:Depends},
134- ${misc:Depends},
135+Depends: ${misc:Depends},
136+ ${shlibs:Depends},
137 Multi-Arch: same
138 Description: Single Sign On framework
139 Framework to provide credential storage and authentication service.
140@@ -61,9 +62,9 @@
141 Priority: optional
142 Section: libdevel
143 Depends: libsignon-qt5-1 (= ${binary:Version}),
144+ qtbase5-dev,
145+ ${misc:Depends},
146 ${shlibs:Depends},
147- ${misc:Depends},
148- qtbase5-dev,
149 Description: Development files for libsignon-qt
150 Headers and static libraries for the libsignon-qt library
151
152@@ -80,8 +81,8 @@
153 Architecture: any
154 Section: libs
155 Priority: optional
156-Depends: ${shlibs:Depends},
157- ${misc:Depends},
158+Depends: ${misc:Depends},
159+ ${shlibs:Depends},
160 Multi-Arch: same
161 Description: Single Sign On framework
162 Framework to provide credential storage and authentication service.
163@@ -90,8 +91,8 @@
164 Architecture: any
165 Section: libs
166 Priority: optional
167-Depends: ${shlibs:Depends},
168- ${misc:Depends},
169+Depends: ${misc:Depends},
170+ ${shlibs:Depends},
171 Multi-Arch: same
172 Description: Single Sign On framework
173 Framework to provide credential storage and authentication service.
174@@ -100,12 +101,14 @@
175 Architecture: any
176 Section: gnome
177 Priority: optional
178-Depends: ${shlibs:Depends},
179+Depends: libqt5sql5-sqlite,
180 ${misc:Depends},
181- libqt5sql5-sqlite,
182-Breaks: signon-saslplugin (<< 8.40), signon-plugins
183-Replaces: signon-saslplugin (<< 8.40), signon-plugins
184-Recommends: signon-ui
185+ ${shlibs:Depends},
186+Breaks: signon-plugins,
187+ signon-saslplugin (<< 8.40),
188+Replaces: signon-plugins,
189+ signon-saslplugin (<< 8.40),
190+Recommends: signon-ui,
191 Description: Single Sign On framework
192 Framework to provide credential storage and authentication service.
193
194@@ -113,12 +116,12 @@
195 Architecture: any
196 Priority: optional
197 Section: libdevel
198-Depends: signond (= ${binary:Version}),
199+Depends: qtbase5-dev,
200+ signond (= ${binary:Version}),
201+ ${misc:Depends},
202 ${shlibs:Depends},
203- ${misc:Depends},
204- qtbase5-dev,
205-Breaks: signon-saslplugin-dev (<< 8.40)
206-Replaces: signon-saslplugin-dev (<< 8.40)
207+Breaks: signon-saslplugin-dev (<< 8.40),
208+Replaces: signon-saslplugin-dev (<< 8.40),
209 Description: Development files for Signon client library development
210 Common headers and DBUS interfaces definition files for the Signon Framework.
211
212@@ -137,8 +140,8 @@
213 Priority: optional
214 Depends: libsignon-plugins-common1 (= ${binary:Version}),
215 libsignon-qt5-dev,
216+ ${misc:Depends},
217 ${shlibs:Depends},
218- ${misc:Depends},
219 Description: Development files for Single Sign On plugins
220 Headers and static libraries for Single Sign On plugin development.
221
222@@ -155,11 +158,11 @@
223 Architecture: any
224 Section: libs
225 Priority: optional
226-Depends: ${shlibs:Depends},
227+Depends: signond,
228 ${misc:Depends},
229- signond,
230-Replaces: signon-passwordplugin
231-Conflicts: signon-passwordplugin
232+ ${shlibs:Depends},
233+Replaces: signon-passwordplugin,
234+Conflicts: signon-passwordplugin,
235 Description: Plain Password plugin for Single Sign On
236 Password plugin for Single Sign On.
237
238@@ -167,8 +170,8 @@
239 Architecture: any
240 Section: libs
241 Priority: optional
242-Depends: ${shlibs:Depends},
243+Depends: signond,
244 ${misc:Depends},
245- signond,
246+ ${shlibs:Depends},
247 Description: Test plugin for Single Sign On
248 Test plugin for Single Sign On.
249
250=== modified file 'debian/docs'
251--- debian/docs 2013-01-21 23:11:25 +0000
252+++ debian/docs 2015-10-01 10:44:18 +0000
253@@ -1,2 +1,2 @@
254-README
255+README.md
256 TODO
257
258=== modified file 'debian/libsignon-qt-dev.install'
259--- debian/libsignon-qt-dev.install 2014-08-25 10:49:45 +0000
260+++ debian/libsignon-qt-dev.install 2015-10-01 10:44:18 +0000
261@@ -1,4 +1,4 @@
262+usr/include/signon-qt/SignOn/*
263 usr/lib/*/cmake/SignOnQt4/
264 usr/lib/*/libsignon-qt.so
265 usr/lib/*/pkgconfig/libsignon-qt.pc
266-usr/include/signon-qt/SignOn/*
267
268=== modified file 'debian/libsignon-qt5-dev.install'
269--- debian/libsignon-qt5-dev.install 2014-08-26 08:23:49 +0000
270+++ debian/libsignon-qt5-dev.install 2015-10-01 10:44:18 +0000
271@@ -1,4 +1,4 @@
272+usr/include/signon-qt5/SignOn/*
273 usr/lib/*/cmake/SignOnQt5/
274 usr/lib/*/libsignon-qt5.so
275 usr/lib/*/pkgconfig/libsignon-qt5.pc
276-usr/include/signon-qt5/SignOn/*
277
278=== modified file 'debian/signon-plugin-password.install'
279--- debian/signon-plugin-password.install 2014-08-25 10:49:45 +0000
280+++ debian/signon-plugin-password.install 2015-10-01 10:44:18 +0000
281@@ -1,1 +1,1 @@
282-usr/lib/*/signon/libpasswordplugin.so
283\ No newline at end of file
284+usr/lib/*/signon/libpasswordplugin.so
285
286=== modified file 'debian/signon-plugins-dev.install'
287--- debian/signon-plugins-dev.install 2014-08-26 08:23:49 +0000
288+++ debian/signon-plugins-dev.install 2015-10-01 10:44:18 +0000
289@@ -1,6 +1,6 @@
290+usr/include/signon-plugins/SignOn
291+usr/include/signon-plugins/passwordplugin.h
292 usr/lib/*/libsignon-plugins.so
293 usr/lib/*/pkgconfig/signon-plugins.pc
294 usr/lib/*/pkgconfig/signon-plugins-common.pc
295-usr/include/signon-plugins/SignOn
296-usr/include/signon-plugins/passwordplugin.h
297 usr/share/doc/signon-plugins-dev/example/*
298
299=== modified file 'debian/signond-dev.install'
300--- debian/signond-dev.install 2014-08-25 10:49:45 +0000
301+++ debian/signond-dev.install 2015-10-01 10:44:18 +0000
302@@ -1,11 +1,9 @@
303+usr/include/signon-extension/SignOn/*
304+usr/include/signond/*
305+usr/lib/*/libsignon-extension.so
306+usr/lib/*/libsignon-plugins-common.so
307+usr/lib/*/pkgconfig/SignOnExtension.pc
308 usr/lib/*/pkgconfig/signond.pc
309-usr/lib/*/libsignon-plugins-common.so
310-usr/include/signond/*
311 usr/share/dbus-1/interfaces/com.google.code.AccountsSSO.SingleSignOn.AuthService.xml
312+usr/share/dbus-1/interfaces/com.google.code.AccountsSSO.SingleSignOn.AuthSession.xml
313 usr/share/dbus-1/interfaces/com.google.code.AccountsSSO.SingleSignOn.Identity.xml
314-usr/share/dbus-1/interfaces/com.google.code.AccountsSSO.SingleSignOn.AuthSession.xml
315-
316-# extensions
317-usr/include/signon-extension/SignOn/*
318-usr/lib/*/libsignon-extension.so
319-usr/lib/*/pkgconfig/SignOnExtension.pc
320
321=== modified file 'debian/signond.install'
322--- debian/signond.install 2013-01-21 23:11:25 +0000
323+++ debian/signond.install 2015-10-01 10:44:18 +0000
324@@ -1,7 +1,7 @@
325+debian/signon-crashdb.conf /etc/apport/crashdb.conf.d/
326+debian/source_signon.py usr/share/apport/package-hooks/
327+etc/signond.conf
328 usr/bin/signond
329 usr/bin/signonpluginprocess
330 usr/share/dbus-1/services/com.google.code.AccountsSSO.SingleSignOn.service
331 usr/share/dbus-1/services/com.nokia.SingleSignOn.Backup.service
332-etc/signond.conf
333-debian/signon-crashdb.conf /etc/apport/crashdb.conf.d/
334-debian/source_signon.py usr/share/apport/package-hooks/
335
336=== modified file 'lib/SignOn/identityimpl.cpp'
337--- lib/SignOn/identityimpl.cpp 2013-11-22 14:46:01 +0000
338+++ lib/SignOn/identityimpl.cpp 2015-10-01 10:44:18 +0000
339@@ -445,7 +445,7 @@
340
341 void IdentityImpl::errorReply(const QDBusError& err)
342 {
343- TRACE() << err.name();
344+ TRACE() << err;
345
346 /* Signon specific errors */
347 if (err.name() == SIGNOND_UNKNOWN_ERR_NAME) {
348
349=== modified file 'lib/plugins/SignOn/uisessiondata.h'
350--- lib/plugins/SignOn/uisessiondata.h 2012-04-18 13:06:27 +0000
351+++ lib/plugins/SignOn/uisessiondata.h 2015-10-01 10:44:18 +0000
352@@ -50,8 +50,9 @@
353 valid. */
354 QUERY_ERROR_REFRESH_FAILED, /**< Refresh failed. */
355 QUERY_ERROR_FORBIDDEN, /**< Showing ui forbidden by ui policy. */
356- QUERY_ERROR_FORGOT_PASSWORD /**< User pressed forgot password. */
357- //TODO add more errors
358+ QUERY_ERROR_FORGOT_PASSWORD, /**< User pressed forgot password. */
359+ QUERY_ERROR_NETWORK, /**< Network error. */
360+ QUERY_ERROR_SSL, /**< SSL error. */
361 };
362
363 /*!

Subscribers

No one subscribed via source and target branches