Merge lp:~ken-vandine/account-plugins/inline into lp:account-plugins

Proposed by Ken VanDine
Status: Superseded
Proposed branch: lp:~ken-vandine/account-plugins/inline
Merge into: lp:account-plugins
Diff against target: 506 lines (+420/-0)
17 files modified
.bzr-builddeb/default.conf (+2/-0)
debian/account-plugin-facebook.install (+7/-0)
debian/account-plugin-flickr.install (+5/-0)
debian/account-plugin-foursquare.install (+5/-0)
debian/account-plugin-google.install (+7/-0)
debian/account-plugin-icons.install (+14/-0)
debian/account-plugin-identica.install (+5/-0)
debian/account-plugin-sina.install (+4/-0)
debian/account-plugin-sohu.install (+4/-0)
debian/account-plugin-tools.install (+2/-0)
debian/account-plugin-twitter.install (+5/-0)
debian/account-plugin-windows-live.install (+5/-0)
debian/changelog (+201/-0)
debian/compat (+1/-0)
debian/control (+108/-0)
debian/copyright (+20/-0)
debian/rules (+25/-0)
To merge this branch: bzr merge lp:~ken-vandine/account-plugins/inline
Reviewer Review Type Date Requested Status
Didier Roche Approve
PS Jenkins bot (community) continuous-integration Needs Fixing
Review via email: mp+133925@code.launchpad.net

This proposal has been superseded by a proposal from 2012-11-15.

Description of the change

Merge packaging inline to trunk

To post a comment you must log in.
Revision history for this message
David King (amigadave) wrote :

I am not sure of the terms, but surely this exposes the API keys for the various online services, by placing them in the same branch?

Revision history for this message
Alberto Mardegan (mardy) wrote :

This looks fine to me, but I'm a bit concerned about the application keys, which will now live in the same branch as the source code.
(though this won't be a big problem, once we allow applications specify their own keys)

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

As discussed on Friday, looks good to me :)

Please coordinate with fginther to get it merged as he needs to make some magic in jenkins side.

