Merge lp:~nonamenoname/switchboard-plug-onlineaccounts/fix-1270091 into lp:~elementary-apps/switchboard-plug-onlineaccounts/trunk

Proposed by No Name
Status: Merged
Merged at revision: 24
Proposed branch: lp:~nonamenoname/switchboard-plug-onlineaccounts/fix-1270091
Merge into: lp:~elementary-apps/switchboard-plug-onlineaccounts/trunk
Diff against target: 43 lines (+4/-4)
3 files modified
CMakeLists.txt (+2/-2)
src/pantheon-online-accounts.deps (+1/-1)
src/pantheon-online-accounts.pc.cmake (+1/-1)
To merge this branch: bzr merge lp:~nonamenoname/switchboard-plug-onlineaccounts/fix-1270091
Reviewer Review Type Date Requested Status
elementary Apps team Pending
Review via email: mp+203145@code.launchpad.net

Description of the change

Switch to gee-0.8

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2014-01-04 15:16:21 +0000
3+++ CMakeLists.txt 2014-01-24 18:18:38 +0000
4@@ -61,7 +61,7 @@
5 glib-2.0
6 gio-2.0
7 gio-unix-2.0
8- gee-1.0
9+ gee-0.8
10 gtk+-3.0
11 posix
12 granite
13@@ -81,7 +81,7 @@
14 glib-2.0
15 gio-2.0
16 gio-unix-2.0
17- gee-1.0
18+ gee-0.8
19 gtk+-3.0>=3.8
20 granite
21 switchboard-2.0
22
23=== modified file 'src/pantheon-online-accounts.deps'
24--- src/pantheon-online-accounts.deps 2013-11-11 21:54:17 +0000
25+++ src/pantheon-online-accounts.deps 2014-01-24 18:18:38 +0000
26@@ -1,6 +1,6 @@
27 glib-2.0
28 gio-2.0
29-gee-1.0
30+gee-0.8
31 libpeas-1.0
32 gtk+-3.0
33 granite
34
35=== modified file 'src/pantheon-online-accounts.pc.cmake'
36--- src/pantheon-online-accounts.pc.cmake 2013-10-28 21:57:16 +0000
37+++ src/pantheon-online-accounts.pc.cmake 2014-01-24 18:18:38 +0000
38@@ -8,5 +8,5 @@
39 Version: 0.1
40 Libs: -lonline-accounts-pantheon
41 Cflags: -I@DOLLAR@{includedir}/online-accounts-pantheon
42-Requires: glib-2.0 gio-2.0 gee-1.0 libpeas-1.0 gtk+-3.0 granite libaccounts-glib libgsignon-glib
43+Requires: glib-2.0 gio-2.0 gee-0.8 libpeas-1.0 gtk+-3.0 granite libaccounts-glib libgsignon-glib
44

Subscribers

People subscribed via source and target branches

to all changes: