New upstream release.

4 files changed, 73 insertions, 51 deletions

diff --git a/ChangeLog b/ChangeLog
index f70f1a7..ab5e803 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,17 @@
 # Generated by Makefile. Do not edit.
 
+2012-08-21  Charles Kerr  <charles.kerr@canonical.com>
+
+	12.10.1
+
+2012-08-21  Charles Kerr  <charles.kerr@canonical.com>
+
+	merge lp:~charlesk/indicator-power/lp-1023533 to bump the glib prerequisite
+
+2012-07-13  Charles Kerr  <charles.kerr@canonical.com>
+
+	raise glib minimum to 2.33
+
 2012-07-11  Charles Kerr  <charles.kerr@canonical.com>
 
 	bump version to 12.10.0
diff --git a/configure b/configure
index c48748d..e3a1115 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for indicator-power 12.10.0.
+# Generated by GNU Autoconf 2.69 for indicator-power 12.10.1.
 #
 # Report bugs to <http://bugs.launchpad.net/indicator-power>.
 #
@@ -590,8 +590,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='indicator-power'
 PACKAGE_TARNAME='indicator-power'
-PACKAGE_VERSION='12.10.0'
-PACKAGE_STRING='indicator-power 12.10.0'
+PACKAGE_VERSION='12.10.1'
+PACKAGE_STRING='indicator-power 12.10.1'
 PACKAGE_BUGREPORT='http://bugs.launchpad.net/indicator-power'
 PACKAGE_URL='http://launchpad.net/indicator-power'
 
@@ -1442,7 +1442,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures indicator-power 12.10.0 to adapt to many kinds of systems.
+\`configure' configures indicator-power 12.10.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1512,7 +1512,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of indicator-power 12.10.0:";;
+     short | recursive ) echo "Configuration of indicator-power 12.10.1:";;
    esac
   cat <<\_ACEOF
 
@@ -1666,7 +1666,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-indicator-power configure 12.10.0
+indicator-power configure 12.10.1
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2202,7 +2202,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by indicator-power $as_me 12.10.0, which was
+It was created by indicator-power $as_me 12.10.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3026,7 +3026,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='indicator-power'
- VERSION='12.10.0'
+ VERSION='12.10.1'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -15438,6 +15438,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 ###########################
 # Dependencies
 ###########################
+GLIB_REQUIRED_VERSION=2.33
 GIO_REQUIRED_VERSION=2.26
 GTK_REQUIRED_VERSION=3.0
 INDICATOR_REQUIRED_VERSION=0.3.90
@@ -15656,6 +15657,7 @@ $as_echo "yes" >&6; }
 
 fi
 
+
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for INDICATOR" >&5
 $as_echo_n "checking for INDICATOR... " >&6; }
@@ -15664,23 +15666,23 @@ if test -n "$INDICATOR_CFLAGS"; then
     pkg_cv_INDICATOR_CFLAGS="$INDICATOR_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"
-        gio-2.0 >= \$GIO_REQUIRED_VERSION
-        gtk+-3.0 >= \$GTK_REQUIRED_VERSION
-        indicator3-0.4 >= \$INDICATOR_REQUIRED_VERSION
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQUIRED_VERSION
+                               gio-2.0 >= \$GIO_REQUIRED_VERSION
+                               gtk+-3.0 >= \$GTK_REQUIRED_VERSION
+                               indicator3-0.4 >= \$INDICATOR_REQUIRED_VERSION
 \""; } >&5
-  ($PKG_CONFIG --exists --print-errors "
-        gio-2.0 >= $GIO_REQUIRED_VERSION
-        gtk+-3.0 >= $GTK_REQUIRED_VERSION
-        indicator3-0.4 >= $INDICATOR_REQUIRED_VERSION
+  ($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQUIRED_VERSION
+                               gio-2.0 >= $GIO_REQUIRED_VERSION
+                               gtk+-3.0 >= $GTK_REQUIRED_VERSION
+                               indicator3-0.4 >= $INDICATOR_REQUIRED_VERSION
 ") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_INDICATOR_CFLAGS=`$PKG_CONFIG --cflags "
-        gio-2.0 >= $GIO_REQUIRED_VERSION
-        gtk+-3.0 >= $GTK_REQUIRED_VERSION
-        indicator3-0.4 >= $INDICATOR_REQUIRED_VERSION
+  pkg_cv_INDICATOR_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= $GLIB_REQUIRED_VERSION
+                               gio-2.0 >= $GIO_REQUIRED_VERSION
+                               gtk+-3.0 >= $GTK_REQUIRED_VERSION
+                               indicator3-0.4 >= $INDICATOR_REQUIRED_VERSION
 " 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
@@ -15693,23 +15695,23 @@ if test -n "$INDICATOR_LIBS"; then
     pkg_cv_INDICATOR_LIBS="$INDICATOR_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"
-        gio-2.0 >= \$GIO_REQUIRED_VERSION
-        gtk+-3.0 >= \$GTK_REQUIRED_VERSION
-        indicator3-0.4 >= \$INDICATOR_REQUIRED_VERSION
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQUIRED_VERSION
+                               gio-2.0 >= \$GIO_REQUIRED_VERSION
+                               gtk+-3.0 >= \$GTK_REQUIRED_VERSION
+                               indicator3-0.4 >= \$INDICATOR_REQUIRED_VERSION
 \""; } >&5
-  ($PKG_CONFIG --exists --print-errors "
-        gio-2.0 >= $GIO_REQUIRED_VERSION
-        gtk+-3.0 >= $GTK_REQUIRED_VERSION
-        indicator3-0.4 >= $INDICATOR_REQUIRED_VERSION
+  ($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQUIRED_VERSION
+                               gio-2.0 >= $GIO_REQUIRED_VERSION
+                               gtk+-3.0 >= $GTK_REQUIRED_VERSION
+                               indicator3-0.4 >= $INDICATOR_REQUIRED_VERSION
 ") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_INDICATOR_LIBS=`$PKG_CONFIG --libs "
-        gio-2.0 >= $GIO_REQUIRED_VERSION
-        gtk+-3.0 >= $GTK_REQUIRED_VERSION
-        indicator3-0.4 >= $INDICATOR_REQUIRED_VERSION
+  pkg_cv_INDICATOR_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= $GLIB_REQUIRED_VERSION
+                               gio-2.0 >= $GIO_REQUIRED_VERSION
+                               gtk+-3.0 >= $GTK_REQUIRED_VERSION
+                               indicator3-0.4 >= $INDICATOR_REQUIRED_VERSION
 " 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
@@ -15731,25 +15733,25 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        INDICATOR_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "
-        gio-2.0 >= $GIO_REQUIRED_VERSION
-        gtk+-3.0 >= $GTK_REQUIRED_VERSION
-        indicator3-0.4 >= $INDICATOR_REQUIRED_VERSION
+	        INDICATOR_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "glib-2.0 >= $GLIB_REQUIRED_VERSION
+                               gio-2.0 >= $GIO_REQUIRED_VERSION
+                               gtk+-3.0 >= $GTK_REQUIRED_VERSION
+                               indicator3-0.4 >= $INDICATOR_REQUIRED_VERSION
 " 2>&1`
         else
-	        INDICATOR_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "
-        gio-2.0 >= $GIO_REQUIRED_VERSION
-        gtk+-3.0 >= $GTK_REQUIRED_VERSION
-        indicator3-0.4 >= $INDICATOR_REQUIRED_VERSION
+	        INDICATOR_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "glib-2.0 >= $GLIB_REQUIRED_VERSION
+                               gio-2.0 >= $GIO_REQUIRED_VERSION
+                               gtk+-3.0 >= $GTK_REQUIRED_VERSION
+                               indicator3-0.4 >= $INDICATOR_REQUIRED_VERSION
 " 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$INDICATOR_PKG_ERRORS" >&5
 
-	as_fn_error $? "Package requirements (
-        gio-2.0 >= $GIO_REQUIRED_VERSION
-        gtk+-3.0 >= $GTK_REQUIRED_VERSION
-        indicator3-0.4 >= $INDICATOR_REQUIRED_VERSION
+	as_fn_error $? "Package requirements (glib-2.0 >= $GLIB_REQUIRED_VERSION
+                               gio-2.0 >= $GIO_REQUIRED_VERSION
+                               gtk+-3.0 >= $GTK_REQUIRED_VERSION
+                               indicator3-0.4 >= $INDICATOR_REQUIRED_VERSION
 ) were not met:
 
 $INDICATOR_PKG_ERRORS
@@ -25189,7 +25191,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by indicator-power $as_me 12.10.0, which was
+This file was extended by indicator-power $as_me 12.10.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -25256,7 +25258,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-indicator-power config.status 12.10.0
+indicator-power config.status 12.10.1
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index 2d0a72e..94f5b83 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_INIT([indicator-power],
-        [12.10.0],
+        [12.10.1],
         [http://bugs.launchpad.net/indicator-power],
         [indicator-power],
         [http://launchpad.net/indicator-power])
@@ -29,6 +29,7 @@ LT_INIT
 ###########################
 # Dependencies
 ###########################
+GLIB_REQUIRED_VERSION=2.33
 GIO_REQUIRED_VERSION=2.26
 GTK_REQUIRED_VERSION=3.0
 INDICATOR_REQUIRED_VERSION=0.3.90
@@ -36,10 +37,11 @@ UPOWER_REQUIRED_VERSION=0.9.5
 GSD_REQUIRED_VERSION=3.1.4
 
 PKG_CHECK_MODULES([UPOWER],[upower-glib >= UPOWER_REQUIRED_VERSION])
-PKG_CHECK_MODULES([INDICATOR],[
-        gio-2.0 >= $GIO_REQUIRED_VERSION
-        gtk+-3.0 >= $GTK_REQUIRED_VERSION
-        indicator3-0.4 >= $INDICATOR_REQUIRED_VERSION
+
+PKG_CHECK_MODULES([INDICATOR],[glib-2.0 >= $GLIB_REQUIRED_VERSION
+                               gio-2.0 >= $GIO_REQUIRED_VERSION
+                               gtk+-3.0 >= $GTK_REQUIRED_VERSION
+                               indicator3-0.4 >= $INDICATOR_REQUIRED_VERSION
 ])
 PKG_CHECK_MODULES([GSD],[gnome-settings-daemon >= $GSD_REQUIRED_VERSION])
 
diff --git a/debian/changelog b/debian/changelog
index 56faa97..d55ef46 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+indicator-power (12.10.1-0ubuntu1) UNRELEASED; urgency=low
+
+  * New upstream release.
+
+ -- Sebastien Bacher <seb128@ubuntu.com>  Wed, 22 Aug 2012 11:28:48 +0200
+
 indicator-power (12.10.0-0ubuntu1) quantal; urgency=low
 
   * New upstream release.