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

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 :
review: Approve (continuous-integration)
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 :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'README'
2--- README 2012-10-26 12:37:14 +0000
3+++ README 2015-12-09 10:22:55 +0000
4@@ -5,7 +5,7 @@
5 used from GLib applications. It is effectively a GLib binding for the D-Bus API
6 provided by signond. It is part of the accounts-sso project:
7
8-http://code.google.com/p/accounts-sso/
9+https://gitlab.com/groups/accounts-sso
10
11 Dependencies
12 ------------
13@@ -20,4 +20,4 @@
14 Resources
15 ---------
16
17-http://code.google.com/p/accounts-sso/sources/list?repo=libsignon-glib
18+https://gitlab.com/accounts-sso/libsignon-glib
19
20=== modified file 'configure.ac'
21--- configure.ac 2014-12-09 09:20:01 +0000
22+++ configure.ac 2015-12-09 10:22:55 +0000
23@@ -1,10 +1,10 @@
24 dnl Process this file with autoconf to produce a configure script.
25 AC_PREREQ([2.64])
26 AC_INIT([libsignon-glib],
27- [1.12],
28- [http://code.google.com/p/accounts-sso/issues/entry],
29+ [1.13],
30+ [https://gitlab.com/accounts-sso/libsignon-glib/issues],
31 [libsignon-glib],
32- [http://code.google.com/p/accounts-sso/])
33+ [https://gitlab.com/accounts-sso/libsignon-glib])
34
35 AC_CONFIG_AUX_DIR([build-aux])
36 AC_CONFIG_HEADERS([config.h])
37
38=== modified file 'debian/changelog'
39--- debian/changelog 2015-12-09 10:21:50 +0000
40+++ debian/changelog 2015-12-09 10:22:55 +0000
41@@ -1,3 +1,15 @@
42+libsignon-glib (1.13-0ubuntu1) UNRELEASED; urgency=medium
43+
44+ * New upstream release.
45+ - Build: don't emit a build error on deprecations
46+ - Build: ignore deprecations of GSimpleAsyncResult
47+ - pkg-config: remove unused variable
48+ Fixes: https://gitlab.com/accounts-sso/libsignon-glib/issues/1
49+ - Tests: do not count on mechanisms being ordered (LP: #1442201)
50+ - Introspection: mark ACL and realms as string lists, update Vala bindings
51+
52+ -- Alberto Mardegan <alberto.mardegan@canonical.com> Wed, 09 Dec 2015 09:55:56 +0200
53+
54 libsignon-glib (1.12+15.04.20150420.1-0ubuntu2) wily; urgency=medium
55
56 * No change rebuild for missing ddebs
57
58=== modified file 'docs/reference/libsignon-glib-docs.xml'
59--- docs/reference/libsignon-glib-docs.xml 2012-11-30 07:37:43 +0000
60+++ docs/reference/libsignon-glib-docs.xml 2015-12-09 10:22:55 +0000
61@@ -10,7 +10,7 @@
62 <releaseinfo>
63 This document is for libsignon-glib, version &version;. The latest
64 version of this documentation can be built from the source code at
65- <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>.
66+ <ulink role="online-location" url="https://gitlab.com/accounts-sso/libsignon-glib">https://gitlab.com/accounts-sso/libsignon-glib</ulink>.
67 </releaseinfo>
68 </bookinfo>
69
70
71=== modified file 'libsignon-glib.pc.in'
72--- libsignon-glib.pc.in 2012-11-30 07:37:43 +0000
73+++ libsignon-glib.pc.in 2015-12-09 10:22:55 +0000
74@@ -2,7 +2,6 @@
75 exec_prefix=@exec_prefix@
76 libdir=@libdir@
77 includedir=@includedir@
78-pluginlibdir=@pluginlibdir@
79
80 Name: libsignon-glib
81 Description: A low-level library for managing account credentials.
82
83=== modified file 'libsignon-glib/Makefile.am'
84--- libsignon-glib/Makefile.am 2012-11-30 07:38:19 +0000
85+++ libsignon-glib/Makefile.am 2015-12-09 10:22:55 +0000
86@@ -7,7 +7,7 @@
87 -I$(top_builddir) \
88 -I$(builddir) \
89 $(DEPS_CFLAGS) \
90- -Wall -Werror
91+ -Wall -Werror -Wno-error=deprecated-declarations
92 libsignon_glib_la_LIBADD = $(DEPS_LIBS)
93 libsignon_glib_la_LDFLAGS = \
94 -version-info 1:0:0 \
95
96=== modified file 'libsignon-glib/signon-auth-session.c'
97--- libsignon-glib/signon-auth-session.c 2014-12-05 07:15:03 +0000
98+++ libsignon-glib/signon-auth-session.c 2015-12-09 10:22:55 +0000
99@@ -146,6 +146,7 @@
100
101 sso_auth_session_call_process_finish (proxy, &reply, res, &error);
102
103+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
104 self = SIGNON_AUTH_SESSION (g_async_result_get_source_object (
105 (GAsyncResult *)res_process));
106 self->priv->busy = FALSE;
107@@ -166,6 +167,7 @@
108 * g_main_context_pop_thread_default: assertion `g_queue_peek_head (stack) == context' failed
109 */
110 g_simple_async_result_complete_in_idle (res_process);
111+G_GNUC_END_IGNORE_DEPRECATIONS
112 g_object_unref (self);
113 }
114
115@@ -180,6 +182,7 @@
116 g_return_if_fail (self != NULL);
117 priv = self->priv;
118
119+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
120 if (error != NULL)
121 {
122 DEBUG ("AuthSessionError: %s", error->message);
123@@ -199,6 +202,7 @@
124 g_simple_async_result_complete (res);
125 return;
126 }
127+G_GNUC_END_IGNORE_DEPRECATIONS
128
129 process_data = g_object_get_data ((GObject *)res, data_key_process);
130 g_return_if_fail (process_data != NULL);
131@@ -592,9 +596,11 @@
132
133 g_return_if_fail (session_data != NULL);
134
135+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
136 res = g_simple_async_result_new ((GObject *)self, callback, user_data,
137 signon_auth_session_process_async);
138 g_simple_async_result_set_check_cancellable (res, cancellable);
139+G_GNUC_END_IGNORE_DEPRECATIONS
140
141 process_data = g_slice_new0 (AuthSessionProcessData);
142 process_data->session_data = g_variant_ref_sink (session_data);
143@@ -636,10 +642,12 @@
144 g_return_val_if_fail (SIGNON_IS_AUTH_SESSION (self), NULL);
145
146 async_result = (GSimpleAsyncResult *)res;
147+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
148 if (g_simple_async_result_propagate_error (async_result, error))
149 return NULL;
150
151 reply = g_simple_async_result_get_op_res_gpointer (async_result);
152+G_GNUC_END_IGNORE_DEPRECATIONS
153 return g_variant_ref (reply);
154 }
155

Subscribers

No one subscribed via source and target branches