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

[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.

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)]

FAILED: Continuous integration, rev:628
http://jenkins.qa.ubuntu.com/job/signon-ci/76/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/signon-wily-amd64-ci/2/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/signon-wily-armhf-ci/2/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/signon-wily-i386-ci/2/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:629
http://jenkins.qa.ubuntu.com/job/signon-ci/77/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/signon-wily-amd64-ci/3
    SUCCESS: http://jenkins.qa.ubuntu.com/job/signon-wily-armhf-ci/3
        deb: http://jenkins.qa.ubuntu.com/job/signon-wily-armhf-ci/3/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/signon-wily-i386-ci/3

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:630
http://jenkins.qa.ubuntu.com/job/signon-ci/78/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/signon-wily-amd64-ci/4
    SUCCESS: http://jenkins.qa.ubuntu.com/job/signon-wily-armhf-ci/4
        deb: http://jenkins.qa.ubuntu.com/job/signon-wily-armhf-ci/4/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/signon-wily-i386-ci/4

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

review: Approve (continuous-integration)

[lp:~online-accounts/signon/packaging]

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

=== removed file 'README'
--- README	2010-04-01 11:58:48 +0000
+++ README	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-

=== added file 'README.md'
--- README.md	1970-01-01 00:00:00 +0000
+++ README.md	2015-10-01 10:44:18 +0000
@@ -0,0 +1,23 @@
+SignOn daemon
+=============
+
+The SignOn daemon is a D-Bus service which performs user authentication on
+behalf of its clients. There are currently authentication plugins for OAuth 1.0
+and 2.0, SASL, Digest-MD5, and plain username/password combination.
+
+
+License
+-------
+
+See COPYING file.
+
+
+Build instructions
+------------------
+
+This project depends on Qt 5. To build it, run
+```
+qmake
+make
+make install
+```

=== modified file 'common-vars.pri'
--- common-vars.pri	2014-08-25 14:33:29 +0000
+++ common-vars.pri	2015-10-01 10:44:18 +0000
@@ -14,7 +14,7 @@
 # Project version
 # remember to update debian/* files if you changes this
 #-----------------------------------------------------------------------------
-PROJECT_VERSION = 8.57
+PROJECT_VERSION = 8.58
 
 #-----------------------------------------------------------------------------
 # Library version

=== modified file 'debian/changelog'
--- debian/changelog	2015-06-16 11:34:22 +0000
+++ debian/changelog	2015-10-01 10:44:18 +0000
@@ -1,3 +1,12 @@
+signon (8.58-0ubuntu1) UNRELEASED; urgency=medium
+
+  * 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.
+
+ -- Alberto Mardegan <[e-mail]>  Mon, 28 Sep 2015 17:49:43 +0300
+
 signon (8.57+15.10.20150616-0ubuntu1) wily; urgency=medium
 
   [ Alberto Mardegan ]

=== modified file 'debian/control'
--- debian/control	2015-02-02 09:45:36 +0000
+++ debian/control	2015-10-01 10:44:18 +0000
@@ -2,8 +2,9 @@
 Section: gnome
 Priority: optional
 Maintainer: Ubuntu Desktop Team <[e-mail]>
-Build-Depends: debhelper (>= 9),
-               pkg-config,
+Build-Depends: dbus-test-runner,
+               debhelper (>= 9),
+               dh-migrations,
                doxygen,
                graphviz,
                libdbus-1-dev,
@@ -12,25 +13,25 @@
                libqt4-sql-sqlite,
                libqt5sql5-sqlite,
                libssl-dev,
+               pkg-config,
                qt4-dev-tools,
                qt4-qmake,
                qt5-qmake,
                qtbase5-dev,
                qtchooser,
-               dh-migrations,
-               dbus-test-runner,
-Standards-Version: 3.9.4
+Standards-Version: 3.9.5
 Homepage: http://code.google.com/p/accounts-sso/
-# If you aren't a member of ~online-accounts but need to upload packaging changes,
-# just go ahead.  ~online-accounts will notice and sync up the code again.
-Vcs-Bzr: https://code.launchpad.net/~online-accounts/signon/trunk
+# if you don't have have commit access to this branch but would like to upload
+# directly to Ubuntu, don't worry: your changes will be merged back into the
+# upstream branch
+Vcs-Bzr: lp:signon
 
 Package: libsignon-qt1
 Architecture: any
 Section: libs
 Priority: optional
-Depends: ${shlibs:Depends},
-         ${misc:Depends},
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
 Multi-Arch: same
 Description: Single Sign On framework
  Framework to provide credential storage and authentication service.
@@ -39,19 +40,19 @@
 Architecture: any
 Priority: optional
 Section: libdevel
-Depends: libsignon-qt1 (= ${binary:Version}),
+Depends: libqt4-dev (>= 4.5),
+         libsignon-qt1 (= ${binary:Version}),
+         ${misc:Depends},
          ${shlibs:Depends},
-         ${misc:Depends},
-         libqt4-dev (>= 4.5),
 Description: Development files for libsignon-qt
