Scratch

Merge lp:~nonamenoname/scratch/fix-1270091 into lp:~elementary-apps/scratch/scratch

  1. fix-1270091
  2. Merge into scratch
Proposed by No Name
Status: Merged
Approved by: Mario Guerriero
Approved revision: 1249
Merged at revision: 1249
Proposed branch: lp:~nonamenoname/scratch/fix-1270091
Merge into: lp:~elementary-apps/scratch/scratch
Diff against target: 216 lines (+17/-17)
17 files modified
CMakeLists.txt (+1/-1)
plugins/brackets-completion/CMakeLists.txt (+1/-1)
plugins/browser-preview/CMakeLists.txt (+1/-1)
plugins/contractor/CMakeLists.txt (+1/-1)
plugins/filemanager/CMakeLists.txt (+1/-1)
plugins/folder-manager/CMakeLists.txt (+1/-1)
plugins/open-with/CMakeLists.txt (+1/-1)
plugins/outline/CMakeLists.txt (+1/-1)
plugins/pastebin/CMakeLists.txt (+1/-1)
plugins/source-tree/CMakeLists.txt (+1/-1)
plugins/spell/CMakeLists.txt (+1/-1)
plugins/strip-trailing-save/CMakeLists.txt (+1/-1)
plugins/terminal/CMakeLists.txt (+1/-1)
plugins/vim-emulation/CMakeLists.txt (+1/-1)
plugins/word-completion/CMakeLists.txt (+1/-1)
src/scratchcore.deps (+1/-1)
src/scratchcore.pc.cmake (+1/-1)
To merge this branch: bzr merge lp:~nonamenoname/scratch/fix-1270091
Reviewer Review Type Date Requested Status
Mario Guerriero (community) Approve
Review via email: mp+203126@code.launchpad.net

Commit message

Switch to gee-0.8

Description of the change

Switch to gee-0.8

To post a comment you must log in.
Revision history for this message
Mario Guerriero (mefrio-g) :
review: Approve

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-24 13:40:24 +0000
3+++ CMakeLists.txt 2014-01-24 17:16:08 +0000
4@@ -49,7 +49,7 @@
5 libpeas-1.0
6 libpeas-gtk-1.0
7 gtksourceview-3.0
8- gee-1.0
9+ gee-0.8
10 gobject-2.0
11 glib-2.0
12 gio-2.0
13
14=== modified file 'plugins/brackets-completion/CMakeLists.txt'
15--- plugins/brackets-completion/CMakeLists.txt 2013-08-18 08:13:55 +0000
16+++ plugins/brackets-completion/CMakeLists.txt 2014-01-24 17:16:08 +0000
17@@ -8,7 +8,7 @@
18 granite
19 gtksourceview-3.0
20 scratchcore
21- gee-1.0
22+ gee-0.8
23 libpeas-1.0
24 zeitgeist-2.0
25 OPTIONS
26
27=== modified file 'plugins/browser-preview/CMakeLists.txt'
28--- plugins/browser-preview/CMakeLists.txt 2013-08-18 08:13:55 +0000
29+++ plugins/browser-preview/CMakeLists.txt 2014-01-24 17:16:08 +0000
30@@ -15,7 +15,7 @@
31 granite
32 gtksourceview-3.0
33 scratchcore
34- gee-1.0
35+ gee-0.8
36 libpeas-1.0
37 zeitgeist-2.0
38 OPTIONS
39
40=== modified file 'plugins/contractor/CMakeLists.txt'
41--- plugins/contractor/CMakeLists.txt 2013-08-18 08:13:55 +0000
42+++ plugins/contractor/CMakeLists.txt 2014-01-24 17:16:08 +0000
43@@ -9,7 +9,7 @@
44 granite
45 gtksourceview-3.0
46 scratchcore
47- gee-1.0
48+ gee-0.8
49 libpeas-1.0
50 zeitgeist-2.0
51 OPTIONS
52
53=== modified file 'plugins/filemanager/CMakeLists.txt'
54--- plugins/filemanager/CMakeLists.txt 2013-09-14 09:21:11 +0000
55+++ plugins/filemanager/CMakeLists.txt 2014-01-24 17:16:08 +0000
56@@ -7,7 +7,7 @@
57 FileView.vala
58 PACKAGES
59 gtk+-3.0
60- gee-1.0
61+ gee-0.8
62 granite
63 scratchcore
64 libpeas-1.0
65
66=== modified file 'plugins/folder-manager/CMakeLists.txt'
67--- plugins/folder-manager/CMakeLists.txt 2013-08-18 08:13:55 +0000
68+++ plugins/folder-manager/CMakeLists.txt 2014-01-24 17:16:08 +0000
69@@ -7,7 +7,7 @@
70 FileView.vala
71 PACKAGES
72 gtk+-3.0
73- gee-1.0
74+ gee-0.8
75 granite
76 scratchcore
77 libpeas-1.0
78
79=== modified file 'plugins/open-with/CMakeLists.txt'
80--- plugins/open-with/CMakeLists.txt 2013-08-18 08:13:55 +0000
81+++ plugins/open-with/CMakeLists.txt 2014-01-24 17:16:08 +0000
82@@ -7,7 +7,7 @@
83 granite
84 gtksourceview-3.0
85 scratchcore
86- gee-1.0
87+ gee-0.8
88 libpeas-1.0
89 zeitgeist-2.0
90 OPTIONS
91
92=== modified file 'plugins/outline/CMakeLists.txt'
93--- plugins/outline/CMakeLists.txt 2013-08-18 08:13:55 +0000
94+++ plugins/outline/CMakeLists.txt 2014-01-24 17:16:08 +0000
95@@ -6,7 +6,7 @@
96 CtagsSymbolResolver.vala
97 PACKAGES
98 gtk+-3.0
99- gee-1.0
100+ gee-0.8
101 granite
102 scratchcore
103 libpeas-1.0
104
105=== modified file 'plugins/pastebin/CMakeLists.txt'
106--- plugins/pastebin/CMakeLists.txt 2013-08-18 08:13:55 +0000
107+++ plugins/pastebin/CMakeLists.txt 2014-01-24 17:16:08 +0000
108@@ -11,7 +11,7 @@
109 granite
110 gtksourceview-3.0
111 scratchcore
112- gee-1.0
113+ gee-0.8
114 libpeas-1.0
115 zeitgeist-2.0
116 OPTIONS
117
118=== modified file 'plugins/source-tree/CMakeLists.txt'
119--- plugins/source-tree/CMakeLists.txt 2013-08-18 08:13:55 +0000
120+++ plugins/source-tree/CMakeLists.txt 2014-01-24 17:16:08 +0000
121@@ -4,7 +4,7 @@
122 SourceTreePlugin.vala
123 PACKAGES
124 gtk+-3.0
125- gee-1.0
126+ gee-0.8
127 granite
128 scratchcore
129 libpeas-1.0
130
131=== modified file 'plugins/spell/CMakeLists.txt'
132--- plugins/spell/CMakeLists.txt 2013-09-14 09:21:11 +0000
133+++ plugins/spell/CMakeLists.txt 2014-01-24 17:16:08 +0000
134@@ -27,7 +27,7 @@
135 granite
136 gtksourceview-3.0
137 scratchcore
138- gee-1.0
139+ gee-0.8
140 libpeas-1.0
141 zeitgeist-2.0
142 OPTIONS
143
144=== modified file 'plugins/strip-trailing-save/CMakeLists.txt'
145--- plugins/strip-trailing-save/CMakeLists.txt 2013-08-18 08:13:55 +0000
146+++ plugins/strip-trailing-save/CMakeLists.txt 2014-01-24 17:16:08 +0000
147@@ -8,7 +8,7 @@
148 granite
149 gtksourceview-3.0
150 scratchcore
151- gee-1.0
152+ gee-0.8
153 libpeas-1.0
154 zeitgeist-2.0
155 OPTIONS
156
157=== modified file 'plugins/terminal/CMakeLists.txt'
158--- plugins/terminal/CMakeLists.txt 2013-08-18 08:13:55 +0000
159+++ plugins/terminal/CMakeLists.txt 2014-01-24 17:16:08 +0000
160@@ -15,7 +15,7 @@
161 granite
162 gtksourceview-3.0
163 scratchcore
164- gee-1.0
165+ gee-0.8
166 libpeas-1.0
167 zeitgeist-2.0
168 OPTIONS
169
170=== modified file 'plugins/vim-emulation/CMakeLists.txt'
171--- plugins/vim-emulation/CMakeLists.txt 2013-08-18 08:13:55 +0000
172+++ plugins/vim-emulation/CMakeLists.txt 2014-01-24 17:16:08 +0000
173@@ -9,7 +9,7 @@
174 granite
175 gtksourceview-3.0
176 scratchcore
177- gee-1.0
178+ gee-0.8
179 libpeas-1.0
180 zeitgeist-2.0
181 OPTIONS
182
183=== modified file 'plugins/word-completion/CMakeLists.txt'
184--- plugins/word-completion/CMakeLists.txt 2013-08-18 08:13:55 +0000
185+++ plugins/word-completion/CMakeLists.txt 2014-01-24 17:16:08 +0000
186@@ -10,7 +10,7 @@
187 granite
188 gtksourceview-3.0
189 scratchcore
190- gee-1.0
191+ gee-0.8
192 libpeas-1.0
193 zeitgeist-2.0
194 OPTIONS
195
196=== modified file 'src/scratchcore.deps'
197--- src/scratchcore.deps 2013-05-26 20:47:33 +0000
198+++ src/scratchcore.deps 2014-01-24 17:16:08 +0000
199@@ -1,6 +1,6 @@
200 scratchcore
201 gtksourceview-3.0
202-gee-1.0
203+gee-0.8
204 gobject-2.0
205 gio-2.0
206 gtk+-3.0
207
208=== modified file 'src/scratchcore.pc.cmake'
209--- src/scratchcore.pc.cmake 2013-05-25 07:32:13 +0000
210+++ src/scratchcore.pc.cmake 2014-01-24 17:16:08 +0000
211@@ -8,5 +8,5 @@
212 Version: 0.1
213 Libs: -L@DOLLAR@{libdir} -lscratchcore
214 Cflags: -I@DOLLAR@{includedir}/scratch
215-Requires: gtk+-3.0 gee-1.0 granite libsoup-2.4
216+Requires: gtk+-3.0 gee-0.8 granite libsoup-2.4
217

Subscribers

People subscribed via source and target branches