Merge lp:~tintou/switchboard-plug-onlineaccounts/deb-packaging-fixes into lp:~elementary-os/switchboard-plug-onlineaccounts/deb-packaging-freya

Proposed by Corentin Noël
Status: Merged
Approved by: Corentin Noël
Approved revision: 14
Merged at revision: 14
Proposed branch: lp:~tintou/switchboard-plug-onlineaccounts/deb-packaging-fixes
Merge into: lp:~elementary-os/switchboard-plug-onlineaccounts/deb-packaging-freya
Diff against target: 96 lines (+45/-1)
4 files modified
debian/control (+37/-1)
debian/pantheon-online-accounts-plugin-fastmail.install (+3/-0)
debian/pantheon-online-accounts-plugin-password.install (+1/-0)
debian/pantheon-online-accounts-plugin-yahoo.install (+4/-0)
To merge this branch: bzr merge lp:~tintou/switchboard-plug-onlineaccounts/deb-packaging-fixes
Reviewer Review Type Date Requested Status
Rico Tzschichholz Pending
Review via email: mp+201502@code.launchpad.net

Commit message

Added fastmail, yahoo and password packages, fixed dependencies

To post a comment you must log in.
13. By Sergey "Shnatsel" Davidoff

bump gee requirement to 0.8

14. By Corentin Noël

Added fastmail, yahoo and password packages

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/control'
2--- debian/control 2014-02-23 19:42:09 +0000
3+++ debian/control 2014-02-23 22:01:28 +0000
4@@ -24,10 +24,16 @@
5
6 Package: switchboard-plug-online-accounts
7 Architecture: any
8-Depends: ${misc:Depends},
9+Depends: gsignond-extension-pantheon,
10+ ${misc:Depends},
11 ${shlibs:Depends}
12 Enhances: switchboard
13 Pre-Depends: dpkg (>= 1.15.6)
14+Recommends: pantheon-online-accounts-plugin-google,
15+ pantheon-online-accounts-plugin-microsoft,
16+ pantheon-online-accounts-plugin-facebook,
17+ pantheon-online-accounts-plugin-yahoo,
18+ pantheon-online-accounts-plugin-fastmail
19 Description: Online Accounts plug for Switchboard
20 This plug allow you to enable online accounts sync.
21
22@@ -55,12 +61,22 @@
23 Package: pantheon-online-accounts-plugin-generic-oauth
24 Architecture: any
25 Depends: switchboard-plug-online-accounts (= ${binary:Version}),
26+ gsignond-plugin-oauth,
27 ${misc:Depends},
28 ${shlibs:Depends}
29 Pre-Depends: dpkg (>= 1.15.6)
30 Description: Online Accounts plugin for single signon - Generic OAuth
31 Online accounts plugin for single signon
32
33+Package: pantheon-online-accounts-plugin-password
34+Architecture: any
35+Depends: switchboard-plug-online-accounts (= ${binary:Version}),
36+ ${misc:Depends},
37+ ${shlibs:Depends}
38+Pre-Depends: dpkg (>= 1.15.6)
39+Description: Online Accounts plugin for single signon - Password
40+ Online accounts plugin for single signon
41+
42 Package: pantheon-online-accounts-plugin-facebook
43 Architecture: any
44 Depends: switchboard-plug-online-accounts (= ${binary:Version}),
45@@ -89,4 +105,24 @@
46 ${shlibs:Depends}
47 Pre-Depends: dpkg (>= 1.15.6)
48 Description: Online Accounts plugin for single signon - Google
49+ Online accounts plugin for single signon
50+
51+Package: pantheon-online-accounts-plugin-yahoo
52+Architecture: any
53+Depends: switchboard-plug-online-accounts (= ${binary:Version}),
54+ pantheon-online-accounts-plugin-generic-oauth,
55+ ${misc:Depends},
56+ ${shlibs:Depends}
57+Pre-Depends: dpkg (>= 1.15.6)
58+Description: Online Accounts plugin for single signon - Yahoo
59+ Online accounts plugin for single signon
60+
61+Package: pantheon-online-accounts-plugin-fastmail
62+Architecture: any
63+Depends: switchboard-plug-online-accounts (= ${binary:Version}),
64+ pantheon-online-accounts-plugin-password,
65+ ${misc:Depends},
66+ ${shlibs:Depends}
67+Pre-Depends: dpkg (>= 1.15.6)
68+Description: Online Accounts plugin for single signon - FastMail
69 Online accounts plugin for single signon
70\ No newline at end of file
71
72=== added file 'debian/pantheon-online-accounts-plugin-fastmail.install'
73--- debian/pantheon-online-accounts-plugin-fastmail.install 1970-01-01 00:00:00 +0000
74+++ debian/pantheon-online-accounts-plugin-fastmail.install 2014-02-23 22:01:28 +0000
75@@ -0,0 +1,3 @@
76+usr/lib/*/pantheon-online-accounts/password/libfastmail.so
77+usr/share/icons/hicolor/scalable/apps/fastmail.svg
78+usr/share/accounts/providers/fastmail*
79\ No newline at end of file
80
81=== added file 'debian/pantheon-online-accounts-plugin-password.install'
82--- debian/pantheon-online-accounts-plugin-password.install 1970-01-01 00:00:00 +0000
83+++ debian/pantheon-online-accounts-plugin-password.install 2014-02-23 22:01:28 +0000
84@@ -0,0 +1,1 @@
85+usr/lib/*/pantheon-online-accounts/libpassword.so
86\ No newline at end of file
87
88=== added file 'debian/pantheon-online-accounts-plugin-yahoo.install'
89--- debian/pantheon-online-accounts-plugin-yahoo.install 1970-01-01 00:00:00 +0000
90+++ debian/pantheon-online-accounts-plugin-yahoo.install 2014-02-23 22:01:28 +0000
91@@ -0,0 +1,4 @@
92+usr/lib/*/pantheon-online-accounts/generic-oauth-plugins/libyahoo.so
93+usr/share/icons/hicolor/scalable/apps/yahoo.svg
94+usr/share/accounts/providers/yahoo*
95+usr/share/accounts/services/yahoo*
96\ No newline at end of file

Subscribers

People subscribed via source and target branches

to all changes: