Merge lp:~ken-vandine/account-plugins/libaccount-split into lp:account-plugins

Proposed by Ken VanDine on 2013-05-01
Status: Merged
Approved by: Ken VanDine on 2013-05-01
Approved revision: 104
Merged at revision: 102
Proposed branch: lp:~ken-vandine/account-plugins/libaccount-split
Merge into: lp:account-plugins
Diff against target: 206 lines (+57/-43)
4 files modified
debian/account-plugin-google.install (+0/-1)
debian/changelog (+11/-1)
debian/control (+45/-41)
debian/libaccount-plugin-google.install (+1/-0)
To merge this branch: bzr merge lp:~ken-vandine/account-plugins/libaccount-split
Reviewer Review Type Date Requested Status
Alberto Mardegan (community) 2013-05-01 Approve on 2013-05-01
PS Jenkins bot (community) continuous-integration Approve on 2013-05-01
Review via email: mp+161756@code.launchpad.net

Commit message

* Put libaccount-plugin modules in separate packages,
  libaccount-plugin-generic-oauth and libaccount-plugin-google and
  add Replaces/Conflicts/Breaks.
* Change depends for the libaccount-plugins to Recommends
* Updated Architecture for account-plugin-* to "all".
* Dropped depends for the libaccount-plugins

Description of the change

* Put libaccount-plugin modules in separate packages,
  libaccount-plugin-generic-oauth and libaccount-plugin-google and
  add Replaces/Conflicts/Breaks.
* Change depends for the libaccount-plugins to Recommends
* Updated Architecture for account-plugin-* to "all".
* Dropped depends for the libaccount-plugins

To post a comment you must log in.
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Alberto Mardegan (mardy) wrote :

Looks good!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/account-plugin-google.install'
2--- debian/account-plugin-google.install 2013-02-11 20:13:19 +0000
3+++ debian/account-plugin-google.install 2013-05-01 00:50:31 +0000
4@@ -1,5 +1,4 @@
5 etc/signon-ui/webkit-options.d/accounts.google.com.conf
6-usr/lib/libaccount-plugin-1.0/providers/libgoogle.so
7 usr/share/accounts/services/google-docs.service
8 usr/share/accounts/services/google-im.service
9 usr/share/accounts/services/picasa.service
10
11=== modified file 'debian/changelog'
12--- debian/changelog 2013-04-29 17:22:56 +0000
13+++ debian/changelog 2013-05-01 00:50:31 +0000
14@@ -1,4 +1,14 @@
15-account-plugins (0.10bzr13.04.26-0ubuntu1) UNRELEASED; urgency=low
16+account-plugins (0.10bzr13.04.30-0ubuntu1) UNRELEASED; urgency=low
17+
18+ * Put libaccount-plugin modules in separate packages,
19+ libaccount-plugin-generic-oauth and libaccount-plugin-google and
20+ add Replaces/Conflicts/Breaks.
21+ * Dropped depends for the libaccount-plugins
22+ * Updated Architecture for account-plugin-* to "all".
23+
24+ -- Ken VanDine <ken.vandine@canonical.com> Tue, 30 Apr 2013 14:28:11 -0700
25+
26+account-plugins (0.10bzr13.04.26-0ubuntu1) raring; urgency=low
27
28 [ Jonathan Davies ]
29 * Added account-plugin-linkedin.
30
31=== modified file 'debian/control'
32--- debian/control 2013-04-11 02:32:35 +0000
33+++ debian/control 2013-05-01 00:50:31 +0000
34@@ -14,112 +14,116 @@
35 gnome-common,
36 dh-autoreconf,
37 libxml2-utils,
38-Standards-Version: 3.9.3
39+Standards-Version: 3.9.4
40 Homepage: https://launchpad.net/account-plugins
41 # If you aren't a member of ~online-accounts but need to upload packaging changes,
42 # just go ahead. ~online-accounts will notice and sync up the code again.
43 Vcs-Bzr: https://code.launchpad.net/~online-accounts/account-plugins/trunk
44
45-Package: account-plugin-generic-oauth
46+Package: libaccount-plugin-generic-oauth
47 Architecture: any
48 Depends: ${shlibs:Depends}, ${misc:Depends},
49- signon-keyring-extension,
50- signon-plugin-oauth2
51+ signon-keyring-extension,
52+ signon-plugin-oauth2,
53+Replaces: account-plugin-generic-oauth (<< 0.10bzr13.04.30)
54+Breaks: account-plugin-generic-oauth (<< 0.10bzr13.04.30)
55+Conflicts: account-plugin-generic-oauth (<< 0.10bzr13.04.30)
56 Description: GNOME Control Center account plugin for single signon - generic OAuth
57 GNOME Control Center account plugins for single signon
58
59+Package: libaccount-plugin-google
60+Architecture: any
61+Depends: ${shlibs:Depends}, ${misc:Depends},
62+ signon-keyring-extension,
63+ signon-plugin-oauth2,
64+Replaces: account-plugin-google (<< 0.10bzr13.04.30)
65+Breaks: account-plugin-google (<< 0.10bzr13.04.30)
66+Conflicts: account-plugin-google (<< 0.10bzr13.04.30)
67+Description: GNOME Control Center account plugin for single signon - Google Auth
68+ GNOME Control Center account plugins for single signon
69+
70 Package: account-plugin-google
71-Architecture: any
72+Architecture: all
73 Depends: ${shlibs:Depends}, ${misc:Depends},
74- signon-keyring-extension,
75- signon-plugin-oauth2,
76- unity-asset-pool (>> 0.8.24daily12.12.05-0ubuntu1)
77+ signon-keyring-extension,
78+ signon-plugin-oauth2,
79+ unity-asset-pool (>> 0.8.24daily12.12.05-0ubuntu1),
80 Description: GNOME Control Center account plugin for single signon
81 GNOME Control Center account plugins for single signon
82
83 Package: account-plugin-facebook
84-Architecture: any
85+Architecture: all
86 Depends: ${misc:Depends},
87- account-plugin-generic-oauth,
88- unity-asset-pool (>> 0.8.24daily12.12.05-0ubuntu1)
89+ unity-asset-pool (>> 0.8.24daily12.12.05-0ubuntu1),
90 Description: GNOME Control Center account plugin for single signon - facebook
91 GNOME Control Center account plugins for single signon
92
93 Package: account-plugin-twitter
94-Architecture: any
95+Architecture: all
96 Depends: ${misc:Depends},
97- account-plugin-generic-oauth,
98- unity-asset-pool (>> 0.8.24daily12.12.05-0ubuntu1)
99+ unity-asset-pool (>> 0.8.24daily12.12.05-0ubuntu1),
100 Description: GNOME Control Center account plugin for single signon - twitter
101 GNOME Control Center account plugins for single signon
102
103 Package: account-plugin-flickr
104-Architecture: any
105+Architecture: all
106 Depends: ${misc:Depends},
107- account-plugin-generic-oauth,
108- unity-asset-pool (>> 0.8.24daily12.12.05-0ubuntu1)
109+ unity-asset-pool (>> 0.8.24daily12.12.05-0ubuntu1),
110 Description: GNOME Control Center account plugin for single signon - flickr
111 GNOME Control Center account plugins for single signon
112
113 Package: account-plugin-identica
114-Architecture: any
115+Architecture: all
116 Depends: ${misc:Depends},
117- account-plugin-generic-oauth,
118- unity-asset-pool (>> 0.8.24daily12.12.05-0ubuntu1)
119+ unity-asset-pool (>> 0.8.24daily12.12.05-0ubuntu1),
120 Description: GNOME Control Center account plugin for single signon - identica
121 GNOME Control Center account plugins for single signon
122
123 Package: account-plugin-foursquare
124-Architecture: any
125+Architecture: all
126 Depends: ${misc:Depends},
127- account-plugin-generic-oauth,
128- unity-asset-pool (>> 0.8.24daily12.12.05-0ubuntu1)
129+ unity-asset-pool (>> 0.8.24daily12.12.05-0ubuntu1),
130 Description: GNOME Control Center account plugin for single signon - foursquare
131 GNOME Control Center account plugins for single signon
132
133 Package: account-plugin-windows-live
134-Architecture: any
135+Architecture: all
136 Depends: ${misc:Depends},
137- account-plugin-generic-oauth,
138- unity-asset-pool (>> 0.8.24daily12.12.05-0ubuntu1)
139+ unity-asset-pool (>> 0.8.24daily12.12.05-0ubuntu1),
140 Description: GNOME Control Center account plugin for single signon - windows live
141 GNOME Control Center account plugins for single signon
142
143 Package: account-plugin-sohu
144-Architecture: any
145+Architecture: all
146 Depends: ${misc:Depends},
147- account-plugin-generic-oauth,
148- unity-asset-pool (>> 0.8.24daily12.12.05-0ubuntu1)
149+ unity-asset-pool (>> 0.8.24daily12.12.05-0ubuntu1),
150 Description: GNOME Control Center account plugin for single signon - sohu
151 GNOME Control Center account plugins for single signon
152
153 Package: account-plugin-sina
154-Architecture: any
155+Architecture: all
156 Depends: ${misc:Depends},
157- account-plugin-generic-oauth,
158- unity-asset-pool (>> 0.8.24daily12.12.05-0ubuntu1)
159+ unity-asset-pool (>> 0.8.24daily12.12.05-0ubuntu1),
160 Description: GNOME Control Center account plugin for single signon - sina
161 GNOME Control Center account plugins for single signon
162
163 Package: account-plugin-linkedin
164-Architecture: any
165+Architecture: all
166 Depends: ${misc:Depends},
167- account-plugin-generic-oauth,
168- unity-asset-pool (>> 0.8.24daily12.12.05-0ubuntu1)
169+ unity-asset-pool (>> 0.8.24daily12.12.05-0ubuntu1),
170 Description: GNOME Control Center account plugin for single signon - LinkedIn
171 GNOME Control Center account plugins for single signon
172
173 Package: account-plugin-instagram
174-Architecture: any
175+Architecture: all
176 Depends: ${misc:Depends},
177- account-plugin-generic-oauth,
178- unity-asset-pool (>> 0.8.24daily12.12.05-0ubuntu1)
179+ unity-asset-pool (>> 0.8.24daily12.12.05-0ubuntu1),
180 Description: GNOME Control Center account plugin for single signon - Instagram
181 GNOME Control Center account plugins for single signon
182
183 Package: account-plugin-tools
184-Architecture: any
185-Depends: ${shlibs:Depends}, ${misc:Depends},
186+Architecture: all
187+Depends: ${misc:Depends},
188 ${python3:Depends},
189 python3-gi,
190 gir1.2-glib-2.0,
191@@ -127,7 +131,7 @@
192 gir1.2-accounts-1.0,
193 signon-keyring-extension,
194 signon-plugin-oauth2,
195- unity-asset-pool (>> 0.8.24daily12.12.05-0ubuntu1)
196+ unity-asset-pool (>> 0.8.24daily12.12.05-0ubuntu1),
197 Description: GNOME Control Center account plugins for single signon - tools
198 GNOME Control Center account plugins for single signon
199
200
201=== renamed file 'debian/account-plugin-generic-oauth.install' => 'debian/libaccount-plugin-generic-oauth.install'
202=== added file 'debian/libaccount-plugin-google.install'
203--- debian/libaccount-plugin-google.install 1970-01-01 00:00:00 +0000
204+++ debian/libaccount-plugin-google.install 2013-05-01 00:50:31 +0000
205@@ -0,0 +1,1 @@
206+usr/lib/libaccount-plugin-1.0/providers/libgoogle.so

Subscribers

People subscribed via source and target branches

to all changes: