Indicator keyboard

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

  1. use-new-gee
  2. Merge into trunk
Proposed by Sebastien Bacher
Status: Merged
Approved by: Lars Karlitski
Approved revision: 929
Merged at revision: 930
Proposed branch: lp:~seb128/indicator-keyboard/use-new-gee
Merge into: lp:indicator-keyboard
Diff against target: 51 lines (+4/-4)
4 files modified
configure.ac (+1/-1)
data/Makefile.am (+1/-1)
debian/control (+1/-1)
lib/Makefile.am (+1/-1)
To merge this branch: bzr merge lp:~seb128/indicator-keyboard/use-new-gee
Reviewer Review Type Date Requested Status
Lars Karlitski (community) Approve
PS Jenkins bot (community) continuous-integration Needs Fixing
Review via email: mp+278552@code.launchpad.net

Commit message

Use the current libgee version

Description of the change

Use the current libgee version

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

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)
Revision history for this message
Lars Karlitski (larsu) wrote :

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

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'configure.ac'
2--- configure.ac 2015-02-17 19:59:57 +0000
3+++ configure.ac 2015-11-25 08:32:55 +0000
4@@ -34,7 +34,7 @@
5
6 GLIB_GSETTINGS
7
8-PKG_CHECK_MODULES([GEE], [gee-1.0])
9+PKG_CHECK_MODULES([GEE], [gee-0.8])
10 PKG_CHECK_MODULES([GIO], [gio-2.0])
11 PKG_CHECK_MODULES([GTK], [gtk+-3.0])
12 PKG_CHECK_MODULES([PANGOFT2], [pangoft2])
13
14=== modified file 'data/Makefile.am'
15--- data/Makefile.am 2015-02-18 17:20:10 +0000
16+++ data/Makefile.am 2015-11-25 08:32:55 +0000
17@@ -16,7 +16,7 @@
18 indicator_keyboard_icon_generator_SOURCES = main.vala \
19 $(top_srcdir)/lib/common.vala
20 indicator_keyboard_icon_generator_VALAFLAGS = $(AM_VALAFLAGS) \
21- --pkg gee-1.0 \
22+ --pkg gee-0.8 \
23 --pkg fontconfig-2.0 \
24 --pkg freetype2-2.0 \
25 --pkg PangoFT2-1.0 \
26
27=== modified file 'debian/control'
28--- debian/control 2015-02-18 18:22:25 +0000
29+++ debian/control 2015-11-25 08:32:55 +0000
30@@ -10,7 +10,7 @@
31 fcitx-libs-dev (>= 1:4.2.8.3),
32 gir1.2-fcitx-1.0,
33 libaccountsservice-dev,
34- libgee-dev,
35+ libgee-0.8-dev,
36 libgirepository1.0-dev,
37 libgnome-desktop-3-dev,
38 libgnomekbd-dev,
39
40=== modified file 'lib/Makefile.am'
41--- lib/Makefile.am 2015-02-18 17:20:10 +0000
42+++ lib/Makefile.am 2015-11-25 08:32:55 +0000
43@@ -17,7 +17,7 @@
44 unity-session.vala \
45 unity-greeter.vala
46 indicator_keyboard_service_VALAFLAGS = $(AM_VALAFLAGS) \
47- --pkg gee-1.0 \
48+ --pkg gee-0.8 \
49 --pkg posix \
50 --pkg pangocairo \
51 --pkg gtk+-3.0 \

Subscribers

People subscribed via source and target branches

to all changes: