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
=== modified file 'CMakeLists.txt'
--- CMakeLists.txt 2013-12-24 13:40:24 +0000
+++ CMakeLists.txt 2014-01-24 17:16:08 +0000
@@ -49,7 +49,7 @@
49 libpeas-1.049 libpeas-1.0
50 libpeas-gtk-1.050 libpeas-gtk-1.0
51 gtksourceview-3.051 gtksourceview-3.0
52 gee-1.052 gee-0.8
53 gobject-2.053 gobject-2.0
54 glib-2.054 glib-2.0
55 gio-2.055 gio-2.0
5656
=== modified file 'plugins/brackets-completion/CMakeLists.txt'
--- plugins/brackets-completion/CMakeLists.txt 2013-08-18 08:13:55 +0000
+++ plugins/brackets-completion/CMakeLists.txt 2014-01-24 17:16:08 +0000
@@ -8,7 +8,7 @@
8 granite8 granite
9 gtksourceview-3.09 gtksourceview-3.0
10 scratchcore10 scratchcore
11 gee-1.011 gee-0.8
12 libpeas-1.012 libpeas-1.0
13 zeitgeist-2.013 zeitgeist-2.0
14OPTIONS14OPTIONS
1515
=== modified file 'plugins/browser-preview/CMakeLists.txt'
--- plugins/browser-preview/CMakeLists.txt 2013-08-18 08:13:55 +0000
+++ plugins/browser-preview/CMakeLists.txt 2014-01-24 17:16:08 +0000
@@ -15,7 +15,7 @@
15 granite15 granite
16 gtksourceview-3.016 gtksourceview-3.0
17 scratchcore17 scratchcore
18 gee-1.018 gee-0.8
19 libpeas-1.019 libpeas-1.0
20 zeitgeist-2.020 zeitgeist-2.0
21OPTIONS21OPTIONS
2222
=== modified file 'plugins/contractor/CMakeLists.txt'
--- plugins/contractor/CMakeLists.txt 2013-08-18 08:13:55 +0000
+++ plugins/contractor/CMakeLists.txt 2014-01-24 17:16:08 +0000
@@ -9,7 +9,7 @@
9 granite9 granite
10 gtksourceview-3.010 gtksourceview-3.0
11 scratchcore11 scratchcore
12 gee-1.012 gee-0.8
13 libpeas-1.013 libpeas-1.0
14 zeitgeist-2.014 zeitgeist-2.0
15OPTIONS15OPTIONS
1616
=== modified file 'plugins/filemanager/CMakeLists.txt'
--- plugins/filemanager/CMakeLists.txt 2013-09-14 09:21:11 +0000
+++ plugins/filemanager/CMakeLists.txt 2014-01-24 17:16:08 +0000
@@ -7,7 +7,7 @@
7 FileView.vala7 FileView.vala
8PACKAGES8PACKAGES
9 gtk+-3.09 gtk+-3.0
10 gee-1.010 gee-0.8
11 granite11 granite
12 scratchcore12 scratchcore
13 libpeas-1.013 libpeas-1.0
1414
=== modified file 'plugins/folder-manager/CMakeLists.txt'
--- plugins/folder-manager/CMakeLists.txt 2013-08-18 08:13:55 +0000
+++ plugins/folder-manager/CMakeLists.txt 2014-01-24 17:16:08 +0000
@@ -7,7 +7,7 @@
7 FileView.vala7 FileView.vala
8PACKAGES8PACKAGES
9 gtk+-3.09 gtk+-3.0
10 gee-1.010 gee-0.8
11 granite11 granite
12 scratchcore12 scratchcore
13 libpeas-1.013 libpeas-1.0
1414
=== modified file 'plugins/open-with/CMakeLists.txt'
--- plugins/open-with/CMakeLists.txt 2013-08-18 08:13:55 +0000
+++ plugins/open-with/CMakeLists.txt 2014-01-24 17:16:08 +0000
@@ -7,7 +7,7 @@
7 granite7 granite
8 gtksourceview-3.08 gtksourceview-3.0
9 scratchcore9 scratchcore
10 gee-1.010 gee-0.8
11 libpeas-1.011 libpeas-1.0
12 zeitgeist-2.012 zeitgeist-2.0
13OPTIONS13OPTIONS
1414
=== modified file 'plugins/outline/CMakeLists.txt'
--- plugins/outline/CMakeLists.txt 2013-08-18 08:13:55 +0000
+++ plugins/outline/CMakeLists.txt 2014-01-24 17:16:08 +0000
@@ -6,7 +6,7 @@
6 CtagsSymbolResolver.vala6 CtagsSymbolResolver.vala
7PACKAGES7PACKAGES
8 gtk+-3.08 gtk+-3.0
9 gee-1.09 gee-0.8
10 granite10 granite
11 scratchcore11 scratchcore
12 libpeas-1.012 libpeas-1.0
1313
=== modified file 'plugins/pastebin/CMakeLists.txt'
--- plugins/pastebin/CMakeLists.txt 2013-08-18 08:13:55 +0000
+++ plugins/pastebin/CMakeLists.txt 2014-01-24 17:16:08 +0000
@@ -11,7 +11,7 @@
11 granite11 granite
12 gtksourceview-3.012 gtksourceview-3.0
13 scratchcore13 scratchcore
14 gee-1.014 gee-0.8
15 libpeas-1.015 libpeas-1.0
16 zeitgeist-2.016 zeitgeist-2.0
17OPTIONS17OPTIONS
1818
=== modified file 'plugins/source-tree/CMakeLists.txt'
--- plugins/source-tree/CMakeLists.txt 2013-08-18 08:13:55 +0000
+++ plugins/source-tree/CMakeLists.txt 2014-01-24 17:16:08 +0000
@@ -4,7 +4,7 @@
4 SourceTreePlugin.vala4 SourceTreePlugin.vala
5PACKAGES5PACKAGES
6 gtk+-3.06 gtk+-3.0
7 gee-1.07 gee-0.8
8 granite8 granite
9 scratchcore9 scratchcore
10 libpeas-1.010 libpeas-1.0
1111
=== modified file 'plugins/spell/CMakeLists.txt'
--- plugins/spell/CMakeLists.txt 2013-09-14 09:21:11 +0000
+++ plugins/spell/CMakeLists.txt 2014-01-24 17:16:08 +0000
@@ -27,7 +27,7 @@
27 granite27 granite
28 gtksourceview-3.028 gtksourceview-3.0
29 scratchcore29 scratchcore
30 gee-1.030 gee-0.8
31 libpeas-1.031 libpeas-1.0
32 zeitgeist-2.032 zeitgeist-2.0
33OPTIONS33OPTIONS
3434
=== modified file 'plugins/strip-trailing-save/CMakeLists.txt'
--- plugins/strip-trailing-save/CMakeLists.txt 2013-08-18 08:13:55 +0000
+++ plugins/strip-trailing-save/CMakeLists.txt 2014-01-24 17:16:08 +0000
@@ -8,7 +8,7 @@
8 granite8 granite
9 gtksourceview-3.09 gtksourceview-3.0
10 scratchcore10 scratchcore
11 gee-1.011 gee-0.8
12 libpeas-1.012 libpeas-1.0
13 zeitgeist-2.013 zeitgeist-2.0
14OPTIONS14OPTIONS
1515
=== modified file 'plugins/terminal/CMakeLists.txt'
--- plugins/terminal/CMakeLists.txt 2013-08-18 08:13:55 +0000
+++ plugins/terminal/CMakeLists.txt 2014-01-24 17:16:08 +0000
@@ -15,7 +15,7 @@
15 granite15 granite
16 gtksourceview-3.016 gtksourceview-3.0
17 scratchcore17 scratchcore
18 gee-1.018 gee-0.8
19 libpeas-1.019 libpeas-1.0
20 zeitgeist-2.020 zeitgeist-2.0
21OPTIONS21OPTIONS
2222
=== modified file 'plugins/vim-emulation/CMakeLists.txt'
--- plugins/vim-emulation/CMakeLists.txt 2013-08-18 08:13:55 +0000
+++ plugins/vim-emulation/CMakeLists.txt 2014-01-24 17:16:08 +0000
@@ -9,7 +9,7 @@
9 granite9 granite
10 gtksourceview-3.010 gtksourceview-3.0
11 scratchcore11 scratchcore
12 gee-1.012 gee-0.8
13 libpeas-1.013 libpeas-1.0
14 zeitgeist-2.014 zeitgeist-2.0
15OPTIONS15OPTIONS
1616
=== modified file 'plugins/word-completion/CMakeLists.txt'
--- plugins/word-completion/CMakeLists.txt 2013-08-18 08:13:55 +0000
+++ plugins/word-completion/CMakeLists.txt 2014-01-24 17:16:08 +0000
@@ -10,7 +10,7 @@
10 granite10 granite
11 gtksourceview-3.011 gtksourceview-3.0
12 scratchcore12 scratchcore
13 gee-1.013 gee-0.8
14 libpeas-1.014 libpeas-1.0
15 zeitgeist-2.015 zeitgeist-2.0
16OPTIONS16OPTIONS
1717
=== modified file 'src/scratchcore.deps'
--- src/scratchcore.deps 2013-05-26 20:47:33 +0000
+++ src/scratchcore.deps 2014-01-24 17:16:08 +0000
@@ -1,6 +1,6 @@
1scratchcore1scratchcore
2gtksourceview-3.02gtksourceview-3.0
3gee-1.03gee-0.8
4gobject-2.04gobject-2.0
5gio-2.05gio-2.0
6gtk+-3.06gtk+-3.0
77
=== modified file 'src/scratchcore.pc.cmake'
--- src/scratchcore.pc.cmake 2013-05-25 07:32:13 +0000
+++ src/scratchcore.pc.cmake 2014-01-24 17:16:08 +0000
@@ -8,5 +8,5 @@
8Version: 0.1 8Version: 0.1
9Libs: -L@DOLLAR@{libdir} -lscratchcore9Libs: -L@DOLLAR@{libdir} -lscratchcore
10Cflags: -I@DOLLAR@{includedir}/scratch10Cflags: -I@DOLLAR@{includedir}/scratch
11Requires: gtk+-3.0 gee-1.0 granite libsoup-2.411Requires: gtk+-3.0 gee-0.8 granite libsoup-2.4
1212

Subscribers

People subscribed via source and target branches