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