- Headers and static libraries for the libsignon-qt library
+ Headers and static libraries for the libsignon-qt library.
 
 Package: libsignon-qt5-1
 Architecture: any
 Section: libs
 Priority: optional
-Depends: ${shlibs:Depends},
-         ${misc:Depends},
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
 Multi-Arch: same
 Description: Single Sign On framework
  Framework to provide credential storage and authentication service.
@@ -61,9 +62,9 @@
 Priority: optional
 Section: libdevel
 Depends: libsignon-qt5-1 (= ${binary:Version}),
+         qtbase5-dev,
+         ${misc:Depends},
          ${shlibs:Depends},
-         ${misc:Depends},
-         qtbase5-dev,
 Description: Development files for libsignon-qt
  Headers and static libraries for the libsignon-qt library
 
@@ -80,8 +81,8 @@
 Architecture: any
 Section: libs
 Priority: optional
-Depends: ${shlibs:Depends},
-         ${misc:Depends},
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
 Multi-Arch: same
 Description: Single Sign On framework
  Framework to provide credential storage and authentication service.
@@ -90,8 +91,8 @@
 Architecture: any
 Section: libs
 Priority: optional
-Depends: ${shlibs:Depends},
-         ${misc:Depends},
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
 Multi-Arch: same
 Description: Single Sign On framework
  Framework to provide credential storage and authentication service.
@@ -100,12 +101,14 @@
 Architecture: any
 Section: gnome
 Priority: optional
-Depends: ${shlibs:Depends},
+Depends: libqt5sql5-sqlite,
          ${misc:Depends},
-         libqt5sql5-sqlite,
-Breaks: signon-saslplugin (<< 8.40), signon-plugins
-Replaces: signon-saslplugin (<< 8.40), signon-plugins
-Recommends: signon-ui
+         ${shlibs:Depends},
+Breaks: signon-plugins,
+        signon-saslplugin (<< 8.40),
+Replaces: signon-plugins,
+          signon-saslplugin (<< 8.40),
+Recommends: signon-ui,
 Description: Single Sign On framework
  Framework to provide credential storage and authentication service.
 
@@ -113,12 +116,12 @@
 Architecture: any
 Priority: optional
 Section: libdevel
-Depends: signond (= ${binary:Version}),
+Depends: qtbase5-dev,
+         signond (= ${binary:Version}),
+         ${misc:Depends},
          ${shlibs:Depends},
-         ${misc:Depends},
-         qtbase5-dev,
-Breaks: signon-saslplugin-dev (<< 8.40)
-Replaces: signon-saslplugin-dev (<< 8.40)
+Breaks: signon-saslplugin-dev (<< 8.40),
+Replaces: signon-saslplugin-dev (<< 8.40),
 Description: Development files for Signon client library development
  Common headers and DBUS interfaces definition files for the Signon Framework.
 
@@ -137,8 +140,8 @@
 Priority: optional
 Depends: libsignon-plugins-common1 (= ${binary:Version}),
          libsignon-qt5-dev,
+         ${misc:Depends},
          ${shlibs:Depends},
-         ${misc:Depends},
 Description: Development files for Single Sign On plugins
  Headers and static libraries for Single Sign On plugin development.
 
@@ -155,11 +158,11 @@
 Architecture: any
 Section: libs
 Priority: optional
-Depends: ${shlibs:Depends},
+Depends: signond,
          ${misc:Depends},
-         signond,
-Replaces: signon-passwordplugin
-Conflicts: signon-passwordplugin
+         ${shlibs:Depends},
+Replaces: signon-passwordplugin,
+Conflicts: signon-passwordplugin,
 Description: Plain Password plugin for Single Sign On
  Password plugin for Single Sign On.
 
@@ -167,8 +170,8 @@
 Architecture: any
 Section: libs
 Priority: optional
-Depends: ${shlibs:Depends},
+Depends: signond,
          ${misc:Depends},
-         signond,
+         ${shlibs:Depends},
 Description: Test plugin for Single Sign On
  Test plugin for Single Sign On.

=== modified file 'debian/docs'
--- debian/docs	2013-01-21 23:11:25 +0000
+++ debian/docs	2015-10-01 10:44:18 +0000
@@ -1,2 +1,2 @@
-README
+README.md
 TODO

=== modified file 'debian/libsignon-qt-dev.install'
--- debian/libsignon-qt-dev.install	2014-08-25 10:49:45 +0000
+++ debian/libsignon-qt-dev.install	2015-10-01 10:44:18 +0000
@@ -1,4 +1,4 @@
+usr/include/signon-qt/SignOn/*
 usr/lib/*/cmake/SignOnQt4/
 usr/lib/*/libsignon-qt.so
 usr/lib/*/pkgconfig/libsignon-qt.pc
-usr/include/signon-qt/SignOn/*

=== modified file 'debian/libsignon-qt5-dev.install'
--- debian/libsignon-qt5-dev.install	2014-08-26 08:23:49 +0000
+++ debian/libsignon-qt5-dev.install	2015-10-01 10:44:18 +0000
@@ -1,4 +1,4 @@
+usr/include/signon-qt5/SignOn/*
 usr/lib/*/cmake/SignOnQt5/
 usr/lib/*/libsignon-qt5.so
 usr/lib/*/pkgconfig/libsignon-qt5.pc
-usr/include/signon-qt5/SignOn/*

=== modified file 'debian/signon-plugin-password.install'
--- debian/signon-plugin-password.install	2014-08-25 10:49:45 +0000
+++ debian/signon-plugin-password.install	2015-10-01 10:44:18 +0000
@@ -1,1 +1,1 @@
-usr/lib/*/signon/libpasswordplugin.so
\ No newline at end of file
+usr/lib/*/signon/libpasswordplugin.so

=== modified file 'debian/signon-plugins-dev.install'
--- debian/signon-plugins-dev.install	2014-08-26 08:23:49 +0000
+++ debian/signon-plugins-dev.install	2015-10-01 10:44:18 +0000
@@ -1,6 +1,6 @@
+usr/include/signon-plugins/SignOn
+usr/include/signon-plugins/passwordplugin.h
 usr/lib/*/libsignon-plugins.so
 usr/lib/*/pkgconfig/signon-plugins.pc
 usr/lib/*/pkgconfig/signon-plugins-common.pc
-usr/include/signon-plugins/SignOn
-usr/include/signon-plugins/passwordplugin.h
 usr/share/doc/signon-plugins-dev/example/*

=== modified file 'debian/signond-dev.install'
--- debian/signond-dev.install	2014-08-25 10:49:45 +0000
+++ debian/signond-dev.install	2015-10-01 10:44:18 +0000
@@ -1,11 +1,9 @@
+usr/include/signon-extension/SignOn/*
+usr/include/signond/*
+usr/lib/*/libsignon-extension.so
+usr/lib/*/libsignon-plugins-common.so
+usr/lib/*/pkgconfig/SignOnExtension.pc
 usr/lib/*/pkgconfig/signond.pc
-usr/lib/*/libsignon-plugins-common.so
-usr/include/signond/*
 usr/share/dbus-1/interfaces/com.google.code.AccountsSSO.SingleSignOn.AuthService.xml
+usr/share/dbus-1/interfaces/com.google.code.AccountsSSO.SingleSignOn.AuthSession.xml
 usr/share/dbus-1/interfaces/com.google.code.AccountsSSO.SingleSignOn.Identity.xml
-usr/share/dbus-1/interfaces/com.google.code.AccountsSSO.SingleSignOn.AuthSession.xml
-
-# extensions
-usr/include/signon-extension/SignOn/*
-usr/lib/*/libsignon-extension.so
-usr/lib/*/pkgconfig/SignOnExtension.pc

=== modified file 'debian/signond.install'
--- debian/signond.install	2013-01-21 23:11:25 +0000
+++ debian/signond.install	2015-10-01 10:44:18 +0000
@@ -1,7 +1,7 @@
+debian/signon-crashdb.conf /etc/apport/crashdb.conf.d/
+debian/source_signon.py usr/share/apport/package-hooks/
+etc/signond.conf
 usr/bin/signond
 usr/bin/signonpluginprocess
 usr/share/dbus-1/services/com.google.code.AccountsSSO.SingleSignOn.service
 usr/share/dbus-1/services/com.nokia.SingleSignOn.Backup.service
-etc/signond.conf
-debian/signon-crashdb.conf /etc/apport/crashdb.conf.d/
-debian/source_signon.py usr/share/apport/package-hooks/

=== modified file 'lib/SignOn/identityimpl.cpp'
--- lib/SignOn/identityimpl.cpp	2013-11-22 14:46:01 +0000
+++ lib/SignOn/identityimpl.cpp	2015-10-01 10:44:18 +0000
@@ -445,7 +445,7 @@
 
 void IdentityImpl::errorReply(const QDBusError& err)
 {
-    TRACE() << err.name();
+    TRACE() << err;
 
     /* Signon specific errors */
     if (err.name() == SIGNOND_UNKNOWN_ERR_NAME) {

=== modified file 'lib/plugins/SignOn/uisessiondata.h'
--- lib/plugins/SignOn/uisessiondata.h	2012-04-18 13:06:27 +0000
+++ lib/plugins/SignOn/uisessiondata.h	2015-10-01 10:44:18 +0000
@@ -50,8 +50,9 @@
                                    valid. */
     QUERY_ERROR_REFRESH_FAILED,  /**< Refresh failed. */
     QUERY_ERROR_FORBIDDEN,       /**< Showing ui forbidden by ui policy. */
-    QUERY_ERROR_FORGOT_PASSWORD  /**< User pressed forgot password. */
-    //TODO add more errors
+    QUERY_ERROR_FORGOT_PASSWORD, /**< User pressed forgot password. */
+    QUERY_ERROR_NETWORK,         /**< Network error. */
+    QUERY_ERROR_SSL,             /**< SSL error. */
 };
 
 /*!