Merge lp:~pimvullers/granite/fix-1270091 into lp:~elementary-pantheon/granite/granite

[Pim Vullers]

Updated fix, according to the comments codygarver's branch.

Unmerged revisions

684. By Pim Vullers <email address hidden> on 2014-01-27

Fixed #1270091, switched to gee-0.8

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2013-12-23 20:13:42 +0000
+++ CMakeLists.txt	2014-01-27 14:41:10 +0000
@@ -42,16 +42,16 @@
     gtk+-3.0
     gio-unix-2.0
     posix
-    gee-1.0)
+    gee-0.8)
 
 set (PKG_DEPS_CHECK
     gtk+-3.0>=3.3.14
     gio-unix-2.0
     gthread-2.0
-    gee-1.0)
+    gee-0.8)
 
 # GI dependencies
-set (GI_PKG_DEPS Gtk-3.0 Gee-1.0)
+set (GI_PKG_DEPS Gtk-3.0 Gee-0.8)
 
 # Check for the deps
 find_package (PkgConfig)

=== modified file 'lib/granite.deps'
--- lib/granite.deps	2012-03-11 19:19:14 +0000
+++ lib/granite.deps	2014-01-27 14:41:10 +0000
@@ -1,3 +1,3 @@
 gtk+-3.0
 gio-unix-2.0
-gee-1.0
\ No newline at end of file
+gee-0.8
\ No newline at end of file

=== modified file 'lib/granite.pc.cmake'
--- lib/granite.pc.cmake	2012-11-23 20:58:45 +0000
+++ lib/granite.pc.cmake	2014-01-27 14:41:10 +0000
@@ -8,5 +8,5 @@
 Version: @PKG_VERSION@
 Libs: -L@DOLLAR@{libdir} -l@PKG_NAME@
 Cflags: -I@DOLLAR@{includedir}/@PKG_NAME@
-Requires: cairo gee-1.0 glib-2.0 gio-unix-2.0 gobject-2.0 gthread-2.0 gdk-3.0 gdk-pixbuf-2.0 gtk+-3.0
+Requires: cairo gee-0.8 glib-2.0 gio-unix-2.0 gobject-2.0 gthread-2.0 gdk-3.0 gdk-pixbuf-2.0 gtk+-3.0