Online Accounts: libsignon-glib

Merge lp:~online-accounts/libsignon-glib/packaging into lp:libsignon-glib

  1. packaging
  2. Merge into trunk
Proposed by Alberto Mardegan
Status: Merged
Approved by: David Barth
Approved revision: no longer in the source branch.
Merged at revision: 157
Proposed branch: lp:~online-accounts/libsignon-glib/packaging
Merge into: lp:libsignon-glib
Diff against target: 154 lines (+27/-8)
7 files modified
README (+2/-2)
configure.ac (+3/-3)
debian/changelog (+12/-0)
docs/reference/libsignon-glib-docs.xml (+1/-1)
libsignon-glib.pc.in (+0/-1)
libsignon-glib/Makefile.am (+1/-1)
libsignon-glib/signon-auth-session.c (+8/-0)
To merge this branch: bzr merge lp:~online-accounts/libsignon-glib/packaging
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Online Accounts Pending
Review via email: mp+279981@code.launchpad.net

Commit message

New upstream version

- Build: don't emit a build error on deprecations
- Build: ignore deprecations of GSimpleAsyncResult
- pkg-config: remove unused variable
   Fixes: https://gitlab.com/accounts-sso/libsignon-glib/issues/1
- Tests: do not count on mechanisms being ordered (LP: #1442201)
- Introspection: mark ACL and realms as string lists, update Vala bindings

Description of the change

New upstream version

- Build: don't emit a build error on deprecations
- Build: ignore deprecations of GSimpleAsyncResult
- pkg-config: remove unused variable
   Fixes: https://gitlab.com/accounts-sso/libsignon-glib/issues/1
- Tests: do not count on mechanisms being ordered (LP: #1442201)
- Introspection: mark ACL and realms as string lists, update Vala bindings

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:156
http://jenkins.qa.ubuntu.com/job/libsignon-glib-ci/15/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libsignon-glib-wily-amd64-ci/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libsignon-glib-wily-armhf-ci/2
        deb: http://jenkins.qa.ubuntu.com/job/libsignon-glib-wily-armhf-ci/2/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libsignon-glib-wily-i386-ci/2

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/libsignon-glib-ci/15/rebuild

review: Approve (continuous-integration)
lp:~online-accounts/libsignon-glib/packaging updated
156. By Alberto Mardegan

No change rebuild for missing ddebs

157. By Alberto Mardegan

New upstream version

- Build: don't emit a build error on deprecations
- Build: ignore deprecations of GSimpleAsyncResult
- pkg-config: remove unused variable
   Fixes: https://gitlab.com/accounts-sso/libsignon-glib/issues/1
- Tests: do not count on mechanisms being ordered (LP: #1442201)
- Introspection: mark ACL and realms as string lists, update Vala bindings

Approved by: PS Jenkins bot

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

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

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/libsignon-glib-ci/16/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'README'
--- README 2012-10-26 12:37:14 +0000
+++ README 2015-12-09 10:22:55 +0000
@@ -5,7 +5,7 @@
5used from GLib applications. It is effectively a GLib binding for the D-Bus API5used from GLib applications. It is effectively a GLib binding for the D-Bus API
6provided by signond. It is part of the accounts-sso project:6provided by signond. It is part of the accounts-sso project:
77
8http://code.google.com/p/accounts-sso/8https://gitlab.com/groups/accounts-sso
99
10Dependencies10Dependencies
11------------11------------
@@ -20,4 +20,4 @@
20Resources20Resources
21---------21---------
2222
23http://code.google.com/p/accounts-sso/sources/list?repo=libsignon-glib23https://gitlab.com/accounts-sso/libsignon-glib
2424
=== modified file 'configure.ac'
--- configure.ac 2014-12-09 09:20:01 +0000
+++ configure.ac 2015-12-09 10:22:55 +0000
@@ -1,10 +1,10 @@
1dnl Process this file with autoconf to produce a configure script.1dnl Process this file with autoconf to produce a configure script.
2AC_PREREQ([2.64])2AC_PREREQ([2.64])
3AC_INIT([libsignon-glib],3AC_INIT([libsignon-glib],
4 [1.12],4 [1.13],
5 [http://code.google.com/p/accounts-sso/issues/entry],5 [https://gitlab.com/accounts-sso/libsignon-glib/issues],
6 [libsignon-glib],6 [libsignon-glib],
7 [http://code.google.com/p/accounts-sso/])7 [https://gitlab.com/accounts-sso/libsignon-glib])
88
9AC_CONFIG_AUX_DIR([build-aux])9AC_CONFIG_AUX_DIR([build-aux])
10AC_CONFIG_HEADERS([config.h])10AC_CONFIG_HEADERS([config.h])
1111
=== modified file 'debian/changelog'
--- debian/changelog 2015-12-09 10:21:50 +0000
+++ debian/changelog 2015-12-09 10:22:55 +0000
@@ -1,3 +1,15 @@
1libsignon-glib (1.13-0ubuntu1) UNRELEASED; urgency=medium
2
3 * New upstream release.
4 - Build: don't emit a build error on deprecations
5 - Build: ignore deprecations of GSimpleAsyncResult
6 - pkg-config: remove unused variable
7 Fixes: https://gitlab.com/accounts-sso/libsignon-glib/issues/1
8 - Tests: do not count on mechanisms being ordered (LP: #1442201)
9 - Introspection: mark ACL and realms as string lists, update Vala bindings
10
11 -- Alberto Mardegan <alberto.mardegan@canonical.com> Wed, 09 Dec 2015 09:55:56 +0200
12
1libsignon-glib (1.12+15.04.20150420.1-0ubuntu2) wily; urgency=medium13libsignon-glib (1.12+15.04.20150420.1-0ubuntu2) wily; urgency=medium
214
3 * No change rebuild for missing ddebs15 * No change rebuild for missing ddebs
416
=== modified file 'docs/reference/libsignon-glib-docs.xml'
--- docs/reference/libsignon-glib-docs.xml 2012-11-30 07:37:43 +0000
+++ docs/reference/libsignon-glib-docs.xml 2015-12-09 10:22:55 +0000
@@ -10,7 +10,7 @@
10 <releaseinfo>10 <releaseinfo>
11 This document is for libsignon-glib, version &version;. The latest11 This document is for libsignon-glib, version &version;. The latest
12 version of this documentation can be built from the source code at12 version of this documentation can be built from the source code at
13 <ulink role="online-location" url="https://code.google.com/p/accounts-sso/source/checkout?repo=libsignon-glib">https://code.google.com/p/accounts-sso/source/checkout?repo=libsignon-glib</ulink>.13 <ulink role="online-location" url="https://gitlab.com/accounts-sso/libsignon-glib">https://gitlab.com/accounts-sso/libsignon-glib</ulink>.
14 </releaseinfo>14 </releaseinfo>
15 </bookinfo>15 </bookinfo>
1616
1717
=== modified file 'libsignon-glib.pc.in'
--- libsignon-glib.pc.in 2012-11-30 07:37:43 +0000
+++ libsignon-glib.pc.in 2015-12-09 10:22:55 +0000
@@ -2,7 +2,6 @@
2exec_prefix=@exec_prefix@2exec_prefix=@exec_prefix@
3libdir=@libdir@3libdir=@libdir@
4includedir=@includedir@4includedir=@includedir@
5pluginlibdir=@pluginlibdir@
65
7Name: libsignon-glib6Name: libsignon-glib
8Description: A low-level library for managing account credentials.7Description: A low-level library for managing account credentials.
98
=== modified file 'libsignon-glib/Makefile.am'
--- libsignon-glib/Makefile.am 2012-11-30 07:38:19 +0000
+++ libsignon-glib/Makefile.am 2015-12-09 10:22:55 +0000
@@ -7,7 +7,7 @@
7 -I$(top_builddir) \7 -I$(top_builddir) \
8 -I$(builddir) \8 -I$(builddir) \
9 $(DEPS_CFLAGS) \9 $(DEPS_CFLAGS) \
10 -Wall -Werror10 -Wall -Werror -Wno-error=deprecated-declarations
11libsignon_glib_la_LIBADD = $(DEPS_LIBS)11libsignon_glib_la_LIBADD = $(DEPS_LIBS)
12libsignon_glib_la_LDFLAGS = \12libsignon_glib_la_LDFLAGS = \
13 -version-info 1:0:0 \13 -version-info 1:0:0 \
1414
=== modified file 'libsignon-glib/signon-auth-session.c'
--- libsignon-glib/signon-auth-session.c 2014-12-05 07:15:03 +0000
+++ libsignon-glib/signon-auth-session.c 2015-12-09 10:22:55 +0000
@@ -146,6 +146,7 @@
146146
147 sso_auth_session_call_process_finish (proxy, &reply, res, &error);147 sso_auth_session_call_process_finish (proxy, &reply, res, &error);
148148
149G_GNUC_BEGIN_IGNORE_DEPRECATIONS
149 self = SIGNON_AUTH_SESSION (g_async_result_get_source_object (150 self = SIGNON_AUTH_SESSION (g_async_result_get_source_object (
150 (GAsyncResult *)res_process));151 (GAsyncResult *)res_process));
151 self->priv->busy = FALSE;152 self->priv->busy = FALSE;
@@ -166,6 +167,7 @@
166 * g_main_context_pop_thread_default: assertion `g_queue_peek_head (stack) == context' failed167 * g_main_context_pop_thread_default: assertion `g_queue_peek_head (stack) == context' failed
167 */168 */
168 g_simple_async_result_complete_in_idle (res_process);169 g_simple_async_result_complete_in_idle (res_process);
170G_GNUC_END_IGNORE_DEPRECATIONS
169 g_object_unref (self);171 g_object_unref (self);
170}172}
171173
@@ -180,6 +182,7 @@
180 g_return_if_fail (self != NULL);182 g_return_if_fail (self != NULL);
181 priv = self->priv;183 priv = self->priv;
182184
185G_GNUC_BEGIN_IGNORE_DEPRECATIONS
183 if (error != NULL)186 if (error != NULL)
184 {187 {
185 DEBUG ("AuthSessionError: %s", error->message);188 DEBUG ("AuthSessionError: %s", error->message);
@@ -199,6 +202,7 @@
199 g_simple_async_result_complete (res);202 g_simple_async_result_complete (res);
200 return;203 return;
201 }204 }
205G_GNUC_END_IGNORE_DEPRECATIONS
202206
203 process_data = g_object_get_data ((GObject *)res, data_key_process);207 process_data = g_object_get_data ((GObject *)res, data_key_process);
204 g_return_if_fail (process_data != NULL);208 g_return_if_fail (process_data != NULL);
@@ -592,9 +596,11 @@
592596
593 g_return_if_fail (session_data != NULL);597 g_return_if_fail (session_data != NULL);
594598
599G_GNUC_BEGIN_IGNORE_DEPRECATIONS
595 res = g_simple_async_result_new ((GObject *)self, callback, user_data,600 res = g_simple_async_result_new ((GObject *)self, callback, user_data,
596 signon_auth_session_process_async);601 signon_auth_session_process_async);
597 g_simple_async_result_set_check_cancellable (res, cancellable);602 g_simple_async_result_set_check_cancellable (res, cancellable);
603G_GNUC_END_IGNORE_DEPRECATIONS
598604
599 process_data = g_slice_new0 (AuthSessionProcessData);605 process_data = g_slice_new0 (AuthSessionProcessData);
600 process_data->session_data = g_variant_ref_sink (session_data);606 process_data->session_data = g_variant_ref_sink (session_data);
@@ -636,10 +642,12 @@
636 g_return_val_if_fail (SIGNON_IS_AUTH_SESSION (self), NULL);642 g_return_val_if_fail (SIGNON_IS_AUTH_SESSION (self), NULL);
637643
638 async_result = (GSimpleAsyncResult *)res;644 async_result = (GSimpleAsyncResult *)res;
645G_GNUC_BEGIN_IGNORE_DEPRECATIONS
639 if (g_simple_async_result_propagate_error (async_result, error))646 if (g_simple_async_result_propagate_error (async_result, error))
640 return NULL;647 return NULL;
641648
642 reply = g_simple_async_result_get_op_res_gpointer (async_result);649 reply = g_simple_async_result_get_op_res_gpointer (async_result);
650G_GNUC_END_IGNORE_DEPRECATIONS
643 return g_variant_ref (reply);651 return g_variant_ref (reply);
644}652}
645653

Subscribers

No one subscribed via source and target branches