review: Approve

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== added directory '.bzr-builddeb'
=== added file '.bzr-builddeb/default.conf'
--- .bzr-builddeb/default.conf 1970-01-01 00:00:00 +0000
+++ .bzr-builddeb/default.conf 2012-11-12 13:47:31 +0000
@@ -0,0 +1,2 @@
1[BUILDDEB]
2split = True
03
=== added directory 'debian'
=== added file 'debian/account-plugin-facebook.install'
--- debian/account-plugin-facebook.install 1970-01-01 00:00:00 +0000
+++ debian/account-plugin-facebook.install 2012-11-12 13:47:31 +0000
@@ -0,0 +1,7 @@
1etc/signon-ui/webkit-options.d/www.facebook.com.conf
2usr/lib/libaccount-plugin-1.0/providers/libfacebook.so
3usr/share/accounts/services/facebook-sharing.service
4usr/share/accounts/services/facebook-microblog.service
5usr/share/accounts/services/facebook-im.service
6usr/share/accounts/providers/facebook.provider
7usr/share/icons/hicolor/32x32/apps/facebook.png
08
=== added file 'debian/account-plugin-flickr.install'
--- debian/account-plugin-flickr.install 1970-01-01 00:00:00 +0000
+++ debian/account-plugin-flickr.install 2012-11-12 13:47:31 +0000
@@ -0,0 +1,5 @@
1etc/signon-ui/webkit-options.d/login.yahoo.com.conf
2usr/lib/libaccount-plugin-1.0/providers/libflickr.so
3usr/share/accounts/services/flickr-*.service
4usr/share/accounts/providers/flickr.provider
5usr/share/icons/hicolor/32x32/apps/flickr.png
06
=== added file 'debian/account-plugin-foursquare.install'
--- debian/account-plugin-foursquare.install 1970-01-01 00:00:00 +0000
+++ debian/account-plugin-foursquare.install 2012-11-12 13:47:31 +0000
@@ -0,0 +1,5 @@
1etc/signon-ui/webkit-options.d/foursquare.com.conf
2usr/lib/libaccount-plugin-1.0/providers/libfoursquare.so
3usr/share/accounts/services/foursquare-microblog.service
4usr/share/accounts/providers/foursquare.provider
5usr/share/icons/hicolor/32x32/apps/foursquare.png
06
=== added file 'debian/account-plugin-google.install'
--- debian/account-plugin-google.install 1970-01-01 00:00:00 +0000
+++ debian/account-plugin-google.install 2012-11-12 13:47:31 +0000
@@ -0,0 +1,7 @@
1etc/signon-ui/webkit-options.d/accounts.google.com.conf
2usr/lib/libaccount-plugin-1.0/providers/libgoogle.so
3usr/share/accounts/services/google-docs.service
4usr/share/accounts/services/google-im.service
5usr/share/accounts/services/picasa.service
6usr/share/accounts/providers/google.provider
7usr/share/icons/hicolor/32x32/apps/google.png
08
=== added file 'debian/account-plugin-icons.install'
--- debian/account-plugin-icons.install 1970-01-01 00:00:00 +0000
+++ debian/account-plugin-icons.install 2012-11-12 13:47:31 +0000
@@ -0,0 +1,14 @@
1usr/share/icons/hicolor/32x32/apps/aim.png
2usr/share/icons/hicolor/32x32/apps/gadugadu.png
3usr/share/icons/hicolor/32x32/apps/groupwise.png
4usr/share/icons/hicolor/32x32/apps/icq.png
5usr/share/icons/hicolor/32x32/apps/irc.png
6usr/share/icons/hicolor/32x32/apps/jabber.png
7usr/share/icons/hicolor/32x32/apps/msn.png
8usr/share/icons/hicolor/32x32/apps/mxit.png
9usr/share/icons/hicolor/32x32/apps/myspace.png
10usr/share/icons/hicolor/32x32/apps/people-nearby.png
11usr/share/icons/hicolor/32x32/apps/sametime.png
12usr/share/icons/hicolor/32x32/apps/sip.png
13usr/share/icons/hicolor/32x32/apps/yahoo.png
14usr/share/icons/hicolor/32x32/apps/zephyr.png
015
=== added file 'debian/account-plugin-identica.install'
--- debian/account-plugin-identica.install 1970-01-01 00:00:00 +0000
+++ debian/account-plugin-identica.install 2012-11-12 13:47:31 +0000
@@ -0,0 +1,5 @@
1etc/signon-ui/webkit-options.d/identi.ca.conf
2usr/lib/libaccount-plugin-1.0/providers/libidentica.so
3usr/share/accounts/services/identica-microblog.service
4usr/share/accounts/providers/identica.provider
5usr/share/icons/hicolor/32x32/apps/identica.png
06
=== added file 'debian/account-plugin-sina.install'
--- debian/account-plugin-sina.install 1970-01-01 00:00:00 +0000
+++ debian/account-plugin-sina.install 2012-11-12 13:47:31 +0000
@@ -0,0 +1,4 @@
1etc/signon-ui/webkit-options.d/api.t.sina.com.cn.conf
2usr/lib/libaccount-plugin-1.0/providers/libsina.so
3usr/share/accounts/services/sina-microblog.service
4usr/share/accounts/providers/sina.provider
05
=== added file 'debian/account-plugin-sohu.install'
--- debian/account-plugin-sohu.install 1970-01-01 00:00:00 +0000
+++ debian/account-plugin-sohu.install 2012-11-12 13:47:31 +0000
@@ -0,0 +1,4 @@
1etc/signon-ui/webkit-options.d/api.t.sohu.com.conf
2usr/lib/libaccount-plugin-1.0/providers/libsohu.so
3usr/share/accounts/services/sohu-microblog.service
4usr/share/accounts/providers/sohu.provider
05
=== added file 'debian/account-plugin-tools.install'
--- debian/account-plugin-tools.install 1970-01-01 00:00:00 +0000
+++ debian/account-plugin-tools.install 2012-11-12 13:47:31 +0000
@@ -0,0 +1,2 @@
1usr/share/account-plugins/tools
2usr/bin
03
=== added file 'debian/account-plugin-twitter.install'
--- debian/account-plugin-twitter.install 1970-01-01 00:00:00 +0000
+++ debian/account-plugin-twitter.install 2012-11-12 13:47:31 +0000
@@ -0,0 +1,5 @@
1etc/signon-ui/webkit-options.d/api.twitter.com.conf
2usr/lib/libaccount-plugin-1.0/providers/libtwitter.so
3usr/share/accounts/services/twitter-microblog.service
4usr/share/accounts/providers/twitter.provider
5usr/share/icons/hicolor/32x32/apps/twitter.png
06
=== added file 'debian/account-plugin-windows-live.install'
--- debian/account-plugin-windows-live.install 1970-01-01 00:00:00 +0000
+++ debian/account-plugin-windows-live.install 2012-11-12 13:47:31 +0000
@@ -0,0 +1,5 @@
1etc/signon-ui/webkit-options.d/login.live.com.conf
2usr/lib/libaccount-plugin-1.0/providers/libwindows-live.so
3usr/share/accounts/services/wlm.service
4usr/share/accounts/providers/windows-live.provider
5usr/share/icons/hicolor/32x32/apps/live.png
06
=== added file 'debian/changelog'
--- debian/changelog 1970-01-01 00:00:00 +0000
+++ debian/changelog 2012-11-12 13:47:31 +0000
@@ -0,0 +1,201 @@
1account-plugins (0.9-0ubuntu1) raring; urgency=low
2
3 * New upstream release.
4 - Add COPYING, using GNU GPL version 2 (LP: #1062194)
5 - Use intltool for internationalization support (LP: #1061433)
6 - Request mobile version of identi.ca (LP: #1051596)
7 * -debian/patches/lp_1064293.patch, upstream
8
9 -- Ken VanDine <ken.vandine@canonical.com> Fri, 09 Nov 2012 11:14:46 -0500
10
11account-plugins (0.8-0ubuntu2) quantal; urgency=low
12
13 * debian/patches/lp_1064293.patch
14 - Do not reveal Google secret API key. (LP: #1064293)
15 * debian/rules
16 - Update API keys for twitter, windows live, foursquare, google,
17 and flickr (LP: #1064293)
18
19 -- Ken VanDine <ken.vandine@canonical.com> Thu, 11 Oct 2012 16:40:21 -0400
20
21account-plugins (0.8-0ubuntu1) quantal; urgency=low
22
23 * New upstream release.
24 - include the sip icon (LP: #1040091)
25
26 -- Ken VanDine <ken.vandine@canonical.com> Wed, 19 Sep 2012 15:43:55 -0400
27
28account-plugins (0.7-0ubuntu3) quantal; urgency=low
29
30 * debian/account-plugin-icons.install
31 - removed missing icon
32
33 -- Ken VanDine <ken.vandine@canonical.com> Fri, 14 Sep 2012 16:59:24 -0400
34
35account-plugins (0.7-0ubuntu2) quantal; urgency=low
36
37 * debian/control
38 - removed unneeded depends for python-gobject
39
40 -- Ken VanDine <ken.vandine@canonical.com> Fri, 14 Sep 2012 11:45:25 -0400
41
42account-plugins (0.7-0ubuntu1) quantal; urgency=low
43
44 * New upstream release.
45 - Updates to work with signon-ui >= 0.7 which requires https (LP: #1039084)
46 * -debian/patches/py3.patch
47 - merged upstream
48
49 -- Ken VanDine <ken.vandine@canonical.com> Fri, 07 Sep 2012 09:34:51 -0400
50
51account-plugins (0.5-0ubuntu3) quantal; urgency=low
52
53 * debian/patches/lp_1037169.patch
54 - Use the secure end point for flickr (LP: #1037169)
55
56 -- Ken VanDine <ken.vandine@canonical.com> Wed, 15 Aug 2012 14:49:05 -0400
57
58account-plugins (0.5-0ubuntu2) quantal; urgency=low
59
60 * debian/watch
61 - added
62 * debian/patches/py3.patch
63 - ported account-console to python3
64 * debian/control, debian/rules
65 - python3
66 * debian/compat
67 - debhelper 9
68
69 -- Ken VanDine <ken.vandine@canonical.com> Mon, 06 Aug 2012 16:48:13 -0400
70
71account-plugins (0.5-0ubuntu1) quantal; urgency=low
72
73 * New upstream release
74
75 -- Ken VanDine <ken.vandine@canonical.com> Thu, 02 Aug 2012 14:49:44 -0400
76
77account-plugins (0.4+r53-0quantal2) quantal; urgency=low
78
79 * debian/account-plugin-icons.install, debian/control
80 - install extra icons in a separate package
81
82 -- Ken VanDine <ken.vandine@canonical.com> Tue, 24 Jul 2012 23:05:33 -0400
83
84account-plugins (0.4+r53-0quantal1) quantal; urgency=low
85
86 * Merged from trunk rev 53
87 - Adds windows live support
88
89 -- Ken VanDine <ken.vandine@canonical.com> Tue, 24 Jul 2012 22:45:27 -0400
90
91account-plugins (0.4+r51-0quantal2) quantal; urgency=low
92
93 * debian/control
94 - build depend on libsignon-glib-dev >= 1.2+bzr127-0quantal2
95
96
97 -- Ken VanDine <ken.vandine@canonical.com> Fri, 20 Jul 2012 14:22:25 -0400
98
99account-plugins (0.4+r51-0quantal1) quantal; urgency=low
100
101 * New snapshot tagged 0.4-bzr51
102
103 -- Ken VanDine <ken.vandine@canonical.com> Fri, 20 Jul 2012 13:19:35 -0400
104
105account-plugins (0.4+r45-0quantal1) quantal; urgency=low
106
107 * rebuild for quantal
108
109 -- Ken VanDine <ken.vandine@canonical.com> Mon, 16 Jul 2012 10:28:28 -0400
110
111account-plugins (0.4+r45-0precise1) precise; urgency=low
112
113 * New snapshot tagged 0.4-bzr45
114
115 -- Ken VanDine <ken.vandine@canonical.com> Thu, 05 Jul 2012 10:33:10 -0400
116
117account-plugins (0.3+r43-0precise1) precise; urgency=low
118
119 * Added account-plugin-identica and account-plugin-foursquare
120
121 -- Ken VanDine <ken.vandine@canonical.com> Tue, 26 Jun 2012 13:25:23 -0400
122
123account-plugins (0.3+r40-0precise1) precise; urgency=low
124
125 * New snapshot from trunk revision 40
126 * debian/rules
127 - Added configure args for twitter consumer key/secret
128
129 -- Ken VanDine <ken.vandine@canonical.com> Tue, 26 Jun 2012 11:51:30 -0400
130
131account-plugins (0.3+r35-0precise1) precise; urgency=low
132
133 * New snapshot tagged 0.3-bzr35
134
135 -- David King <david.king@canonical.com> Wed, 20 Jun 2012 12:12:10 +0100
136
137account-plugins (0.3+r34-0precise3) precise; urgency=low
138
139 * data/services/*-microblog.service
140 - Added gwibber settings
141
142 -- Ken VanDine <ken.vandine@canonical.com> Tue, 19 Jun 2012 22:36:16 -0400
143
144account-plugins (0.3+r34-0precise2) precise; urgency=low
145
146 * no change rebuild
147
148 -- Ken VanDine <ken.vandine@canonical.com> Fri, 15 Jun 2012 16:43:48 -0400
149
150account-plugins (0.3+r34-0precise1) precise; urgency=low
151
152 * New snapshot tagged 0.3-bzr34
153 * debian/control
154 - bumped the depends for signon-plugin-oauth2 to >= 0.10+bzr39
155 - bumped build depends for libaccount-plugin-1.0-dev to >= 0.0.6+r73
156 - added new packages account-plugin-twitter and account-plugin-flickr
157
158 -- Ken VanDine <ken.vandine@canonical.com> Thu, 14 Jun 2012 15:38:46 -0400
159
160account-plugins (0.2+r29-0precise1) precise; urgency=low
161
162 * New snapshot tagged 0.2-bzr29
163
164 -- Ken VanDine <ken.vandine@canonical.com> Fri, 01 Jun 2012 14:44:31 -0400
165
166account-plugins (0.1+r27-0precise1) precise; urgency=low
167
168 [ David King ]
169 * Merged trunk r27
170
171 [ Ken VanDine ]
172 * debian/rules
173 - Fix removal of the .la files, path changed
174 * debian/control
175 - Build depend on libaccount-plugin-1.0-dev (>= 0.0.2+r56)
176
177 -- Ken VanDine <ken.vandine@canonical.com> Thu, 17 May 2012 14:09:09 -0400
178
179account-plugins (0.1+r22-0precise1) precise; urgency=low
180
181 * Merged trunk r22
182
183 -- Ken VanDine <ken.vandine@canonical.com> Fri, 23 Mar 2012 09:47:27 -0400
184
185account-plugins (0.1+r21-0precise1) precise; urgency=low
186
187 * New snapshot tagged 0.1-bzr21
188
189 -- Ken VanDine <ken.vandine@canonical.com> Thu, 22 Mar 2012 12:24:09 -0400
190
191account-plugins (0.0.1+r20-0precise1) precise; urgency=low
192
193 * New snapshot
194
195 -- Ken VanDine <ken.vandine@canonical.com> Fri, 16 Mar 2012 14:22:37 -0400
196
197account-plugins (0.0.1+r10-0precise1) precise; urgency=low
198
199 * Initial package
200
201 -- Alberto Mardegan <alberto.mardegan@canonical.com> Tue, 10 Jan 2012 12:19:29 +0100
0202
=== added file 'debian/compat'
--- debian/compat 1970-01-01 00:00:00 +0000
+++ debian/compat 2012-11-12 13:47:31 +0000
@@ -0,0 +1,1 @@
19
02
=== added file 'debian/control'
--- debian/control 1970-01-01 00:00:00 +0000
+++ debian/control 2012-11-12 13:47:31 +0000
@@ -0,0 +1,108 @@
1Source: account-plugins
2Section: gnome
3Priority: optional
4Maintainer: Ubuntu Desktop Team <ubuntu-desktop@lists.ubuntu.com>
5Build-Depends: debhelper (>= 9),
6 autotools-dev,
7 gobject-introspection,
8 python3,
9 pkg-config,
10 libaccounts-glib-dev,
11 libsignon-glib-dev,
12 libaccount-plugin-1.0-dev,
13 valac-0.16,
14 gnome-common,
15 dh-autoreconf,
16Standards-Version: 3.9.3
17Homepage: https://launchpad.net/online-accounts-account-plugins
18# If you aren't a member of ~online-accounts but need to upload packaging changes,
19# just go ahead. ~online-accounts will notice and sync up the code again.
20Vcs-Bzr: https://code.launchpad.net/~online-accounts/online-accounts-account-plugins/trunk
21
22Package: account-plugin-google
23Architecture: any
24Depends: ${shlibs:Depends}, ${misc:Depends},
25 signon-keyring-extension,
26 signon-plugin-oauth2
27Description: GNOME Control Center account plugin for single signon
28 GNOME Control Center account plugins for single signon
29
30Package: account-plugin-facebook
31Architecture: any
32Depends: ${shlibs:Depends}, ${misc:Depends},
33 signon-keyring-extension,
34 signon-plugin-oauth2
35Description: GNOME Control Center account plugin for single signon - facebook
36 GNOME Control Center account plugins for single signon
37
38Package: account-plugin-twitter
39Architecture: any
40Depends: ${shlibs:Depends}, ${misc:Depends},
41 signon-keyring-extension,
42 signon-plugin-oauth2
43Description: GNOME Control Center account plugin for single signon - twitter
44 GNOME Control Center account plugins for single signon
45
46Package: account-plugin-flickr
47Architecture: any
48Depends: ${shlibs:Depends}, ${misc:Depends},
49 signon-keyring-extension,
50 signon-plugin-oauth2
51Description: GNOME Control Center account plugin for single signon - flickr
52 GNOME Control Center account plugins for single signon
53
54Package: account-plugin-identica
55Architecture: any
56Depends: ${shlibs:Depends}, ${misc:Depends},
57 signon-keyring-extension,
58 signon-plugin-oauth2
59Description: GNOME Control Center account plugin for single signon - identica
60 GNOME Control Center account plugins for single signon
61
62Package: account-plugin-foursquare
63Architecture: any
64Depends: ${shlibs:Depends}, ${misc:Depends},
65 signon-keyring-extension,
66 signon-plugin-oauth2
67Description: GNOME Control Center account plugin for single signon - foursquare
68 GNOME Control Center account plugins for single signon
69
70Package: account-plugin-windows-live
71Architecture: any
72Depends: ${shlibs:Depends}, ${misc:Depends},
73 signon-keyring-extension,
74 signon-plugin-oauth2
75Description: GNOME Control Center account plugin for single signon - windows live
76 GNOME Control Center account plugins for single signon
77
78Package: account-plugin-sohu
79Architecture: any
80Depends: ${shlibs:Depends}, ${misc:Depends},
81 signon-keyring-extension,
82 signon-plugin-oauth2
83Description: GNOME Control Center account plugin for single signon - sohu
84 GNOME Control Center account plugins for single signon
85
86Package: account-plugin-sina
87Architecture: any
88Depends: ${shlibs:Depends}, ${misc:Depends},
89 signon-keyring-extension,
90 signon-plugin-oauth2
91Description: GNOME Control Center account plugin for single signon - sina
92 GNOME Control Center account plugins for single signon
93
94Package: account-plugin-tools
95Architecture: any
96Depends: ${shlibs:Depends}, ${misc:Depends},
97 ${python3:Depends},
98 gir1.2-glib-2.0,
99 signon-keyring-extension,
100 signon-plugin-oauth2
101Description: GNOME Control Center account plugins for single signon - tools
102 GNOME Control Center account plugins for single signon
103
104Package: account-plugin-icons
105Architecture: all
106Depends: ${misc:Depends},
107Description: GNOME Control Center account plugin for single signon - icons
108 GNOME Control Center account plugins for single signon
0109
=== added file 'debian/copyright'
--- debian/copyright 1970-01-01 00:00:00 +0000
+++ debian/copyright 2012-11-12 13:47:31 +0000
@@ -0,0 +1,20 @@
1Format: http://dep.debian.net/deps/dep5
2Upstream-Name: online-accounts-account-plugins
3Upstream-Contact: Alberto Mardegan <alberto.mardegan@canonical.com>
4Source: https://launchpad.net/online-accounts-account-plugins
5
6Files: *
7Copyright: 2012 Canonical Ltd.
8License: GPL-2+
9
10Files: src/windows-live.vala
11Copyright: 2012 Collabora Ltd.
12License: GPL-2+
13
14Files: debian/*
15Copyright: 2012 Ken VanDine <ken.vandine@canonical.com>
16License: GPL-2+
17
18License: GPL-2+
19 On Debian systems, the complete text of the GNU General
20 Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
021
=== added file 'debian/rules'
--- debian/rules 1970-01-01 00:00:00 +0000
+++ debian/rules 2012-11-12 13:47:31 +0000
@@ -0,0 +1,25 @@
1#!/usr/bin/make -f
2# -*- makefile -*-
3
4# Uncomment this to turn on verbose mode.
5#export DH_VERBOSE=1
6
7override_dh_autoreconf:
8 NOCONFIGURE=1 dh_autoreconf ./autogen.sh
9
10override_dh_auto_configure:
11 dh_auto_configure -- --with-twitter-consumer-key="NGOB5S7sICsj6epjh0PhAw" \
12 --with-twitter-consumer-secret="rbUEJCBEokMnGZd8bubd0QL2cSmoCjJeyiSJpnx3OM0" \
13 --with-windows-live-client-id="00000000400D5635" \
14 --with-foursquare-client-id="1I2UNJXPHNDZT3OPZOOA5LCPIUEUJFMKRXSF42UFCN1KXKTK" \
15 --with-google-client-id="759250720802-4sii0me9963n9fdqdmi7cepn6ub8luoh.apps.googleusercontent.com" \
16 --with-flickr-consumer-key="d87224f0b467093b2a87fd788d950e27" \
17 --with-flickr-consumer-secret="4c7e48102c226509"
18
19override_dh_install:
20 rm -f debian/*/usr/lib/*/*/*.la
21 mkdir -p debian/tmp/usr/share/account-plugins/tools
22 dh_install --fail-missing
23
24%:
25 dh $@ --with python3,autoreconf

Subscribers

People subscribed via source and target branches