Switchboard

Merge lp:~nonamenoname/switchboard/fix-1270091 into lp:~elementary-pantheon/switchboard/switchboard

  1. fix-1270091
  2. Merge into switchboard
Proposed by No Name
Status: Merged
Merged at revision: 418
Proposed branch: lp:~nonamenoname/switchboard/fix-1270091
Merge into: lp:~elementary-pantheon/switchboard/switchboard
Diff against target: 43 lines (+4/-4)
3 files modified
CMakeLists.txt (+2/-2)
lib/switchboard-2.0.deps (+1/-1)
lib/switchboard.pc.cmake (+1/-1)
To merge this branch: bzr merge lp:~nonamenoname/switchboard/fix-1270091
Reviewer Review Type Date Requested Status
elementary Pantheon team Pending
Review via email: mp+203130@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 2013-12-23 23:32:28 +0000
3+++ CMakeLists.txt 2014-01-24 17:20:15 +0000
4@@ -71,7 +71,7 @@
5 set (LIB_PACKAGES
6 glib-2.0
7 gio-2.0
8- gee-1.0
9+ gee-0.8
10 gmodule-2.0
11 gtk+-3.0
12 gio-unix-2.0
13@@ -80,7 +80,7 @@
14 set (LIB_PKG
15 glib-2.0>=2.32
16 gio-2.0
17- gee-1.0
18+ gee-0.8
19 gmodule-2.0
20 gtk+-3.0>=3.10
21 gio-unix-2.0
22
23=== modified file 'lib/switchboard-2.0.deps'
24--- lib/switchboard-2.0.deps 2013-12-11 23:03:22 +0000
25+++ lib/switchboard-2.0.deps 2014-01-24 17:20:15 +0000
26@@ -1,6 +1,6 @@
27 glib-2.0
28 gio-2.0
29-gee-1.0
30+gee-0.8
31 gmodule-2.0
32 gtk+-3.0
33 gio-unix-2.0
34
35=== modified file 'lib/switchboard.pc.cmake'
36--- lib/switchboard.pc.cmake 2013-12-11 23:03:22 +0000
37+++ lib/switchboard.pc.cmake 2014-01-24 17:20:15 +0000
38@@ -8,5 +8,5 @@
39 Version: 2.0
40 Libs: -lswitchboard-2.0
41 Cflags: -I@DOLLAR@{includedir}/switchboard-2.0
42-Requires: glib-2.0 gio-2.0 gee-1.0 gmodule-2.0 gtk+-3.0 gio-unix-2.0
43+Requires: glib-2.0 gio-2.0 gee-0.8 gmodule-2.0 gtk+-3.0 gio-unix-2.0
44

Subscribers

People subscribed via source and target branches

to all changes: