Import upstream version 0.5.4

1 files changed, 53 insertions, 33 deletions

diff --git a/configure b/configure
index 1bc85bf..b513441 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.67 for indicator-sound 0.5.3.
+# Generated by GNU Autoconf 2.67 for indicator-sound 0.5.4.
 #
 # Report bugs to <conor.curran@canonical.com>.
 #
@@ -761,8 +761,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='indicator-sound'
 PACKAGE_TARNAME='indicator-sound'
-PACKAGE_VERSION='0.5.3'
-PACKAGE_STRING='indicator-sound 0.5.3'
+PACKAGE_VERSION='0.5.4'
+PACKAGE_STRING='indicator-sound 0.5.4'
 PACKAGE_BUGREPORT='conor.curran@canonical.com'
 PACKAGE_URL=''
 
@@ -1565,7 +1565,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-sound 0.5.3 to adapt to many kinds of systems.
+\`configure' configures indicator-sound 0.5.4 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1635,7 +1635,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of indicator-sound 0.5.3:";;
+     short | recursive ) echo "Configuration of indicator-sound 0.5.4:";;
    esac
   cat <<\_ACEOF
 
@@ -1768,7 +1768,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-indicator-sound configure 0.5.3
+indicator-sound configure 0.5.4
 generated by GNU Autoconf 2.67
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2137,7 +2137,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-sound $as_me 0.5.3, which was
+It was created by indicator-sound $as_me 0.5.4, which was
 generated by GNU Autoconf 2.67.  Invocation command line was
 
   $ $0 $@
@@ -2957,7 +2957,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE=indicator-sound
- VERSION=0.5.3
+ VERSION=0.5.4
 
 
 cat >>confdefs.h <<_ACEOF
@@ -12383,12 +12383,15 @@ if test -n "$PULSEAUDIO_CFLAGS"; then
     pkg_cv_PULSEAUDIO_CFLAGS="$PULSEAUDIO_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpulse-mainloop-glib >= \$PULSE_AUDIO_REQUIRED_VERSION\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libpulse-mainloop-glib >= $PULSE_AUDIO_REQUIRED_VERSION") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpulse-mainloop-glib >= \$PULSE_AUDIO_REQUIRED_VERSION
+                              gio-unix-2.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libpulse-mainloop-glib >= $PULSE_AUDIO_REQUIRED_VERSION
+                              gio-unix-2.0") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_PULSEAUDIO_CFLAGS=`$PKG_CONFIG --cflags "libpulse-mainloop-glib >= $PULSE_AUDIO_REQUIRED_VERSION" 2>/dev/null`
+  pkg_cv_PULSEAUDIO_CFLAGS=`$PKG_CONFIG --cflags "libpulse-mainloop-glib >= $PULSE_AUDIO_REQUIRED_VERSION
+                              gio-unix-2.0" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -12399,12 +12402,15 @@ if test -n "$PULSEAUDIO_LIBS"; then
     pkg_cv_PULSEAUDIO_LIBS="$PULSEAUDIO_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpulse-mainloop-glib >= \$PULSE_AUDIO_REQUIRED_VERSION\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libpulse-mainloop-glib >= $PULSE_AUDIO_REQUIRED_VERSION") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpulse-mainloop-glib >= \$PULSE_AUDIO_REQUIRED_VERSION
+                              gio-unix-2.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libpulse-mainloop-glib >= $PULSE_AUDIO_REQUIRED_VERSION
+                              gio-unix-2.0") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_PULSEAUDIO_LIBS=`$PKG_CONFIG --libs "libpulse-mainloop-glib >= $PULSE_AUDIO_REQUIRED_VERSION" 2>/dev/null`
+  pkg_cv_PULSEAUDIO_LIBS=`$PKG_CONFIG --libs "libpulse-mainloop-glib >= $PULSE_AUDIO_REQUIRED_VERSION
+                              gio-unix-2.0" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -12424,14 +12430,17 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        PULSEAUDIO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libpulse-mainloop-glib >= $PULSE_AUDIO_REQUIRED_VERSION" 2>&1`
+	        PULSEAUDIO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libpulse-mainloop-glib >= $PULSE_AUDIO_REQUIRED_VERSION
+                              gio-unix-2.0" 2>&1`
         else
-	        PULSEAUDIO_PKG_ERRORS=`$PKG_CONFIG --print-errors "libpulse-mainloop-glib >= $PULSE_AUDIO_REQUIRED_VERSION" 2>&1`
+	        PULSEAUDIO_PKG_ERRORS=`$PKG_CONFIG --print-errors "libpulse-mainloop-glib >= $PULSE_AUDIO_REQUIRED_VERSION
+                              gio-unix-2.0" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$PULSEAUDIO_PKG_ERRORS" >&5
 
-	as_fn_error $? "Package requirements (libpulse-mainloop-glib >= $PULSE_AUDIO_REQUIRED_VERSION) were not met:
+	as_fn_error $? "Package requirements (libpulse-mainloop-glib >= $PULSE_AUDIO_REQUIRED_VERSION
+                              gio-unix-2.0) were not met:
 
 $PULSEAUDIO_PKG_ERRORS
 
@@ -12478,18 +12487,21 @@ if test -n "$SOUNDSERVICE_CFLAGS"; then
     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbusmenu-glib >= \$DBUSMENUGLIB_REQUIRED_VERSION
                                 indicator >= \$INDICATOR_REQUIRED_VERSION
 																indicate >= \$INDICATE_REQUIRED_VERSION
-																gee-1.0\""; } >&5
+																gee-1.0
+                                gio-unix-2.0\""; } >&5
   ($PKG_CONFIG --exists --print-errors "dbusmenu-glib >= $DBUSMENUGLIB_REQUIRED_VERSION
                                 indicator >= $INDICATOR_REQUIRED_VERSION
 																indicate >= $INDICATE_REQUIRED_VERSION
-																gee-1.0") 2>&5
+																gee-1.0
+                                gio-unix-2.0") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_SOUNDSERVICE_CFLAGS=`$PKG_CONFIG --cflags "dbusmenu-glib >= $DBUSMENUGLIB_REQUIRED_VERSION
                                 indicator >= $INDICATOR_REQUIRED_VERSION
 																indicate >= $INDICATE_REQUIRED_VERSION
-																gee-1.0" 2>/dev/null`
+																gee-1.0
+                                gio-unix-2.0" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -12503,18 +12515,21 @@ if test -n "$SOUNDSERVICE_LIBS"; then
     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbusmenu-glib >= \$DBUSMENUGLIB_REQUIRED_VERSION
                                 indicator >= \$INDICATOR_REQUIRED_VERSION
 																indicate >= \$INDICATE_REQUIRED_VERSION
-																gee-1.0\""; } >&5
+																gee-1.0
+                                gio-unix-2.0\""; } >&5
   ($PKG_CONFIG --exists --print-errors "dbusmenu-glib >= $DBUSMENUGLIB_REQUIRED_VERSION
                                 indicator >= $INDICATOR_REQUIRED_VERSION
 																indicate >= $INDICATE_REQUIRED_VERSION
-																gee-1.0") 2>&5
+																gee-1.0
+                                gio-unix-2.0") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_SOUNDSERVICE_LIBS=`$PKG_CONFIG --libs "dbusmenu-glib >= $DBUSMENUGLIB_REQUIRED_VERSION
                                 indicator >= $INDICATOR_REQUIRED_VERSION
 																indicate >= $INDICATE_REQUIRED_VERSION
-																gee-1.0" 2>/dev/null`
+																gee-1.0
+                                gio-unix-2.0" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -12537,12 +12552,14 @@ fi
 	        SOUNDSERVICE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "dbusmenu-glib >= $DBUSMENUGLIB_REQUIRED_VERSION
                                 indicator >= $INDICATOR_REQUIRED_VERSION
 																indicate >= $INDICATE_REQUIRED_VERSION
-																gee-1.0" 2>&1`
+																gee-1.0
+                                gio-unix-2.0" 2>&1`
         else
 	        SOUNDSERVICE_PKG_ERRORS=`$PKG_CONFIG --print-errors "dbusmenu-glib >= $DBUSMENUGLIB_REQUIRED_VERSION
                                 indicator >= $INDICATOR_REQUIRED_VERSION
 																indicate >= $INDICATE_REQUIRED_VERSION
-																gee-1.0" 2>&1`
+																gee-1.0
+                                gio-unix-2.0" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$SOUNDSERVICE_PKG_ERRORS" >&5
@@ -12550,7 +12567,8 @@ fi
 	as_fn_error $? "Package requirements (dbusmenu-glib >= $DBUSMENUGLIB_REQUIRED_VERSION
                                 indicator >= $INDICATOR_REQUIRED_VERSION
 																indicate >= $INDICATE_REQUIRED_VERSION
-																gee-1.0) were not met:
+																gee-1.0
+                                gio-unix-2.0) were not met:
 
 $SOUNDSERVICE_PKG_ERRORS
 
@@ -12993,7 +13011,7 @@ mostlyclean-am: clean-gsettings-schemas
 gsettings__enum_file = $(addsuffix .enums.xml,$(gsettings_ENUM_NAMESPACE))
 
 %.gschema.valid: %.gschema.xml $(gsettings__enum_file)
-	$(AM_V_GEN) if test -f "$<"; then d=; else d="$(srcdir)/"; fi; $(GLIB_COMPILE_SCHEMAS) --dry-run $(addprefix --schema-file=,$(gsettings__enum_file)) --schema-file=$${d}$< && touch $@
+	$(AM_V_GEN) if test -f "$<"; then d=; else d="$(srcdir)/"; fi; $(GLIB_COMPILE_SCHEMAS) --strict --dry-run $(addprefix --schema-file=,$(gsettings__enum_file)) --schema-file=$${d}$< && touch $@
 
 all-am: $(gsettings_SCHEMAS:.xml=.valid)
 uninstall-am: uninstall-gsettings-schemas
@@ -13003,9 +13021,11 @@ install-data-am: install-gsettings-schemas
 
 install-gsettings-schemas: $(gsettings_SCHEMAS) $(gsettings__enum_file)
 	@$(NORMAL_INSTALL)
-	test -z "$(gsettingsschemadir)" || $(MKDIR_P) "$(DESTDIR)$(gsettingsschemadir)"
-	$(INSTALL_DATA) $^ "$(DESTDIR)$(gsettingsschemadir)"
-	test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir)
+	if test -n "$^"; then \
+		test -z "$(gsettingsschemadir)" || $(MKDIR_P) "$(DESTDIR)$(gsettingsschemadir)"; \
+		$(INSTALL_DATA) $^ "$(DESTDIR)$(gsettingsschemadir)"; \
+		test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir); \
+	fi
 
 uninstall-gsettings-schemas:
 	@$(NORMAL_UNINSTALL)
@@ -13021,7 +13041,7 @@ clean-gsettings-schemas:
 
 ifdef gsettings_ENUM_NAMESPACE
 $(gsettings__enum_file): $(gsettings_ENUM_FILES)
-	$(AM_V_GEN) glib-mkenums --comments '\''<!-- @comment@ -->'\'' --fhead "<schemalist>" --vhead "  <@type@ id='\''$(gsettings_ENUM_NAMESPACE).@EnumName@'\''>" --vprod "    <value nick='\''@valuenick@'\'' value='\''@valuenum@'\''/>" --vtail "  </@type@>" --ftail "</schemalist>" $(gsettings_ENUM_FILES) > $@.tmp && mv $@.tmp $@
+	$(AM_V_GEN) glib-mkenums --comments '\''<!-- @comment@ -->'\'' --fhead "<schemalist>" --vhead "  <@type@ id='\''$(gsettings_ENUM_NAMESPACE).@EnumName@'\''>" --vprod "    <value nick='\''@valuenick@'\'' value='\''@valuenum@'\''/>" --vtail "  </@type@>" --ftail "</schemalist>" $^ > $@.tmp && mv $@.tmp $@
 endif
 '
 
@@ -14322,7 +14342,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-sound $as_me 0.5.3, which was
+This file was extended by indicator-sound $as_me 0.5.4, which was
 generated by GNU Autoconf 2.67.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -14388,7 +14408,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-sound config.status 0.5.3
+indicator-sound config.status 0.5.4
 configured by $0, generated by GNU Autoconf 2.67,
   with options \\"\$ac_cs_config\\"