Import upstream version 0.2

4 files changed, 47 insertions, 65 deletions

diff --git a/ChangeLog b/ChangeLog
index 832f388..fe4a956 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,19 @@
 # Generated by Makefile. Do not edit.
 
+2011-07-08  Javier Jardón  <javier.jardon@codethink.co.uk>
+
+	Release version 0.2
+
+2011-07-08  Javier Jardón  <javier.jardon@codethink.co.uk>
+
+	configure.ac: Add support for the new indicator3-0.4
+
+2011-07-08  Javier Jardón  <javier.jardon@codethink.co.uk>
+
+	configure.ac: Remove dbus service stuff
+	
+	We do not need it anymore
+
 2011-07-07  ken.vandine@canonical.com
 
 	Packaging fixes
diff --git a/Makefile.in b/Makefile.in
index b49b8ca..1e89c14 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -188,7 +188,6 @@ CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DATADIRNAME = @DATADIRNAME@
-DBUSSERVICEDIR = @DBUSSERVICEDIR@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
diff --git a/configure b/configure
index 2efccba..279185a 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.68 for indicator-power 0.1.
+# Generated by GNU Autoconf 2.68 for indicator-power 0.2.
 #
 # Report bugs to <http://bugs.launchpad.net/indicator-power>.
 #
@@ -570,8 +570,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='indicator-power'
 PACKAGE_TARNAME='indicator-power'
-PACKAGE_VERSION='0.1'
-PACKAGE_STRING='indicator-power 0.1'
+PACKAGE_VERSION='0.2'
+PACKAGE_STRING='indicator-power 0.2'
 PACKAGE_BUGREPORT='http://bugs.launchpad.net/indicator-power'
 PACKAGE_URL='http://launchpad.net/indicator-power'
 
@@ -660,7 +660,6 @@ INTLTOOL_EXTRACT
 INTLTOOL_MERGE
 INTLTOOL_UPDATE
 USE_NLS
-DBUSSERVICEDIR
 INDICATORICONSDIR
 INDICATORDIR
 INDICATOR_LIBS
@@ -1359,7 +1358,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 0.1 to adapt to many kinds of systems.
+\`configure' configures indicator-power 0.2 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1429,7 +1428,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of indicator-power 0.1:";;
+     short | recursive ) echo "Configuration of indicator-power 0.2:";;
    esac
   cat <<\_ACEOF
 
@@ -1556,7 +1555,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-indicator-power configure 0.1
+indicator-power configure 0.2
 generated by GNU Autoconf 2.68
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1834,7 +1833,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 0.1, which was
+It was created by indicator-power $as_me 0.2, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   $ $0 $@
@@ -2658,7 +2657,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='indicator-power'
- VERSION='0.1'
+ VERSION='0.2'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -11396,7 +11395,7 @@ CC="$lt_save_CC"
 ###########################
 
 GTK_REQUIRED_VERSION=3.0
-INDICATOR_REQUIRED_VERSION=0.3.0
+INDICATOR_REQUIRED_VERSION=0.3.90
 UPOWER_REQUIRED_VERSION=0.9.5
 
 
@@ -11621,18 +11620,18 @@ if test -n "$INDICATOR_CFLAGS"; then
     if test -n "$PKG_CONFIG" && \
     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"
         gtk+-3.0 >= \$GTK_REQUIRED_VERSION
-        indicator3 >= \$INDICATOR_REQUIRED_VERSION
+        indicator3-0.4 >= \$INDICATOR_REQUIRED_VERSION
 \""; } >&5
   ($PKG_CONFIG --exists --print-errors "
         gtk+-3.0 >= $GTK_REQUIRED_VERSION
-        indicator3 >= $INDICATOR_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 "
         gtk+-3.0 >= $GTK_REQUIRED_VERSION
-        indicator3 >= $INDICATOR_REQUIRED_VERSION
+        indicator3-0.4 >= $INDICATOR_REQUIRED_VERSION
 " 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
@@ -11647,18 +11646,18 @@ if test -n "$INDICATOR_LIBS"; then
     if test -n "$PKG_CONFIG" && \
     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"
         gtk+-3.0 >= \$GTK_REQUIRED_VERSION
-        indicator3 >= \$INDICATOR_REQUIRED_VERSION
+        indicator3-0.4 >= \$INDICATOR_REQUIRED_VERSION
 \""; } >&5
   ($PKG_CONFIG --exists --print-errors "
         gtk+-3.0 >= $GTK_REQUIRED_VERSION
-        indicator3 >= $INDICATOR_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 "
         gtk+-3.0 >= $GTK_REQUIRED_VERSION
-        indicator3 >= $INDICATOR_REQUIRED_VERSION
+        indicator3-0.4 >= $INDICATOR_REQUIRED_VERSION
 " 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
@@ -11682,12 +11681,12 @@ fi
         if test $_pkg_short_errors_supported = yes; then
 	        INDICATOR_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "
         gtk+-3.0 >= $GTK_REQUIRED_VERSION
-        indicator3 >= $INDICATOR_REQUIRED_VERSION
+        indicator3-0.4 >= $INDICATOR_REQUIRED_VERSION
 " 2>&1`
         else
 	        INDICATOR_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "
         gtk+-3.0 >= $GTK_REQUIRED_VERSION
-        indicator3 >= $INDICATOR_REQUIRED_VERSION
+        indicator3-0.4 >= $INDICATOR_REQUIRED_VERSION
 " 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
@@ -11695,7 +11694,7 @@ fi
 
 	as_fn_error $? "Package requirements (
         gtk+-3.0 >= $GTK_REQUIRED_VERSION
-        indicator3 >= $INDICATOR_REQUIRED_VERSION
+        indicator3-0.4 >= $INDICATOR_REQUIRED_VERSION
 ) were not met:
 
 $INDICATOR_PKG_ERRORS
@@ -11746,30 +11745,16 @@ fi
 # Indicator Info
 ###########################
 
-if test "x$with_localinstall" = "xyes"; then
-	INDICATORDIR="${libdir}/indicators/3/"
-	INDICATORICONSDIR="${datadir}/indicator-applet/icons/"
-elif test "x$with_gtk" = x2; then
-        INDICATORDIR=`$PKG_CONFIG --variable=indicatordir indicator`
-        INDICATORICONSDIR=`$PKG_CONFIG --variable=iconsdir indicator`
+if test "x$with_localinstall" = "xyes"; then :
+  INDICATORDIR="${libdir}/indicators3/2/"
+       INDICATORICONSDIR="${datadir}/indicator-applet/icons/"
 else
-        INDICATORDIR=`$PKG_CONFIG --variable=indicatordir indicator3`
-        INDICATORICONSDIR=`$PKG_CONFIG --variable=iconsdir indicator3`
+  INDICATORDIR=`$PKG_CONFIG --variable=indicatordir indicator3-0.4`
+       INDICATORICONSDIR=`$PKG_CONFIG --variable=iconsdir indicator3-0.4`
 fi
 
 
 
-###########################
-# DBus Service Info
-###########################
-
-if test "x$with_localinstall" = "xyes"; then
-	DBUSSERVICEDIR="${datadir}/dbus-1/services/"
-else
-	DBUSSERVICEDIR=`$PKG_CONFIG --variable=session_bus_services_dir dbus-1`
-fi
-
-
 ##############################
 # Custom Junk
 ##############################
@@ -14784,7 +14769,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 0.1, which was
+This file was extended by indicator-power $as_me 0.2, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -14851,7 +14836,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 0.1
+indicator-power config.status 0.2
 configured by $0, generated by GNU Autoconf 2.68,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index 1e882e6..b8724b0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_INIT([indicator-power],
-        [0.1],
+        [0.2],
         [http://bugs.launchpad.net/indicator-power],
         [indicator-power],
         [http://launchpad.net/indicator-power])
@@ -30,13 +30,13 @@ LT_INIT
 ###########################
 
 GTK_REQUIRED_VERSION=3.0
-INDICATOR_REQUIRED_VERSION=0.3.0
+INDICATOR_REQUIRED_VERSION=0.3.90
 UPOWER_REQUIRED_VERSION=0.9.5
 
 PKG_CHECK_MODULES([UPOWER],[upower-glib >= UPOWER_REQUIRED_VERSION])
 PKG_CHECK_MODULES([INDICATOR],[
         gtk+-3.0 >= $GTK_REQUIRED_VERSION
-        indicator3 >= $INDICATOR_REQUIRED_VERSION
+        indicator3-0.4 >= $INDICATOR_REQUIRED_VERSION
 ])
 
 ###########################
@@ -54,30 +54,14 @@ AC_ARG_ENABLE([localinstall],
 # Indicator Info
 ###########################
 
-if test "x$with_localinstall" = "xyes"; then
-	INDICATORDIR="${libdir}/indicators/3/"
-	INDICATORICONSDIR="${datadir}/indicator-applet/icons/"
-elif test "x$with_gtk" = x2; then
-        INDICATORDIR=`$PKG_CONFIG --variable=indicatordir indicator`
-        INDICATORICONSDIR=`$PKG_CONFIG --variable=iconsdir indicator`
-else
-        INDICATORDIR=`$PKG_CONFIG --variable=indicatordir indicator3`
-        INDICATORICONSDIR=`$PKG_CONFIG --variable=iconsdir indicator3`
-fi
+AS_IF([test "x$with_localinstall" = "xyes"],
+      [INDICATORDIR="${libdir}/indicators3/2/"
+       INDICATORICONSDIR="${datadir}/indicator-applet/icons/"],
+      [INDICATORDIR=`$PKG_CONFIG --variable=indicatordir indicator3-0.4`
+       INDICATORICONSDIR=`$PKG_CONFIG --variable=iconsdir indicator3-0.4`])
 AC_SUBST(INDICATORDIR)
 AC_SUBST(INDICATORICONSDIR)
 
-###########################
-# DBus Service Info
-###########################
-
-if test "x$with_localinstall" = "xyes"; then
-	DBUSSERVICEDIR="${datadir}/dbus-1/services/"
-else
-	DBUSSERVICEDIR=`$PKG_CONFIG --variable=session_bus_services_dir dbus-1`
-fi
-AC_SUBST(DBUSSERVICEDIR)
-
 ##############################
 # Custom Junk
 ##############################