Online Accounts: libsignon-glib

Merge lp:~robru/libsignon-glib/inline-packaging into lp:libsignon-glib

  1. inline-packaging
  2. Merge into trunk
Proposed by Robert Bruce Park
Status: Merged
Approved by: Víctor R. Ruiz
Approved revision: 137
Merged at revision: 137
Proposed branch: lp:~robru/libsignon-glib/inline-packaging
Merge into: lp:libsignon-glib
Diff against target: 311 lines (+245/-0)
13 files modified
.bzr-builddeb/default.conf (+2/-0)
debian/changelog (+71/-0)
debian/compat (+1/-0)
debian/control (+70/-0)
debian/copyright (+13/-0)
debian/gir1.2-signon-1.0.install (+2/-0)
debian/libsignon-glib-dev.dirs (+2/-0)
debian/libsignon-glib-dev.install (+5/-0)
debian/libsignon-glib-doc.install (+1/-0)
debian/libsignon-glib1.dirs (+1/-0)
debian/libsignon-glib1.install (+1/-0)
debian/libsignon-glib1.symbols (+50/-0)
debian/rules (+26/-0)
To merge this branch: bzr merge lp:~robru/libsignon-glib/inline-packaging
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Needs Fixing
Robert Bruce Park (community) Approve
David King Pending
Didier Roche-Tolomelli Pending
Ken VanDine Pending
Víctor R. Ruiz Pending
Alberto Mardegan Pending
Review via email: mp+144424@code.launchpad.net

Commit message

Inline packaging metadata.

Description of the change

This one is looking quite good, no test failures, but again with that gtk-doc.make symlink. It's not clear to me exactly how this file is normally handled, but automake totally pukes without it, and it's not present in bzr trunk.

I think either upstream will need to modify automake to look for this file in the system rather than the source tree, or if that's not workable for some reason, ship it's own copy of it in the source tree.

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

FAILED: Continuous integration, rev:136
http://s-jenkins:8080/job/libsignon-glib-ci/1/
Executed test runs:
    FAILURE: http://s-jenkins:8080/job/libsignon-glib-ci/./build=pbuilder,distribution=raring,flavor=amd64/1/console
    FAILURE: http://s-jenkins:8080/job/libsignon-glib-ci/./build=pbuilder,distribution=raring,flavor=i386/1/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/libsignon-glib-ci/1//rebuild/?

review: Needs Fixing (continuous-integration)
Revision history for this message
Didier Roche-Tolomelli (didrocks) wrote :

On the symlink, please see the other merge request (running autogen.sh should do it, look at any indicator package like http://bazaar.launchpad.net/~indicator-applet-developers/indicator-power/trunk.13.04/view/head:/debian/rules :)

All the rest is good to me, so once this is fixed and CI is happy, please go ahead :)

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

FAILED: Continuous integration, rev:137
http://s-jenkins:8080/job/libsignon-glib-ci/2/
Executed test runs:
    FAILURE: http://s-jenkins:8080/job/libsignon-glib-ci/./build=pbuilder,distribution=raring,flavor=amd64/2/console
    FAILURE: http://s-jenkins:8080/job/libsignon-glib-ci/./build=pbuilder,distribution=raring,flavor=i386/2/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/libsignon-glib-ci/2//rebuild/?

review: Needs Fixing (continuous-integration)
Revision history for this message
Robert Bruce Park (robru) wrote :

Ok, gtk-doc.make is fixed here, please approve and merge! ;-)

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

FAILED: Autolanding.
More details in the following jenkins job:
http://s-jenkins:8080/job/libsignon-glib-autolanding/1/
Executed test runs:
    FAILURE: http://s-jenkins:8080/job/libsignon-glib-autolanding/./build=pbuilder,distribution=raring,flavor=amd64/1/console
    FAILURE: http://s-jenkins:8080/job/libsignon-glib-autolanding/./build=pbuilder,distribution=raring,flavor=i386/1/console

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://s-jenkins:8080/job/libsignon-glib-autolanding/2/
Executed test runs:
    FAILURE: http://s-jenkins:8080/job/libsignon-glib-autolanding/./build=pbuilder,distribution=raring,flavor=amd64/2/console
    FAILURE: http://s-jenkins:8080/job/libsignon-glib-autolanding/./build=pbuilder,distribution=raring,flavor=i386/2/console

review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added directory '.bzr-builddeb'
2=== added file '.bzr-builddeb/default.conf'
3--- .bzr-builddeb/default.conf 1970-01-01 00:00:00 +0000
4+++ .bzr-builddeb/default.conf 2013-01-23 18:10:25 +0000
5@@ -0,0 +1,2 @@
6+[BUILDDEB]
7+split = True
8
9=== added directory 'debian'
10=== added file 'debian/changelog'
11--- debian/changelog 1970-01-01 00:00:00 +0000
12+++ debian/changelog 2013-01-23 18:10:25 +0000
13@@ -0,0 +1,71 @@
14+libsignon-glib (1.8.1-0ubuntu1) UNRELEASED; urgency=low
15+
16+ * Inline packaging metadata.
17+
18+ -- Robert Bruce Park <robert.park@canonical.com> Tue, 22 Jan 2013 18:06:19 -0800
19+
20+libsignon-glib (1.8-0ubuntu1) raring; urgency=low
21+
22+ * New upstream release.
23+ - Add signon_auth_session_process_async (using GAsyncResult and GVariant)
24+ - Tests: fix all memory leaks detected by valgrind
25+ - Set ID before invoking the client callback
26+ - Make tests optional at configure time
27+ * debian/libsignon-glib1.symbols
28+ - added new symbols
29+ * debian/libsignon-glib-dev.install
30+ - dropped the static lib, upstream has disabled static builds
31+
32+ -- Ken VanDine <ken.vandine@canonical.com> Thu, 10 Jan 2013 10:31:51 -0500
33+
34+libsignon-glib (1.7-0ubuntu1) raring; urgency=low
35+
36+ * New upstream release.
37+ - Fixed handling of GValues of type G_TYPE_VARIANT (LP: #1066917)
38+ * debian/control
39+ - make gir1.2-signon-1.0 depend on libsignon-glib1
40+
41+ -- Ken VanDine <ken.vandine@canonical.com> Thu, 08 Nov 2012 12:42:04 -0500
42+
43+libsignon-glib (1.6-0ubuntu1) quantal; urgency=low
44+
45+ * New upstream release.
46+
47+ -- Ken VanDine <ken.vandine@canonical.com> Wed, 22 Aug 2012 09:33:04 -0400
48+
49+libsignon-glib (1.5-0ubuntu2) quantal; urgency=low
50+
51+ * debian/patches/py3.patch
52+ - support python3
53+ * debian/rules
54+ - install the GI override for both python2 and python3
55+
56+ -- Ken VanDine <ken.vandine@canonical.com> Tue, 21 Aug 2012 13:24:12 -0400
57+
58+libsignon-glib (1.5-0ubuntu1) quantal; urgency=low
59+
60+ * New upstream release.
61+ - Port to GDBus (no API changes), removed dbus-glib dependency
62+ * debian/patches/gi_override.patch
63+ - dropped, merged upstream
64+
65+ -- Ken VanDine <ken.vandine@canonical.com> Mon, 13 Aug 2012 10:17:27 -0400
66+
67+libsignon-glib (1.4-0ubuntu2) quantal; urgency=low
68+
69+ * debian/rules
70+ - run the tests during build
71+ - use dh_python3
72+ * debian/control
73+ - debhelper 9
74+ - added a build depends for signon-plugin-ssotest
75+
76+ -- Ken VanDine <ken.vandine@canonical.com> Thu, 26 Jul 2012 15:28:10 -0400
77+
78+libsignon-glib (1.4-0ubuntu1) quantal; urgency=low
79+
80+ * New package
81+ * debian/patches/gi_override.patch
82+ - add python fixes still pending merge upstream
83+
84+ -- Ken VanDine <ken.vandine@canonical.com> Thu, 26 Jul 2012 11:09:37 -0400
85
86=== added file 'debian/compat'
87--- debian/compat 1970-01-01 00:00:00 +0000
88+++ debian/compat 2013-01-23 18:10:25 +0000
89@@ -0,0 +1,1 @@
90+9
91
92=== added file 'debian/control'
93--- debian/control 1970-01-01 00:00:00 +0000
94+++ debian/control 2013-01-23 18:10:25 +0000
95@@ -0,0 +1,70 @@
96+Source: libsignon-glib
97+Priority: optional
98+Maintainer: Ubuntu Desktop Team <ubuntu-desktop@lists.ubuntu.com>
99+Build-Depends: debhelper (>= 9),
100+ autotools-dev,
101+ libglib2.0-dev,
102+ libgirepository1.0-dev,
103+ gobject-introspection,
104+ gir1.2-glib-2.0,
105+ dh-autoreconf,
106+ gtk-doc-tools,
107+ python (>= 2.6.5),
108+ python3,
109+ python3-gi,
110+ python-gi-dev,
111+ check,
112+ dbus-test-runner,
113+ signond-dev (>= 8.40),
114+ signon-plugin-ssotest,
115+Standards-Version: 3.9.3
116+Section: libs
117+Homepage: http://code.google.com/p/accounts-sso/
118+# If you aren't a member of ~online-accounts but need to upload packaging changes,
119+# just go ahead. ~online-accounts will notice and sync up the code again.
120+Vcs-Bzr: https://code.launchpad.net/~online-accounts/libsignon-glib/trunk
121+
122+Package: libsignon-glib-dev
123+Section: libdevel
124+Architecture: any
125+Depends: libsignon-glib1 (= ${binary:Version}),
126+ ${shlibs:Depends},
127+ ${misc:Depends},
128+ libdbus-glib-1-dev,
129+ libglib2.0-dev,
130+ gir1.2-signon-1.0,
131+ signond-dev,
132+Description: library for signond - development files
133+ .
134+ This package contains files that are needed to build applications.
135+
136+Package: libsignon-glib1
137+Section: libs
138+Architecture: any
139+Pre-Depends: ${misc:Pre-Depends}
140+Depends: ${shlibs:Depends},
141+ ${misc:Depends},
142+ signond,
143+Description: library for signond
144+ .
145+ This package contains shared libraries to be used by applications.
146+
147+Package: gir1.2-signon-1.0
148+Section: libs
149+Architecture: any
150+Depends: libsignon-glib1 (= ${binary:Version}),
151+ ${gir:Depends},
152+ ${misc:Depends},
153+Description: GObject introspection data for the Signon library
154+ This package contains introspection data for the Signon library.
155+ .
156+ It can be used by packages using the GIRepository format to generate
157+ dynamic bindings.
158+
159+Package: libsignon-glib-doc
160+Section: doc
161+Architecture: all
162+Depends: ${misc:Depends}
163+Description: library for signond - documentation
164+ .
165+ This package contains the documentation.
166
167=== added file 'debian/copyright'
168--- debian/copyright 1970-01-01 00:00:00 +0000
169+++ debian/copyright 2013-01-23 18:10:25 +0000
170@@ -0,0 +1,13 @@
171+Format: http://dep.debian.net/deps/dep5
172+Upstream-Name: libsignon-glib
173+Upstream-Contact: Alberto Mardegan <alberto.mardegan@canonical.com>
174+Source: http://code.google.com/p/accounts-sso/
175+
176+Files: *
177+Copyright: 2009-2011 Nokia Corporation
178+ 2011 Canonical Ltd
179+License: LGPL-2.1
180+
181+License: LGPL-2.1
182+ On Debian systems, the complete text of the GNU Lesser General
183+ Public License version 2.1 can be found in `/usr/share/common-licenses/LGPL-2.1'.
184
185=== added file 'debian/gir1.2-signon-1.0.install'
186--- debian/gir1.2-signon-1.0.install 1970-01-01 00:00:00 +0000
187+++ debian/gir1.2-signon-1.0.install 2013-01-23 18:10:25 +0000
188@@ -0,0 +1,2 @@
189+usr/lib/*/girepository-1.0/ usr/lib/
190+usr/lib/python*/dist-packages/gi/overrides/*.py
191
192=== added file 'debian/libsignon-glib-dev.dirs'
193--- debian/libsignon-glib-dev.dirs 1970-01-01 00:00:00 +0000
194+++ debian/libsignon-glib-dev.dirs 2013-01-23 18:10:25 +0000
195@@ -0,0 +1,2 @@
196+usr/lib
197+usr/include
198
199=== added file 'debian/libsignon-glib-dev.install'
200--- debian/libsignon-glib-dev.install 1970-01-01 00:00:00 +0000
201+++ debian/libsignon-glib-dev.install 2013-01-23 18:10:25 +0000
202@@ -0,0 +1,5 @@
203+usr/include/*
204+usr/lib/*/lib*.so
205+usr/lib/*/pkgconfig
206+usr/share/vala/vapi
207+usr/share/gir-1.0
208
209=== added file 'debian/libsignon-glib-doc.install'
210--- debian/libsignon-glib-doc.install 1970-01-01 00:00:00 +0000
211+++ debian/libsignon-glib-doc.install 2013-01-23 18:10:25 +0000
212@@ -0,0 +1,1 @@
213+usr/share/gtk-doc/html/libsignon-glib
214
215=== added file 'debian/libsignon-glib1.dirs'
216--- debian/libsignon-glib1.dirs 1970-01-01 00:00:00 +0000
217+++ debian/libsignon-glib1.dirs 2013-01-23 18:10:25 +0000
218@@ -0,0 +1,1 @@
219+usr/lib
220
221=== added file 'debian/libsignon-glib1.install'
222--- debian/libsignon-glib1.install 1970-01-01 00:00:00 +0000
223+++ debian/libsignon-glib1.install 2013-01-23 18:10:25 +0000
224@@ -0,0 +1,1 @@
225+usr/lib/*/lib*.so.*
226
227=== added file 'debian/libsignon-glib1.symbols'
228--- debian/libsignon-glib1.symbols 1970-01-01 00:00:00 +0000
229+++ debian/libsignon-glib1.symbols 2013-01-23 18:10:25 +0000
230@@ -0,0 +1,50 @@
231+libsignon-glib.so.1 libsignon-glib1 #MINVER#
232+ signon_auth_service_get_type@Base 1.1
233+ signon_auth_service_new@Base 1.1
234+ signon_auth_service_query_mechanisms@Base 1.1
235+ signon_auth_service_query_methods@Base 1.1
236+ signon_auth_session_cancel@Base 1.1
237+ signon_auth_session_get_method@Base 1.1
238+ signon_auth_session_get_type@Base 1.1
239+ signon_auth_session_new@Base 1.1
240+ signon_auth_session_process@Base 1.1
241+ signon_auth_session_process_async@Base 1.8
242+ signon_auth_session_process_finish@Base 1.8
243+ signon_auth_session_query_available_mechanisms@Base 1.1
244+ signon_error_get_type@Base 1.1
245+ signon_error_quark@Base 1.1
246+ signon_identity_add_reference@Base 1.1
247+ signon_identity_create_session@Base 1.1
248+ signon_identity_get_last_error@Base 1.1
249+ signon_identity_get_type@Base 1.1
250+ signon_identity_info_copy@Base 1.1
251+ signon_identity_info_free@Base 1.1
252+ signon_identity_info_get_access_control_list@Base 1.1
253+ signon_identity_info_get_caption@Base 1.1
254+ signon_identity_info_get_id@Base 1.1
255+ signon_identity_info_get_identity_type@Base 1.1
256+ signon_identity_info_get_methods@Base 1.1
257+ signon_identity_info_get_realms@Base 1.1
258+ signon_identity_info_get_storing_secret@Base 1.1
259+ signon_identity_info_get_type@Base 1.1
260+ signon_identity_info_get_username@Base 1.1
261+ signon_identity_info_new@Base 1.1
262+ signon_identity_info_remove_method@Base 1.1
263+ signon_identity_info_set_access_control_list@Base 1.1
264+ signon_identity_info_set_caption@Base 1.1
265+ signon_identity_info_set_identity_type@Base 1.1
266+ signon_identity_info_set_method@Base 1.1
267+ signon_identity_info_set_realms@Base 1.1
268+ signon_identity_info_set_secret@Base 1.1
269+ signon_identity_info_set_username@Base 1.1
270+ signon_identity_new@Base 1.1
271+ signon_identity_new_from_db@Base 1.1
272+ signon_identity_query_info@Base 1.1
273+ signon_identity_remove@Base 1.1
274+ signon_identity_remove_reference@Base 1.1
275+ signon_identity_signout@Base 1.1
276+ signon_identity_store_credentials_with_args@Base 1.1
277+ signon_identity_store_credentials_with_info@Base 1.1
278+ signon_identity_type_get_type@Base 1.1
279+ signon_identity_verify_secret@Base 1.1
280+ signon_session_data_ui_policy_get_type@Base 1.1
281
282=== added file 'debian/rules'
283--- debian/rules 1970-01-01 00:00:00 +0000
284+++ debian/rules 2013-01-23 18:10:25 +0000
285@@ -0,0 +1,26 @@
286+#!/usr/bin/make -f
287+# -*- makefile -*-
288+
289+# Uncomment this to turn on verbose mode.
290+#export DH_VERBOSE=1
291+export DPKG_GENSYMBOLS_CHECK_LEVEL=4
292+
293+override_dh_auto_configure:
294+ dh_auto_configure -- --enable-gtk-doc
295+
296+override_dh_install:
297+ # install the python3 gir override file as well
298+ PYTHON=python3 ./configure --prefix=/usr
299+ cd pygobject/ && DESTDIR=../debian/tmp make install && cd ..
300+ rm debian/tmp/usr/lib/*/*.la
301+ rm debian/tmp/usr/lib/python*/dist-packages/gi/overrides/*.pyc
302+ rm debian/tmp/usr/lib/python*/dist-packages/gi/overrides/*.pyo
303+ rm -rf debian/tmp/usr/doc/reference
304+ dh_install --fail-missing
305+ dh_python2 -pgir1.2-signon-1.0
306+
307+override_dh_autoreconf:
308+ NOCONFIGURE=1 dh_autoreconf ./autogen.sh
309+
310+%:
311+ dh $@ --with autoreconf,python2

Subscribers

People subscribed via source and target branches

to all changes: