Merge lp:~seb128/indicator-keyboard/use-new-gee into lp:indicator-keyboard

[Sebastien Bacher]

Use the current libgee version

Use the current libgee version

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:929
http://jenkins.qa.ubuntu.com/job/indicator-keyboard-15.04-ci/3/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-keyboard-15.04-vivid-amd64-ci/3/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-keyboard-15.04-vivid-armhf-ci/3/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-keyboard-15.04-ci/3/rebuild

review: Needs Fixing (continuous-integration)

[Lars Karlitski (larsu)]

That's some weird versioning going on in that library. Looks correct though

review: Approve

=== modified file 'configure.ac'
--- configure.ac	2015-02-17 19:59:57 +0000
+++ configure.ac	2015-11-25 08:32:55 +0000
@@ -34,7 +34,7 @@
 
 GLIB_GSETTINGS
 
-PKG_CHECK_MODULES([GEE], [gee-1.0])
+PKG_CHECK_MODULES([GEE], [gee-0.8])
 PKG_CHECK_MODULES([GIO], [gio-2.0])
 PKG_CHECK_MODULES([GTK], [gtk+-3.0])
 PKG_CHECK_MODULES([PANGOFT2], [pangoft2])
 
=== modified file 'data/Makefile.am'
--- data/Makefile.am	2015-02-18 17:20:10 +0000
+++ data/Makefile.am	2015-11-25 08:32:55 +0000
@@ -16,7 +16,7 @@
 indicator_keyboard_icon_generator_SOURCES = main.vala                     \
                                             $(top_srcdir)/lib/common.vala
 indicator_keyboard_icon_generator_VALAFLAGS = $(AM_VALAFLAGS)         \
-                                              --pkg gee-1.0           \
+                                              --pkg gee-0.8           \
                                               --pkg fontconfig-2.0    \
                                               --pkg freetype2-2.0     \
                                               --pkg PangoFT2-1.0      \
 
=== modified file 'debian/control'
--- debian/control	2015-02-18 18:22:25 +0000
+++ debian/control	2015-11-25 08:32:55 +0000
@@ -10,7 +10,7 @@
                fcitx-libs-dev (>= 1:4.2.8.3),
                gir1.2-fcitx-1.0,
                libaccountsservice-dev,
-               libgee-dev,
+               libgee-0.8-dev,
                libgirepository1.0-dev,
                libgnome-desktop-3-dev,
                libgnomekbd-dev,
 
=== modified file 'lib/Makefile.am'
--- lib/Makefile.am	2015-02-18 17:20:10 +0000
+++ lib/Makefile.am	2015-11-25 08:32:55 +0000
@@ -17,7 +17,7 @@
                                      unity-session.vala   \
                                      unity-greeter.vala
 indicator_keyboard_service_VALAFLAGS = $(AM_VALAFLAGS)            \
-                                       --pkg gee-1.0              \
+                                       --pkg gee-0.8              \
                                        --pkg posix                \
                                        --pkg pangocairo           \
                                        --pkg gtk+-3.0             \