Merge lp:~charlesk/indicator-power/lp-1023533 into lp:indicator-power/12.10

Proposed by Charles Kerr
Status: Merged
Merged at revision: 144
Proposed branch: lp:~charlesk/indicator-power/lp-1023533
Merge into: lp:indicator-power/12.10
Diff against target: 26 lines (+6/-4)
1 file modified
configure.ac (+6/-4)
To merge this branch: bzr merge lp:~charlesk/indicator-power/lp-1023533
Reviewer Review Type Date Requested Status
jenkins (community) continuous-integration Needs Fixing
Lars Karlitski (community) Approve
Review via email: mp+114902@code.launchpad.net
To post a comment you must log in.
Revision history for this message
jenkins (martin-mrazik+qa) wrote :
review: Approve (continuous-integration)
Revision history for this message
Lars Karlitski (larsu) :
review: Approve
Revision history for this message
jenkins (martin-mrazik+qa) wrote :

FAILED: Autolanding.
No commit message was specified.
http://s-jenkins:8080/job/indicator-power-autolanding/4/

review: Needs Fixing (continuous-integration)

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 2012-07-11 17:12:35 +0000
3+++ configure.ac 2012-07-13 16:16:33 +0000
4@@ -29,6 +29,7 @@
5 ###########################
6 # Dependencies
7 ###########################
8+GLIB_REQUIRED_VERSION=2.33
9 GIO_REQUIRED_VERSION=2.26
10 GTK_REQUIRED_VERSION=3.0
11 INDICATOR_REQUIRED_VERSION=0.3.90
12@@ -36,10 +37,11 @@
13 GSD_REQUIRED_VERSION=3.1.4
14
15 PKG_CHECK_MODULES([UPOWER],[upower-glib >= UPOWER_REQUIRED_VERSION])
16-PKG_CHECK_MODULES([INDICATOR],[
17- gio-2.0 >= $GIO_REQUIRED_VERSION
18- gtk+-3.0 >= $GTK_REQUIRED_VERSION
19- indicator3-0.4 >= $INDICATOR_REQUIRED_VERSION
20+
21+PKG_CHECK_MODULES([INDICATOR],[glib-2.0 >= $GLIB_REQUIRED_VERSION
22+ gio-2.0 >= $GIO_REQUIRED_VERSION
23+ gtk+-3.0 >= $GTK_REQUIRED_VERSION
24+ indicator3-0.4 >= $INDICATOR_REQUIRED_VERSION
25 ])
26 PKG_CHECK_MODULES([GSD],[gnome-settings-daemon >= $GSD_REQUIRED_VERSION])
27

Subscribers

People subscribed via source and target branches