r24721 - in /desktop/unstable/gnome-applets/debian: changelog control control.in patches/01_battstat_upower.patch patches/98_autoreconf.patch patches/series rules
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Wed Jul 7 20:03:12 UTC 2010
Author: joss
Date: Wed Jul 7 20:03:10 2010
New Revision: 24721
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=24721
Log:
* 01_battstat_upower.patch: patch from Joachim Breitner to support
upower in the battstat applet.
* 98_autoreconf.patch: regenerated.
* Require libupower-glib-dev accordingly.
Added:
desktop/unstable/gnome-applets/debian/patches/01_battstat_upower.patch
Modified:
desktop/unstable/gnome-applets/debian/changelog
desktop/unstable/gnome-applets/debian/control
desktop/unstable/gnome-applets/debian/control.in
desktop/unstable/gnome-applets/debian/patches/98_autoreconf.patch
desktop/unstable/gnome-applets/debian/patches/series
desktop/unstable/gnome-applets/debian/rules
Modified: desktop/unstable/gnome-applets/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-applets/debian/changelog?rev=24721&op=diff
==============================================================================
--- desktop/unstable/gnome-applets/debian/changelog [utf-8] (original)
+++ desktop/unstable/gnome-applets/debian/changelog [utf-8] Wed Jul 7 20:03:10 2010
@@ -1,12 +1,16 @@
-gnome-applets (2.30.0-3) UNRELEASED; urgency=low
+gnome-applets (2.30.0-3) unstable; urgency=low
* Drop type-handling usage. Closes: #587858.
* Bump standards version accordingly.
* Explicitly require gstreamer0.10-alsa on Linux and -plugins-good
(for OSS) on kfreebsd.
* Drop gnome-keyboard-layout manual page, obsolete. Closes: #587966.
-
- -- Josselin Mouette <joss at debian.org> Fri, 02 Jul 2010 18:59:05 +0200
+ * 01_battstat_upower.patch: patch from Joachim Breitner to support
+ upower in the battstat applet.
+ * 98_autoreconf.patch: regenerated.
+ * Require libupower-glib-dev accordingly.
+
+ -- Josselin Mouette <joss at debian.org> Wed, 07 Jul 2010 21:52:08 +0200
gnome-applets (2.30.0-2) unstable; urgency=low
Modified: desktop/unstable/gnome-applets/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-applets/debian/control?rev=24721&op=diff
==============================================================================
--- desktop/unstable/gnome-applets/debian/control [utf-8] (original)
+++ desktop/unstable/gnome-applets/debian/control [utf-8] Wed Jul 7 20:03:10 2010
@@ -52,7 +52,8 @@
gnome-pkg-tools (>= 0.10),
sharutils,
python-support (>= 0.4),
- liboobs-1-dev (>= 0.2.0)
+ liboobs-1-dev (>= 0.2.0),
+ libupower-glib-dev (>= 0.9.4)
Package: gnome-applets-data
Architecture: all
Modified: desktop/unstable/gnome-applets/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-applets/debian/control.in?rev=24721&op=diff
==============================================================================
--- desktop/unstable/gnome-applets/debian/control.in [utf-8] (original)
+++ desktop/unstable/gnome-applets/debian/control.in [utf-8] Wed Jul 7 20:03:10 2010
@@ -47,7 +47,8 @@
gnome-pkg-tools (>= 0.10),
sharutils,
python-support (>= 0.4),
- liboobs-1-dev (>= 0.2.0)
+ liboobs-1-dev (>= 0.2.0),
+ libupower-glib-dev (>= 0.9.4)
Package: gnome-applets-data
Architecture: all
Added: desktop/unstable/gnome-applets/debian/patches/01_battstat_upower.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-applets/debian/patches/01_battstat_upower.patch?rev=24721&op=file
==============================================================================
--- desktop/unstable/gnome-applets/debian/patches/01_battstat_upower.patch (added)
+++ desktop/unstable/gnome-applets/debian/patches/01_battstat_upower.patch [utf-8] Wed Jul 7 20:03:10 2010
@@ -1,0 +1,647 @@
+From 18a2f4aa3ba2c8c9fc3718b15a9ab366fdd35f05 Mon Sep 17 00:00:00 2001
+From: Joachim Breitner <mail at joachim-breitner.de>
+Date: Mon, 5 Jul 2010 12:20:04 +0200
+Subject: [PATCH] [battstat applet] upower support
+
+As HAL is being deprecated, the battstat applet is adjusted to talk to
+upower, using libupower-glib. (Bug #607254)
+---
+ battstat/Makefile.am | 6 +-
+ battstat/battstat-upower.c | 330 +++++++++++++++++++++++++++++++++++++++++
+ battstat/battstat-upower.h | 33 ++++
+ battstat/battstat_applet.c | 7 +-
+ battstat/docs/C/battstat.xml | 18 ++-
+ battstat/docs/de/battstat.xml | 22 +++-
+ battstat/docs/eu/battstat.xml | 20 ++-
+ battstat/power-management.c | 66 +++++++--
+ configure.in | 22 +++
+ 9 files changed, 493 insertions(+), 31 deletions(-)
+ create mode 100644 battstat/battstat-upower.c
+ create mode 100644 battstat/battstat-upower.h
+
+Index: gnome-applets-2.30.0/battstat/Makefile.am
+===================================================================
+--- gnome-applets-2.30.0.orig/battstat/Makefile.am 2010-03-28 07:29:51.000000000 +0200
++++ gnome-applets-2.30.0/battstat/Makefile.am 2010-07-07 21:20:44.390235925 +0200
+@@ -28,6 +28,7 @@ INCLUDES = \
+ $(GNOME_LIBS2_CFLAGS) \
+ $(LIBNOTIFY_CFLAGS) \
+ $(HAL_CFLAGS) \
++ $(UPOWER_CFLAGS) \
+ $(APMINC) \
+ $(ACPIINC) \
+ -DG_LOG_DOMAIN=\"battstat_applet\"
+@@ -47,7 +48,9 @@ battstat_applet_2_SOURCES = \
+ acpi-freebsd.c \
+ acpi-freebsd.h \
+ battstat-hal.c \
+- battstat-hal.h
++ battstat-hal.h \
++ battstat-upower.c \
++ battstat-upower.h
+
+
+ battstat_applet_2_LDADD = \
+@@ -55,6 +58,7 @@ battstat_applet_2_LDADD = \
+ $(GNOME_LIBS2_LIBS) \
+ $(LIBNOTIFY_LIBS) \
+ $(HAL_LIBS) \
++ $(UPOWER_LIBS) \
+ $(APMLIB)
+
+ schemasdir = @GCONF_SCHEMA_FILE_DIR@
+Index: gnome-applets-2.30.0/battstat/battstat-upower.c
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ gnome-applets-2.30.0/battstat/battstat-upower.c 2010-07-07 21:20:44.390235925 +0200
+@@ -0,0 +1,330 @@
++/*
++ * Copyright (C) 2010 by Joachim Breitner <mail at joachim-breitner.de>
++ *
++ * Based on battstat-hal.c:
++ * Copyright (C) 2005 by Ryan Lortie <desrt at desrt.ca>
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
++ *
++ * $Id$
++ */
++
++#include <config.h>
++
++#ifdef HAVE_UPOWER
++
++#include <upower.h>
++#include <math.h>
++
++#include "battstat-upower.h"
++
++static UpClient *upc;
++static void (*status_updated_callback) (void);
++
++
++/* status_updated_callback() can not be called directly because at the time of
++ * the device-remove signal, the device is not actually removed from the list
++ * of devices known to the up_client object (see libupower-glib/up-client.c in
++ * upower). Waiting for the next idle timer works around this issue and has has
++ * the additionaly benefit of possibly running status_updated_callback only
++ * once when several events happen very soon after each other.
++ */
++static gboolean status_update_scheduled;
++
++static gboolean
++update_status_idle (gpointer junk)
++{
++ if (status_updated_callback)
++ status_updated_callback ();
++
++ return status_update_scheduled = FALSE;
++}
++
++static void
++schedule_status_callback (void)
++{
++ if (status_update_scheduled)
++ return;
++
++ status_update_scheduled = TRUE;
++ g_idle_add (update_status_idle, NULL);
++}
++
++static void
++device_cb (UpClient *client, UpDevice *device, gpointer user_data) {
++ schedule_status_callback();
++}
++
++/* ---- public functions ---- */
++
++char *
++battstat_upower_initialise (void (*callback) (void))
++{
++ char *error_str;
++ int i, num;
++
++ status_updated_callback = callback;
++
++ if( upc != NULL )
++ return g_strdup( "Already initialised!" );
++
++ if( (upc = up_client_new() ) == NULL )
++ goto error_out;
++
++ GCancellable *cancellable = g_cancellable_new();
++ GError *gerror;
++
++ if (! up_client_enumerate_devices_sync( upc, cancellable, &gerror ) ) {
++ sprintf(error_str, "Unable to enumerate upower devices: %s\n", gerror->message);
++ goto error_shutdownclient;
++ }
++
++ g_signal_connect_after( upc, "device-changed", device_cb, NULL );
++ g_signal_connect_after( upc, "device-added", device_cb, NULL );
++ g_signal_connect_after( upc, "device-removed", device_cb, NULL );
++
++ return NULL;
++
++error_shutdownclient:
++ g_object_unref( upc );
++ upc = NULL;
++
++error_out:
++ return "Can not initialize upower";
++}
++
++void
++battstat_upower_cleanup( void )
++{
++ if( upc == NULL )
++ return;
++
++ g_object_unref( upc );
++ upc = NULL;
++}
++
++#include "battstat.h"
++
++/* This function currently exists to allow the multiple batteries supported
++ * by the upower backend to appear as a single composite battery device (since
++ * at the current time this is all that battstat supports).
++ *
++ * This entire function is filled with logic to make multiple batteries
++ * appear as one "composite" battery. Comments included as appropriate.
++ *
++ * For more information about some of the assumptions made in the following
++ * code please see the following mailing list post and the resulting thread:
++ *
++ * http://lists.freedesktop.org/archives/hal/2005-July/002841.html
++ */
++void
++battstat_upower_get_battery_info( BatteryStatus *status )
++{
++
++ GPtrArray *devices = up_client_get_devices( upc );
++
++ /* The calculation to get overall percentage power remaining is as follows:
++ *
++ * Sum( Current charges ) / Sum( Full Capacities )
++ *
++ * We can't just take an average of all of the percentages since this
++ * doesn't deal with the case that one battery might have a larger
++ * capacity than the other.
++ *
++ * In order to do this calculation, we need to keep a running total of
++ * current charge and full capacities.
++ */
++ double current_charge_total = 0, full_capacity_total = 0;
++
++ /* Record the time remaining as reported by upower. This is used in the event
++ * that the system has exactly one battery (since, then, upower is capable
++ * of providing an accurate time remaining report and we should trust it.)
++ */
++ gint64 remaining_time = 0;
++
++ /* The total (dis)charge rate of the system is the sum of the rates of
++ * the individual batteries.
++ */
++ double rate_total = 0;
++
++ /* We need to know if we should report the composite battery as present
++ * at all. The logic is that if at least one actual battery is installed
++ * then the composite battery will be reported to exist.
++ */
++ int present = 0;
++
++ /* We need to know if we are on AC power or not. Eventually, we can look
++ * at the AC adaptor upower devices to determine that. For now, we assume that
++ * if any battery is discharging then we must not be on AC power. Else, by
++ * default, we must be on AC.
++ */
++ int on_ac_power = 1;
++
++ /* Finally, we consider the composite battery to be "charging" if at least
++ * one of the actual batteries in the system is charging.
++ */
++ int charging = 0;
++
++ /* A list iterator. */
++ GSList *item;
++
++ /* For each physical battery bay... */
++ int i;
++ for( i = 0; i < devices->len; i++ )
++ {
++ UpDevice *upd = g_ptr_array_index( devices, i );
++
++ int type, state;
++ double current_charge, full_capacity, rate;
++ gint64 time_to_full, time_to_empty;
++
++ g_object_get( upd,
++ "kind", &type,
++ "state", &state,
++ "energy", ¤t_charge,
++ "energy-full", &full_capacity,
++ "energy-rate", &rate,
++ "time-to-full", &time_to_full,
++ "time-to-empty", &time_to_empty,
++ NULL );
++
++ /* Only count batteries here */
++
++ if (type != UP_DEVICE_KIND_BATTERY)
++ continue;
++
++ /* At least one battery present -> composite battery is present. */
++ present++;
++
++ /* At least one battery charging -> composite battery is charging. */
++ if( state == UP_DEVICE_STATE_CHARGING )
++ charging = 1;
++
++ /* At least one battery is discharging -> we're not on AC. */
++ if( state == UP_DEVICE_STATE_DISCHARGING )
++ on_ac_power = 0;
++
++ /* Sum the totals for current charge, design capacity, (dis)charge rate. */
++ current_charge_total += current_charge;
++ full_capacity_total += full_capacity;
++ rate_total += rate;
++
++ /* Record remaining time too, incase this is the only battery. */
++ remaining_time = (state == UP_DEVICE_STATE_DISCHARGING ? time_to_empty : time_to_full);
++ }
++
++ if( !present || full_capacity_total <= 0 || (charging && !on_ac_power) )
++ {
++ /* Either no battery is present or something has gone horribly wrong.
++ * In either case we must return that the composite battery is not
++ * present.
++ */
++ status->present = FALSE;
++ status->percent = 0;
++ status->minutes = -1;
++ status->on_ac_power = TRUE;
++ status->charging = FALSE;
++
++ g_ptr_array_unref( devices );
++ return;
++ }
++
++ /* Else, our composite battery is present. */
++ status->present = TRUE;
++
++ /* As per above, overall charge is:
++ *
++ * Sum( Current charges ) / Sum( Full Capacities )
++ */
++ status->percent = ( current_charge_total / full_capacity_total ) * 100.0 + 0.5;
++
++ if( present == 1 )
++ {
++ /* In the case of exactly one battery, report the time remaining figure
++ * from upower directly since it might have come from an authorative source
++ * (ie: the PMU or APM subsystem).
++ *
++ * upower gives remaining time in seconds with a 0 to mean that the
++ * remaining time is unknown. Battstat uses minutes and -1 for
++ * unknown time remaining.
++ */
++
++ if( remaining_time == 0 )
++ status->minutes = -1;
++ else
++ status->minutes = (remaining_time + 30) / 60;
++ }
++ /* Rest of cases to deal with multiple battery systems... */
++ else if( !on_ac_power && rate_total != 0 )
++ {
++ /* Then we're discharging. Calculate time remaining until at zero. */
++
++ double remaining;
++
++ remaining = current_charge_total;
++ remaining /= rate_total;
++ status->minutes = (int) floor( remaining * 60.0 + 0.5 );
++ }
++ else if( charging && rate_total != 0 )
++ {
++ /* Calculate time remaining until charged. For systems with more than
++ * one battery, this code is very approximate. The assumption is that if
++ * one battery reaches full charge before the other that the other will
++ * start charging faster due to the increase in available power (similar
++ * to how a laptop will charge faster if you're not using it).
++ */
++
++ double remaining;
++
++ remaining = full_capacity_total - current_charge_total;
++ if( remaining < 0 )
++ remaining = 0;
++ remaining /= rate_total;
++
++ status->minutes = (int) floor( remaining * 60.0 + 0.5 );
++ }
++ else
++ {
++ /* On AC power and not charging -or- rate is unknown. */
++ status->minutes = -1;
++ }
++
++ /* These are simple and well-explained above. */
++ status->charging = charging;
++ status->on_ac_power = on_ac_power;
++
++ g_ptr_array_unref( devices );
++}
++
++void
++error_dialog( const char *fmt , ...)
++{
++ va_list ap;
++ va_start(ap, fmt);
++ char str[1000];
++ vsprintf(str, fmt, ap);
++ GtkWidget *dialog;
++
++ dialog = gtk_message_dialog_new( NULL, 0, GTK_MESSAGE_ERROR,
++ GTK_BUTTONS_OK, "%s", str);
++
++ g_signal_connect_swapped( GTK_OBJECT (dialog), "response",
++ G_CALLBACK (gtk_widget_destroy),
++ GTK_OBJECT (dialog) );
++
++ gtk_widget_show_all( dialog );
++}
++
++#endif /* HAVE_UPOWER */
+Index: gnome-applets-2.30.0/battstat/battstat-upower.h
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ gnome-applets-2.30.0/battstat/battstat-upower.h 2010-07-07 21:20:44.390235925 +0200
+@@ -0,0 +1,33 @@
++/*
++ * Copyright (C) 2010 by Joachim Breitner <mail at joachim-breitner.de>
++ *
++ * Based on battstat-hal.h:
++ * Copyright (C) 2005 by Ryan Lortie <desrt at desrt.ca>
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
++ *
++ * $Id$
++ */
++
++#ifndef _battstat_upower_h_
++#define _battstat_upower_h_
++
++char *battstat_upower_initialise (void (*) (void));
++void battstat_upower_cleanup (void);
++
++#include "battstat.h"
++void battstat_upower_get_battery_info (BatteryStatus *status);
++
++#endif /* _battstat_upower_h_ */
+Index: gnome-applets-2.30.0/battstat/battstat_applet.c
+===================================================================
+--- gnome-applets-2.30.0.orig/battstat/battstat_applet.c 2010-03-28 07:29:51.000000000 +0200
++++ gnome-applets-2.30.0/battstat/battstat_applet.c 2010-07-07 21:20:44.390235925 +0200
+@@ -1231,9 +1231,12 @@ about_cb( BonoboUIComponent *uic, Progre
+
+ char *comments = g_strdup_printf ("%s\n\n%s",
+ _("This utility shows the status of your laptop battery."),
+- power_management_using_hal () ?
++ power_management_using_upower () ?
++ /* true */ _("upower backend enabled.") :
++ (power_management_using_hal () ?
+ /* true */ _("HAL backend enabled.") :
+- /* false */ _("Legacy (non-HAL) backend enabled."));
++ /* false */ _("Legacy (non-HAL) backend enabled.")
++ ));
+
+ gtk_show_about_dialog( NULL,
+ "version", VERSION,
+Index: gnome-applets-2.30.0/battstat/docs/C/battstat.xml
+===================================================================
+--- gnome-applets-2.30.0.orig/battstat/docs/C/battstat.xml 2010-03-28 08:29:26.000000000 +0200
++++ gnome-applets-2.30.0/battstat/docs/C/battstat.xml 2010-07-07 21:27:13.882238528 +0200
+@@ -226,10 +226,13 @@
+ <title>Power Management Backends</title>
+
+ <para>
+- The battery monitor supports a number of power management backends. If it
+- is available, the monitor will attempt to use the freedesktop.org
+- <ulink url="http://freedesktop.org/Software/hal">HAL (Hardware Abstraction
+- Layer)</ulink>. If it is unavailable or unsupported on your platform, the
++ The battery monitor supports a number of power management backends.
++ If it is available, the monitor will attempt to use the freedesktop.org
++ <ulink url="http://upower.freedesktop.org/">upower</ulink> interface.
++ If it is unavailable or unsupported on your platform, it will fall back
++ to the freedesktop.org
++ <ulink url="http://freedesktop.org/Software/hal">HAL (Hardware
++ Abstraction Layer)</ulink>. If that is also not availble, the
+ battery monitor will attempt direct access to the power management system.
+ </para>
+ <para>
+@@ -410,10 +413,10 @@
+ <sect2 id="battstat-troubleshooting-backends">
+ <title>Determining the backend</title>
+ <para>
+- If you are using the Hardware Abstraction Layer
+- (see <xref linkend="battstat-power-backends"/>) then that will be
+- indicated in the about dialog by placing a star next to the author of the
+- HAL backend.
++ If you are using the upower interface, or the the Hardware
++ Abstraction Layer (see <xref linkend="battstat-power-backends"/>) then
++ that will be indicated in the about dialog by placing a star next to the
++ author of the HAL backend.
+ <figure id="battstat-credits-hal">
+ <title>Check you're using the HAL backend</title>
+ <screenshot>
+Index: gnome-applets-2.30.0/battstat/power-management.c
+===================================================================
+--- gnome-applets-2.30.0.orig/battstat/power-management.c 2010-03-28 07:29:51.000000000 +0200
++++ gnome-applets-2.30.0/battstat/power-management.c 2010-07-07 21:20:44.394239437 +0200
+@@ -41,6 +41,7 @@
+
+ #include "battstat.h"
+ #include "battstat-hal.h"
++#include "battstat-upower.h"
+
+ #define ERR_ACPID _("Can't access ACPI events in /var/run/acpid.socket! " \
+ "Make sure the ACPI subsystem is working and " \
+@@ -66,6 +67,9 @@ static int pm_initialised;
+ #ifdef HAVE_HAL
+ static int using_hal;
+ #endif
++#ifdef HAVE_UPOWER
++static int using_upower;
++#endif
+
+ /*
+ * What follows is a series of platform-specific apm_readinfo functions
+@@ -390,6 +394,14 @@ power_management_getinfo( BatteryStatus
+ return NULL;
+ }
+
++#ifdef HAVE_UPOWER
++ if( using_upower )
++ {
++ battstat_upower_get_battery_info( status );
++ return NULL;
++ }
++#endif
++
+ #ifdef HAVE_HAL
+ if( using_hal )
+ {
+@@ -430,27 +442,36 @@ power_management_getinfo( BatteryStatus
+ const char *
+ power_management_initialise (int no_hal, void (*callback) (void))
+ {
++ char *err;
++ err = g_strdup( ":(" );
+ #ifdef __linux__
+ struct stat statbuf;
+ #endif
+-#ifdef HAVE_HAL
+- char *err;
++#ifdef HAVE_UPOWER
++ err = battstat_upower_initialise (callback);
+
+- if( no_hal )
+- err = g_strdup( ":(" );
+- else
+- err = battstat_hal_initialise (callback);
+-
+-
+- if( err == NULL ) /* HAL is up */
++ if( err == NULL ) /* UPOWER is up */
+ {
+ pm_initialised = 1;
+- using_hal = TRUE;
++ using_upower = TRUE;
+ return NULL;
++ }
++#endif
++
++#ifdef HAVE_HAL
++ if(! no_hal ) {
++ err = battstat_hal_initialise (callback);
++
++ if( err == NULL ) /* HAL is up */
++ {
++ pm_initialised = 1;
++ using_hal = TRUE;
++ return NULL;
++ }
+ }
+- else
+- /* fallback to legacy methods */
+- g_free( err );
++
++ /* fallback to legacy methods */
++ g_free( err );
+ #endif
+
+ #ifdef __linux__
+@@ -498,6 +519,15 @@ power_management_initialise (int no_hal,
+ void
+ power_management_cleanup( void )
+ {
++#ifdef HAVE_UPOWER
++ if( using_upower )
++ {
++ battstat_upower_cleanup();
++ pm_initialised = 1;
++ return;
++ }
++#endif
++
+ #ifdef HAVE_HAL
+ if( using_hal )
+ {
+@@ -525,6 +555,16 @@ power_management_cleanup( void )
+ }
+
+ int
++power_management_using_upower( void )
++{
++#ifdef HAVE_UPOWER
++ return using_upower;
++#else
++ return 0;
++#endif
++}
++
++int
+ power_management_using_hal( void )
+ {
+ #ifdef HAVE_HAL
+Index: gnome-applets-2.30.0/configure.in
+===================================================================
+--- gnome-applets-2.30.0.orig/configure.in 2010-07-07 21:19:23.918738153 +0200
++++ gnome-applets-2.30.0/configure.in 2010-07-07 21:20:44.394239437 +0200
+@@ -23,6 +23,7 @@ LIBWNCK_REQUIRED=2.9.3
+ LIBGNOME_DESKTOP_REQUIRED=2.11.1
+ LIBNOTIFY_REQUIRED=0.3.2
+ HAL_REQUIRED=0.5.3
++UPOWER_REQUIRED=0.9.4
+ DBUS_REQUIRED=1.1.2
+ DBUS_GLIB_REQUIRED=0.74
+ PYGTK_REQUIRED=2.6
+@@ -222,6 +223,26 @@ fi
+ AC_SUBST(HAL_CFLAGS)
+ AC_SUBST(HAL_LIBS)
+
++dnl -- check for libupower-glib (optional) --------------------------------------------
++UPOWER_CFLAGS=
++UPOWER_LIBS=
++AC_ARG_WITH(upower,[ --without-upower build without upower support])
++
++if test "x$with_upower" != xno; then
++ PKG_CHECK_MODULES(UPOWER, upower-glib >= $UPOWER_REQUIRED,
++ HAVE_UPOWER="yes",
++ HAVE_UPOWER="no")
++
++ if test "x$HAVE_UPOWER" = "xyes"; then
++ AC_DEFINE(HAVE_UPOWER, 1, [UPOWER available])
++ fi
++else
++ AC_MSG_WARN(["upower support disabled"])
++fi
++
++AC_SUBST(UPOWER_CFLAGS)
++AC_SUBST(UPOWER_LIBS)
++
+ dnl -- check for gucharmap (optional) -----------------------------------------
+
+ PKG_CHECK_EXISTS([gucharmap-2 >= $GUCHARMAP2_REQUIRED],
+@@ -758,5 +779,6 @@ gnome-applets-$VERSION configure summary
+ Using DBUS: $HAVE_DBUS
+ Using NetworkManager: $HAVE_NETWORKMANAGER
+ Using HAL: $HAVE_HAL
++ Using UPOWER: $HAVE_UPOWER
+ Enabling IPv6: $have_ipv6
+ " >&2
Modified: desktop/unstable/gnome-applets/debian/patches/98_autoreconf.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-applets/debian/patches/98_autoreconf.patch?rev=24721&op=diff
==============================================================================
--- desktop/unstable/gnome-applets/debian/patches/98_autoreconf.patch [utf-8] (original)
+++ desktop/unstable/gnome-applets/debian/patches/98_autoreconf.patch [utf-8] Wed Jul 7 20:03:10 2010
@@ -1,13 +1,21 @@
-diff -Naur gnome-applets-2.30.0.old/accessx-status/docs/Makefile.in gnome-applets-2.30.0/accessx-status/docs/Makefile.in
---- gnome-applets-2.30.0.old/accessx-status/docs/Makefile.in 2010-03-28 08:27:57.000000000 +0200
-+++ gnome-applets-2.30.0/accessx-status/docs/Makefile.in 2010-05-05 10:10:00.705500269 +0200
+libtoolize --force --copy
+aclocal -I m4
+automake -acf -Wno-portability
+autoheader
+autoconf
+rm -rf autom4te.cache/ config.h.in~
+
+Index: gnome-applets-2.30.0/accessx-status/docs/Makefile.in
+===================================================================
+--- gnome-applets-2.30.0.orig/accessx-status/docs/Makefile.in 2010-03-28 08:27:57.000000000 +0200
++++ gnome-applets-2.30.0/accessx-status/docs/Makefile.in 2010-07-07 21:45:55.902236763 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -184,6 +184,8 @@
+@@ -184,6 +184,8 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
MIXER_LIBS = @MIXER_LIBS@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
@@ -16,24 +24,37 @@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
-@@ -229,7 +231,6 @@
+@@ -206,6 +208,8 @@ PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POLKIT_CFLAGS = @POLKIT_CFLAGS@
+ POLKIT_LIBS = @POLKIT_LIBS@
+@@ -229,8 +233,9 @@ SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-SU_TOOL = @SU_TOOL@
SYSCONFDIR = @SYSCONFDIR@
++UPOWER_CFLAGS = @UPOWER_CFLAGS@
++UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
-diff -Naur gnome-applets-2.30.0.old/accessx-status/Makefile.in gnome-applets-2.30.0/accessx-status/Makefile.in
---- gnome-applets-2.30.0.old/accessx-status/Makefile.in 2010-03-28 08:27:57.000000000 +0200
-+++ gnome-applets-2.30.0/accessx-status/Makefile.in 2010-05-05 10:10:00.605500262 +0200
+ WARN_CFLAGS = @WARN_CFLAGS@
+Index: gnome-applets-2.30.0/accessx-status/Makefile.in
+===================================================================
+--- gnome-applets-2.30.0.orig/accessx-status/Makefile.in 2010-03-28 08:27:57.000000000 +0200
++++ gnome-applets-2.30.0/accessx-status/Makefile.in 2010-07-07 21:45:55.786233682 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -246,6 +246,8 @@
+@@ -246,6 +246,8 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
MIXER_LIBS = @MIXER_LIBS@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
@@ -42,15 +63,27 @@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
-@@ -291,7 +293,6 @@
+@@ -268,6 +270,8 @@ PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POLKIT_CFLAGS = @POLKIT_CFLAGS@
+ POLKIT_LIBS = @POLKIT_LIBS@
+@@ -291,8 +295,9 @@ SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-SU_TOOL = @SU_TOOL@
SYSCONFDIR = @SYSCONFDIR@
++UPOWER_CFLAGS = @UPOWER_CFLAGS@
++UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
-@@ -553,7 +554,7 @@
+ WARN_CFLAGS = @WARN_CFLAGS@
+@@ -553,7 +558,7 @@ uninstall-uiDATA:
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
@@ -59,7 +92,7 @@
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
-@@ -578,7 +579,7 @@
+@@ -578,7 +583,7 @@ $(RECURSIVE_TARGETS):
fi; test -z "$$fail"
$(RECURSIVE_CLEAN_TARGETS):
@@ -68,16 +101,17 @@
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
-diff -Naur gnome-applets-2.30.0.old/accessx-status/pixmaps/Makefile.in gnome-applets-2.30.0/accessx-status/pixmaps/Makefile.in
---- gnome-applets-2.30.0.old/accessx-status/pixmaps/Makefile.in 2010-03-28 08:27:57.000000000 +0200
-+++ gnome-applets-2.30.0/accessx-status/pixmaps/Makefile.in 2010-05-05 10:10:00.821501255 +0200
+Index: gnome-applets-2.30.0/accessx-status/pixmaps/Makefile.in
+===================================================================
+--- gnome-applets-2.30.0.orig/accessx-status/pixmaps/Makefile.in 2010-03-28 08:27:57.000000000 +0200
++++ gnome-applets-2.30.0/accessx-status/pixmaps/Makefile.in 2010-07-07 21:45:55.994234421 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -184,6 +184,8 @@
+@@ -184,6 +184,8 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
MIXER_LIBS = @MIXER_LIBS@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
@@ -86,17 +120,30 @@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
-@@ -229,7 +231,6 @@
+@@ -206,6 +208,8 @@ PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POLKIT_CFLAGS = @POLKIT_CFLAGS@
+ POLKIT_LIBS = @POLKIT_LIBS@
+@@ -229,8 +233,9 @@ SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-SU_TOOL = @SU_TOOL@
SYSCONFDIR = @SYSCONFDIR@
++UPOWER_CFLAGS = @UPOWER_CFLAGS@
++UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
-diff -Naur gnome-applets-2.30.0.old/aclocal.m4 gnome-applets-2.30.0/aclocal.m4
---- gnome-applets-2.30.0.old/aclocal.m4 2010-03-28 08:27:54.000000000 +0200
-+++ gnome-applets-2.30.0/aclocal.m4 2010-05-05 10:09:58.189501447 +0200
+ WARN_CFLAGS = @WARN_CFLAGS@
+Index: gnome-applets-2.30.0/aclocal.m4
+===================================================================
+--- gnome-applets-2.30.0.orig/aclocal.m4 2010-03-28 08:27:54.000000000 +0200
++++ gnome-applets-2.30.0/aclocal.m4 2010-07-07 21:45:44.210236531 +0200
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.11 -*- Autoconf -*-
+# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
@@ -114,7 +161,167 @@
You have another version of autoconf. It may work, but is not guaranteed to.
If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically `autoreconf'.])])
-@@ -844,7 +844,7 @@
+@@ -639,8 +639,9 @@ AC_DEFUN([GNOME_CXX_WARNINGS],[
+ AC_SUBST(WARN_CXXFLAGS)
+ ])
+
+-# nls.m4 serial 3 (gettext-0.15)
+-dnl Copyright (C) 1995-2003, 2005-2006 Free Software Foundation, Inc.
++# nls.m4 serial 5 (gettext-0.18)
++dnl Copyright (C) 1995-2003, 2005-2006, 2008-2010 Free Software Foundation,
++dnl Inc.
+ dnl This file is free software; the Free Software Foundation
+ dnl gives unlimited permission to copy and/or distribute it,
+ dnl with or without modifications, as long as this notice is preserved.
+@@ -658,20 +659,21 @@ dnl Authors:
+ dnl Ulrich Drepper <drepper at cygnus.com>, 1995-2000.
+ dnl Bruno Haible <haible at clisp.cons.org>, 2000-2003.
+
+-AC_PREREQ(2.50)
++AC_PREREQ([2.50])
+
+ AC_DEFUN([AM_NLS],
+ [
+ AC_MSG_CHECKING([whether NLS is requested])
+ dnl Default is enabled NLS
+- AC_ARG_ENABLE(nls,
++ AC_ARG_ENABLE([nls],
+ [ --disable-nls do not use Native Language Support],
+ USE_NLS=$enableval, USE_NLS=yes)
+- AC_MSG_RESULT($USE_NLS)
+- AC_SUBST(USE_NLS)
++ AC_MSG_RESULT([$USE_NLS])
++ AC_SUBST([USE_NLS])
+ ])
+
+ # pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
++# serial 1 (pkg-config-0.24)
+ #
+ # Copyright © 2004 Scott James Remnant <scott at netsplit.com>.
+ #
+@@ -699,7 +701,10 @@ AC_DEFUN([AM_NLS],
+ AC_DEFUN([PKG_PROG_PKG_CONFIG],
+ [m4_pattern_forbid([^_?PKG_[A-Z_]+$])
+ m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
+-AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl
++AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
++AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
++AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
++
+ if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+ AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
+ fi
+@@ -712,7 +717,6 @@ if test -n "$PKG_CONFIG"; then
+ AC_MSG_RESULT([no])
+ PKG_CONFIG=""
+ fi
+-
+ fi[]dnl
+ ])# PKG_PROG_PKG_CONFIG
+
+@@ -721,34 +725,31 @@ fi[]dnl
+ # Check to see whether a particular set of modules exists. Similar
+ # to PKG_CHECK_MODULES(), but does not set variables or print errors.
+ #
+-#
+-# Similar to PKG_CHECK_MODULES, make sure that the first instance of
+-# this or PKG_CHECK_MODULES is called, or make sure to call
+-# PKG_CHECK_EXISTS manually
++# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
++# only at the first occurence in configure.ac, so if the first place
++# it's called might be skipped (such as if it is within an "if", you
++# have to call PKG_CHECK_EXISTS manually
+ # --------------------------------------------------------------
+ AC_DEFUN([PKG_CHECK_EXISTS],
+ [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+ if test -n "$PKG_CONFIG" && \
+ AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
+- m4_ifval([$2], [$2], [:])
++ m4_default([$2], [:])
+ m4_ifvaln([$3], [else
+ $3])dnl
+ fi])
+
+-
+ # _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
+ # ---------------------------------------------
+ m4_define([_PKG_CONFIG],
+-[if test -n "$PKG_CONFIG"; then
+- if test -n "$$1"; then
+- pkg_cv_[]$1="$$1"
+- else
+- PKG_CHECK_EXISTS([$3],
+- [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
+- [pkg_failed=yes])
+- fi
+-else
+- pkg_failed=untried
++[if test -n "$$1"; then
++ pkg_cv_[]$1="$$1"
++ elif test -n "$PKG_CONFIG"; then
++ PKG_CHECK_EXISTS([$3],
++ [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
++ [pkg_failed=yes])
++ else
++ pkg_failed=untried
+ fi[]dnl
+ ])# _PKG_CONFIG
+
+@@ -790,16 +791,17 @@ and $1[]_LIBS to avoid the need to call
+ See the pkg-config man page for more details.])
+
+ if test $pkg_failed = yes; then
++ AC_MSG_RESULT([no])
+ _PKG_SHORT_ERRORS_SUPPORTED
+ if test $_pkg_short_errors_supported = yes; then
+- $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
++ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
+ else
+- $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
++ $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
+
+- ifelse([$4], , [AC_MSG_ERROR(dnl
++ m4_default([$4], [AC_MSG_ERROR(
+ [Package requirements ($2) were not met:
+
+ $$1_PKG_ERRORS
+@@ -807,25 +809,24 @@ $$1_PKG_ERRORS
+ Consider adjusting the PKG_CONFIG_PATH environment variable if you
+ installed software in a non-standard prefix.
+
+-_PKG_TEXT
+-])],
+- [AC_MSG_RESULT([no])
+- $4])
++_PKG_TEXT])dnl
++ ])
+ elif test $pkg_failed = untried; then
+- ifelse([$4], , [AC_MSG_FAILURE(dnl
++ AC_MSG_RESULT([no])
++ m4_default([$4], [AC_MSG_FAILURE(
+ [The pkg-config script could not be found or is too old. Make sure it
+ is in your PATH or set the PKG_CONFIG environment variable to the full
+ path to pkg-config.
+
+ _PKG_TEXT
+
+-To get pkg-config, see <http://pkg-config.freedesktop.org/>.])],
+- [$4])
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.])dnl
++ ])
+ else
+ $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
+ $1[]_LIBS=$pkg_cv_[]$1[]_LIBS
+ AC_MSG_RESULT([yes])
+- ifelse([$3], , :, [$3])
++ $3
+ fi[]dnl
+ ])# PKG_CHECK_MODULES
+
+@@ -844,7 +845,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
[am__api_version='1.11'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
@@ -123,7 +330,7 @@
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
-@@ -860,7 +860,7 @@
+@@ -860,7 +861,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
@@ -132,7 +339,7 @@
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
-@@ -1728,6 +1728,14 @@
+@@ -1728,6 +1729,14 @@ python2.1 python2.0])
am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'`
am_cv_python_pythondir=`echo "$am_cv_python_pythondir" | sed "s,^$am__strip_prefix,$PYTHON_PREFIX,"`
;;
@@ -147,7 +354,7 @@
esac
])
AC_SUBST([pythondir], [$am_cv_python_pythondir])
-@@ -1758,6 +1766,14 @@
+@@ -1758,6 +1767,14 @@ python2.1 python2.0])
am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'`
am_cv_python_pyexecdir=`echo "$am_cv_python_pyexecdir" | sed "s,^$am__strip_prefix,$PYTHON_EXEC_PREFIX,"`
;;
@@ -162,16 +369,17 @@
esac
])
AC_SUBST([pyexecdir], [$am_cv_python_pyexecdir])
-diff -Naur gnome-applets-2.30.0.old/battstat/apmlib/Makefile.in gnome-applets-2.30.0/battstat/apmlib/Makefile.in
---- gnome-applets-2.30.0.old/battstat/apmlib/Makefile.in 2010-03-28 08:27:57.000000000 +0200
-+++ gnome-applets-2.30.0/battstat/apmlib/Makefile.in 2010-05-05 10:10:01.077500404 +0200
+Index: gnome-applets-2.30.0/battstat/apmlib/Makefile.in
+===================================================================
+--- gnome-applets-2.30.0.orig/battstat/apmlib/Makefile.in 2010-03-28 08:27:57.000000000 +0200
++++ gnome-applets-2.30.0/battstat/apmlib/Makefile.in 2010-07-07 21:45:56.230233834 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -187,6 +187,8 @@
+@@ -187,6 +187,8 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
MIXER_LIBS = @MIXER_LIBS@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
@@ -180,24 +388,37 @@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
-@@ -232,7 +234,6 @@
+@@ -209,6 +211,8 @@ PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POLKIT_CFLAGS = @POLKIT_CFLAGS@
+ POLKIT_LIBS = @POLKIT_LIBS@
+@@ -232,8 +236,9 @@ SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-SU_TOOL = @SU_TOOL@
SYSCONFDIR = @SYSCONFDIR@
++UPOWER_CFLAGS = @UPOWER_CFLAGS@
++UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
-diff -Naur gnome-applets-2.30.0.old/battstat/docs/Makefile.in gnome-applets-2.30.0/battstat/docs/Makefile.in
---- gnome-applets-2.30.0.old/battstat/docs/Makefile.in 2010-03-28 08:27:57.000000000 +0200
-+++ gnome-applets-2.30.0/battstat/docs/Makefile.in 2010-05-05 10:10:01.181500919 +0200
+ WARN_CFLAGS = @WARN_CFLAGS@
+Index: gnome-applets-2.30.0/battstat/docs/Makefile.in
+===================================================================
+--- gnome-applets-2.30.0.orig/battstat/docs/Makefile.in 2010-03-28 08:27:57.000000000 +0200
++++ gnome-applets-2.30.0/battstat/docs/Makefile.in 2010-07-07 21:45:56.346233974 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -184,6 +184,8 @@
+@@ -184,6 +184,8 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
MIXER_LIBS = @MIXER_LIBS@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
@@ -206,24 +427,54 @@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
-@@ -229,7 +231,6 @@
+@@ -206,6 +208,8 @@ PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POLKIT_CFLAGS = @POLKIT_CFLAGS@
+ POLKIT_LIBS = @POLKIT_LIBS@
+@@ -229,8 +233,9 @@ SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-SU_TOOL = @SU_TOOL@
SYSCONFDIR = @SYSCONFDIR@
++UPOWER_CFLAGS = @UPOWER_CFLAGS@
++UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
-diff -Naur gnome-applets-2.30.0.old/battstat/Makefile.in gnome-applets-2.30.0/battstat/Makefile.in
---- gnome-applets-2.30.0.old/battstat/Makefile.in 2010-03-28 08:27:57.000000000 +0200
-+++ gnome-applets-2.30.0/battstat/Makefile.in 2010-05-05 10:10:00.941500504 +0200
+ WARN_CFLAGS = @WARN_CFLAGS@
+Index: gnome-applets-2.30.0/battstat/Makefile.in
+===================================================================
+--- gnome-applets-2.30.0.orig/battstat/Makefile.in 2010-03-28 08:27:57.000000000 +0200
++++ gnome-applets-2.30.0/battstat/Makefile.in 2010-07-07 21:45:56.126236403 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -251,6 +251,8 @@
+@@ -58,14 +58,14 @@ PROGRAMS = $(libexec_PROGRAMS)
+ am_battstat_applet_2_OBJECTS = properties.$(OBJEXT) \
+ battstat_applet.$(OBJEXT) power-management.$(OBJEXT) \
+ acpi-linux.$(OBJEXT) acpi-freebsd.$(OBJEXT) \
+- battstat-hal.$(OBJEXT)
++ battstat-hal.$(OBJEXT) battstat-upower.$(OBJEXT)
+ battstat_applet_2_OBJECTS = $(am_battstat_applet_2_OBJECTS)
+ am__DEPENDENCIES_1 =
+ @HAVE_LIBAPM_FALSE@@NEED_LIBAPM_TRUE at am__DEPENDENCIES_2 = \
+ @HAVE_LIBAPM_FALSE@@NEED_LIBAPM_TRUE@ apmlib/libapm.a
+ battstat_applet_2_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+- $(am__DEPENDENCIES_2)
++ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2)
+ DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
+@@ -251,6 +251,8 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
MIXER_LIBS = @MIXER_LIBS@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
@@ -232,15 +483,61 @@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
-@@ -296,7 +298,6 @@
+@@ -273,6 +275,8 @@ PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POLKIT_CFLAGS = @POLKIT_CFLAGS@
+ POLKIT_LIBS = @POLKIT_LIBS@
+@@ -296,8 +300,9 @@ SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-SU_TOOL = @SU_TOOL@
SYSCONFDIR = @SYSCONFDIR@
++UPOWER_CFLAGS = @UPOWER_CFLAGS@
++UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
-@@ -634,7 +635,7 @@
+ WARN_CFLAGS = @WARN_CFLAGS@
+@@ -387,6 +392,7 @@ INCLUDES = \
+ $(GNOME_LIBS2_CFLAGS) \
+ $(LIBNOTIFY_CFLAGS) \
+ $(HAL_CFLAGS) \
++ $(UPOWER_CFLAGS) \
+ $(APMINC) \
+ $(ACPIINC) \
+ -DG_LOG_DOMAIN=\"battstat_applet\"
+@@ -402,13 +408,16 @@ battstat_applet_2_SOURCES = \
+ acpi-freebsd.c \
+ acpi-freebsd.h \
+ battstat-hal.c \
+- battstat-hal.h
++ battstat-hal.h \
++ battstat-upower.c \
++ battstat-upower.h
+
+ battstat_applet_2_LDADD = \
+ $(GNOME_APPLETS_LIBS) \
+ $(GNOME_LIBS2_LIBS) \
+ $(LIBNOTIFY_LIBS) \
+ $(HAL_LIBS) \
++ $(UPOWER_LIBS) \
+ $(APMLIB)
+
+ schemasdir = @GCONF_SCHEMA_FILE_DIR@
+@@ -516,6 +525,7 @@ distclean-compile:
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/acpi-freebsd.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/acpi-linux.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/battstat-hal.Po at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/battstat-upower.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/battstat_applet.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/power-management.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/properties.Po at am__quote@
+@@ -634,7 +644,7 @@ uninstall-uiDATA:
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
@@ -249,7 +546,7 @@
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
-@@ -659,7 +660,7 @@
+@@ -659,7 +669,7 @@ $(RECURSIVE_TARGETS):
fi; test -z "$$fail"
$(RECURSIVE_CLEAN_TARGETS):
@@ -258,16 +555,17 @@
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
-diff -Naur gnome-applets-2.30.0.old/battstat/sounds/Makefile.in gnome-applets-2.30.0/battstat/sounds/Makefile.in
---- gnome-applets-2.30.0.old/battstat/sounds/Makefile.in 2010-03-28 08:27:58.000000000 +0200
-+++ gnome-applets-2.30.0/battstat/sounds/Makefile.in 2010-05-05 10:10:01.253500016 +0200
+Index: gnome-applets-2.30.0/battstat/sounds/Makefile.in
+===================================================================
+--- gnome-applets-2.30.0.orig/battstat/sounds/Makefile.in 2010-03-28 08:27:58.000000000 +0200
++++ gnome-applets-2.30.0/battstat/sounds/Makefile.in 2010-07-07 21:45:56.434233500 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -183,6 +183,8 @@
+@@ -183,6 +183,8 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
MIXER_LIBS = @MIXER_LIBS@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
@@ -276,24 +574,37 @@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
-@@ -228,7 +230,6 @@
+@@ -205,6 +207,8 @@ PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POLKIT_CFLAGS = @POLKIT_CFLAGS@
+ POLKIT_LIBS = @POLKIT_LIBS@
+@@ -228,8 +232,9 @@ SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-SU_TOOL = @SU_TOOL@
SYSCONFDIR = @SYSCONFDIR@
++UPOWER_CFLAGS = @UPOWER_CFLAGS@
++UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
-diff -Naur gnome-applets-2.30.0.old/charpick/help/Makefile.in gnome-applets-2.30.0/charpick/help/Makefile.in
---- gnome-applets-2.30.0.old/charpick/help/Makefile.in 2010-03-28 08:27:58.000000000 +0200
-+++ gnome-applets-2.30.0/charpick/help/Makefile.in 2010-05-05 10:10:01.449499984 +0200
+ WARN_CFLAGS = @WARN_CFLAGS@
+Index: gnome-applets-2.30.0/charpick/help/Makefile.in
+===================================================================
+--- gnome-applets-2.30.0.orig/charpick/help/Makefile.in 2010-03-28 08:27:58.000000000 +0200
++++ gnome-applets-2.30.0/charpick/help/Makefile.in 2010-07-07 21:45:56.670234383 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -184,6 +184,8 @@
+@@ -184,6 +184,8 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
MIXER_LIBS = @MIXER_LIBS@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
@@ -302,24 +613,37 @@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
-@@ -229,7 +231,6 @@
+@@ -206,6 +208,8 @@ PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POLKIT_CFLAGS = @POLKIT_CFLAGS@
+ POLKIT_LIBS = @POLKIT_LIBS@
+@@ -229,8 +233,9 @@ SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-SU_TOOL = @SU_TOOL@
SYSCONFDIR = @SYSCONFDIR@
++UPOWER_CFLAGS = @UPOWER_CFLAGS@
++UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
-diff -Naur gnome-applets-2.30.0.old/charpick/Makefile.in gnome-applets-2.30.0/charpick/Makefile.in
---- gnome-applets-2.30.0.old/charpick/Makefile.in 2010-03-28 08:27:58.000000000 +0200
-+++ gnome-applets-2.30.0/charpick/Makefile.in 2010-05-05 10:10:01.349500551 +0200
+ WARN_CFLAGS = @WARN_CFLAGS@
+Index: gnome-applets-2.30.0/charpick/Makefile.in
+===================================================================
+--- gnome-applets-2.30.0.orig/charpick/Makefile.in 2010-03-28 08:27:58.000000000 +0200
++++ gnome-applets-2.30.0/charpick/Makefile.in 2010-07-07 21:45:56.554234232 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -245,6 +245,8 @@
+@@ -245,6 +245,8 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
MIXER_LIBS = @MIXER_LIBS@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
@@ -328,15 +652,27 @@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
-@@ -290,7 +292,6 @@
+@@ -267,6 +269,8 @@ PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POLKIT_CFLAGS = @POLKIT_CFLAGS@
+ POLKIT_LIBS = @POLKIT_LIBS@
+@@ -290,8 +294,9 @@ SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-SU_TOOL = @SU_TOOL@
SYSCONFDIR = @SYSCONFDIR@
++UPOWER_CFLAGS = @UPOWER_CFLAGS@
++UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
-@@ -579,7 +580,7 @@
+ WARN_CFLAGS = @WARN_CFLAGS@
+@@ -579,7 +584,7 @@ uninstall-uiDATA:
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
@@ -345,7 +681,7 @@
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
-@@ -604,7 +605,7 @@
+@@ -604,7 +609,7 @@ $(RECURSIVE_TARGETS):
fi; test -z "$$fail"
$(RECURSIVE_CLEAN_TARGETS):
@@ -354,9 +690,10 @@
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
-diff -Naur gnome-applets-2.30.0.old/configure gnome-applets-2.30.0/configure
---- gnome-applets-2.30.0.old/configure 2010-03-28 08:27:56.000000000 +0200
-+++ gnome-applets-2.30.0/configure 2010-05-05 10:09:59.654498252 +0200
+Index: gnome-applets-2.30.0/configure
+===================================================================
+--- gnome-applets-2.30.0.orig/configure 2010-03-28 08:27:56.000000000 +0200
++++ gnome-applets-2.30.0/configure 2010-07-07 21:46:15.174232375 +0200
@@ -1,10 +1,12 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
@@ -373,7 +710,7 @@
#
# This configure script is free software; the Free Software Foundation
# gives unlimited permission to copy, distribute and modify it.
-@@ -673,7 +675,8 @@
+@@ -673,7 +675,8 @@ fi
@@ -383,7 +720,7 @@
# Name of the host.
# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
-@@ -767,7 +770,8 @@
+@@ -767,7 +770,8 @@ HAVE_LIBCPUFREQ_FALSE
HAVE_LIBCPUFREQ_TRUE
APPLET_MODEMLIGHTS_FALSE
APPLET_MODEMLIGHTS_TRUE
@@ -393,7 +730,51 @@
APPLET_ACCESSX_FALSE
APPLET_ACCESSX_TRUE
HAVE_XKB
-@@ -1106,7 +1110,9 @@
+@@ -838,6 +842,8 @@ PYGTK_LIBS
+ PYGTK_CFLAGS
+ GUCHARMAP_LIBS
+ GUCHARMAP_CFLAGS
++UPOWER_LIBS
++UPOWER_CFLAGS
+ HAL_LIBS
+ HAL_CFLAGS
+ HAVE_POLKIT_FALSE
+@@ -913,6 +919,8 @@ LIBTOOL
+ EGREP
+ GREP
+ CPP
++PKG_CONFIG_LIBDIR
++PKG_CONFIG_PATH
+ PKG_CONFIG
+ DATADIRNAME
+ am__fastdepCC_FALSE
+@@ -1042,6 +1050,7 @@ enable_iso_c
+ enable_more_warnings
+ enable_polkit
+ with_hal
++with_upower
+ enable_networkmanager
+ enable_mixer_applet
+ with_gconf_source
+@@ -1067,6 +1076,8 @@ LDFLAGS
+ LIBS
+ CPPFLAGS
+ PKG_CONFIG
++PKG_CONFIG_PATH
++PKG_CONFIG_LIBDIR
+ CPP
+ XMKMF
+ GIT_CFLAGS
+@@ -1095,6 +1106,8 @@ POLKIT_CFLAGS
+ POLKIT_LIBS
+ HAL_CFLAGS
+ HAL_LIBS
++UPOWER_CFLAGS
++UPOWER_LIBS
+ GUCHARMAP_CFLAGS
+ GUCHARMAP_LIBS
+ PYGTK_CFLAGS
+@@ -1106,7 +1119,9 @@ LIBGWEATHER_LIBS
NETWORKMANAGER_CFLAGS
NETWORKMANAGER_LIBS
MIXER_CFLAGS
@@ -404,7 +785,15 @@
# Initialize some variables set by options.
-@@ -1786,7 +1792,7 @@
+@@ -1771,6 +1786,7 @@ Optional Packages:
+ --with-gnu-ld assume the C compiler uses GNU ld [default=no]
+ --with-x use the X Window System
+ --without-hal build without hal support
++ --without-upower build without upower support
+ --with-gconf-source=sourceaddress
+ Config database for installing schema files.
+ --with-gconf-schema-file-dir=dir
+@@ -1786,9 +1802,13 @@ Some influential environment variables:
LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
nonstandard directory <lib dir>
LIBS libraries to pass to the linker, e.g. -l<library>
@@ -412,8 +801,24 @@
+ CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
you have headers in a nonstandard directory <include dir>
PKG_CONFIG path to pkg-config utility
++ PKG_CONFIG_PATH
++ directories to add to pkg-config's search path
++ PKG_CONFIG_LIBDIR
++ path overriding pkg-config's built-in search path
CPP C preprocessor
-@@ -1853,6 +1859,10 @@
+ XMKMF Path to xmkmf, Makefile generator for X Window System
+ GIT_CFLAGS C compiler flags for GIT, overriding pkg-config
+@@ -1833,6 +1853,9 @@ Some influential environment variables:
+ POLKIT_LIBS linker flags for POLKIT, overriding pkg-config
+ HAL_CFLAGS C compiler flags for HAL, overriding pkg-config
+ HAL_LIBS linker flags for HAL, overriding pkg-config
++ UPOWER_CFLAGS
++ C compiler flags for UPOWER, overriding pkg-config
++ UPOWER_LIBS linker flags for UPOWER, overriding pkg-config
+ GUCHARMAP_CFLAGS
+ C compiler flags for GUCHARMAP, overriding pkg-config
+ GUCHARMAP_LIBS
+@@ -1853,6 +1876,10 @@ Some influential environment variables:
MIXER_CFLAGS
C compiler flags for MIXER, overriding pkg-config
MIXER_LIBS linker flags for MIXER, overriding pkg-config
@@ -424,7 +829,7 @@
Use these variables to override the choices made by `configure' or to help
it to find libraries and programs with nonstandard names/locations.
-@@ -1921,7 +1931,7 @@
+@@ -1921,7 +1948,7 @@ test -n "$ac_init_help" && exit $ac_stat
if $ac_init_version; then
cat <<\_ACEOF
gnome-applets configure 2.30.0
@@ -433,7 +838,7 @@
Copyright (C) 2009 Free Software Foundation, Inc.
This configure script is free software; the Free Software Foundation
-@@ -1968,7 +1978,7 @@
+@@ -1968,7 +1995,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_retval=1
fi
eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
@@ -442,7 +847,7 @@
} # ac_fn_c_try_compile
-@@ -2014,7 +2024,7 @@
+@@ -2014,7 +2041,7 @@ fi
# left behind by Apple's compiler. We do this before executing the actions.
rm -rf conftest.dSYM conftest_ipa8_conftest.oo
eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
@@ -451,7 +856,7 @@
} # ac_fn_c_try_link
-@@ -2118,7 +2128,7 @@
+@@ -2118,7 +2145,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_retval=1
fi
eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
@@ -460,7 +865,7 @@
} # ac_fn_c_try_cpp
-@@ -2160,7 +2170,7 @@
+@@ -2160,7 +2187,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
fi
rm -rf conftest.dSYM conftest_ipa8_conftest.oo
eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
@@ -469,7 +874,7 @@
} # ac_fn_c_try_run
-@@ -2382,7 +2392,7 @@
+@@ -2382,7 +2409,7 @@ This file contains any messages produced
running configure, to aid debugging if configure makes a mistake.
It was created by gnome-applets $as_me 2.30.0, which was
@@ -478,7 +883,7 @@
$ $0 $@
-@@ -2635,7 +2645,7 @@
+@@ -2635,7 +2662,7 @@ fi
for ac_site_file in "$ac_site_file1" "$ac_site_file2"
do
test "x$ac_site_file" = xNONE && continue
@@ -487,7 +892,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
$as_echo "$as_me: loading site script $ac_site_file" >&6;}
sed 's/^/| /' "$ac_site_file" >&5
-@@ -2644,9 +2654,9 @@
+@@ -2644,9 +2671,9 @@ $as_echo "$as_me: loading site script $a
done
if test -r "$cache_file"; then
@@ -500,7 +905,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
$as_echo "$as_me: loading cache $cache_file" >&6;}
case $cache_file in
-@@ -3069,6 +3079,7 @@
+@@ -3069,6 +3096,7 @@ IFS=$as_save_IFS
fi
@@ -508,7 +913,7 @@
if test "${ac_cv_path_mkdir+set}" = set; then
MKDIR_P="$ac_cv_path_mkdir -p"
else
-@@ -3076,7 +3087,6 @@
+@@ -3076,7 +3104,6 @@ fi
# value for MKDIR_P within a source directory, because that will
# break other packages using the cache if that directory is
# removed, or if the value is a relative name.
@@ -516,7 +921,7 @@
MKDIR_P="$ac_install_sh -d"
fi
fi
-@@ -3244,6 +3254,7 @@
+@@ -3244,9 +3271,11 @@ LIBPANEL_REQUIRED=2.13.4
LIBGTOP_REQUIRED=2.11.92
LIBXKLAVIER_REQUIRED=4.0
LIBWNCK_REQUIRED=2.9.3
@@ -524,7 +929,11 @@
LIBGNOME_DESKTOP_REQUIRED=2.11.1
LIBNOTIFY_REQUIRED=0.3.2
HAL_REQUIRED=0.5.3
-@@ -3683,32 +3694,30 @@
++UPOWER_REQUIRED=0.9.4
+ DBUS_REQUIRED=1.1.2
+ DBUS_GLIB_REQUIRED=0.74
+ PYGTK_REQUIRED=2.6
+@@ -3683,32 +3712,30 @@ $as_echo "$ac_try_echo"; } >&5
... rest of stderr output deleted ...
10q' conftest.err >conftest.er1
cat conftest.er1 >&5
@@ -562,7 +971,7 @@
ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
# The possible output files:
-@@ -3770,10 +3779,10 @@
+@@ -3770,10 +3797,10 @@ test "$ac_cv_exeext" = no && ac_cv_exeex
else
ac_file=''
fi
@@ -576,7 +985,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-@@ -3781,51 +3790,18 @@
+@@ -3781,51 +3808,18 @@ $as_echo "$as_me: error: in \`$ac_pwd':"
{ as_fn_set_status 77
as_fn_error "C compiler cannot create executables
See \`config.log' for more details." "$LINENO" 5; }; }
@@ -636,7 +1045,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
$as_echo_n "checking for suffix of executables... " >&6; }
if { { ac_try="$ac_link"
-@@ -3858,13 +3834,72 @@
+@@ -3858,13 +3852,72 @@ $as_echo "$as_me: error: in \`$ac_pwd':"
as_fn_error "cannot compute suffix of executables: cannot compile and link
See \`config.log' for more details." "$LINENO" 5; }
fi
@@ -710,7 +1119,26 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
$as_echo_n "checking for suffix of object files... " >&6; }
if test "${ac_cv_objext+set}" = set; then :
-@@ -5239,8 +5274,8 @@
+@@ -4802,6 +4855,10 @@ fi
+
+
+
++
++
++
++
+ if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
+@@ -4914,7 +4971,6 @@ $as_echo "yes" >&6; }
+ $as_echo "no" >&6; }
+ PKG_CONFIG=""
+ fi
+-
+ fi
+
+ ac_ext=c
+@@ -5239,8 +5295,8 @@ $as_echo "$ac_try_echo"; } >&5
... rest of stderr output deleted ...
10q' conftest.err >conftest.er1
cat conftest.er1 >&5
@@ -720,7 +1148,7 @@
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }
done
-@@ -6028,8 +6063,8 @@
+@@ -6028,8 +6084,8 @@ esac
@@ -731,24 +1159,24 @@
-@@ -6570,13 +6605,13 @@
+@@ -6570,13 +6626,13 @@ if test "${lt_cv_nm_interface+set}" = se
else
lt_cv_nm_interface="BSD nm"
echo "int some_variable = 0;" > conftest.$ac_ext
- (eval echo "\"\$as_me:6573: $ac_compile\"" >&5)
-+ (eval echo "\"\$as_me:6608: $ac_compile\"" >&5)
++ (eval echo "\"\$as_me:6629: $ac_compile\"" >&5)
(eval "$ac_compile" 2>conftest.err)
cat conftest.err >&5
- (eval echo "\"\$as_me:6576: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
-+ (eval echo "\"\$as_me:6611: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
++ (eval echo "\"\$as_me:6632: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
cat conftest.err >&5
- (eval echo "\"\$as_me:6579: output\"" >&5)
-+ (eval echo "\"\$as_me:6614: output\"" >&5)
++ (eval echo "\"\$as_me:6635: output\"" >&5)
cat conftest.out >&5
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
lt_cv_nm_interface="MS dumpbin"
-@@ -7042,7 +7077,7 @@
+@@ -7042,7 +7098,7 @@ irix5* | irix6* | nonstopux*)
;;
# This must be Linux ELF.
@@ -757,30 +1185,30 @@
lt_cv_deplibs_check_method=pass_all
;;
-@@ -7781,7 +7816,7 @@
+@@ -7781,7 +7837,7 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 7784 "configure"' > conftest.$ac_ext
-+ echo '#line 7819 "configure"' > conftest.$ac_ext
++ echo '#line 7840 "configure"' > conftest.$ac_ext
if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
ac_status=$?
-@@ -9061,11 +9096,11 @@
+@@ -9061,11 +9117,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:9064: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9099: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9120: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:9068: \$? = $ac_status" >&5
-+ echo "$as_me:9103: \$? = $ac_status" >&5
++ echo "$as_me:9124: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
-@@ -9230,7 +9265,7 @@
+@@ -9230,7 +9286,7 @@ $as_echo_n "checking for $compiler optio
lt_prog_compiler_static='-non_shared'
;;
@@ -789,49 +1217,49 @@
case $cc_basename in
# old Intel for x86_64 which still supported -KPIC.
ecc*)
-@@ -9400,11 +9435,11 @@
+@@ -9400,11 +9456,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:9403: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9438: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9459: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:9407: \$? = $ac_status" >&5
-+ echo "$as_me:9442: \$? = $ac_status" >&5
++ echo "$as_me:9463: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
-@@ -9505,11 +9540,11 @@
+@@ -9505,11 +9561,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:9508: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9543: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9564: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:9512: \$? = $ac_status" >&5
-+ echo "$as_me:9547: \$? = $ac_status" >&5
++ echo "$as_me:9568: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
-@@ -9560,11 +9595,11 @@
+@@ -9560,11 +9616,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:9563: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9598: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9619: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:9567: \$? = $ac_status" >&5
-+ echo "$as_me:9602: \$? = $ac_status" >&5
++ echo "$as_me:9623: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
-@@ -9703,6 +9738,7 @@
+@@ -9703,6 +9759,7 @@ $as_echo_n "checking whether the $compil
fi
supports_anon_versioning=no
case `$LD -v 2>&1` in
@@ -839,7 +1267,7 @@
*\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
*\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
*\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-@@ -9794,7 +9830,7 @@
+@@ -9794,7 +9851,7 @@ _LT_EOF
archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
;;
@@ -848,7 +1276,7 @@
tmp_diet=no
if test "$host_os" = linux-dietlibc; then
case $cc_basename in
-@@ -11256,7 +11292,7 @@
+@@ -11256,7 +11313,7 @@ linux*oldld* | linux*aout* | linux*coff*
;;
# This must be Linux ELF.
@@ -857,25 +1285,25 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -11943,7 +11979,7 @@
+@@ -11943,7 +12000,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 11946 "configure"
-+#line 11982 "configure"
++#line 12003 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -12039,7 +12075,7 @@
+@@ -12039,7 +12096,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 12042 "configure"
-+#line 12078 "configure"
++#line 12099 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -13113,6 +13149,14 @@
+@@ -13113,6 +13170,14 @@ else
am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'`
am_cv_python_pythondir=`echo "$am_cv_python_pythondir" | sed "s,^$am__strip_prefix,$PYTHON_PREFIX,"`
;;
@@ -890,7 +1318,7 @@
esac
fi
-@@ -13143,6 +13187,14 @@
+@@ -13143,6 +13208,14 @@ else
am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'`
am_cv_python_pyexecdir=`echo "$am_cv_python_pyexecdir" | sed "s,^$am__strip_prefix,$PYTHON_EXEC_PREFIX,"`
;;
@@ -905,7 +1333,1813 @@
esac
fi
-@@ -16583,95 +16635,90 @@
+@@ -13377,11 +13450,10 @@ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GIT" >&5
+ $as_echo_n "checking for GIT... " >&6; }
+
+-if test -n "$PKG_CONFIG"; then
+- if test -n "$GIT_CFLAGS"; then
+- pkg_cv_GIT_CFLAGS="$GIT_CFLAGS"
+- else
+- if test -n "$PKG_CONFIG" && \
++if test -n "$GIT_CFLAGS"; then
++ pkg_cv_GIT_CFLAGS="$GIT_CFLAGS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnome-icon-theme >= \$GNOME_ICON_THEME_REQUIRED\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "gnome-icon-theme >= $GNOME_ICON_THEME_REQUIRED") 2>&5
+ ac_status=$?
+@@ -13391,15 +13463,13 @@ if test -n "$PKG_CONFIG"; then
+ else
+ pkg_failed=yes
+ fi
+- fi
+-else
+- pkg_failed=untried
++ else
++ pkg_failed=untried
+ fi
+-if test -n "$PKG_CONFIG"; then
+- if test -n "$GIT_LIBS"; then
+- pkg_cv_GIT_LIBS="$GIT_LIBS"
+- else
+- if test -n "$PKG_CONFIG" && \
++if test -n "$GIT_LIBS"; then
++ pkg_cv_GIT_LIBS="$GIT_LIBS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnome-icon-theme >= \$GNOME_ICON_THEME_REQUIRED\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "gnome-icon-theme >= $GNOME_ICON_THEME_REQUIRED") 2>&5
+ ac_status=$?
+@@ -13409,14 +13479,15 @@ if test -n "$PKG_CONFIG"; then
+ else
+ pkg_failed=yes
+ fi
+- fi
+-else
+- pkg_failed=untried
++ else
++ pkg_failed=untried
+ fi
+
+
+
+ if test $pkg_failed = yes; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+@@ -13424,9 +13495,9 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- GIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gnome-icon-theme >= $GNOME_ICON_THEME_REQUIRED"`
++ GIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gnome-icon-theme >= $GNOME_ICON_THEME_REQUIRED" 2>&1`
+ else
+- GIT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gnome-icon-theme >= $GNOME_ICON_THEME_REQUIRED"`
++ GIT_PKG_ERRORS=`$PKG_CONFIG --print-errors "gnome-icon-theme >= $GNOME_ICON_THEME_REQUIRED" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$GIT_PKG_ERRORS" >&5
+@@ -13440,9 +13511,10 @@ installed software in a non-standard pre
+
+ Alternatively, you may set the environment variables GIT_CFLAGS
+ and GIT_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-" "$LINENO" 5
++See the pkg-config man page for more details." "$LINENO" 5
+ elif test $pkg_failed = untried; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+ as_fn_error "The pkg-config script could not be found or is too old. Make sure it
+@@ -13460,7 +13532,7 @@ else
+ GIT_LIBS=$pkg_cv_GIT_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+- :
++
+ fi
+
+
+@@ -13468,11 +13540,10 @@ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GIO" >&5
+ $as_echo_n "checking for GIO... " >&6; }
+
+-if test -n "$PKG_CONFIG"; then
+- if test -n "$GIO_CFLAGS"; then
+- pkg_cv_GIO_CFLAGS="$GIO_CFLAGS"
+- else
+- if test -n "$PKG_CONFIG" && \
++if test -n "$GIO_CFLAGS"; then
++ pkg_cv_GIO_CFLAGS="$GIO_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\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "gio-2.0 >= $GIO_REQUIRED") 2>&5
+ ac_status=$?
+@@ -13482,15 +13553,13 @@ if test -n "$PKG_CONFIG"; then
+ else
+ pkg_failed=yes
+ fi
+- fi
+-else
+- pkg_failed=untried
++ else
++ pkg_failed=untried
+ fi
+-if test -n "$PKG_CONFIG"; then
+- if test -n "$GIO_LIBS"; then
+- pkg_cv_GIO_LIBS="$GIO_LIBS"
+- else
+- if test -n "$PKG_CONFIG" && \
++if test -n "$GIO_LIBS"; then
++ pkg_cv_GIO_LIBS="$GIO_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\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "gio-2.0 >= $GIO_REQUIRED") 2>&5
+ ac_status=$?
+@@ -13500,14 +13569,15 @@ if test -n "$PKG_CONFIG"; then
+ else
+ pkg_failed=yes
+ fi
+- fi
+-else
+- pkg_failed=untried
++ else
++ pkg_failed=untried
+ fi
+
+
+
+ if test $pkg_failed = yes; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+@@ -13515,9 +13585,9 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- GIO_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gio-2.0 >= $GIO_REQUIRED"`
++ GIO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gio-2.0 >= $GIO_REQUIRED" 2>&1`
+ else
+- GIO_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gio-2.0 >= $GIO_REQUIRED"`
++ GIO_PKG_ERRORS=`$PKG_CONFIG --print-errors "gio-2.0 >= $GIO_REQUIRED" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$GIO_PKG_ERRORS" >&5
+@@ -13531,9 +13601,10 @@ installed software in a non-standard pre
+
+ Alternatively, you may set the environment variables GIO_CFLAGS
+ and GIO_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-" "$LINENO" 5
++See the pkg-config man page for more details." "$LINENO" 5
+ elif test $pkg_failed = untried; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+ as_fn_error "The pkg-config script could not be found or is too old. Make sure it
+@@ -13551,7 +13622,7 @@ else
+ GIO_LIBS=$pkg_cv_GIO_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+- :
++
+ fi
+
+
+@@ -13561,11 +13632,10 @@ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK" >&5
+ $as_echo_n "checking for GTK... " >&6; }
+
+-if test -n "$PKG_CONFIG"; then
+- if test -n "$GTK_CFLAGS"; then
+- pkg_cv_GTK_CFLAGS="$GTK_CFLAGS"
+- else
+- if test -n "$PKG_CONFIG" && \
++if test -n "$GTK_CFLAGS"; then
++ pkg_cv_GTK_CFLAGS="$GTK_CFLAGS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \$GTK_REQUIRED\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= $GTK_REQUIRED") 2>&5
+ ac_status=$?
+@@ -13575,15 +13645,13 @@ if test -n "$PKG_CONFIG"; then
+ else
+ pkg_failed=yes
+ fi
+- fi
+-else
+- pkg_failed=untried
++ else
++ pkg_failed=untried
+ fi
+-if test -n "$PKG_CONFIG"; then
+- if test -n "$GTK_LIBS"; then
+- pkg_cv_GTK_LIBS="$GTK_LIBS"
+- else
+- if test -n "$PKG_CONFIG" && \
++if test -n "$GTK_LIBS"; then
++ pkg_cv_GTK_LIBS="$GTK_LIBS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \$GTK_REQUIRED\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= $GTK_REQUIRED") 2>&5
+ ac_status=$?
+@@ -13593,14 +13661,15 @@ if test -n "$PKG_CONFIG"; then
+ else
+ pkg_failed=yes
+ fi
+- fi
+-else
+- pkg_failed=untried
++ else
++ pkg_failed=untried
+ fi
+
+
+
+ if test $pkg_failed = yes; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+@@ -13608,9 +13677,9 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gtk+-2.0 >= $GTK_REQUIRED"`
++ GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gtk+-2.0 >= $GTK_REQUIRED" 2>&1`
+ else
+- GTK_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk+-2.0 >= $GTK_REQUIRED"`
++ GTK_PKG_ERRORS=`$PKG_CONFIG --print-errors "gtk+-2.0 >= $GTK_REQUIRED" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$GTK_PKG_ERRORS" >&5
+@@ -13624,9 +13693,10 @@ installed software in a non-standard pre
+
+ Alternatively, you may set the environment variables GTK_CFLAGS
+ and GTK_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-" "$LINENO" 5
++See the pkg-config man page for more details." "$LINENO" 5
+ elif test $pkg_failed = untried; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+ as_fn_error "The pkg-config script could not be found or is too old. Make sure it
+@@ -13644,7 +13714,7 @@ else
+ GTK_LIBS=$pkg_cv_GTK_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+- :
++
+ fi
+
+
+@@ -13654,11 +13724,10 @@ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNOME_APPLETS" >&5
+ $as_echo_n "checking for GNOME_APPLETS... " >&6; }
+
+-if test -n "$PKG_CONFIG"; then
+- if test -n "$GNOME_APPLETS_CFLAGS"; then
+- pkg_cv_GNOME_APPLETS_CFLAGS="$GNOME_APPLETS_CFLAGS"
+- else
+- if test -n "$PKG_CONFIG" && \
++if test -n "$GNOME_APPLETS_CFLAGS"; then
++ pkg_cv_GNOME_APPLETS_CFLAGS="$GNOME_APPLETS_CFLAGS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpanelapplet-2.0 >= \$LIBPANEL_REQUIRED\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libpanelapplet-2.0 >= $LIBPANEL_REQUIRED") 2>&5
+ ac_status=$?
+@@ -13668,15 +13737,13 @@ if test -n "$PKG_CONFIG"; then
+ else
+ pkg_failed=yes
+ fi
+- fi
+-else
+- pkg_failed=untried
++ else
++ pkg_failed=untried
+ fi
+-if test -n "$PKG_CONFIG"; then
+- if test -n "$GNOME_APPLETS_LIBS"; then
+- pkg_cv_GNOME_APPLETS_LIBS="$GNOME_APPLETS_LIBS"
+- else
+- if test -n "$PKG_CONFIG" && \
++if test -n "$GNOME_APPLETS_LIBS"; then
++ pkg_cv_GNOME_APPLETS_LIBS="$GNOME_APPLETS_LIBS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpanelapplet-2.0 >= \$LIBPANEL_REQUIRED\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libpanelapplet-2.0 >= $LIBPANEL_REQUIRED") 2>&5
+ ac_status=$?
+@@ -13686,14 +13753,15 @@ if test -n "$PKG_CONFIG"; then
+ else
+ pkg_failed=yes
+ fi
+- fi
+-else
+- pkg_failed=untried
++ else
++ pkg_failed=untried
+ fi
+
+
+
+ if test $pkg_failed = yes; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+@@ -13701,9 +13769,9 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- GNOME_APPLETS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libpanelapplet-2.0 >= $LIBPANEL_REQUIRED"`
++ GNOME_APPLETS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libpanelapplet-2.0 >= $LIBPANEL_REQUIRED" 2>&1`
+ else
+- GNOME_APPLETS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libpanelapplet-2.0 >= $LIBPANEL_REQUIRED"`
++ GNOME_APPLETS_PKG_ERRORS=`$PKG_CONFIG --print-errors "libpanelapplet-2.0 >= $LIBPANEL_REQUIRED" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$GNOME_APPLETS_PKG_ERRORS" >&5
+@@ -13717,9 +13785,10 @@ installed software in a non-standard pre
+
+ Alternatively, you may set the environment variables GNOME_APPLETS_CFLAGS
+ and GNOME_APPLETS_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-" "$LINENO" 5
++See the pkg-config man page for more details." "$LINENO" 5
+ elif test $pkg_failed = untried; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+ as_fn_error "The pkg-config script could not be found or is too old. Make sure it
+@@ -13737,7 +13806,7 @@ else
+ GNOME_APPLETS_LIBS=$pkg_cv_GNOME_APPLETS_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+- :
++
+ fi
+
+
+@@ -13747,11 +13816,10 @@ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNOMEDESKTOP" >&5
+ $as_echo_n "checking for GNOMEDESKTOP... " >&6; }
+
+-if test -n "$PKG_CONFIG"; then
+- if test -n "$GNOMEDESKTOP_CFLAGS"; then
+- pkg_cv_GNOMEDESKTOP_CFLAGS="$GNOMEDESKTOP_CFLAGS"
+- else
+- if test -n "$PKG_CONFIG" && \
++if test -n "$GNOMEDESKTOP_CFLAGS"; then
++ pkg_cv_GNOMEDESKTOP_CFLAGS="$GNOMEDESKTOP_CFLAGS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnome-desktop-2.0 >= \$LIBGNOME_DESKTOP_REQUIRED\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED") 2>&5
+ ac_status=$?
+@@ -13761,15 +13829,13 @@ if test -n "$PKG_CONFIG"; then
+ else
+ pkg_failed=yes
+ fi
+- fi
+-else
+- pkg_failed=untried
++ else
++ pkg_failed=untried
+ fi
+-if test -n "$PKG_CONFIG"; then
+- if test -n "$GNOMEDESKTOP_LIBS"; then
+- pkg_cv_GNOMEDESKTOP_LIBS="$GNOMEDESKTOP_LIBS"
+- else
+- if test -n "$PKG_CONFIG" && \
++if test -n "$GNOMEDESKTOP_LIBS"; then
++ pkg_cv_GNOMEDESKTOP_LIBS="$GNOMEDESKTOP_LIBS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnome-desktop-2.0 >= \$LIBGNOME_DESKTOP_REQUIRED\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED") 2>&5
+ ac_status=$?
+@@ -13779,14 +13845,15 @@ if test -n "$PKG_CONFIG"; then
+ else
+ pkg_failed=yes
+ fi
+- fi
+-else
+- pkg_failed=untried
++ else
++ pkg_failed=untried
+ fi
+
+
+
+ if test $pkg_failed = yes; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+@@ -13794,9 +13861,9 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- GNOMEDESKTOP_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED"`
++ GNOMEDESKTOP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED" 2>&1`
+ else
+- GNOMEDESKTOP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED"`
++ GNOMEDESKTOP_PKG_ERRORS=`$PKG_CONFIG --print-errors "gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$GNOMEDESKTOP_PKG_ERRORS" >&5
+@@ -13810,9 +13877,10 @@ installed software in a non-standard pre
+
+ Alternatively, you may set the environment variables GNOMEDESKTOP_CFLAGS
+ and GNOMEDESKTOP_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-" "$LINENO" 5
++See the pkg-config man page for more details." "$LINENO" 5
+ elif test $pkg_failed = untried; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+ as_fn_error "The pkg-config script could not be found or is too old. Make sure it
+@@ -13830,7 +13898,7 @@ else
+ GNOMEDESKTOP_LIBS=$pkg_cv_GNOMEDESKTOP_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+- :
++
+ fi
+
+
+@@ -13841,11 +13909,10 @@ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTOP_APPLETS" >&5
+ $as_echo_n "checking for GTOP_APPLETS... " >&6; }
+
+-if test -n "$PKG_CONFIG"; then
+- if test -n "$GTOP_APPLETS_CFLAGS"; then
+- pkg_cv_GTOP_APPLETS_CFLAGS="$GTOP_APPLETS_CFLAGS"
+- else
+- if test -n "$PKG_CONFIG" && \
++if test -n "$GTOP_APPLETS_CFLAGS"; then
++ pkg_cv_GTOP_APPLETS_CFLAGS="$GTOP_APPLETS_CFLAGS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgtop-2.0 >= \$LIBGTOP_REQUIRED\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libgtop-2.0 >= $LIBGTOP_REQUIRED") 2>&5
+ ac_status=$?
+@@ -13855,15 +13922,13 @@ if test -n "$PKG_CONFIG"; then
+ else
+ pkg_failed=yes
+ fi
+- fi
+-else
+- pkg_failed=untried
++ else
++ pkg_failed=untried
+ fi
+-if test -n "$PKG_CONFIG"; then
+- if test -n "$GTOP_APPLETS_LIBS"; then
+- pkg_cv_GTOP_APPLETS_LIBS="$GTOP_APPLETS_LIBS"
+- else
+- if test -n "$PKG_CONFIG" && \
++if test -n "$GTOP_APPLETS_LIBS"; then
++ pkg_cv_GTOP_APPLETS_LIBS="$GTOP_APPLETS_LIBS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgtop-2.0 >= \$LIBGTOP_REQUIRED\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libgtop-2.0 >= $LIBGTOP_REQUIRED") 2>&5
+ ac_status=$?
+@@ -13873,14 +13938,15 @@ if test -n "$PKG_CONFIG"; then
+ else
+ pkg_failed=yes
+ fi
+- fi
+-else
+- pkg_failed=untried
++ else
++ pkg_failed=untried
+ fi
+
+
+
+ if test $pkg_failed = yes; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+@@ -13888,18 +13954,18 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- GTOP_APPLETS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libgtop-2.0 >= $LIBGTOP_REQUIRED"`
++ GTOP_APPLETS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libgtop-2.0 >= $LIBGTOP_REQUIRED" 2>&1`
+ else
+- GTOP_APPLETS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgtop-2.0 >= $LIBGTOP_REQUIRED"`
++ GTOP_APPLETS_PKG_ERRORS=`$PKG_CONFIG --print-errors "libgtop-2.0 >= $LIBGTOP_REQUIRED" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$GTOP_APPLETS_PKG_ERRORS" >&5
+
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libgtop not found. Not building gtop applets." >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libgtop not found. Not building gtop applets." >&5
+ $as_echo "$as_me: WARNING: libgtop not found. Not building gtop applets." >&2;}
+ elif test $pkg_failed = untried; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libgtop not found. Not building gtop applets." >&5
+ $as_echo "$as_me: WARNING: libgtop not found. Not building gtop applets." >&2;}
+ else
+@@ -13925,11 +13991,10 @@ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNOME_SETTINGS_DAEMON" >&5
+ $as_echo_n "checking for GNOME_SETTINGS_DAEMON... " >&6; }
+
+-if test -n "$PKG_CONFIG"; then
+- if test -n "$GNOME_SETTINGS_DAEMON_CFLAGS"; then
+- pkg_cv_GNOME_SETTINGS_DAEMON_CFLAGS="$GNOME_SETTINGS_DAEMON_CFLAGS"
+- else
+- if test -n "$PKG_CONFIG" && \
++if test -n "$GNOME_SETTINGS_DAEMON_CFLAGS"; then
++ pkg_cv_GNOME_SETTINGS_DAEMON_CFLAGS="$GNOME_SETTINGS_DAEMON_CFLAGS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnome-settings-daemon\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "gnome-settings-daemon") 2>&5
+ ac_status=$?
+@@ -13939,15 +14004,13 @@ if test -n "$PKG_CONFIG"; then
+ else
+ pkg_failed=yes
+ fi
+- fi
+-else
+- pkg_failed=untried
++ else
++ pkg_failed=untried
+ fi
+-if test -n "$PKG_CONFIG"; then
+- if test -n "$GNOME_SETTINGS_DAEMON_LIBS"; then
+- pkg_cv_GNOME_SETTINGS_DAEMON_LIBS="$GNOME_SETTINGS_DAEMON_LIBS"
+- else
+- if test -n "$PKG_CONFIG" && \
++if test -n "$GNOME_SETTINGS_DAEMON_LIBS"; then
++ pkg_cv_GNOME_SETTINGS_DAEMON_LIBS="$GNOME_SETTINGS_DAEMON_LIBS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnome-settings-daemon\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "gnome-settings-daemon") 2>&5
+ ac_status=$?
+@@ -13957,14 +14020,15 @@ if test -n "$PKG_CONFIG"; then
+ else
+ pkg_failed=yes
+ fi
+- fi
+-else
+- pkg_failed=untried
++ else
++ pkg_failed=untried
+ fi
+
+
+
+ if test $pkg_failed = yes; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+@@ -13972,17 +14036,17 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- GNOME_SETTINGS_DAEMON_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gnome-settings-daemon"`
++ GNOME_SETTINGS_DAEMON_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gnome-settings-daemon" 2>&1`
+ else
+- GNOME_SETTINGS_DAEMON_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gnome-settings-daemon"`
++ GNOME_SETTINGS_DAEMON_PKG_ERRORS=`$PKG_CONFIG --print-errors "gnome-settings-daemon" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$GNOME_SETTINGS_DAEMON_PKG_ERRORS" >&5
+
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+- HAVE_GNOME_SETTINGS_DAEMON=no
++ HAVE_GNOME_SETTINGS_DAEMON=no
+ elif test $pkg_failed = untried; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+ HAVE_GNOME_SETTINGS_DAEMON=no
+ else
+ GNOME_SETTINGS_DAEMON_CFLAGS=$pkg_cv_GNOME_SETTINGS_DAEMON_CFLAGS
+@@ -14005,11 +14069,10 @@ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBWNCK" >&5
+ $as_echo_n "checking for LIBWNCK... " >&6; }
+
+-if test -n "$PKG_CONFIG"; then
+- if test -n "$LIBWNCK_CFLAGS"; then
+- pkg_cv_LIBWNCK_CFLAGS="$LIBWNCK_CFLAGS"
+- else
+- if test -n "$PKG_CONFIG" && \
++if test -n "$LIBWNCK_CFLAGS"; then
++ pkg_cv_LIBWNCK_CFLAGS="$LIBWNCK_CFLAGS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libwnck-1.0 >= \$LIBWNCK_REQUIRED\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libwnck-1.0 >= $LIBWNCK_REQUIRED") 2>&5
+ ac_status=$?
+@@ -14019,15 +14082,13 @@ if test -n "$PKG_CONFIG"; then
+ else
+ pkg_failed=yes
+ fi
+- fi
+-else
+- pkg_failed=untried
++ else
++ pkg_failed=untried
+ fi
+-if test -n "$PKG_CONFIG"; then
+- if test -n "$LIBWNCK_LIBS"; then
+- pkg_cv_LIBWNCK_LIBS="$LIBWNCK_LIBS"
+- else
+- if test -n "$PKG_CONFIG" && \
++if test -n "$LIBWNCK_LIBS"; then
++ pkg_cv_LIBWNCK_LIBS="$LIBWNCK_LIBS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libwnck-1.0 >= \$LIBWNCK_REQUIRED\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libwnck-1.0 >= $LIBWNCK_REQUIRED") 2>&5
+ ac_status=$?
+@@ -14037,14 +14098,15 @@ if test -n "$PKG_CONFIG"; then
+ else
+ pkg_failed=yes
+ fi
+- fi
+-else
+- pkg_failed=untried
++ else
++ pkg_failed=untried
+ fi
+
+
+
+ if test $pkg_failed = yes; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+@@ -14052,18 +14114,18 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- LIBWNCK_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libwnck-1.0 >= $LIBWNCK_REQUIRED"`
++ LIBWNCK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libwnck-1.0 >= $LIBWNCK_REQUIRED" 2>&1`
+ else
+- LIBWNCK_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libwnck-1.0 >= $LIBWNCK_REQUIRED"`
++ LIBWNCK_PKG_ERRORS=`$PKG_CONFIG --print-errors "libwnck-1.0 >= $LIBWNCK_REQUIRED" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$LIBWNCK_PKG_ERRORS" >&5
+
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+- { as_fn_set_status 1
++ { as_fn_set_status 1
+ as_fn_error "libwnck is required to build gnome-applets." "$LINENO" 5; }
+ elif test $pkg_failed = untried; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+ { as_fn_set_status 1
+ as_fn_error "libwnck is required to build gnome-applets." "$LINENO" 5; }
+ else
+@@ -14071,7 +14133,7 @@ else
+ LIBWNCK_LIBS=$pkg_cv_LIBWNCK_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+- :
++
+ fi
+
+
+@@ -14084,11 +14146,10 @@ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBNOTIFY" >&5
+ $as_echo_n "checking for LIBNOTIFY... " >&6; }
+
+-if test -n "$PKG_CONFIG"; then
+- if test -n "$LIBNOTIFY_CFLAGS"; then
+- pkg_cv_LIBNOTIFY_CFLAGS="$LIBNOTIFY_CFLAGS"
+- else
+- if test -n "$PKG_CONFIG" && \
++if test -n "$LIBNOTIFY_CFLAGS"; then
++ pkg_cv_LIBNOTIFY_CFLAGS="$LIBNOTIFY_CFLAGS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnotify >= \$LIBNOTIFY_REQUIRED\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libnotify >= $LIBNOTIFY_REQUIRED") 2>&5
+ ac_status=$?
+@@ -14098,15 +14159,13 @@ if test -n "$PKG_CONFIG"; then
+ else
+ pkg_failed=yes
+ fi
+- fi
+-else
+- pkg_failed=untried
++ else
++ pkg_failed=untried
+ fi
+-if test -n "$PKG_CONFIG"; then
+- if test -n "$LIBNOTIFY_LIBS"; then
+- pkg_cv_LIBNOTIFY_LIBS="$LIBNOTIFY_LIBS"
+- else
+- if test -n "$PKG_CONFIG" && \
++if test -n "$LIBNOTIFY_LIBS"; then
++ pkg_cv_LIBNOTIFY_LIBS="$LIBNOTIFY_LIBS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnotify >= \$LIBNOTIFY_REQUIRED\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libnotify >= $LIBNOTIFY_REQUIRED") 2>&5
+ ac_status=$?
+@@ -14116,14 +14175,15 @@ if test -n "$PKG_CONFIG"; then
+ else
+ pkg_failed=yes
+ fi
+- fi
+-else
+- pkg_failed=untried
++ else
++ pkg_failed=untried
+ fi
+
+
+
+ if test $pkg_failed = yes; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+@@ -14131,17 +14191,17 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- LIBNOTIFY_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libnotify >= $LIBNOTIFY_REQUIRED"`
++ LIBNOTIFY_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libnotify >= $LIBNOTIFY_REQUIRED" 2>&1`
+ else
+- LIBNOTIFY_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libnotify >= $LIBNOTIFY_REQUIRED"`
++ LIBNOTIFY_PKG_ERRORS=`$PKG_CONFIG --print-errors "libnotify >= $LIBNOTIFY_REQUIRED" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$LIBNOTIFY_PKG_ERRORS" >&5
+
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+- HAVE_LIBNOTIFY="no"
++ HAVE_LIBNOTIFY="no"
+ elif test $pkg_failed = untried; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+ HAVE_LIBNOTIFY="no"
+ else
+ LIBNOTIFY_CFLAGS=$pkg_cv_LIBNOTIFY_CFLAGS
+@@ -14165,11 +14225,10 @@ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CPUFREQ_SELECTOR" >&5
+ $as_echo_n "checking for CPUFREQ_SELECTOR... " >&6; }
+
+-if test -n "$PKG_CONFIG"; then
+- if test -n "$CPUFREQ_SELECTOR_CFLAGS"; then
+- pkg_cv_CPUFREQ_SELECTOR_CFLAGS="$CPUFREQ_SELECTOR_CFLAGS"
+- else
+- if test -n "$PKG_CONFIG" && \
++if test -n "$CPUFREQ_SELECTOR_CFLAGS"; then
++ pkg_cv_CPUFREQ_SELECTOR_CFLAGS="$CPUFREQ_SELECTOR_CFLAGS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQUIRED gobject-2.0 >= \$GLIB_REQUIRED\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED") 2>&5
+ ac_status=$?
+@@ -14179,15 +14238,13 @@ if test -n "$PKG_CONFIG"; then
+ else
+ pkg_failed=yes
+ fi
+- fi
+-else
+- pkg_failed=untried
++ else
++ pkg_failed=untried
+ fi
+-if test -n "$PKG_CONFIG"; then
+- if test -n "$CPUFREQ_SELECTOR_LIBS"; then
+- pkg_cv_CPUFREQ_SELECTOR_LIBS="$CPUFREQ_SELECTOR_LIBS"
+- else
+- if test -n "$PKG_CONFIG" && \
++if test -n "$CPUFREQ_SELECTOR_LIBS"; then
++ pkg_cv_CPUFREQ_SELECTOR_LIBS="$CPUFREQ_SELECTOR_LIBS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQUIRED gobject-2.0 >= \$GLIB_REQUIRED\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED") 2>&5
+ ac_status=$?
+@@ -14197,14 +14254,15 @@ if test -n "$PKG_CONFIG"; then
+ else
+ pkg_failed=yes
+ fi
+- fi
+-else
+- pkg_failed=untried
++ else
++ pkg_failed=untried
+ fi
+
+
+
+ if test $pkg_failed = yes; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+@@ -14212,9 +14270,9 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- CPUFREQ_SELECTOR_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "glib-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED"`
++ CPUFREQ_SELECTOR_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "glib-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED" 2>&1`
+ else
+- CPUFREQ_SELECTOR_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glib-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED"`
++ CPUFREQ_SELECTOR_PKG_ERRORS=`$PKG_CONFIG --print-errors "glib-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$CPUFREQ_SELECTOR_PKG_ERRORS" >&5
+@@ -14228,9 +14286,10 @@ installed software in a non-standard pre
+
+ Alternatively, you may set the environment variables CPUFREQ_SELECTOR_CFLAGS
+ and CPUFREQ_SELECTOR_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-" "$LINENO" 5
++See the pkg-config man page for more details." "$LINENO" 5
+ elif test $pkg_failed = untried; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+ as_fn_error "The pkg-config script could not be found or is too old. Make sure it
+@@ -14248,7 +14307,7 @@ else
+ CPUFREQ_SELECTOR_LIBS=$pkg_cv_CPUFREQ_SELECTOR_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+- :
++
+ fi
+
+
+@@ -14258,11 +14317,10 @@ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DBUS" >&5
+ $as_echo_n "checking for DBUS... " >&6; }
+
+-if test -n "$PKG_CONFIG"; then
+- if test -n "$DBUS_CFLAGS"; then
+- pkg_cv_DBUS_CFLAGS="$DBUS_CFLAGS"
+- else
+- if test -n "$PKG_CONFIG" && \
++if test -n "$DBUS_CFLAGS"; then
++ pkg_cv_DBUS_CFLAGS="$DBUS_CFLAGS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-1 >= \$DBUS_REQUIRED dbus-glib-1 >= \$DBUS_GLIB_REQUIRED\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "dbus-1 >= $DBUS_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED") 2>&5
+ ac_status=$?
+@@ -14272,15 +14330,13 @@ if test -n "$PKG_CONFIG"; then
+ else
+ pkg_failed=yes
+ fi
+- fi
+-else
+- pkg_failed=untried
++ else
++ pkg_failed=untried
+ fi
+-if test -n "$PKG_CONFIG"; then
+- if test -n "$DBUS_LIBS"; then
+- pkg_cv_DBUS_LIBS="$DBUS_LIBS"
+- else
+- if test -n "$PKG_CONFIG" && \
++if test -n "$DBUS_LIBS"; then
++ pkg_cv_DBUS_LIBS="$DBUS_LIBS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-1 >= \$DBUS_REQUIRED dbus-glib-1 >= \$DBUS_GLIB_REQUIRED\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "dbus-1 >= $DBUS_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED") 2>&5
+ ac_status=$?
+@@ -14290,14 +14346,15 @@ if test -n "$PKG_CONFIG"; then
+ else
+ pkg_failed=yes
+ fi
+- fi
+-else
+- pkg_failed=untried
++ else
++ pkg_failed=untried
+ fi
+
+
+
+ if test $pkg_failed = yes; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+@@ -14305,17 +14362,17 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- DBUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "dbus-1 >= $DBUS_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED"`
++ DBUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "dbus-1 >= $DBUS_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED" 2>&1`
+ else
+- DBUS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "dbus-1 >= $DBUS_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED"`
++ DBUS_PKG_ERRORS=`$PKG_CONFIG --print-errors "dbus-1 >= $DBUS_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$DBUS_PKG_ERRORS" >&5
+
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+- HAVE_DBUS=no
++ HAVE_DBUS=no
+ elif test $pkg_failed = untried; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+ HAVE_DBUS=no
+ else
+ DBUS_CFLAGS=$pkg_cv_DBUS_CFLAGS
+@@ -14343,11 +14400,10 @@ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for POLKIT" >&5
+ $as_echo_n "checking for POLKIT... " >&6; }
+
+-if test -n "$PKG_CONFIG"; then
+- if test -n "$POLKIT_CFLAGS"; then
+- pkg_cv_POLKIT_CFLAGS="$POLKIT_CFLAGS"
+- else
+- if test -n "$PKG_CONFIG" && \
++if test -n "$POLKIT_CFLAGS"; then
++ pkg_cv_POLKIT_CFLAGS="$POLKIT_CFLAGS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"polkit-gobject-1 >= \$POLKIT_REQUIRED dbus-glib-1 >= \$DBUS_GLIB_REQUIRED\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "polkit-gobject-1 >= $POLKIT_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED") 2>&5
+ ac_status=$?
+@@ -14357,15 +14413,13 @@ if test -n "$PKG_CONFIG"; then
+ else
+ pkg_failed=yes
+ fi
+- fi
+-else
+- pkg_failed=untried
++ else
++ pkg_failed=untried
+ fi
+-if test -n "$PKG_CONFIG"; then
+- if test -n "$POLKIT_LIBS"; then
+- pkg_cv_POLKIT_LIBS="$POLKIT_LIBS"
+- else
+- if test -n "$PKG_CONFIG" && \
++if test -n "$POLKIT_LIBS"; then
++ pkg_cv_POLKIT_LIBS="$POLKIT_LIBS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"polkit-gobject-1 >= \$POLKIT_REQUIRED dbus-glib-1 >= \$DBUS_GLIB_REQUIRED\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "polkit-gobject-1 >= $POLKIT_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED") 2>&5
+ ac_status=$?
+@@ -14375,14 +14429,15 @@ if test -n "$PKG_CONFIG"; then
+ else
+ pkg_failed=yes
+ fi
+- fi
+-else
+- pkg_failed=untried
++ else
++ pkg_failed=untried
+ fi
+
+
+
+ if test $pkg_failed = yes; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+@@ -14390,17 +14445,17 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- POLKIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "polkit-gobject-1 >= $POLKIT_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED"`
++ POLKIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "polkit-gobject-1 >= $POLKIT_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED" 2>&1`
+ else
+- POLKIT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "polkit-gobject-1 >= $POLKIT_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED"`
++ POLKIT_PKG_ERRORS=`$PKG_CONFIG --print-errors "polkit-gobject-1 >= $POLKIT_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$POLKIT_PKG_ERRORS" >&5
+
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+- HAVE_POLKIT=no
++ HAVE_POLKIT=no
+ elif test $pkg_failed = untried; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+ HAVE_POLKIT=no
+ else
+ POLKIT_CFLAGS=$pkg_cv_POLKIT_CFLAGS
+@@ -14448,11 +14503,10 @@ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for HAL" >&5
+ $as_echo_n "checking for HAL... " >&6; }
+
+-if test -n "$PKG_CONFIG"; then
+- if test -n "$HAL_CFLAGS"; then
+- pkg_cv_HAL_CFLAGS="$HAL_CFLAGS"
+- else
+- if test -n "$PKG_CONFIG" && \
++if test -n "$HAL_CFLAGS"; then
++ pkg_cv_HAL_CFLAGS="$HAL_CFLAGS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"hal >= \$HAL_REQUIRED dbus-glib-1 >= \$DBUS_GLIB_REQUIRED\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "hal >= $HAL_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED") 2>&5
+ ac_status=$?
+@@ -14462,15 +14516,13 @@ if test -n "$PKG_CONFIG"; then
+ else
+ pkg_failed=yes
+ fi
+- fi
+-else
+- pkg_failed=untried
++ else
++ pkg_failed=untried
+ fi
+-if test -n "$PKG_CONFIG"; then
+- if test -n "$HAL_LIBS"; then
+- pkg_cv_HAL_LIBS="$HAL_LIBS"
+- else
+- if test -n "$PKG_CONFIG" && \
++if test -n "$HAL_LIBS"; then
++ pkg_cv_HAL_LIBS="$HAL_LIBS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"hal >= \$HAL_REQUIRED dbus-glib-1 >= \$DBUS_GLIB_REQUIRED\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "hal >= $HAL_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED") 2>&5
+ ac_status=$?
+@@ -14480,14 +14532,15 @@ if test -n "$PKG_CONFIG"; then
+ else
+ pkg_failed=yes
+ fi
+- fi
+-else
+- pkg_failed=untried
++ else
++ pkg_failed=untried
+ fi
+
+
+
+ if test $pkg_failed = yes; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+@@ -14495,17 +14548,17 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- HAL_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "hal >= $HAL_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED"`
++ HAL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "hal >= $HAL_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED" 2>&1`
+ else
+- HAL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "hal >= $HAL_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED"`
++ HAL_PKG_ERRORS=`$PKG_CONFIG --print-errors "hal >= $HAL_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$HAL_PKG_ERRORS" >&5
+
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+- HAVE_HAL="no"
++ HAVE_HAL="no"
+ elif test $pkg_failed = untried; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+ HAVE_HAL="no"
+ else
+ HAL_CFLAGS=$pkg_cv_HAL_CFLAGS
+@@ -14528,6 +14581,99 @@ fi
+
+
+
++UPOWER_CFLAGS=
++UPOWER_LIBS=
++
++# Check whether --with-upower was given.
++if test "${with_upower+set}" = set; then :
++ withval=$with_upower;
++fi
++
++
++if test "x$with_upower" != xno; then
++
++pkg_failed=no
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for UPOWER" >&5
++$as_echo_n "checking for UPOWER... " >&6; }
++
++if test -n "$UPOWER_CFLAGS"; then
++ pkg_cv_UPOWER_CFLAGS="$UPOWER_CFLAGS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"upower-glib >= \$UPOWER_REQUIRED\""; } >&5
++ ($PKG_CONFIG --exists --print-errors "upower-glib >= $UPOWER_REQUIRED") 2>&5
++ ac_status=$?
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; }; then
++ pkg_cv_UPOWER_CFLAGS=`$PKG_CONFIG --cflags "upower-glib >= $UPOWER_REQUIRED" 2>/dev/null`
++else
++ pkg_failed=yes
++fi
++ else
++ pkg_failed=untried
++fi
++if test -n "$UPOWER_LIBS"; then
++ pkg_cv_UPOWER_LIBS="$UPOWER_LIBS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"upower-glib >= \$UPOWER_REQUIRED\""; } >&5
++ ($PKG_CONFIG --exists --print-errors "upower-glib >= $UPOWER_REQUIRED") 2>&5
++ ac_status=$?
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; }; then
++ pkg_cv_UPOWER_LIBS=`$PKG_CONFIG --libs "upower-glib >= $UPOWER_REQUIRED" 2>/dev/null`
++else
++ pkg_failed=yes
++fi
++ else
++ pkg_failed=untried
++fi
++
++
++
++if test $pkg_failed = yes; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++
++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
++ _pkg_short_errors_supported=yes
++else
++ _pkg_short_errors_supported=no
++fi
++ if test $_pkg_short_errors_supported = yes; then
++ UPOWER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "upower-glib >= $UPOWER_REQUIRED" 2>&1`
++ else
++ UPOWER_PKG_ERRORS=`$PKG_CONFIG --print-errors "upower-glib >= $UPOWER_REQUIRED" 2>&1`
++ fi
++ # Put the nasty error message in config.log where it belongs
++ echo "$UPOWER_PKG_ERRORS" >&5
++
++ HAVE_UPOWER="no"
++elif test $pkg_failed = untried; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++ HAVE_UPOWER="no"
++else
++ UPOWER_CFLAGS=$pkg_cv_UPOWER_CFLAGS
++ UPOWER_LIBS=$pkg_cv_UPOWER_LIBS
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }
++ HAVE_UPOWER="yes"
++fi
++
++ if test "x$HAVE_UPOWER" = "xyes"; then
++
++$as_echo "#define HAVE_UPOWER 1" >>confdefs.h
++
++ fi
++else
++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"upower support disabled\"" >&5
++$as_echo "$as_me: WARNING: \"upower support disabled\"" >&2;}
++fi
++
++
++
++
+
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gucharmap-2 >= \$GUCHARMAP2_REQUIRED\""; } >&5
+@@ -14545,11 +14691,10 @@ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GUCHARMAP" >&5
+ $as_echo_n "checking for GUCHARMAP... " >&6; }
+
+-if test -n "$PKG_CONFIG"; then
+- if test -n "$GUCHARMAP_CFLAGS"; then
+- pkg_cv_GUCHARMAP_CFLAGS="$GUCHARMAP_CFLAGS"
+- else
+- if test -n "$PKG_CONFIG" && \
++if test -n "$GUCHARMAP_CFLAGS"; then
++ pkg_cv_GUCHARMAP_CFLAGS="$GUCHARMAP_CFLAGS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gucharmap-2 >= \$GUCHARMAP2_REQUIRED\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "gucharmap-2 >= $GUCHARMAP2_REQUIRED") 2>&5
+ ac_status=$?
+@@ -14559,15 +14704,13 @@ if test -n "$PKG_CONFIG"; then
+ else
+ pkg_failed=yes
+ fi
+- fi
+-else
+- pkg_failed=untried
++ else
++ pkg_failed=untried
+ fi
+-if test -n "$PKG_CONFIG"; then
+- if test -n "$GUCHARMAP_LIBS"; then
+- pkg_cv_GUCHARMAP_LIBS="$GUCHARMAP_LIBS"
+- else
+- if test -n "$PKG_CONFIG" && \
++if test -n "$GUCHARMAP_LIBS"; then
++ pkg_cv_GUCHARMAP_LIBS="$GUCHARMAP_LIBS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gucharmap-2 >= \$GUCHARMAP2_REQUIRED\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "gucharmap-2 >= $GUCHARMAP2_REQUIRED") 2>&5
+ ac_status=$?
+@@ -14577,14 +14720,15 @@ if test -n "$PKG_CONFIG"; then
+ else
+ pkg_failed=yes
+ fi
+- fi
+-else
+- pkg_failed=untried
++ else
++ pkg_failed=untried
+ fi
+
+
+
+ if test $pkg_failed = yes; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+@@ -14592,9 +14736,9 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- GUCHARMAP_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gucharmap-2 >= $GUCHARMAP2_REQUIRED"`
++ GUCHARMAP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gucharmap-2 >= $GUCHARMAP2_REQUIRED" 2>&1`
+ else
+- GUCHARMAP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gucharmap-2 >= $GUCHARMAP2_REQUIRED"`
++ GUCHARMAP_PKG_ERRORS=`$PKG_CONFIG --print-errors "gucharmap-2 >= $GUCHARMAP2_REQUIRED" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$GUCHARMAP_PKG_ERRORS" >&5
+@@ -14608,9 +14752,10 @@ installed software in a non-standard pre
+
+ Alternatively, you may set the environment variables GUCHARMAP_CFLAGS
+ and GUCHARMAP_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-" "$LINENO" 5
++See the pkg-config man page for more details." "$LINENO" 5
+ elif test $pkg_failed = untried; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+ as_fn_error "The pkg-config script could not be found or is too old. Make sure it
+@@ -14628,7 +14773,7 @@ else
+ GUCHARMAP_LIBS=$pkg_cv_GUCHARMAP_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+- :
++
+ fi
+ else
+
+@@ -14636,11 +14781,10 @@ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GUCHARMAP" >&5
+ $as_echo_n "checking for GUCHARMAP... " >&6; }
+
+-if test -n "$PKG_CONFIG"; then
+- if test -n "$GUCHARMAP_CFLAGS"; then
+- pkg_cv_GUCHARMAP_CFLAGS="$GUCHARMAP_CFLAGS"
+- else
+- if test -n "$PKG_CONFIG" && \
++if test -n "$GUCHARMAP_CFLAGS"; then
++ pkg_cv_GUCHARMAP_CFLAGS="$GUCHARMAP_CFLAGS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gucharmap >= \$GUCHARMAP_REQUIRED\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "gucharmap >= $GUCHARMAP_REQUIRED") 2>&5
+ ac_status=$?
+@@ -14650,15 +14794,13 @@ if test -n "$PKG_CONFIG"; then
+ else
+ pkg_failed=yes
+ fi
+- fi
+-else
+- pkg_failed=untried
++ else
++ pkg_failed=untried
+ fi
+-if test -n "$PKG_CONFIG"; then
+- if test -n "$GUCHARMAP_LIBS"; then
+- pkg_cv_GUCHARMAP_LIBS="$GUCHARMAP_LIBS"
+- else
+- if test -n "$PKG_CONFIG" && \
++if test -n "$GUCHARMAP_LIBS"; then
++ pkg_cv_GUCHARMAP_LIBS="$GUCHARMAP_LIBS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gucharmap >= \$GUCHARMAP_REQUIRED\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "gucharmap >= $GUCHARMAP_REQUIRED") 2>&5
+ ac_status=$?
+@@ -14668,14 +14810,15 @@ if test -n "$PKG_CONFIG"; then
+ else
+ pkg_failed=yes
+ fi
+- fi
+-else
+- pkg_failed=untried
++ else
++ pkg_failed=untried
+ fi
+
+
+
+ if test $pkg_failed = yes; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+@@ -14683,17 +14826,17 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- GUCHARMAP_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gucharmap >= $GUCHARMAP_REQUIRED"`
++ GUCHARMAP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gucharmap >= $GUCHARMAP_REQUIRED" 2>&1`
+ else
+- GUCHARMAP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gucharmap >= $GUCHARMAP_REQUIRED"`
++ GUCHARMAP_PKG_ERRORS=`$PKG_CONFIG --print-errors "gucharmap >= $GUCHARMAP_REQUIRED" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$GUCHARMAP_PKG_ERRORS" >&5
+
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+- have_gucharmap=no
++ have_gucharmap=no
+ elif test $pkg_failed = untried; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+ have_gucharmap=no
+ else
+ GUCHARMAP_CFLAGS=$pkg_cv_GUCHARMAP_CFLAGS
+@@ -14727,11 +14870,10 @@ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PYGTK" >&5
+ $as_echo_n "checking for PYGTK... " >&6; }
+
+-if test -n "$PKG_CONFIG"; then
+- if test -n "$PYGTK_CFLAGS"; then
+- pkg_cv_PYGTK_CFLAGS="$PYGTK_CFLAGS"
+- else
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PYGTK_CFLAGS"; then
++ pkg_cv_PYGTK_CFLAGS="$PYGTK_CFLAGS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"pygtk-2.0 >= \$PYGTK_REQUIRED
+ pygobject-2.0 >= \$PYGOBJECT_REQUIRED
+ gnome-python-2.0 >= \$GNOME_PYTHON_REQUIRED\""; } >&5
+@@ -14747,15 +14889,13 @@ if test -n "$PKG_CONFIG"; then
+ else
+ pkg_failed=yes
+ fi
+- fi
+-else
+- pkg_failed=untried
++ else
++ pkg_failed=untried
+ fi
+-if test -n "$PKG_CONFIG"; then
+- if test -n "$PYGTK_LIBS"; then
+- pkg_cv_PYGTK_LIBS="$PYGTK_LIBS"
+- else
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PYGTK_LIBS"; then
++ pkg_cv_PYGTK_LIBS="$PYGTK_LIBS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"pygtk-2.0 >= \$PYGTK_REQUIRED
+ pygobject-2.0 >= \$PYGOBJECT_REQUIRED
+ gnome-python-2.0 >= \$GNOME_PYTHON_REQUIRED\""; } >&5
+@@ -14771,14 +14911,15 @@ if test -n "$PKG_CONFIG"; then
+ else
+ pkg_failed=yes
+ fi
+- fi
+-else
+- pkg_failed=untried
++ else
++ pkg_failed=untried
+ fi
+
+
+
+ if test $pkg_failed = yes; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+@@ -14786,21 +14927,21 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- PYGTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "pygtk-2.0 >= $PYGTK_REQUIRED
++ PYGTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "pygtk-2.0 >= $PYGTK_REQUIRED
+ pygobject-2.0 >= $PYGOBJECT_REQUIRED
+- gnome-python-2.0 >= $GNOME_PYTHON_REQUIRED"`
++ gnome-python-2.0 >= $GNOME_PYTHON_REQUIRED" 2>&1`
+ else
+- PYGTK_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "pygtk-2.0 >= $PYGTK_REQUIRED
++ PYGTK_PKG_ERRORS=`$PKG_CONFIG --print-errors "pygtk-2.0 >= $PYGTK_REQUIRED
+ pygobject-2.0 >= $PYGOBJECT_REQUIRED
+- gnome-python-2.0 >= $GNOME_PYTHON_REQUIRED"`
++ gnome-python-2.0 >= $GNOME_PYTHON_REQUIRED" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$PYGTK_PKG_ERRORS" >&5
+
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+- HAVE_PYGTK="no"
++ HAVE_PYGTK="no"
+ elif test $pkg_failed = untried; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+ HAVE_PYGTK="no"
+ else
+ PYGTK_CFLAGS=$pkg_cv_PYGTK_CFLAGS
+@@ -14817,11 +14958,10 @@ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XML2" >&5
+ $as_echo_n "checking for XML2... " >&6; }
+
+-if test -n "$PKG_CONFIG"; then
+- if test -n "$XML2_CFLAGS"; then
+- pkg_cv_XML2_CFLAGS="$XML2_CFLAGS"
+- else
+- if test -n "$PKG_CONFIG" && \
++if test -n "$XML2_CFLAGS"; then
++ pkg_cv_XML2_CFLAGS="$XML2_CFLAGS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= \$LIBXML_REQUIRED\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libxml-2.0 >= $LIBXML_REQUIRED") 2>&5
+ ac_status=$?
+@@ -14831,15 +14971,13 @@ if test -n "$PKG_CONFIG"; then
+ else
+ pkg_failed=yes
+ fi
+- fi
+-else
+- pkg_failed=untried
++ else
++ pkg_failed=untried
+ fi
+-if test -n "$PKG_CONFIG"; then
+- if test -n "$XML2_LIBS"; then
+- pkg_cv_XML2_LIBS="$XML2_LIBS"
+- else
+- if test -n "$PKG_CONFIG" && \
++if test -n "$XML2_LIBS"; then
++ pkg_cv_XML2_LIBS="$XML2_LIBS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= \$LIBXML_REQUIRED\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libxml-2.0 >= $LIBXML_REQUIRED") 2>&5
+ ac_status=$?
+@@ -14849,14 +14987,15 @@ if test -n "$PKG_CONFIG"; then
+ else
+ pkg_failed=yes
+ fi
+- fi
+-else
+- pkg_failed=untried
++ else
++ pkg_failed=untried
+ fi
+
+
+
+ if test $pkg_failed = yes; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+@@ -14864,9 +15003,9 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- XML2_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libxml-2.0 >= $LIBXML_REQUIRED"`
++ XML2_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libxml-2.0 >= $LIBXML_REQUIRED" 2>&1`
+ else
+- XML2_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libxml-2.0 >= $LIBXML_REQUIRED"`
++ XML2_PKG_ERRORS=`$PKG_CONFIG --print-errors "libxml-2.0 >= $LIBXML_REQUIRED" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$XML2_PKG_ERRORS" >&5
+@@ -14880,9 +15019,10 @@ installed software in a non-standard pre
+
+ Alternatively, you may set the environment variables XML2_CFLAGS
+ and XML2_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-" "$LINENO" 5
++See the pkg-config man page for more details." "$LINENO" 5
+ elif test $pkg_failed = untried; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+ as_fn_error "The pkg-config script could not be found or is too old. Make sure it
+@@ -14900,7 +15040,7 @@ else
+ XML2_LIBS=$pkg_cv_XML2_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+- :
++
+ fi
+
+
+@@ -14911,11 +15051,10 @@ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBGWEATHER" >&5
+ $as_echo_n "checking for LIBGWEATHER... " >&6; }
+
+-if test -n "$PKG_CONFIG"; then
+- if test -n "$LIBGWEATHER_CFLAGS"; then
+- pkg_cv_LIBGWEATHER_CFLAGS="$LIBGWEATHER_CFLAGS"
+- else
+- if test -n "$PKG_CONFIG" && \
++if test -n "$LIBGWEATHER_CFLAGS"; then
++ pkg_cv_LIBGWEATHER_CFLAGS="$LIBGWEATHER_CFLAGS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gweather >= \$GWEATHER_REQUIRED\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "gweather >= $GWEATHER_REQUIRED") 2>&5
+ ac_status=$?
+@@ -14925,15 +15064,13 @@ if test -n "$PKG_CONFIG"; then
+ else
+ pkg_failed=yes
+ fi
+- fi
+-else
+- pkg_failed=untried
++ else
++ pkg_failed=untried
+ fi
+-if test -n "$PKG_CONFIG"; then
+- if test -n "$LIBGWEATHER_LIBS"; then
+- pkg_cv_LIBGWEATHER_LIBS="$LIBGWEATHER_LIBS"
+- else
+- if test -n "$PKG_CONFIG" && \
++if test -n "$LIBGWEATHER_LIBS"; then
++ pkg_cv_LIBGWEATHER_LIBS="$LIBGWEATHER_LIBS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gweather >= \$GWEATHER_REQUIRED\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "gweather >= $GWEATHER_REQUIRED") 2>&5
+ ac_status=$?
+@@ -14943,14 +15080,15 @@ if test -n "$PKG_CONFIG"; then
+ else
+ pkg_failed=yes
+ fi
+- fi
+-else
+- pkg_failed=untried
++ else
++ pkg_failed=untried
+ fi
+
+
+
+ if test $pkg_failed = yes; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+@@ -14958,18 +15096,18 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- LIBGWEATHER_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gweather >= $GWEATHER_REQUIRED"`
++ LIBGWEATHER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gweather >= $GWEATHER_REQUIRED" 2>&1`
+ else
+- LIBGWEATHER_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gweather >= $GWEATHER_REQUIRED"`
++ LIBGWEATHER_PKG_ERRORS=`$PKG_CONFIG --print-errors "gweather >= $GWEATHER_REQUIRED" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$LIBGWEATHER_PKG_ERRORS" >&5
+
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libgweather not found. Not building the weather applet." >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libgweather not found. Not building the weather applet." >&5
+ $as_echo "$as_me: WARNING: libgweather not found. Not building the weather applet." >&2;}
+ elif test $pkg_failed = untried; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libgweather not found. Not building the weather applet." >&5
+ $as_echo "$as_me: WARNING: libgweather not found. Not building the weather applet." >&2;}
+ else
+@@ -15005,11 +15143,10 @@ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for NETWORKMANAGER" >&5
+ $as_echo_n "checking for NETWORKMANAGER... " >&6; }
+
+-if test -n "$PKG_CONFIG"; then
+- if test -n "$NETWORKMANAGER_CFLAGS"; then
+- pkg_cv_NETWORKMANAGER_CFLAGS="$NETWORKMANAGER_CFLAGS"
+- else
+- if test -n "$PKG_CONFIG" && \
++if test -n "$NETWORKMANAGER_CFLAGS"; then
++ pkg_cv_NETWORKMANAGER_CFLAGS="$NETWORKMANAGER_CFLAGS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"NetworkManager >= \$NETWORKMANAGER_REQUIRED\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "NetworkManager >= $NETWORKMANAGER_REQUIRED") 2>&5
+ ac_status=$?
+@@ -15019,15 +15156,13 @@ if test -n "$PKG_CONFIG"; then
+ else
+ pkg_failed=yes
+ fi
+- fi
+-else
+- pkg_failed=untried
++ else
++ pkg_failed=untried
+ fi
+-if test -n "$PKG_CONFIG"; then
+- if test -n "$NETWORKMANAGER_LIBS"; then
+- pkg_cv_NETWORKMANAGER_LIBS="$NETWORKMANAGER_LIBS"
+- else
+- if test -n "$PKG_CONFIG" && \
++if test -n "$NETWORKMANAGER_LIBS"; then
++ pkg_cv_NETWORKMANAGER_LIBS="$NETWORKMANAGER_LIBS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"NetworkManager >= \$NETWORKMANAGER_REQUIRED\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "NetworkManager >= $NETWORKMANAGER_REQUIRED") 2>&5
+ ac_status=$?
+@@ -15037,14 +15172,15 @@ if test -n "$PKG_CONFIG"; then
+ else
+ pkg_failed=yes
+ fi
+- fi
+-else
+- pkg_failed=untried
++ else
++ pkg_failed=untried
+ fi
+
+
+
+ if test $pkg_failed = yes; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+@@ -15052,17 +15188,17 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- NETWORKMANAGER_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "NetworkManager >= $NETWORKMANAGER_REQUIRED"`
++ NETWORKMANAGER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "NetworkManager >= $NETWORKMANAGER_REQUIRED" 2>&1`
+ else
+- NETWORKMANAGER_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "NetworkManager >= $NETWORKMANAGER_REQUIRED"`
++ NETWORKMANAGER_PKG_ERRORS=`$PKG_CONFIG --print-errors "NetworkManager >= $NETWORKMANAGER_REQUIRED" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$NETWORKMANAGER_PKG_ERRORS" >&5
+
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+- HAVE_NETWORKMANAGER=no
++ HAVE_NETWORKMANAGER=no
+ elif test $pkg_failed = untried; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+ HAVE_NETWORKMANAGER=no
+ else
+ NETWORKMANAGER_CFLAGS=$pkg_cv_NETWORKMANAGER_CFLAGS
+@@ -15097,11 +15233,10 @@ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MIXER" >&5
+ $as_echo_n "checking for MIXER... " >&6; }
+
+-if test -n "$PKG_CONFIG"; then
+- if test -n "$MIXER_CFLAGS"; then
+- pkg_cv_MIXER_CFLAGS="$MIXER_CFLAGS"
+- else
+- if test -n "$PKG_CONFIG" && \
++if test -n "$MIXER_CFLAGS"; then
++ pkg_cv_MIXER_CFLAGS="$MIXER_CFLAGS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$GST10_PKGS\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "$GST10_PKGS") 2>&5
+ ac_status=$?
+@@ -15111,15 +15246,13 @@ if test -n "$PKG_CONFIG"; then
+ else
+ pkg_failed=yes
+ fi
+- fi
+-else
+- pkg_failed=untried
++ else
++ pkg_failed=untried
+ fi
+-if test -n "$PKG_CONFIG"; then
+- if test -n "$MIXER_LIBS"; then
+- pkg_cv_MIXER_LIBS="$MIXER_LIBS"
+- else
+- if test -n "$PKG_CONFIG" && \
++if test -n "$MIXER_LIBS"; then
++ pkg_cv_MIXER_LIBS="$MIXER_LIBS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$GST10_PKGS\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "$GST10_PKGS") 2>&5
+ ac_status=$?
+@@ -15129,14 +15262,15 @@ if test -n "$PKG_CONFIG"; then
+ else
+ pkg_failed=yes
+ fi
+- fi
+-else
+- pkg_failed=untried
++ else
++ pkg_failed=untried
+ fi
+
+
+
+ if test $pkg_failed = yes; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+@@ -15144,17 +15278,17 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- MIXER_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$GST10_PKGS"`
++ MIXER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$GST10_PKGS" 2>&1`
+ else
+- MIXER_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$GST10_PKGS"`
++ MIXER_PKG_ERRORS=`$PKG_CONFIG --print-errors "$GST10_PKGS" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$MIXER_PKG_ERRORS" >&5
+
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+- HAVE_GST=no
++ HAVE_GST=no
+ elif test $pkg_failed = untried; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+ HAVE_GST=no
+ else
+ MIXER_CFLAGS=$pkg_cv_MIXER_CFLAGS
+@@ -16583,95 +16717,88 @@ fi
CPPFLAGS=$savecppflags
@@ -947,11 +3181,10 @@
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for MODEMLIGHTS" >&5
+$as_echo_n "checking for MODEMLIGHTS... " >&6; }
+
-+if test -n "$PKG_CONFIG"; then
-+ if test -n "$MODEMLIGHTS_CFLAGS"; then
-+ pkg_cv_MODEMLIGHTS_CFLAGS="$MODEMLIGHTS_CFLAGS"
-+ else
-+ if test -n "$PKG_CONFIG" && \
++if test -n "$MODEMLIGHTS_CFLAGS"; then
++ pkg_cv_MODEMLIGHTS_CFLAGS="$MODEMLIGHTS_CFLAGS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"liboobs-1 >= \$LIBOOBS_REQUIRED\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "liboobs-1 >= $LIBOOBS_REQUIRED") 2>&5
+ ac_status=$?
@@ -965,29 +3198,26 @@
-if test -n "$SU_TOOL"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SU_TOOL" >&5
-$as_echo "$SU_TOOL" >&6; }
-+ fi
- else
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
--$as_echo "no" >&6; }
-+ pkg_failed=untried
++ else
++ pkg_failed=untried
+fi
-+if test -n "$PKG_CONFIG"; then
-+ if test -n "$MODEMLIGHTS_LIBS"; then
-+ pkg_cv_MODEMLIGHTS_LIBS="$MODEMLIGHTS_LIBS"
-+ else
-+ if test -n "$PKG_CONFIG" && \
++if test -n "$MODEMLIGHTS_LIBS"; then
++ pkg_cv_MODEMLIGHTS_LIBS="$MODEMLIGHTS_LIBS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"liboobs-1 >= \$LIBOOBS_REQUIRED\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "liboobs-1 >= $LIBOOBS_REQUIRED") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_MODEMLIGHTS_LIBS=`$PKG_CONFIG --libs "liboobs-1 >= $LIBOOBS_REQUIRED" 2>/dev/null`
-+else
+ else
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+ pkg_failed=yes
+fi
-+ fi
-+else
-+ pkg_failed=untried
++ else
++ pkg_failed=untried
fi
@@ -1019,6 +3249,8 @@
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_util_forkpty=yes
+if test $pkg_failed = yes; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
@@ -1035,17 +3267,17 @@
-if test "x$ac_cv_lib_util_forkpty" = x""yes; then :
- HAVE_LIBUTIL=true
+ if test $_pkg_short_errors_supported = yes; then
-+ MODEMLIGHTS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "liboobs-1 >= $LIBOOBS_REQUIRED"`
++ MODEMLIGHTS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "liboobs-1 >= $LIBOOBS_REQUIRED" 2>&1`
+ else
-+ MODEMLIGHTS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "liboobs-1 >= $LIBOOBS_REQUIRED"`
++ MODEMLIGHTS_PKG_ERRORS=`$PKG_CONFIG --print-errors "liboobs-1 >= $LIBOOBS_REQUIRED" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$MODEMLIGHTS_PKG_ERRORS" >&5
+
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++ HAVE_LIBOOBS=no
++elif test $pkg_failed = untried; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
-+ HAVE_LIBOOBS=no
-+elif test $pkg_failed = untried; then
+ HAVE_LIBOOBS=no
else
- HAVE_LIBUTIL=false
@@ -1069,7 +3301,7 @@
if test "x$BUILD_MODEM_LIGHTS" = "xyes"; then
APPLET_MODEMLIGHTS_TRUE=
-@@ -17807,7 +17854,7 @@
+@@ -17807,7 +17934,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_wri
# values after options handling.
ac_log="
This file was extended by gnome-applets $as_me 2.30.0, which was
@@ -1078,7 +3310,7 @@
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
-@@ -17847,6 +17894,7 @@
+@@ -17847,6 +17974,7 @@ Usage: $0 [OPTION]... [TAG]...
-h, --help print this help, then exit
-V, --version print version number and configuration settings, then exit
@@ -1086,7 +3318,7 @@
-q, --quiet, --silent
do not print progress messages
-d, --debug don't remove temporary files
-@@ -17869,10 +17917,11 @@
+@@ -17869,10 +17997,11 @@ Report bugs to the package provider."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
@@ -1100,7 +3332,7 @@
Copyright (C) 2009 Free Software Foundation, Inc.
This config.status script is free software; the Free Software Foundation
-@@ -17910,6 +17959,8 @@
+@@ -17910,6 +18039,8 @@ do
ac_cs_recheck=: ;;
--version | --versio | --versi | --vers | --ver | --ve | --v | -V )
$as_echo "$ac_cs_version"; exit ;;
@@ -1109,7 +3341,7 @@
--debug | --debu | --deb | --de | --d | -d )
debug=: ;;
--file | --fil | --fi | --f )
-@@ -18407,7 +18458,7 @@
+@@ -18407,7 +18538,7 @@ s/'"$ac_delim"'$//
t delim
:nl
h
@@ -1118,7 +3350,7 @@
t more1
s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
p
-@@ -18421,7 +18472,7 @@
+@@ -18421,7 +18552,7 @@ s/.\{148\}//
t nl
:delim
h
@@ -1127,16 +3359,24 @@
t more2
s/["\\]/\\&/g; s/^/"/; s/$/"/
p
-diff -Naur gnome-applets-2.30.0.old/cpufreq/help/Makefile.in gnome-applets-2.30.0/cpufreq/help/Makefile.in
---- gnome-applets-2.30.0.old/cpufreq/help/Makefile.in 2010-03-28 08:27:58.000000000 +0200
-+++ gnome-applets-2.30.0/cpufreq/help/Makefile.in 2010-05-05 10:10:01.653500919 +0200
+@@ -19711,5 +19842,6 @@ gnome-applets-$VERSION configure summary
+ Using DBUS: $HAVE_DBUS
+ Using NetworkManager: $HAVE_NETWORKMANAGER
+ Using HAL: $HAVE_HAL
++ Using UPOWER: $HAVE_UPOWER
+ Enabling IPv6: $have_ipv6
+ " >&2
+Index: gnome-applets-2.30.0/cpufreq/help/Makefile.in
+===================================================================
+--- gnome-applets-2.30.0.orig/cpufreq/help/Makefile.in 2010-03-28 08:27:58.000000000 +0200
++++ gnome-applets-2.30.0/cpufreq/help/Makefile.in 2010-07-07 21:45:56.898733735 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -184,6 +184,8 @@
+@@ -184,6 +184,8 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
MIXER_LIBS = @MIXER_LIBS@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
@@ -1145,24 +3385,37 @@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
-@@ -229,7 +231,6 @@
+@@ -206,6 +208,8 @@ PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POLKIT_CFLAGS = @POLKIT_CFLAGS@
+ POLKIT_LIBS = @POLKIT_LIBS@
+@@ -229,8 +233,9 @@ SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-SU_TOOL = @SU_TOOL@
SYSCONFDIR = @SYSCONFDIR@
++UPOWER_CFLAGS = @UPOWER_CFLAGS@
++UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
-diff -Naur gnome-applets-2.30.0.old/cpufreq/Makefile.in gnome-applets-2.30.0/cpufreq/Makefile.in
---- gnome-applets-2.30.0.old/cpufreq/Makefile.in 2010-03-28 08:27:58.000000000 +0200
-+++ gnome-applets-2.30.0/cpufreq/Makefile.in 2010-05-05 10:10:01.541530538 +0200
+ WARN_CFLAGS = @WARN_CFLAGS@
+Index: gnome-applets-2.30.0/cpufreq/Makefile.in
+===================================================================
+--- gnome-applets-2.30.0.orig/cpufreq/Makefile.in 2010-03-28 08:27:58.000000000 +0200
++++ gnome-applets-2.30.0/cpufreq/Makefile.in 2010-07-07 21:45:56.778733986 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -225,6 +225,8 @@
+@@ -225,6 +225,8 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
MIXER_LIBS = @MIXER_LIBS@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
@@ -1171,15 +3424,27 @@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
-@@ -270,7 +272,6 @@
+@@ -247,6 +249,8 @@ PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POLKIT_CFLAGS = @POLKIT_CFLAGS@
+ POLKIT_LIBS = @POLKIT_LIBS@
+@@ -270,8 +274,9 @@ SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-SU_TOOL = @SU_TOOL@
SYSCONFDIR = @SYSCONFDIR@
++UPOWER_CFLAGS = @UPOWER_CFLAGS@
++UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
-@@ -495,7 +496,7 @@
+ WARN_CFLAGS = @WARN_CFLAGS@
+@@ -495,7 +500,7 @@ uninstall-uiDATA:
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
@@ -1188,7 +3453,7 @@
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
-@@ -520,7 +521,7 @@
+@@ -520,7 +525,7 @@ $(RECURSIVE_TARGETS):
fi; test -z "$$fail"
$(RECURSIVE_CLEAN_TARGETS):
@@ -1197,16 +3462,17 @@
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
-diff -Naur gnome-applets-2.30.0.old/cpufreq/pixmaps/Makefile.in gnome-applets-2.30.0/cpufreq/pixmaps/Makefile.in
---- gnome-applets-2.30.0.old/cpufreq/pixmaps/Makefile.in 2010-03-28 08:27:58.000000000 +0200
-+++ gnome-applets-2.30.0/cpufreq/pixmaps/Makefile.in 2010-05-05 10:10:01.729501016 +0200
+Index: gnome-applets-2.30.0/cpufreq/pixmaps/Makefile.in
+===================================================================
+--- gnome-applets-2.30.0.orig/cpufreq/pixmaps/Makefile.in 2010-03-28 08:27:58.000000000 +0200
++++ gnome-applets-2.30.0/cpufreq/pixmaps/Makefile.in 2010-07-07 21:45:56.994736860 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -183,6 +183,8 @@
+@@ -183,6 +183,8 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
MIXER_LIBS = @MIXER_LIBS@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
@@ -1215,24 +3481,37 @@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
-@@ -228,7 +230,6 @@
+@@ -205,6 +207,8 @@ PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POLKIT_CFLAGS = @POLKIT_CFLAGS@
+ POLKIT_LIBS = @POLKIT_LIBS@
+@@ -228,8 +232,9 @@ SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-SU_TOOL = @SU_TOOL@
SYSCONFDIR = @SYSCONFDIR@
++UPOWER_CFLAGS = @UPOWER_CFLAGS@
++UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
-diff -Naur gnome-applets-2.30.0.old/cpufreq/src/cpufreq-selector/Makefile.in gnome-applets-2.30.0/cpufreq/src/cpufreq-selector/Makefile.in
---- gnome-applets-2.30.0.old/cpufreq/src/cpufreq-selector/Makefile.in 2010-03-28 08:27:58.000000000 +0200
-+++ gnome-applets-2.30.0/cpufreq/src/cpufreq-selector/Makefile.in 2010-05-05 10:10:01.921500058 +0200
+ WARN_CFLAGS = @WARN_CFLAGS@
+Index: gnome-applets-2.30.0/cpufreq/src/cpufreq-selector/Makefile.in
+===================================================================
+--- gnome-applets-2.30.0.orig/cpufreq/src/cpufreq-selector/Makefile.in 2010-03-28 08:27:58.000000000 +0200
++++ gnome-applets-2.30.0/cpufreq/src/cpufreq-selector/Makefile.in 2010-07-07 21:45:57.246737606 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -236,6 +236,8 @@
+@@ -236,6 +236,8 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
MIXER_LIBS = @MIXER_LIBS@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
@@ -1241,24 +3520,37 @@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
-@@ -281,7 +283,6 @@
+@@ -258,6 +260,8 @@ PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POLKIT_CFLAGS = @POLKIT_CFLAGS@
+ POLKIT_LIBS = @POLKIT_LIBS@
+@@ -281,8 +285,9 @@ SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-SU_TOOL = @SU_TOOL@
SYSCONFDIR = @SYSCONFDIR@
++UPOWER_CFLAGS = @UPOWER_CFLAGS@
++UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
-diff -Naur gnome-applets-2.30.0.old/cpufreq/src/Makefile.in gnome-applets-2.30.0/cpufreq/src/Makefile.in
---- gnome-applets-2.30.0.old/cpufreq/src/Makefile.in 2010-03-28 08:27:58.000000000 +0200
-+++ gnome-applets-2.30.0/cpufreq/src/Makefile.in 2010-05-05 10:10:01.817499979 +0200
+ WARN_CFLAGS = @WARN_CFLAGS@
+Index: gnome-applets-2.30.0/cpufreq/src/Makefile.in
+===================================================================
+--- gnome-applets-2.30.0.orig/cpufreq/src/Makefile.in 2010-03-28 08:27:58.000000000 +0200
++++ gnome-applets-2.30.0/cpufreq/src/Makefile.in 2010-07-07 21:45:57.114733684 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -239,6 +239,8 @@
+@@ -239,6 +239,8 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
MIXER_LIBS = @MIXER_LIBS@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
@@ -1267,15 +3559,27 @@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
-@@ -284,7 +286,6 @@
+@@ -261,6 +263,8 @@ PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POLKIT_CFLAGS = @POLKIT_CFLAGS@
+ POLKIT_LIBS = @POLKIT_LIBS@
+@@ -284,8 +288,9 @@ SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-SU_TOOL = @SU_TOOL@
SYSCONFDIR = @SYSCONFDIR@
++UPOWER_CFLAGS = @UPOWER_CFLAGS@
++UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
-@@ -518,7 +519,7 @@
+ WARN_CFLAGS = @WARN_CFLAGS@
+@@ -518,7 +523,7 @@ clean-libtool:
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
@@ -1284,7 +3588,7 @@
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
-@@ -543,7 +544,7 @@
+@@ -543,7 +548,7 @@ $(RECURSIVE_TARGETS):
fi; test -z "$$fail"
$(RECURSIVE_CLEAN_TARGETS):
@@ -1293,16 +3597,17 @@
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
-diff -Naur gnome-applets-2.30.0.old/drivemount/help/Makefile.in gnome-applets-2.30.0/drivemount/help/Makefile.in
---- gnome-applets-2.30.0.old/drivemount/help/Makefile.in 2010-03-28 08:27:58.000000000 +0200
-+++ gnome-applets-2.30.0/drivemount/help/Makefile.in 2010-05-05 10:10:02.121499991 +0200
+Index: gnome-applets-2.30.0/drivemount/help/Makefile.in
+===================================================================
+--- gnome-applets-2.30.0.orig/drivemount/help/Makefile.in 2010-03-28 08:27:58.000000000 +0200
++++ gnome-applets-2.30.0/drivemount/help/Makefile.in 2010-07-07 21:45:57.494733857 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -184,6 +184,8 @@
+@@ -184,6 +184,8 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
MIXER_LIBS = @MIXER_LIBS@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
@@ -1311,24 +3616,37 @@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
-@@ -229,7 +231,6 @@
+@@ -206,6 +208,8 @@ PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POLKIT_CFLAGS = @POLKIT_CFLAGS@
+ POLKIT_LIBS = @POLKIT_LIBS@
+@@ -229,8 +233,9 @@ SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-SU_TOOL = @SU_TOOL@
SYSCONFDIR = @SYSCONFDIR@
++UPOWER_CFLAGS = @UPOWER_CFLAGS@
++UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
-diff -Naur gnome-applets-2.30.0.old/drivemount/Makefile.in gnome-applets-2.30.0/drivemount/Makefile.in
---- gnome-applets-2.30.0.old/drivemount/Makefile.in 2010-03-28 08:27:58.000000000 +0200
-+++ gnome-applets-2.30.0/drivemount/Makefile.in 2010-05-05 10:10:02.025500637 +0200
+ WARN_CFLAGS = @WARN_CFLAGS@
+Index: gnome-applets-2.30.0/drivemount/Makefile.in
+===================================================================
+--- gnome-applets-2.30.0.orig/drivemount/Makefile.in 2010-03-28 08:27:58.000000000 +0200
++++ gnome-applets-2.30.0/drivemount/Makefile.in 2010-07-07 21:45:57.374735572 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -245,6 +245,8 @@
+@@ -245,6 +245,8 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
MIXER_LIBS = @MIXER_LIBS@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
@@ -1337,15 +3655,27 @@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
-@@ -290,7 +292,6 @@
+@@ -267,6 +269,8 @@ PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POLKIT_CFLAGS = @POLKIT_CFLAGS@
+ POLKIT_LIBS = @POLKIT_LIBS@
+@@ -290,8 +294,9 @@ SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-SU_TOOL = @SU_TOOL@
SYSCONFDIR = @SYSCONFDIR@
++UPOWER_CFLAGS = @UPOWER_CFLAGS@
++UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
-@@ -581,7 +582,7 @@
+ WARN_CFLAGS = @WARN_CFLAGS@
+@@ -581,7 +586,7 @@ uninstall-uiDATA:
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
@@ -1354,7 +3684,7 @@
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
-@@ -606,7 +607,7 @@
+@@ -606,7 +611,7 @@ $(RECURSIVE_TARGETS):
fi; test -z "$$fail"
$(RECURSIVE_CLEAN_TARGETS):
@@ -1363,16 +3693,17 @@
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
-diff -Naur gnome-applets-2.30.0.old/geyes/docs/Makefile.in gnome-applets-2.30.0/geyes/docs/Makefile.in
---- gnome-applets-2.30.0.old/geyes/docs/Makefile.in 2010-03-28 08:27:59.000000000 +0200
-+++ gnome-applets-2.30.0/geyes/docs/Makefile.in 2010-05-05 10:10:02.341500164 +0200
+Index: gnome-applets-2.30.0/geyes/docs/Makefile.in
+===================================================================
+--- gnome-applets-2.30.0.orig/geyes/docs/Makefile.in 2010-03-28 08:27:59.000000000 +0200
++++ gnome-applets-2.30.0/geyes/docs/Makefile.in 2010-07-07 21:45:57.746735580 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -184,6 +184,8 @@
+@@ -184,6 +184,8 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
MIXER_LIBS = @MIXER_LIBS@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
@@ -1381,24 +3712,37 @@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
-@@ -229,7 +231,6 @@
+@@ -206,6 +208,8 @@ PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POLKIT_CFLAGS = @POLKIT_CFLAGS@
+ POLKIT_LIBS = @POLKIT_LIBS@
+@@ -229,8 +233,9 @@ SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-SU_TOOL = @SU_TOOL@
SYSCONFDIR = @SYSCONFDIR@
++UPOWER_CFLAGS = @UPOWER_CFLAGS@
++UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
-diff -Naur gnome-applets-2.30.0.old/geyes/Makefile.in gnome-applets-2.30.0/geyes/Makefile.in
---- gnome-applets-2.30.0.old/geyes/Makefile.in 2010-03-28 08:27:59.000000000 +0200
-+++ gnome-applets-2.30.0/geyes/Makefile.in 2010-05-05 10:10:02.213500099 +0200
+ WARN_CFLAGS = @WARN_CFLAGS@
+Index: gnome-applets-2.30.0/geyes/Makefile.in
+===================================================================
+--- gnome-applets-2.30.0.orig/geyes/Makefile.in 2010-03-28 08:27:59.000000000 +0200
++++ gnome-applets-2.30.0/geyes/Makefile.in 2010-07-07 21:45:57.622733793 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -245,6 +245,8 @@
+@@ -245,6 +245,8 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
MIXER_LIBS = @MIXER_LIBS@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
@@ -1407,15 +3751,27 @@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
-@@ -290,7 +292,6 @@
+@@ -267,6 +269,8 @@ PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POLKIT_CFLAGS = @POLKIT_CFLAGS@
+ POLKIT_LIBS = @POLKIT_LIBS@
+@@ -290,8 +294,9 @@ SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-SU_TOOL = @SU_TOOL@
SYSCONFDIR = @SYSCONFDIR@
++UPOWER_CFLAGS = @UPOWER_CFLAGS@
++UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
-@@ -591,7 +592,7 @@
+ WARN_CFLAGS = @WARN_CFLAGS@
+@@ -591,7 +596,7 @@ uninstall-uiDATA:
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
@@ -1424,7 +3780,7 @@
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
-@@ -616,7 +617,7 @@
+@@ -616,7 +621,7 @@ $(RECURSIVE_TARGETS):
fi; test -z "$$fail"
$(RECURSIVE_CLEAN_TARGETS):
@@ -1433,16 +3789,17 @@
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
-diff -Naur gnome-applets-2.30.0.old/geyes/themes/Makefile.in gnome-applets-2.30.0/geyes/themes/Makefile.in
---- gnome-applets-2.30.0.old/geyes/themes/Makefile.in 2010-03-28 08:27:59.000000000 +0200
-+++ gnome-applets-2.30.0/geyes/themes/Makefile.in 2010-05-05 10:10:02.425500077 +0200
+Index: gnome-applets-2.30.0/geyes/themes/Makefile.in
+===================================================================
+--- gnome-applets-2.30.0.orig/geyes/themes/Makefile.in 2010-03-28 08:27:59.000000000 +0200
++++ gnome-applets-2.30.0/geyes/themes/Makefile.in 2010-07-07 21:45:57.850733987 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -189,6 +189,8 @@
+@@ -189,6 +189,8 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
MIXER_LIBS = @MIXER_LIBS@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
@@ -1451,24 +3808,37 @@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
-@@ -234,7 +236,6 @@
+@@ -211,6 +213,8 @@ PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POLKIT_CFLAGS = @POLKIT_CFLAGS@
+ POLKIT_LIBS = @POLKIT_LIBS@
+@@ -234,8 +238,9 @@ SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-SU_TOOL = @SU_TOOL@
SYSCONFDIR = @SYSCONFDIR@
++UPOWER_CFLAGS = @UPOWER_CFLAGS@
++UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
-diff -Naur gnome-applets-2.30.0.old/gkb-new/Makefile.in gnome-applets-2.30.0/gkb-new/Makefile.in
---- gnome-applets-2.30.0.old/gkb-new/Makefile.in 2010-03-28 08:27:59.000000000 +0200
-+++ gnome-applets-2.30.0/gkb-new/Makefile.in 2010-05-05 10:10:02.497499312 +0200
+ WARN_CFLAGS = @WARN_CFLAGS@
+Index: gnome-applets-2.30.0/gkb-new/Makefile.in
+===================================================================
+--- gnome-applets-2.30.0.orig/gkb-new/Makefile.in 2010-03-28 08:27:59.000000000 +0200
++++ gnome-applets-2.30.0/gkb-new/Makefile.in 2010-07-07 21:45:57.942736047 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -200,6 +200,8 @@
+@@ -200,6 +200,8 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
MIXER_LIBS = @MIXER_LIBS@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
@@ -1477,15 +3847,27 @@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
-@@ -245,7 +247,6 @@
+@@ -222,6 +224,8 @@ PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POLKIT_CFLAGS = @POLKIT_CFLAGS@
+ POLKIT_LIBS = @POLKIT_LIBS@
+@@ -245,8 +249,9 @@ SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-SU_TOOL = @SU_TOOL@
SYSCONFDIR = @SYSCONFDIR@
++UPOWER_CFLAGS = @UPOWER_CFLAGS@
++UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
-@@ -369,7 +370,7 @@
+ WARN_CFLAGS = @WARN_CFLAGS@
+@@ -369,7 +374,7 @@ clean-libtool:
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
@@ -1494,7 +3876,7 @@
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
-@@ -394,7 +395,7 @@
+@@ -394,7 +399,7 @@ $(RECURSIVE_TARGETS):
fi; test -z "$$fail"
$(RECURSIVE_CLEAN_TARGETS):
@@ -1503,16 +3885,17 @@
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
-diff -Naur gnome-applets-2.30.0.old/gkb-new/xmodmap/Makefile.in gnome-applets-2.30.0/gkb-new/xmodmap/Makefile.in
---- gnome-applets-2.30.0.old/gkb-new/xmodmap/Makefile.in 2010-03-28 08:27:59.000000000 +0200
-+++ gnome-applets-2.30.0/gkb-new/xmodmap/Makefile.in 2010-05-05 10:10:02.653499801 +0200
+Index: gnome-applets-2.30.0/gkb-new/xmodmap/Makefile.in
+===================================================================
+--- gnome-applets-2.30.0.orig/gkb-new/xmodmap/Makefile.in 2010-03-28 08:27:59.000000000 +0200
++++ gnome-applets-2.30.0/gkb-new/xmodmap/Makefile.in 2010-07-07 21:45:58.130234746 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -183,6 +183,8 @@
+@@ -183,6 +183,8 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
MIXER_LIBS = @MIXER_LIBS@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
@@ -1521,24 +3904,37 @@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
-@@ -228,7 +230,6 @@
+@@ -205,6 +207,8 @@ PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POLKIT_CFLAGS = @POLKIT_CFLAGS@
+ POLKIT_LIBS = @POLKIT_LIBS@
+@@ -228,8 +232,9 @@ SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-SU_TOOL = @SU_TOOL@
SYSCONFDIR = @SYSCONFDIR@
++UPOWER_CFLAGS = @UPOWER_CFLAGS@
++UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
-diff -Naur gnome-applets-2.30.0.old/gkb-new/xmodmap.sun/Makefile.in gnome-applets-2.30.0/gkb-new/xmodmap.sun/Makefile.in
---- gnome-applets-2.30.0.old/gkb-new/xmodmap.sun/Makefile.in 2010-03-28 08:27:59.000000000 +0200
-+++ gnome-applets-2.30.0/gkb-new/xmodmap.sun/Makefile.in 2010-05-05 10:10:02.573501222 +0200
+ WARN_CFLAGS = @WARN_CFLAGS@
+Index: gnome-applets-2.30.0/gkb-new/xmodmap.sun/Makefile.in
+===================================================================
+--- gnome-applets-2.30.0.orig/gkb-new/xmodmap.sun/Makefile.in 2010-03-28 08:27:59.000000000 +0200
++++ gnome-applets-2.30.0/gkb-new/xmodmap.sun/Makefile.in 2010-07-07 21:45:58.038234641 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -183,6 +183,8 @@
+@@ -183,6 +183,8 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
MIXER_LIBS = @MIXER_LIBS@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
@@ -1547,24 +3943,37 @@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
-@@ -228,7 +230,6 @@
+@@ -205,6 +207,8 @@ PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POLKIT_CFLAGS = @POLKIT_CFLAGS@
+ POLKIT_LIBS = @POLKIT_LIBS@
+@@ -228,8 +232,9 @@ SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-SU_TOOL = @SU_TOOL@
SYSCONFDIR = @SYSCONFDIR@
++UPOWER_CFLAGS = @UPOWER_CFLAGS@
++UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
-diff -Naur gnome-applets-2.30.0.old/gswitchit/help/Makefile.in gnome-applets-2.30.0/gswitchit/help/Makefile.in
---- gnome-applets-2.30.0.old/gswitchit/help/Makefile.in 2010-03-28 08:27:59.000000000 +0200
-+++ gnome-applets-2.30.0/gswitchit/help/Makefile.in 2010-05-05 10:10:02.849499993 +0200
+ WARN_CFLAGS = @WARN_CFLAGS@
+Index: gnome-applets-2.30.0/gswitchit/help/Makefile.in
+===================================================================
+--- gnome-applets-2.30.0.orig/gswitchit/help/Makefile.in 2010-03-28 08:27:59.000000000 +0200
++++ gnome-applets-2.30.0/gswitchit/help/Makefile.in 2010-07-07 21:45:58.342234093 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -184,6 +184,8 @@
+@@ -184,6 +184,8 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
MIXER_LIBS = @MIXER_LIBS@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
@@ -1573,24 +3982,37 @@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
-@@ -229,7 +231,6 @@
+@@ -206,6 +208,8 @@ PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POLKIT_CFLAGS = @POLKIT_CFLAGS@
+ POLKIT_LIBS = @POLKIT_LIBS@
+@@ -229,8 +233,9 @@ SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-SU_TOOL = @SU_TOOL@
SYSCONFDIR = @SYSCONFDIR@
++UPOWER_CFLAGS = @UPOWER_CFLAGS@
++UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
-diff -Naur gnome-applets-2.30.0.old/gswitchit/Makefile.in gnome-applets-2.30.0/gswitchit/Makefile.in
---- gnome-applets-2.30.0.old/gswitchit/Makefile.in 2010-03-28 08:27:59.000000000 +0200
-+++ gnome-applets-2.30.0/gswitchit/Makefile.in 2010-05-05 10:10:02.725499669 +0200
+ WARN_CFLAGS = @WARN_CFLAGS@
+Index: gnome-applets-2.30.0/gswitchit/Makefile.in
+===================================================================
+--- gnome-applets-2.30.0.orig/gswitchit/Makefile.in 2010-03-28 08:27:59.000000000 +0200
++++ gnome-applets-2.30.0/gswitchit/Makefile.in 2010-07-07 21:45:58.226233466 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -199,6 +199,8 @@
+@@ -199,6 +199,8 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
MIXER_LIBS = @MIXER_LIBS@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
@@ -1599,15 +4021,27 @@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
-@@ -244,7 +246,6 @@
+@@ -221,6 +223,8 @@ PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POLKIT_CFLAGS = @POLKIT_CFLAGS@
+ POLKIT_LIBS = @POLKIT_LIBS@
+@@ -244,8 +248,9 @@ SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-SU_TOOL = @SU_TOOL@
SYSCONFDIR = @SYSCONFDIR@
++UPOWER_CFLAGS = @UPOWER_CFLAGS@
++UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
-@@ -366,7 +367,7 @@
+ WARN_CFLAGS = @WARN_CFLAGS@
+@@ -366,7 +371,7 @@ clean-libtool:
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
@@ -1616,7 +4050,7 @@
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
-@@ -391,7 +392,7 @@
+@@ -391,7 +396,7 @@ $(RECURSIVE_TARGETS):
fi; test -z "$$fail"
$(RECURSIVE_CLEAN_TARGETS):
@@ -1625,16 +4059,17 @@
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
-diff -Naur gnome-applets-2.30.0.old/gweather/docs/Makefile.in gnome-applets-2.30.0/gweather/docs/Makefile.in
---- gnome-applets-2.30.0.old/gweather/docs/Makefile.in 2010-03-28 08:27:59.000000000 +0200
-+++ gnome-applets-2.30.0/gweather/docs/Makefile.in 2010-05-05 10:10:03.049500266 +0200
+Index: gnome-applets-2.30.0/gweather/docs/Makefile.in
+===================================================================
+--- gnome-applets-2.30.0.orig/gweather/docs/Makefile.in 2010-03-28 08:27:59.000000000 +0200
++++ gnome-applets-2.30.0/gweather/docs/Makefile.in 2010-07-07 21:45:58.578233513 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -184,6 +184,8 @@
+@@ -184,6 +184,8 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
MIXER_LIBS = @MIXER_LIBS@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
@@ -1643,24 +4078,37 @@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
-@@ -229,7 +231,6 @@
+@@ -206,6 +208,8 @@ PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POLKIT_CFLAGS = @POLKIT_CFLAGS@
+ POLKIT_LIBS = @POLKIT_LIBS@
+@@ -229,8 +233,9 @@ SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-SU_TOOL = @SU_TOOL@
SYSCONFDIR = @SYSCONFDIR@
++UPOWER_CFLAGS = @UPOWER_CFLAGS@
++UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
-diff -Naur gnome-applets-2.30.0.old/gweather/Makefile.in gnome-applets-2.30.0/gweather/Makefile.in
---- gnome-applets-2.30.0.old/gweather/Makefile.in 2010-03-28 08:27:59.000000000 +0200
-+++ gnome-applets-2.30.0/gweather/Makefile.in 2010-05-05 10:10:02.949500403 +0200
+ WARN_CFLAGS = @WARN_CFLAGS@
+Index: gnome-applets-2.30.0/gweather/Makefile.in
+===================================================================
+--- gnome-applets-2.30.0.orig/gweather/Makefile.in 2010-03-28 08:27:59.000000000 +0200
++++ gnome-applets-2.30.0/gweather/Makefile.in 2010-07-07 21:45:58.462233358 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -248,6 +248,8 @@
+@@ -248,6 +248,8 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
MIXER_LIBS = @MIXER_LIBS@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
@@ -1669,15 +4117,27 @@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
-@@ -293,7 +295,6 @@
+@@ -270,6 +272,8 @@ PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POLKIT_CFLAGS = @POLKIT_CFLAGS@
+ POLKIT_LIBS = @POLKIT_LIBS@
+@@ -293,8 +297,9 @@ SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-SU_TOOL = @SU_TOOL@
SYSCONFDIR = @SYSCONFDIR@
++UPOWER_CFLAGS = @UPOWER_CFLAGS@
++UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
-@@ -569,7 +570,7 @@
+ WARN_CFLAGS = @WARN_CFLAGS@
+@@ -569,7 +574,7 @@ uninstall-uiDATA:
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
@@ -1686,7 +4146,7 @@
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
-@@ -594,7 +595,7 @@
+@@ -594,7 +599,7 @@ $(RECURSIVE_TARGETS):
fi; test -z "$$fail"
$(RECURSIVE_CLEAN_TARGETS):
@@ -1695,16 +4155,17 @@
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
-diff -Naur gnome-applets-2.30.0.old/invest-applet/data/art/Makefile.in gnome-applets-2.30.0/invest-applet/data/art/Makefile.in
---- gnome-applets-2.30.0.old/invest-applet/data/art/Makefile.in 2010-03-28 08:28:00.000000000 +0200
-+++ gnome-applets-2.30.0/invest-applet/data/art/Makefile.in 2010-05-05 10:10:03.265500703 +0200
+Index: gnome-applets-2.30.0/invest-applet/data/art/Makefile.in
+===================================================================
+--- gnome-applets-2.30.0.orig/invest-applet/data/art/Makefile.in 2010-03-28 08:28:00.000000000 +0200
++++ gnome-applets-2.30.0/invest-applet/data/art/Makefile.in 2010-07-07 21:45:58.854233804 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -183,6 +183,8 @@
+@@ -183,6 +183,8 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
MIXER_LIBS = @MIXER_LIBS@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
@@ -1713,24 +4174,37 @@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
-@@ -228,7 +230,6 @@
+@@ -205,6 +207,8 @@ PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POLKIT_CFLAGS = @POLKIT_CFLAGS@
+ POLKIT_LIBS = @POLKIT_LIBS@
+@@ -228,8 +232,9 @@ SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-SU_TOOL = @SU_TOOL@
SYSCONFDIR = @SYSCONFDIR@
++UPOWER_CFLAGS = @UPOWER_CFLAGS@
++UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
-diff -Naur gnome-applets-2.30.0.old/invest-applet/data/Makefile.in gnome-applets-2.30.0/invest-applet/data/Makefile.in
---- gnome-applets-2.30.0.old/invest-applet/data/Makefile.in 2010-03-28 08:28:00.000000000 +0200
-+++ gnome-applets-2.30.0/invest-applet/data/Makefile.in 2010-05-05 10:10:03.193501048 +0200
+ WARN_CFLAGS = @WARN_CFLAGS@
+Index: gnome-applets-2.30.0/invest-applet/data/Makefile.in
+===================================================================
+--- gnome-applets-2.30.0.orig/invest-applet/data/Makefile.in 2010-03-28 08:28:00.000000000 +0200
++++ gnome-applets-2.30.0/invest-applet/data/Makefile.in 2010-07-07 21:45:58.766233796 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -224,6 +224,8 @@
+@@ -224,6 +224,8 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
MIXER_LIBS = @MIXER_LIBS@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
@@ -1739,15 +4213,27 @@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
-@@ -269,7 +271,6 @@
+@@ -246,6 +248,8 @@ PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POLKIT_CFLAGS = @POLKIT_CFLAGS@
+ POLKIT_LIBS = @POLKIT_LIBS@
+@@ -269,8 +273,9 @@ SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-SU_TOOL = @SU_TOOL@
SYSCONFDIR = @SYSCONFDIR@
++UPOWER_CFLAGS = @UPOWER_CFLAGS@
++UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
-@@ -499,7 +500,7 @@
+ WARN_CFLAGS = @WARN_CFLAGS@
+@@ -499,7 +504,7 @@ uninstall-uiDATA:
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
@@ -1756,7 +4242,7 @@
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
-@@ -524,7 +525,7 @@
+@@ -524,7 +529,7 @@ $(RECURSIVE_TARGETS):
fi; test -z "$$fail"
$(RECURSIVE_CLEAN_TARGETS):
@@ -1765,16 +4251,17 @@
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
-diff -Naur gnome-applets-2.30.0.old/invest-applet/docs/Makefile.in gnome-applets-2.30.0/invest-applet/docs/Makefile.in
---- gnome-applets-2.30.0.old/invest-applet/docs/Makefile.in 2010-03-28 08:28:00.000000000 +0200
-+++ gnome-applets-2.30.0/invest-applet/docs/Makefile.in 2010-05-05 10:10:03.365500139 +0200
+Index: gnome-applets-2.30.0/invest-applet/docs/Makefile.in
+===================================================================
+--- gnome-applets-2.30.0.orig/invest-applet/docs/Makefile.in 2010-03-28 08:28:00.000000000 +0200
++++ gnome-applets-2.30.0/invest-applet/docs/Makefile.in 2010-07-07 21:45:58.970233956 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -184,6 +184,8 @@
+@@ -184,6 +184,8 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
MIXER_LIBS = @MIXER_LIBS@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
@@ -1783,24 +4270,37 @@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
-@@ -229,7 +231,6 @@
+@@ -206,6 +208,8 @@ PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POLKIT_CFLAGS = @POLKIT_CFLAGS@
+ POLKIT_LIBS = @POLKIT_LIBS@
+@@ -229,8 +233,9 @@ SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-SU_TOOL = @SU_TOOL@
SYSCONFDIR = @SYSCONFDIR@
++UPOWER_CFLAGS = @UPOWER_CFLAGS@
++UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
-diff -Naur gnome-applets-2.30.0.old/invest-applet/invest/Makefile.in gnome-applets-2.30.0/invest-applet/invest/Makefile.in
---- gnome-applets-2.30.0.old/invest-applet/invest/Makefile.in 2010-03-28 08:28:00.000000000 +0200
-+++ gnome-applets-2.30.0/invest-applet/invest/Makefile.in 2010-05-05 10:10:03.449500682 +0200
+ WARN_CFLAGS = @WARN_CFLAGS@
+Index: gnome-applets-2.30.0/invest-applet/invest/Makefile.in
+===================================================================
+--- gnome-applets-2.30.0.orig/invest-applet/invest/Makefile.in 2010-03-28 08:28:00.000000000 +0200
++++ gnome-applets-2.30.0/invest-applet/invest/Makefile.in 2010-07-07 21:45:59.106235536 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -186,6 +186,8 @@
+@@ -186,6 +186,8 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
MIXER_LIBS = @MIXER_LIBS@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
@@ -1809,24 +4309,37 @@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
-@@ -231,7 +233,6 @@
+@@ -208,6 +210,8 @@ PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POLKIT_CFLAGS = @POLKIT_CFLAGS@
+ POLKIT_LIBS = @POLKIT_LIBS@
+@@ -231,8 +235,9 @@ SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-SU_TOOL = @SU_TOOL@
SYSCONFDIR = @SYSCONFDIR@
++UPOWER_CFLAGS = @UPOWER_CFLAGS@
++UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
-diff -Naur gnome-applets-2.30.0.old/invest-applet/Makefile.in gnome-applets-2.30.0/invest-applet/Makefile.in
---- gnome-applets-2.30.0.old/invest-applet/Makefile.in 2010-03-28 08:27:59.000000000 +0200
-+++ gnome-applets-2.30.0/invest-applet/Makefile.in 2010-05-05 10:10:03.113499882 +0200
+ WARN_CFLAGS = @WARN_CFLAGS@
+Index: gnome-applets-2.30.0/invest-applet/Makefile.in
+===================================================================
+--- gnome-applets-2.30.0.orig/invest-applet/Makefile.in 2010-03-28 08:27:59.000000000 +0200
++++ gnome-applets-2.30.0/invest-applet/Makefile.in 2010-07-07 21:45:58.666234503 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -199,6 +199,8 @@
+@@ -199,6 +199,8 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
MIXER_LIBS = @MIXER_LIBS@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
@@ -1835,15 +4348,27 @@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
-@@ -244,7 +246,6 @@
+@@ -221,6 +223,8 @@ PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POLKIT_CFLAGS = @POLKIT_CFLAGS@
+ POLKIT_LIBS = @POLKIT_LIBS@
+@@ -244,8 +248,9 @@ SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-SU_TOOL = @SU_TOOL@
SYSCONFDIR = @SYSCONFDIR@
++UPOWER_CFLAGS = @UPOWER_CFLAGS@
++UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
-@@ -366,7 +367,7 @@
+ WARN_CFLAGS = @WARN_CFLAGS@
+@@ -366,7 +371,7 @@ clean-libtool:
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
@@ -1852,7 +4377,7 @@
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
-@@ -391,7 +392,7 @@
+@@ -391,7 +396,7 @@ $(RECURSIVE_TARGETS):
fi; test -z "$$fail"
$(RECURSIVE_CLEAN_TARGETS):
@@ -1861,9 +4386,10 @@
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
-diff -Naur gnome-applets-2.30.0.old/ltmain.sh gnome-applets-2.30.0/ltmain.sh
---- gnome-applets-2.30.0.old/ltmain.sh 2010-03-28 08:27:52.000000000 +0200
-+++ gnome-applets-2.30.0/ltmain.sh 2010-05-05 10:09:54.701498434 +0200
+Index: gnome-applets-2.30.0/ltmain.sh
+===================================================================
+--- gnome-applets-2.30.0.orig/ltmain.sh 2010-03-28 08:27:52.000000000 +0200
++++ gnome-applets-2.30.0/ltmain.sh 2010-07-07 21:48:08.182739380 +0200
@@ -1,6 +1,6 @@
# Generated from ltmain.m4sh.
@@ -1893,10 +4419,11 @@
# Be Bourne compatible
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-diff -Naur gnome-applets-2.30.0.old/m4/intltool.m4 gnome-applets-2.30.0/m4/intltool.m4
---- gnome-applets-2.30.0.old/m4/intltool.m4 2010-03-28 08:27:52.000000000 +0200
-+++ gnome-applets-2.30.0/m4/intltool.m4 2010-05-05 10:09:55.049500755 +0200
-@@ -172,7 +172,7 @@
+Index: gnome-applets-2.30.0/m4/intltool.m4
+===================================================================
+--- gnome-applets-2.30.0.orig/m4/intltool.m4 2010-03-28 08:27:52.000000000 +0200
++++ gnome-applets-2.30.0/m4/intltool.m4 2010-07-07 21:44:56.294737402 +0200
+@@ -172,7 +172,7 @@ IT_PO_SUBDIR([po])
AC_DEFUN([IT_PO_SUBDIR],
[AC_PREREQ([2.53])dnl We use ac_top_srcdir inside AC_CONFIG_COMMANDS.
dnl
@@ -1905,10 +4432,11 @@
dnl of config.status.
AC_CONFIG_COMMANDS_PRE([
AC_CONFIG_COMMANDS([$1/stamp-it], [
-diff -Naur gnome-applets-2.30.0.old/m4/libtool.m4 gnome-applets-2.30.0/m4/libtool.m4
---- gnome-applets-2.30.0.old/m4/libtool.m4 2010-03-28 08:27:52.000000000 +0200
-+++ gnome-applets-2.30.0/m4/libtool.m4 2010-05-05 10:09:54.749499368 +0200
-@@ -2445,7 +2445,7 @@
+Index: gnome-applets-2.30.0/m4/libtool.m4
+===================================================================
+--- gnome-applets-2.30.0.orig/m4/libtool.m4 2010-03-28 08:27:52.000000000 +0200
++++ gnome-applets-2.30.0/m4/libtool.m4 2010-07-07 21:44:56.298740914 +0200
+@@ -2445,7 +2445,7 @@ linux*oldld* | linux*aout* | linux*coff*
;;
# This must be Linux ELF.
@@ -1917,7 +4445,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -3084,7 +3084,7 @@
+@@ -3084,7 +3084,7 @@ irix5* | irix6* | nonstopux*)
;;
# This must be Linux ELF.
@@ -1926,7 +4454,7 @@
lt_cv_deplibs_check_method=pass_all
;;
-@@ -3705,7 +3705,7 @@
+@@ -3705,7 +3705,7 @@ m4_if([$1], [CXX], [
;;
esac
;;
@@ -1935,7 +4463,7 @@
case $cc_basename in
KCC*)
# KAI C++ Compiler
-@@ -3989,7 +3989,7 @@
+@@ -3989,7 +3989,7 @@ m4_if([$1], [CXX], [
_LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
;;
@@ -1944,7 +4472,7 @@
case $cc_basename in
# old Intel for x86_64 which still supported -KPIC.
ecc*)
-@@ -4285,6 +4285,7 @@
+@@ -4285,6 +4285,7 @@ dnl Note also adjust exclude_expsyms for
fi
supports_anon_versioning=no
case `$LD -v 2>&1` in
@@ -1952,7 +4480,7 @@
*\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
*\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
*\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-@@ -4376,7 +4377,7 @@
+@@ -4376,7 +4377,7 @@ _LT_EOF
_LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
;;
@@ -1961,7 +4489,7 @@
tmp_diet=no
if test "$host_os" = linux-dietlibc; then
case $cc_basename in
-@@ -5860,7 +5861,7 @@
+@@ -5860,7 +5861,7 @@ if test "$_lt_caught_CXX_error" != yes;
_LT_TAGVAR(inherit_rpath, $1)=yes
;;
@@ -1970,9 +4498,10 @@
case $cc_basename in
KCC*)
# Kuck and Associates, Inc. (KAI) C++ Compiler
-diff -Naur gnome-applets-2.30.0.old/m4/ltversion.m4 gnome-applets-2.30.0/m4/ltversion.m4
---- gnome-applets-2.30.0.old/m4/ltversion.m4 2010-03-28 08:27:52.000000000 +0200
-+++ gnome-applets-2.30.0/m4/ltversion.m4 2010-05-05 10:09:54.897500362 +0200
+Index: gnome-applets-2.30.0/m4/ltversion.m4
+===================================================================
+--- gnome-applets-2.30.0.orig/m4/ltversion.m4 2010-03-28 08:27:52.000000000 +0200
++++ gnome-applets-2.30.0/m4/ltversion.m4 2010-07-07 21:44:56.298740914 +0200
@@ -9,15 +9,15 @@
# Generated from ltversion.in.
@@ -1994,16 +4523,17 @@
_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
_LT_DECL(, macro_revision, 0)
])
-diff -Naur gnome-applets-2.30.0.old/Makefile.in gnome-applets-2.30.0/Makefile.in
---- gnome-applets-2.30.0.old/Makefile.in 2010-03-28 08:28:02.000000000 +0200
-+++ gnome-applets-2.30.0/Makefile.in 2010-05-05 10:10:06.866500197 +0200
+Index: gnome-applets-2.30.0/Makefile.in
+===================================================================
+--- gnome-applets-2.30.0.orig/Makefile.in 2010-03-28 08:28:02.000000000 +0200
++++ gnome-applets-2.30.0/Makefile.in 2010-07-07 21:46:01.114232503 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -217,6 +217,8 @@
+@@ -217,6 +217,8 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
MIXER_LIBS = @MIXER_LIBS@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
@@ -2012,15 +4542,27 @@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
-@@ -262,7 +264,6 @@
+@@ -239,6 +241,8 @@ PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POLKIT_CFLAGS = @POLKIT_CFLAGS@
+ POLKIT_LIBS = @POLKIT_LIBS@
+@@ -262,8 +266,9 @@ SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-SU_TOOL = @SU_TOOL@
SYSCONFDIR = @SYSCONFDIR@
++UPOWER_CFLAGS = @UPOWER_CFLAGS@
++UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
-@@ -493,7 +494,7 @@
+ WARN_CFLAGS = @WARN_CFLAGS@
+@@ -493,7 +498,7 @@ distclean-libtool:
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
@@ -2029,7 +4571,7 @@
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
-@@ -518,7 +519,7 @@
+@@ -518,7 +523,7 @@ $(RECURSIVE_TARGETS):
fi; test -z "$$fail"
$(RECURSIVE_CLEAN_TARGETS):
@@ -2038,7 +4580,7 @@
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
-@@ -682,7 +683,8 @@
+@@ -682,7 +687,8 @@ distdir: $(DISTFILES)
fi; \
done
-test -n "$(am__skip_mode_fix)" \
@@ -2048,7 +4590,7 @@
! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
! -type d ! -perm -400 -exec chmod a+r {} \; -o \
! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
-@@ -726,17 +728,17 @@
+@@ -726,17 +732,17 @@ dist dist-all: distdir
distcheck: dist
case '$(DIST_ARCHIVES)' in \
*.tar.gz*) \
@@ -2070,16 +4612,17 @@
*.zip*) \
unzip $(distdir).zip ;;\
esac
-diff -Naur gnome-applets-2.30.0.old/man/Makefile.in gnome-applets-2.30.0/man/Makefile.in
---- gnome-applets-2.30.0.old/man/Makefile.in 2010-03-28 08:28:00.000000000 +0200
-+++ gnome-applets-2.30.0/man/Makefile.in 2010-05-05 10:10:03.517499969 +0200
+Index: gnome-applets-2.30.0/man/Makefile.in
+===================================================================
+--- gnome-applets-2.30.0.orig/man/Makefile.in 2010-03-28 08:28:00.000000000 +0200
++++ gnome-applets-2.30.0/man/Makefile.in 2010-07-07 21:45:59.202234257 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -184,6 +184,8 @@
+@@ -184,6 +184,8 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
MIXER_LIBS = @MIXER_LIBS@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
@@ -2088,24 +4631,37 @@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
-@@ -229,7 +231,6 @@
+@@ -206,6 +208,8 @@ PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POLKIT_CFLAGS = @POLKIT_CFLAGS@
+ POLKIT_LIBS = @POLKIT_LIBS@
+@@ -229,8 +233,9 @@ SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-SU_TOOL = @SU_TOOL@
SYSCONFDIR = @SYSCONFDIR@
++UPOWER_CFLAGS = @UPOWER_CFLAGS@
++UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
-diff -Naur gnome-applets-2.30.0.old/mini-commander/help/Makefile.in gnome-applets-2.30.0/mini-commander/help/Makefile.in
---- gnome-applets-2.30.0.old/mini-commander/help/Makefile.in 2010-03-28 08:28:00.000000000 +0200
-+++ gnome-applets-2.30.0/mini-commander/help/Makefile.in 2010-05-05 10:10:03.689499981 +0200
+ WARN_CFLAGS = @WARN_CFLAGS@
+Index: gnome-applets-2.30.0/mini-commander/help/Makefile.in
+===================================================================
+--- gnome-applets-2.30.0.orig/mini-commander/help/Makefile.in 2010-03-28 08:28:00.000000000 +0200
++++ gnome-applets-2.30.0/mini-commander/help/Makefile.in 2010-07-07 21:45:59.418236144 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -184,6 +184,8 @@
+@@ -184,6 +184,8 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
MIXER_LIBS = @MIXER_LIBS@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
@@ -2114,24 +4670,37 @@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
-@@ -229,7 +231,6 @@
+@@ -206,6 +208,8 @@ PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POLKIT_CFLAGS = @POLKIT_CFLAGS@
+ POLKIT_LIBS = @POLKIT_LIBS@
+@@ -229,8 +233,9 @@ SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-SU_TOOL = @SU_TOOL@
SYSCONFDIR = @SYSCONFDIR@
++UPOWER_CFLAGS = @UPOWER_CFLAGS@
++UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
-diff -Naur gnome-applets-2.30.0.old/mini-commander/Makefile.in gnome-applets-2.30.0/mini-commander/Makefile.in
---- gnome-applets-2.30.0.old/mini-commander/Makefile.in 2010-03-28 08:28:00.000000000 +0200
-+++ gnome-applets-2.30.0/mini-commander/Makefile.in 2010-05-05 10:10:03.593501949 +0200
+ WARN_CFLAGS = @WARN_CFLAGS@
+Index: gnome-applets-2.30.0/mini-commander/Makefile.in
+===================================================================
+--- gnome-applets-2.30.0.orig/mini-commander/Makefile.in 2010-03-28 08:28:00.000000000 +0200
++++ gnome-applets-2.30.0/mini-commander/Makefile.in 2010-07-07 21:45:59.298233460 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -223,6 +223,8 @@
+@@ -223,6 +223,8 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
MIXER_LIBS = @MIXER_LIBS@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
@@ -2140,15 +4709,27 @@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
-@@ -268,7 +270,6 @@
+@@ -245,6 +247,8 @@ PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POLKIT_CFLAGS = @POLKIT_CFLAGS@
+ POLKIT_LIBS = @POLKIT_LIBS@
+@@ -268,8 +272,9 @@ SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-SU_TOOL = @SU_TOOL@
SYSCONFDIR = @SYSCONFDIR@
++UPOWER_CFLAGS = @UPOWER_CFLAGS@
++UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
-@@ -419,7 +420,7 @@
+ WARN_CFLAGS = @WARN_CFLAGS@
+@@ -419,7 +424,7 @@ uninstall-serverDATA:
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
@@ -2157,7 +4738,7 @@
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
-@@ -444,7 +445,7 @@
+@@ -444,7 +449,7 @@ $(RECURSIVE_TARGETS):
fi; test -z "$$fail"
$(RECURSIVE_CLEAN_TARGETS):
@@ -2166,16 +4747,17 @@
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
-diff -Naur gnome-applets-2.30.0.old/mini-commander/src/Makefile.in gnome-applets-2.30.0/mini-commander/src/Makefile.in
---- gnome-applets-2.30.0.old/mini-commander/src/Makefile.in 2010-03-28 08:28:00.000000000 +0200
-+++ gnome-applets-2.30.0/mini-commander/src/Makefile.in 2010-05-05 10:10:03.801501088 +0200
+Index: gnome-applets-2.30.0/mini-commander/src/Makefile.in
+===================================================================
+--- gnome-applets-2.30.0.orig/mini-commander/src/Makefile.in 2010-03-28 08:28:00.000000000 +0200
++++ gnome-applets-2.30.0/mini-commander/src/Makefile.in 2010-07-07 21:45:59.550234212 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -220,6 +220,8 @@
+@@ -220,6 +220,8 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
MIXER_LIBS = @MIXER_LIBS@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
@@ -2184,24 +4766,37 @@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
-@@ -265,7 +267,6 @@
+@@ -242,6 +244,8 @@ PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POLKIT_CFLAGS = @POLKIT_CFLAGS@
+ POLKIT_LIBS = @POLKIT_LIBS@
+@@ -265,8 +269,9 @@ SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-SU_TOOL = @SU_TOOL@
SYSCONFDIR = @SYSCONFDIR@
++UPOWER_CFLAGS = @UPOWER_CFLAGS@
++UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
-diff -Naur gnome-applets-2.30.0.old/mixer/docs/Makefile.in gnome-applets-2.30.0/mixer/docs/Makefile.in
---- gnome-applets-2.30.0.old/mixer/docs/Makefile.in 2010-03-28 08:28:00.000000000 +0200
-+++ gnome-applets-2.30.0/mixer/docs/Makefile.in 2010-05-05 10:10:04.001500169 +0200
+ WARN_CFLAGS = @WARN_CFLAGS@
+Index: gnome-applets-2.30.0/mixer/docs/Makefile.in
+===================================================================
+--- gnome-applets-2.30.0.orig/mixer/docs/Makefile.in 2010-03-28 08:28:00.000000000 +0200
++++ gnome-applets-2.30.0/mixer/docs/Makefile.in 2010-07-07 21:45:59.790234190 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -184,6 +184,8 @@
+@@ -184,6 +184,8 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
MIXER_LIBS = @MIXER_LIBS@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
@@ -2210,24 +4805,37 @@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
-@@ -229,7 +231,6 @@
+@@ -206,6 +208,8 @@ PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POLKIT_CFLAGS = @POLKIT_CFLAGS@
+ POLKIT_LIBS = @POLKIT_LIBS@
+@@ -229,8 +233,9 @@ SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-SU_TOOL = @SU_TOOL@
SYSCONFDIR = @SYSCONFDIR@
++UPOWER_CFLAGS = @UPOWER_CFLAGS@
++UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
-diff -Naur gnome-applets-2.30.0.old/mixer/Makefile.in gnome-applets-2.30.0/mixer/Makefile.in
---- gnome-applets-2.30.0.old/mixer/Makefile.in 2010-03-28 08:28:00.000000000 +0200
-+++ gnome-applets-2.30.0/mixer/Makefile.in 2010-05-05 10:10:03.909501117 +0200
+ WARN_CFLAGS = @WARN_CFLAGS@
+Index: gnome-applets-2.30.0/mixer/Makefile.in
+===================================================================
+--- gnome-applets-2.30.0.orig/mixer/Makefile.in 2010-03-28 08:28:00.000000000 +0200
++++ gnome-applets-2.30.0/mixer/Makefile.in 2010-07-07 21:45:59.674234542 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -249,6 +249,8 @@
+@@ -249,6 +249,8 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
MIXER_LIBS = @MIXER_LIBS@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
@@ -2236,15 +4844,27 @@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
-@@ -294,7 +296,6 @@
+@@ -271,6 +273,8 @@ PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POLKIT_CFLAGS = @POLKIT_CFLAGS@
+ POLKIT_LIBS = @POLKIT_LIBS@
+@@ -294,8 +298,9 @@ SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-SU_TOOL = @SU_TOOL@
SYSCONFDIR = @SYSCONFDIR@
++UPOWER_CFLAGS = @UPOWER_CFLAGS@
++UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
-@@ -593,7 +594,7 @@
+ WARN_CFLAGS = @WARN_CFLAGS@
+@@ -593,7 +598,7 @@ uninstall-uiDATA:
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
@@ -2253,7 +4873,7 @@
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
-@@ -618,7 +619,7 @@
+@@ -618,7 +623,7 @@ $(RECURSIVE_TARGETS):
fi; test -z "$$fail"
$(RECURSIVE_CLEAN_TARGETS):
@@ -2262,16 +4882,17 @@
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
-diff -Naur gnome-applets-2.30.0.old/modemlights/Makefile.in gnome-applets-2.30.0/modemlights/Makefile.in
---- gnome-applets-2.30.0.old/modemlights/Makefile.in 2010-03-28 08:28:01.000000000 +0200
-+++ gnome-applets-2.30.0/modemlights/Makefile.in 2010-05-05 10:10:04.097501200 +0200
+Index: gnome-applets-2.30.0/modemlights/Makefile.in
+===================================================================
+--- gnome-applets-2.30.0.orig/modemlights/Makefile.in 2010-03-28 08:28:01.000000000 +0200
++++ gnome-applets-2.30.0/modemlights/Makefile.in 2010-07-07 21:45:59.910233941 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -59,7 +59,8 @@
+@@ -59,7 +59,8 @@ PROGRAMS = $(libexec_PROGRAMS)
am_modem_applet_OBJECTS = modem-applet.$(OBJEXT)
modem_applet_OBJECTS = $(am_modem_applet_OBJECTS)
am__DEPENDENCIES_1 =
@@ -2281,7 +4902,7 @@
DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
-@@ -208,6 +209,8 @@
+@@ -208,6 +209,8 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
MIXER_LIBS = @MIXER_LIBS@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
@@ -2290,15 +4911,27 @@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
-@@ -253,7 +256,6 @@
+@@ -230,6 +233,8 @@ PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POLKIT_CFLAGS = @POLKIT_CFLAGS@
+ POLKIT_LIBS = @POLKIT_LIBS@
+@@ -253,8 +258,9 @@ SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-SU_TOOL = @SU_TOOL@
SYSCONFDIR = @SYSCONFDIR@
++UPOWER_CFLAGS = @UPOWER_CFLAGS@
++UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
-@@ -328,7 +330,8 @@
+ WARN_CFLAGS = @WARN_CFLAGS@
+@@ -328,7 +334,8 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
INCLUDES = -I. -I$(srcdir) \
@@ -2308,16 +4941,17 @@
modem_applet_SOURCES = \
modem-applet.c \
-diff -Naur gnome-applets-2.30.0.old/multiload/docs/Makefile.in gnome-applets-2.30.0/multiload/docs/Makefile.in
---- gnome-applets-2.30.0.old/multiload/docs/Makefile.in 2010-03-28 08:28:01.000000000 +0200
-+++ gnome-applets-2.30.0/multiload/docs/Makefile.in 2010-05-05 10:10:05.070498466 +0200
+Index: gnome-applets-2.30.0/multiload/docs/Makefile.in
+===================================================================
+--- gnome-applets-2.30.0.orig/multiload/docs/Makefile.in 2010-03-28 08:28:01.000000000 +0200
++++ gnome-applets-2.30.0/multiload/docs/Makefile.in 2010-07-07 21:46:00.150234425 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -184,6 +184,8 @@
+@@ -184,6 +184,8 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
MIXER_LIBS = @MIXER_LIBS@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
@@ -2326,24 +4960,37 @@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
-@@ -229,7 +231,6 @@
+@@ -206,6 +208,8 @@ PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POLKIT_CFLAGS = @POLKIT_CFLAGS@
+ POLKIT_LIBS = @POLKIT_LIBS@
+@@ -229,8 +233,9 @@ SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-SU_TOOL = @SU_TOOL@
SYSCONFDIR = @SYSCONFDIR@
++UPOWER_CFLAGS = @UPOWER_CFLAGS@
++UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
-diff -Naur gnome-applets-2.30.0.old/multiload/Makefile.in gnome-applets-2.30.0/multiload/Makefile.in
---- gnome-applets-2.30.0.old/multiload/Makefile.in 2010-03-28 08:28:01.000000000 +0200
-+++ gnome-applets-2.30.0/multiload/Makefile.in 2010-05-05 10:10:04.197499950 +0200
+ WARN_CFLAGS = @WARN_CFLAGS@
+Index: gnome-applets-2.30.0/multiload/Makefile.in
+===================================================================
+--- gnome-applets-2.30.0.orig/multiload/Makefile.in 2010-03-28 08:28:01.000000000 +0200
++++ gnome-applets-2.30.0/multiload/Makefile.in 2010-07-07 21:46:00.034233783 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -247,6 +247,8 @@
+@@ -247,6 +247,8 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
MIXER_LIBS = @MIXER_LIBS@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
@@ -2352,15 +4999,27 @@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
-@@ -292,7 +294,6 @@
+@@ -269,6 +271,8 @@ PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POLKIT_CFLAGS = @POLKIT_CFLAGS@
+ POLKIT_LIBS = @POLKIT_LIBS@
+@@ -292,8 +296,9 @@ SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-SU_TOOL = @SU_TOOL@
SYSCONFDIR = @SYSCONFDIR@
++UPOWER_CFLAGS = @UPOWER_CFLAGS@
++UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
-@@ -594,7 +595,7 @@
+ WARN_CFLAGS = @WARN_CFLAGS@
+@@ -594,7 +599,7 @@ uninstall-uiDATA:
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
@@ -2369,7 +5028,7 @@
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
-@@ -619,7 +620,7 @@
+@@ -619,7 +624,7 @@ $(RECURSIVE_TARGETS):
fi; test -z "$$fail"
$(RECURSIVE_CLEAN_TARGETS):
@@ -2378,16 +5037,17 @@
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
-diff -Naur gnome-applets-2.30.0.old/null_applet/Makefile.in gnome-applets-2.30.0/null_applet/Makefile.in
---- gnome-applets-2.30.0.old/null_applet/Makefile.in 2010-03-28 08:28:01.000000000 +0200
-+++ gnome-applets-2.30.0/null_applet/Makefile.in 2010-05-05 10:10:06.046497720 +0200
+Index: gnome-applets-2.30.0/null_applet/Makefile.in
+===================================================================
+--- gnome-applets-2.30.0.orig/null_applet/Makefile.in 2010-03-28 08:28:01.000000000 +0200
++++ gnome-applets-2.30.0/null_applet/Makefile.in 2010-07-07 21:46:00.262233498 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -205,6 +205,8 @@
+@@ -205,6 +205,8 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
MIXER_LIBS = @MIXER_LIBS@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
@@ -2396,24 +5056,37 @@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
-@@ -250,7 +252,6 @@
+@@ -227,6 +229,8 @@ PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POLKIT_CFLAGS = @POLKIT_CFLAGS@
+ POLKIT_LIBS = @POLKIT_LIBS@
+@@ -250,8 +254,9 @@ SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-SU_TOOL = @SU_TOOL@
SYSCONFDIR = @SYSCONFDIR@
++UPOWER_CFLAGS = @UPOWER_CFLAGS@
++UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
-diff -Naur gnome-applets-2.30.0.old/stickynotes/data/Makefile.in gnome-applets-2.30.0/stickynotes/data/Makefile.in
---- gnome-applets-2.30.0.old/stickynotes/data/Makefile.in 2010-03-28 08:28:01.000000000 +0200
-+++ gnome-applets-2.30.0/stickynotes/data/Makefile.in 2010-05-05 10:10:06.270498825 +0200
+ WARN_CFLAGS = @WARN_CFLAGS@
+Index: gnome-applets-2.30.0/stickynotes/data/Makefile.in
+===================================================================
+--- gnome-applets-2.30.0.orig/stickynotes/data/Makefile.in 2010-03-28 08:28:01.000000000 +0200
++++ gnome-applets-2.30.0/stickynotes/data/Makefile.in 2010-07-07 21:46:00.478233436 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -186,6 +186,8 @@
+@@ -186,6 +186,8 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
MIXER_LIBS = @MIXER_LIBS@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
@@ -2422,24 +5095,37 @@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
-@@ -231,7 +233,6 @@
+@@ -208,6 +210,8 @@ PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POLKIT_CFLAGS = @POLKIT_CFLAGS@
+ POLKIT_LIBS = @POLKIT_LIBS@
+@@ -231,8 +235,9 @@ SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-SU_TOOL = @SU_TOOL@
SYSCONFDIR = @SYSCONFDIR@
++UPOWER_CFLAGS = @UPOWER_CFLAGS@
++UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
-diff -Naur gnome-applets-2.30.0.old/stickynotes/docs/Makefile.in gnome-applets-2.30.0/stickynotes/docs/Makefile.in
---- gnome-applets-2.30.0.old/stickynotes/docs/Makefile.in 2010-03-28 08:28:01.000000000 +0200
-+++ gnome-applets-2.30.0/stickynotes/docs/Makefile.in 2010-05-05 10:10:06.370499238 +0200
+ WARN_CFLAGS = @WARN_CFLAGS@
+Index: gnome-applets-2.30.0/stickynotes/docs/Makefile.in
+===================================================================
+--- gnome-applets-2.30.0.orig/stickynotes/docs/Makefile.in 2010-03-28 08:28:01.000000000 +0200
++++ gnome-applets-2.30.0/stickynotes/docs/Makefile.in 2010-07-07 21:46:00.594234081 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -184,6 +184,8 @@
+@@ -184,6 +184,8 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
MIXER_LIBS = @MIXER_LIBS@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
@@ -2448,24 +5134,37 @@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
-@@ -229,7 +231,6 @@
+@@ -206,6 +208,8 @@ PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POLKIT_CFLAGS = @POLKIT_CFLAGS@
+ POLKIT_LIBS = @POLKIT_LIBS@
+@@ -229,8 +233,9 @@ SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-SU_TOOL = @SU_TOOL@
SYSCONFDIR = @SYSCONFDIR@
++UPOWER_CFLAGS = @UPOWER_CFLAGS@
++UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
-diff -Naur gnome-applets-2.30.0.old/stickynotes/Makefile.in gnome-applets-2.30.0/stickynotes/Makefile.in
---- gnome-applets-2.30.0.old/stickynotes/Makefile.in 2010-03-28 08:28:01.000000000 +0200
-+++ gnome-applets-2.30.0/stickynotes/Makefile.in 2010-05-05 10:10:06.190498711 +0200
+ WARN_CFLAGS = @WARN_CFLAGS@
+Index: gnome-applets-2.30.0/stickynotes/Makefile.in
+===================================================================
+--- gnome-applets-2.30.0.orig/stickynotes/Makefile.in 2010-03-28 08:28:01.000000000 +0200
++++ gnome-applets-2.30.0/stickynotes/Makefile.in 2010-07-07 21:46:00.390233912 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -259,6 +259,8 @@
+@@ -259,6 +259,8 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
MIXER_LIBS = @MIXER_LIBS@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
@@ -2474,15 +5173,27 @@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
-@@ -304,7 +306,6 @@
+@@ -281,6 +283,8 @@ PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POLKIT_CFLAGS = @POLKIT_CFLAGS@
+ POLKIT_LIBS = @POLKIT_LIBS@
+@@ -304,8 +308,9 @@ SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-SU_TOOL = @SU_TOOL@
SYSCONFDIR = @SYSCONFDIR@
++UPOWER_CFLAGS = @UPOWER_CFLAGS@
++UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
-@@ -631,7 +632,7 @@
+ WARN_CFLAGS = @WARN_CFLAGS@
+@@ -631,7 +636,7 @@ uninstall-uiDATA:
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
@@ -2491,7 +5202,7 @@
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
-@@ -656,7 +657,7 @@
+@@ -656,7 +661,7 @@ $(RECURSIVE_TARGETS):
fi; test -z "$$fail"
$(RECURSIVE_CLEAN_TARGETS):
@@ -2500,16 +5211,17 @@
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
-diff -Naur gnome-applets-2.30.0.old/stickynotes/pixmaps/Makefile.in gnome-applets-2.30.0/stickynotes/pixmaps/Makefile.in
---- gnome-applets-2.30.0.old/stickynotes/pixmaps/Makefile.in 2010-03-28 08:28:01.000000000 +0200
-+++ gnome-applets-2.30.0/stickynotes/pixmaps/Makefile.in 2010-05-05 10:10:06.442498815 +0200
+Index: gnome-applets-2.30.0/stickynotes/pixmaps/Makefile.in
+===================================================================
+--- gnome-applets-2.30.0.orig/stickynotes/pixmaps/Makefile.in 2010-03-28 08:28:01.000000000 +0200
++++ gnome-applets-2.30.0/stickynotes/pixmaps/Makefile.in 2010-07-07 21:46:00.686236137 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -183,6 +183,8 @@
+@@ -183,6 +183,8 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
MIXER_LIBS = @MIXER_LIBS@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
@@ -2518,24 +5230,37 @@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
-@@ -228,7 +230,6 @@
+@@ -205,6 +207,8 @@ PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POLKIT_CFLAGS = @POLKIT_CFLAGS@
+ POLKIT_LIBS = @POLKIT_LIBS@
+@@ -228,8 +232,9 @@ SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-SU_TOOL = @SU_TOOL@
SYSCONFDIR = @SYSCONFDIR@
++UPOWER_CFLAGS = @UPOWER_CFLAGS@
++UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
-diff -Naur gnome-applets-2.30.0.old/trashapplet/docs/Makefile.in gnome-applets-2.30.0/trashapplet/docs/Makefile.in
---- gnome-applets-2.30.0.old/trashapplet/docs/Makefile.in 2010-03-28 08:28:01.000000000 +0200
-+++ gnome-applets-2.30.0/trashapplet/docs/Makefile.in 2010-05-05 10:10:06.618498632 +0200
+ WARN_CFLAGS = @WARN_CFLAGS@
+Index: gnome-applets-2.30.0/trashapplet/docs/Makefile.in
+===================================================================
+--- gnome-applets-2.30.0.orig/trashapplet/docs/Makefile.in 2010-03-28 08:28:01.000000000 +0200
++++ gnome-applets-2.30.0/trashapplet/docs/Makefile.in 2010-07-07 21:46:00.902238022 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -184,6 +184,8 @@
+@@ -184,6 +184,8 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
MIXER_LIBS = @MIXER_LIBS@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
@@ -2544,24 +5269,37 @@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
-@@ -229,7 +231,6 @@
+@@ -206,6 +208,8 @@ PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POLKIT_CFLAGS = @POLKIT_CFLAGS@
+ POLKIT_LIBS = @POLKIT_LIBS@
+@@ -229,8 +233,9 @@ SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-SU_TOOL = @SU_TOOL@
SYSCONFDIR = @SYSCONFDIR@
++UPOWER_CFLAGS = @UPOWER_CFLAGS@
++UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
-diff -Naur gnome-applets-2.30.0.old/trashapplet/Makefile.in gnome-applets-2.30.0/trashapplet/Makefile.in
---- gnome-applets-2.30.0.old/trashapplet/Makefile.in 2010-03-28 08:28:01.000000000 +0200
-+++ gnome-applets-2.30.0/trashapplet/Makefile.in 2010-05-05 10:10:06.522499138 +0200
+ WARN_CFLAGS = @WARN_CFLAGS@
+Index: gnome-applets-2.30.0/trashapplet/Makefile.in
+===================================================================
+--- gnome-applets-2.30.0.orig/trashapplet/Makefile.in 2010-03-28 08:28:01.000000000 +0200
++++ gnome-applets-2.30.0/trashapplet/Makefile.in 2010-07-07 21:46:00.782233384 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -224,6 +224,8 @@
+@@ -224,6 +224,8 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
MIXER_LIBS = @MIXER_LIBS@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
@@ -2570,15 +5308,27 @@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
-@@ -269,7 +271,6 @@
+@@ -246,6 +248,8 @@ PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POLKIT_CFLAGS = @POLKIT_CFLAGS@
+ POLKIT_LIBS = @POLKIT_LIBS@
+@@ -269,8 +273,9 @@ SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-SU_TOOL = @SU_TOOL@
SYSCONFDIR = @SYSCONFDIR@
++UPOWER_CFLAGS = @UPOWER_CFLAGS@
++UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
-@@ -463,7 +464,7 @@
+ WARN_CFLAGS = @WARN_CFLAGS@
+@@ -463,7 +468,7 @@ uninstall-uiDATA:
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
@@ -2587,7 +5337,7 @@
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
-@@ -488,7 +489,7 @@
+@@ -488,7 +493,7 @@ $(RECURSIVE_TARGETS):
fi; test -z "$$fail"
$(RECURSIVE_CLEAN_TARGETS):
@@ -2596,16 +5346,17 @@
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
-diff -Naur gnome-applets-2.30.0.old/trashapplet/src/Makefile.in gnome-applets-2.30.0/trashapplet/src/Makefile.in
---- gnome-applets-2.30.0.old/trashapplet/src/Makefile.in 2010-03-28 08:28:02.000000000 +0200
-+++ gnome-applets-2.30.0/trashapplet/src/Makefile.in 2010-05-05 10:10:06.702498421 +0200
+Index: gnome-applets-2.30.0/trashapplet/src/Makefile.in
+===================================================================
+--- gnome-applets-2.30.0.orig/trashapplet/src/Makefile.in 2010-03-28 08:28:02.000000000 +0200
++++ gnome-applets-2.30.0/trashapplet/src/Makefile.in 2010-07-07 21:46:01.006233992 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -183,6 +183,8 @@
+@@ -183,6 +183,8 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
MIXER_LIBS = @MIXER_LIBS@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
@@ -2614,11 +5365,759 @@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
-@@ -228,7 +230,6 @@
+@@ -205,6 +207,8 @@ PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POLKIT_CFLAGS = @POLKIT_CFLAGS@
+ POLKIT_LIBS = @POLKIT_LIBS@
+@@ -228,8 +232,9 @@ SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-SU_TOOL = @SU_TOOL@
SYSCONFDIR = @SYSCONFDIR@
++UPOWER_CFLAGS = @UPOWER_CFLAGS@
++UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
+ WARN_CFLAGS = @WARN_CFLAGS@
+Index: gnome-applets-2.30.0/INSTALL
+===================================================================
+--- gnome-applets-2.30.0.orig/INSTALL 2010-07-07 21:47:17.022239859 +0200
++++ gnome-applets-2.30.0/INSTALL 2010-07-07 21:46:01.046238802 +0200
+@@ -4,8 +4,10 @@ Installation Instructions
+ Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
+ 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+
+- This file is free documentation; the Free Software Foundation gives
+-unlimited permission to copy, distribute and modify it.
++ Copying and distribution of this file, with or without modification,
++are permitted in any medium without royalty provided the copyright
++notice and this notice are preserved. This file is offered as-is,
++without warranty of any kind.
+
+ Basic Installation
+ ==================
+@@ -13,7 +15,11 @@ Basic Installation
+ Briefly, the shell commands `./configure; make; make install' should
+ configure, build, and install this package. The following
+ more-detailed instructions are generic; see the `README' file for
+-instructions specific to this package.
++instructions specific to this package. Some packages provide this
++`INSTALL' file but do not implement all of the features documented
++below. The lack of an optional feature in a given package is not
++necessarily a bug. More recommendations for GNU packages can be found
++in *note Makefile Conventions: (standards)Makefile Conventions.
+
+ The `configure' shell script attempts to guess correct values for
+ various system-dependent variables used during compilation. It uses
+@@ -42,7 +48,7 @@ may remove or edit it.
+ you want to change it or regenerate `configure' using a newer version
+ of `autoconf'.
+
+-The simplest way to compile this package is:
++ The simplest way to compile this package is:
+
+ 1. `cd' to the directory containing the package's source code and type
+ `./configure' to configure the package for your system.
+@@ -53,12 +59,22 @@ The simplest way to compile this package
+ 2. Type `make' to compile the package.
+
+ 3. Optionally, type `make check' to run any self-tests that come with
+- the package.
++ the package, generally using the just-built uninstalled binaries.
+
+ 4. Type `make install' to install the programs and any data files and
+- documentation.
++ documentation. When installing into a prefix owned by root, it is
++ recommended that the package be configured and built as a regular
++ user, and only the `make install' phase executed with root
++ privileges.
++
++ 5. Optionally, type `make installcheck' to repeat any self-tests, but
++ this time using the binaries in their final installed location.
++ This target does not install anything. Running this target as a
++ regular user, particularly if the prior `make install' required
++ root privileges, verifies that the installation completed
++ correctly.
+
+- 5. You can remove the program binaries and object files from the
++ 6. You can remove the program binaries and object files from the
+ source code directory by typing `make clean'. To also remove the
+ files that `configure' created (so you can compile the package for
+ a different kind of computer), type `make distclean'. There is
+@@ -67,8 +83,15 @@ The simplest way to compile this package
+ all sorts of other programs in order to regenerate files that came
+ with the distribution.
+
+- 6. Often, you can also type `make uninstall' to remove the installed
+- files again.
++ 7. Often, you can also type `make uninstall' to remove the installed
++ files again. In practice, not all packages have tested that
++ uninstallation works correctly, even though it is required by the
++ GNU Coding Standards.
++
++ 8. Some packages, particularly those that use Automake, provide `make
++ distcheck', which can by used by developers to test that all other
++ targets like `make install' and `make uninstall' work correctly.
++ This target is generally not run by end users.
+
+ Compilers and Options
+ =====================
+@@ -93,7 +116,8 @@ same time, by placing the object files f
+ own directory. To do this, you can use GNU `make'. `cd' to the
+ directory where you want the object files and executables to go and run
+ the `configure' script. `configure' automatically checks for the
+-source code in the directory that `configure' is in and in `..'.
++source code in the directory that `configure' is in and in `..'. This
++is known as a "VPATH" build.
+
+ With a non-GNU `make', it is safer to compile the package for one
+ architecture at a time in the source code directory. After you have
+@@ -120,7 +144,8 @@ Installation Names
+ By default, `make install' installs the package's commands under
+ `/usr/local/bin', include files under `/usr/local/include', etc. You
+ can specify an installation prefix other than `/usr/local' by giving
+-`configure' the option `--prefix=PREFIX'.
++`configure' the option `--prefix=PREFIX', where PREFIX must be an
++absolute file name.
+
+ You can specify separate installation prefixes for
+ architecture-specific files and architecture-independent files. If you
+@@ -131,15 +156,46 @@ Documentation and other data files still
+ In addition, if you use an unusual directory layout you can give
+ options like `--bindir=DIR' to specify different values for particular
+ kinds of files. Run `configure --help' for a list of the directories
+-you can set and what kinds of files go in them.
++you can set and what kinds of files go in them. In general, the
++default for these options is expressed in terms of `${prefix}', so that
++specifying just `--prefix' will affect all of the other directory
++specifications that were not explicitly provided.
++
++ The most portable way to affect installation locations is to pass the
++correct locations to `configure'; however, many packages provide one or
++both of the following shortcuts of passing variable assignments to the
++`make install' command line to change installation locations without
++having to reconfigure or recompile.
++
++ The first method involves providing an override variable for each
++affected directory. For example, `make install
++prefix=/alternate/directory' will choose an alternate location for all
++directory configuration variables that were expressed in terms of
++`${prefix}'. Any directories that were specified during `configure',
++but not in terms of `${prefix}', must each be overridden at install
++time for the entire installation to be relocated. The approach of
++makefile variable overrides for each directory variable is required by
++the GNU Coding Standards, and ideally causes no recompilation.
++However, some platforms have known limitations with the semantics of
++shared libraries that end up requiring recompilation when using this
++method, particularly noticeable in packages that use GNU Libtool.
++
++ The second method involves providing the `DESTDIR' variable. For
++example, `make install DESTDIR=/alternate/directory' will prepend
++`/alternate/directory' before all installation names. The approach of
++`DESTDIR' overrides is not required by the GNU Coding Standards, and
++does not work on platforms that have drive letters. On the other hand,
++it does better at avoiding recompilation issues, and works well even
++when some directory options were not specified in terms of `${prefix}'
++at `configure' time.
++
++Optional Features
++=================
+
+ If the package supports it, you can cause programs to be installed
+ with an extra prefix or suffix on their names by giving `configure' the
+ option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
+
+-Optional Features
+-=================
+-
+ Some packages pay attention to `--enable-FEATURE' options to
+ `configure', where FEATURE indicates an optional part of the package.
+ They may also pay attention to `--with-PACKAGE' options, where PACKAGE
+@@ -152,6 +208,13 @@ find the X include and library files aut
+ you can use the `configure' options `--x-includes=DIR' and
+ `--x-libraries=DIR' to specify their locations.
+
++ Some packages offer the ability to configure how verbose the
++execution of `make' will be. For these packages, running `./configure
++--enable-silent-rules' sets the default to minimal output, which can be
++overridden with `make V=1'; while running `./configure
++--disable-silent-rules' sets the default to verbose, which can be
++overridden with `make V=0'.
++
+ Particular systems
+ ==================
+
+@@ -288,7 +351,7 @@ operates.
+ `configure' can determine that directory automatically.
+
+ `--prefix=DIR'
+- Use DIR as the installation prefix. *Note Installation Names::
++ Use DIR as the installation prefix. *note Installation Names::
+ for more details, including other options available for fine-tuning
+ the installation locations.
+
+Index: gnome-applets-2.30.0/config.guess
+===================================================================
+--- gnome-applets-2.30.0.orig/config.guess 2010-07-07 21:47:17.230235714 +0200
++++ gnome-applets-2.30.0/config.guess 2010-07-07 21:45:55.450923329 +0200
+@@ -1,10 +1,10 @@
+ #! /bin/sh
+ # Attempt to guess a canonical system name.
+ # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
++# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+ # Free Software Foundation, Inc.
+
+-timestamp='2009-04-27'
++timestamp='2009-12-30'
+
+ # This file is free software; you can redistribute it and/or modify it
+ # under the terms of the GNU General Public License as published by
+@@ -27,16 +27,16 @@ timestamp='2009-04-27'
+ # the same distribution terms that you use for the rest of that program.
+
+
+-# Originally written by Per Bothner <per at bothner.com>.
+-# Please send patches to <config-patches at gnu.org>. Submit a context
+-# diff and a properly formatted ChangeLog entry.
++# Originally written by Per Bothner. Please send patches (context
++# diff format) to <config-patches at gnu.org> and include a ChangeLog
++# entry.
+ #
+ # This script attempts to guess a canonical system name similar to
+ # config.sub. If it succeeds, it prints the system name on stdout, and
+ # exits with 0. Otherwise, it exits with 1.
+ #
+-# The plan is that this can be called by configure scripts if you
+-# don't specify an explicit build system type.
++# You can get the latest version of this script from:
++# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+
+ me=`echo "$0" | sed -e 's,.*/,,'`
+
+@@ -56,8 +56,9 @@ version="\
+ GNU config.guess ($timestamp)
+
+ Originally written by Per Bothner.
+-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
++2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
++Software Foundation, Inc.
+
+ This is free software; see the source for copying conditions. There is NO
+ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+@@ -170,7 +171,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
+ arm*|i386|m68k|ns32k|sh3*|sparc|vax)
+ eval $set_cc_for_build
+ if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
+- | grep __ELF__ >/dev/null
++ | grep -q __ELF__
+ then
+ # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
+ # Return netbsd for either. FIX?
+@@ -333,6 +334,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
+ sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
+ echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ exit ;;
++ i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
++ echo i386-pc-auroraux${UNAME_RELEASE}
++ exit ;;
+ i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
+ eval $set_cc_for_build
+ SUN_ARCH="i386"
+@@ -656,7 +660,7 @@ EOF
+ # => hppa64-hp-hpux11.23
+
+ if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
+- grep __LP64__ >/dev/null
++ grep -q __LP64__
+ then
+ HP_ARCH="hppa2.0w"
+ else
+@@ -807,12 +811,12 @@ EOF
+ i*:PW*:*)
+ echo ${UNAME_MACHINE}-pc-pw32
+ exit ;;
+- *:Interix*:[3456]*)
++ *:Interix*:*)
+ case ${UNAME_MACHINE} in
+ x86)
+ echo i586-pc-interix${UNAME_RELEASE}
+ exit ;;
+- EM64T | authenticamd | genuineintel)
++ authenticamd | genuineintel | EM64T)
+ echo x86_64-unknown-interix${UNAME_RELEASE}
+ exit ;;
+ IA64)
+@@ -822,6 +826,9 @@ EOF
+ [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
+ echo i${UNAME_MACHINE}-pc-mks
+ exit ;;
++ 8664:Windows_NT:*)
++ echo x86_64-pc-mks
++ exit ;;
+ i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
+ # How do we know it's Interix rather than the generic POSIX subsystem?
+ # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
+@@ -851,6 +858,20 @@ EOF
+ i*86:Minix:*:*)
+ echo ${UNAME_MACHINE}-pc-minix
+ exit ;;
++ alpha:Linux:*:*)
++ case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
++ EV5) UNAME_MACHINE=alphaev5 ;;
++ EV56) UNAME_MACHINE=alphaev56 ;;
++ PCA56) UNAME_MACHINE=alphapca56 ;;
++ PCA57) UNAME_MACHINE=alphapca56 ;;
++ EV6) UNAME_MACHINE=alphaev6 ;;
++ EV67) UNAME_MACHINE=alphaev67 ;;
++ EV68*) UNAME_MACHINE=alphaev68 ;;
++ esac
++ objdump --private-headers /bin/sh | grep -q ld.so.1
++ if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
++ echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
++ exit ;;
+ arm*:Linux:*:*)
+ eval $set_cc_for_build
+ if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
+@@ -873,6 +894,17 @@ EOF
+ frv:Linux:*:*)
+ echo frv-unknown-linux-gnu
+ exit ;;
++ i*86:Linux:*:*)
++ LIBC=gnu
++ eval $set_cc_for_build
++ sed 's/^ //' << EOF >$dummy.c
++ #ifdef __dietlibc__
++ LIBC=dietlibc
++ #endif
++EOF
++ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
++ echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
++ exit ;;
+ ia64:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit ;;
+@@ -882,78 +914,34 @@ EOF
+ m68*:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit ;;
+- mips:Linux:*:*)
+- eval $set_cc_for_build
+- sed 's/^ //' << EOF >$dummy.c
+- #undef CPU
+- #undef mips
+- #undef mipsel
+- #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
+- CPU=mipsel
+- #else
+- #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
+- CPU=mips
+- #else
+- CPU=
+- #endif
+- #endif
+-EOF
+- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+- /^CPU/{
+- s: ::g
+- p
+- }'`"
+- test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
+- ;;
+- mips64:Linux:*:*)
++ mips:Linux:*:* | mips64:Linux:*:*)
+ eval $set_cc_for_build
+ sed 's/^ //' << EOF >$dummy.c
+ #undef CPU
+- #undef mips64
+- #undef mips64el
++ #undef ${UNAME_MACHINE}
++ #undef ${UNAME_MACHINE}el
+ #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
+- CPU=mips64el
++ CPU=${UNAME_MACHINE}el
+ #else
+ #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
+- CPU=mips64
++ CPU=${UNAME_MACHINE}
+ #else
+ CPU=
+ #endif
+ #endif
+ EOF
+- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+- /^CPU/{
+- s: ::g
+- p
+- }'`"
++ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
+ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
+ ;;
+ or32:Linux:*:*)
+ echo or32-unknown-linux-gnu
+ exit ;;
+- ppc:Linux:*:*)
+- echo powerpc-unknown-linux-gnu
+- exit ;;
+- ppc64:Linux:*:*)
+- echo powerpc64-unknown-linux-gnu
+- exit ;;
+- alpha:Linux:*:*)
+- case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
+- EV5) UNAME_MACHINE=alphaev5 ;;
+- EV56) UNAME_MACHINE=alphaev56 ;;
+- PCA56) UNAME_MACHINE=alphapca56 ;;
+- PCA57) UNAME_MACHINE=alphapca56 ;;
+- EV6) UNAME_MACHINE=alphaev6 ;;
+- EV67) UNAME_MACHINE=alphaev67 ;;
+- EV68*) UNAME_MACHINE=alphaev68 ;;
+- esac
+- objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
+- if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
+- echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+- exit ;;
+ padre:Linux:*:*)
+ echo sparc-unknown-linux-gnu
+ exit ;;
++ parisc64:Linux:*:* | hppa64:Linux:*:*)
++ echo hppa64-unknown-linux-gnu
++ exit ;;
+ parisc:Linux:*:* | hppa:Linux:*:*)
+ # Look for CPU level
+ case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
+@@ -962,8 +950,11 @@ EOF
+ *) echo hppa-unknown-linux-gnu ;;
+ esac
+ exit ;;
+- parisc64:Linux:*:* | hppa64:Linux:*:*)
+- echo hppa64-unknown-linux-gnu
++ ppc64:Linux:*:*)
++ echo powerpc64-unknown-linux-gnu
++ exit ;;
++ ppc:Linux:*:*)
++ echo powerpc-unknown-linux-gnu
+ exit ;;
+ s390:Linux:*:* | s390x:Linux:*:*)
+ echo ${UNAME_MACHINE}-ibm-linux
+@@ -986,66 +977,6 @@ EOF
+ xtensa*:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit ;;
+- i*86:Linux:*:*)
+- # The BFD linker knows what the default object file format is, so
+- # first see if it will tell us. cd to the root directory to prevent
+- # problems with other programs or directories called `ld' in the path.
+- # Set LC_ALL=C to ensure ld outputs messages in English.
+- ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
+- | sed -ne '/supported targets:/!d
+- s/[ ][ ]*/ /g
+- s/.*supported targets: *//
+- s/ .*//
+- p'`
+- case "$ld_supported_targets" in
+- elf32-i386)
+- TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
+- ;;
+- a.out-i386-linux)
+- echo "${UNAME_MACHINE}-pc-linux-gnuaout"
+- exit ;;
+- "")
+- # Either a pre-BFD a.out linker (linux-gnuoldld) or
+- # one that does not give us useful --help.
+- echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
+- exit ;;
+- esac
+- # Determine whether the default compiler is a.out or elf
+- eval $set_cc_for_build
+- sed 's/^ //' << EOF >$dummy.c
+- #include <features.h>
+- #ifdef __ELF__
+- # ifdef __GLIBC__
+- # if __GLIBC__ >= 2
+- LIBC=gnu
+- # else
+- LIBC=gnulibc1
+- # endif
+- # else
+- LIBC=gnulibc1
+- # endif
+- #else
+- #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
+- LIBC=gnu
+- #else
+- LIBC=gnuaout
+- #endif
+- #endif
+- #ifdef __dietlibc__
+- LIBC=dietlibc
+- #endif
+-EOF
+- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+- /^LIBC/{
+- s: ::g
+- p
+- }'`"
+- test x"${LIBC}" != x && {
+- echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
+- exit
+- }
+- test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
+- ;;
+ i*86:DYNIX/ptx:4*:*)
+ # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
+ # earlier versions are messed up and put the nodename in both
+@@ -1074,7 +1005,7 @@ EOF
+ i*86:syllable:*:*)
+ echo ${UNAME_MACHINE}-pc-syllable
+ exit ;;
+- i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
++ i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
+ echo i386-unknown-lynxos${UNAME_RELEASE}
+ exit ;;
+ i*86:*DOS:*:*)
+@@ -1182,7 +1113,7 @@ EOF
+ rs6000:LynxOS:2.*:*)
+ echo rs6000-unknown-lynxos${UNAME_RELEASE}
+ exit ;;
+- PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
++ PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
+ echo powerpc-unknown-lynxos${UNAME_RELEASE}
+ exit ;;
+ SM[BE]S:UNIX_SV:*:*)
+@@ -1275,6 +1206,16 @@ EOF
+ *:Darwin:*:*)
+ UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
+ case $UNAME_PROCESSOR in
++ i386)
++ eval $set_cc_for_build
++ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
++ if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
++ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
++ grep IS_64BIT_ARCH >/dev/null
++ then
++ UNAME_PROCESSOR="x86_64"
++ fi
++ fi ;;
+ unknown) UNAME_PROCESSOR=powerpc ;;
+ esac
+ echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
+Index: gnome-applets-2.30.0/config.h.in
+===================================================================
+--- gnome-applets-2.30.0.orig/config.h.in 2010-07-07 21:47:16.866235385 +0200
++++ gnome-applets-2.30.0/config.h.in 2010-07-07 21:46:12.878734957 +0200
+@@ -111,6 +111,9 @@
+ /* Define to 1 if you have the <unistd.h> header file. */
+ #undef HAVE_UNISTD_H
+
++/* UPOWER available */
++#undef HAVE_UPOWER
++
+ /* Define to 1 if you have the <values.h> header file. */
+ #undef HAVE_VALUES_H
+
+Index: gnome-applets-2.30.0/config.sub
+===================================================================
+--- gnome-applets-2.30.0.orig/config.sub 2010-07-07 21:47:17.126240725 +0200
++++ gnome-applets-2.30.0/config.sub 2010-07-07 21:45:55.474235510 +0200
+@@ -1,10 +1,10 @@
+ #! /bin/sh
+ # Configuration validation subroutine script.
+ # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
++# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+ # Free Software Foundation, Inc.
+
+-timestamp='2009-04-17'
++timestamp='2010-01-22'
+
+ # This file is (in principle) common to ALL GNU software.
+ # The presence of a machine in this file suggests that SOME GNU software
+@@ -32,13 +32,16 @@ timestamp='2009-04-17'
+
+
+ # Please send patches to <config-patches at gnu.org>. Submit a context
+-# diff and a properly formatted ChangeLog entry.
++# diff and a properly formatted GNU ChangeLog entry.
+ #
+ # Configuration subroutine to validate and canonicalize a configuration type.
+ # Supply the specified configuration type as an argument.
+ # If it is invalid, we print an error message on stderr and exit with code 1.
+ # Otherwise, we print the canonical config type on stdout and succeed.
+
++# You can get the latest version of this script from:
++# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
++
+ # This file is supposed to be the same for all GNU packages
+ # and recognize all the CPU types, system types and aliases
+ # that are meaningful with *any* GNU software.
+@@ -72,8 +75,9 @@ Report bugs and patches to <config-patch
+ version="\
+ GNU config.sub ($timestamp)
+
+-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
++2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
++Software Foundation, Inc.
+
+ This is free software; see the source for copying conditions. There is NO
+ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+@@ -149,10 +153,13 @@ case $os in
+ -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
+ -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
+ -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
+- -apple | -axis | -knuth | -cray)
++ -apple | -axis | -knuth | -cray | -microblaze)
+ os=
+ basic_machine=$1
+ ;;
++ -bluegene*)
++ os=-cnk
++ ;;
+ -sim | -cisco | -oki | -wec | -winbond)
+ os=
+ basic_machine=$1
+@@ -281,6 +288,7 @@ case $basic_machine in
+ | pdp10 | pdp11 | pj | pjl \
+ | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
+ | pyramid \
++ | rx \
+ | score \
+ | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
+ | sh64 | sh64le \
+@@ -288,13 +296,14 @@ case $basic_machine in
+ | sparcv8 | sparcv9 | sparcv9b | sparcv9v \
+ | spu | strongarm \
+ | tahoe | thumb | tic4x | tic80 | tron \
++ | ubicom32 \
+ | v850 | v850e \
+ | we32k \
+ | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
+ | z8k | z80)
+ basic_machine=$basic_machine-unknown
+ ;;
+- m6811 | m68hc11 | m6812 | m68hc12)
++ m6811 | m68hc11 | m6812 | m68hc12 | picochip)
+ # Motorola 68HC11/12.
+ basic_machine=$basic_machine-unknown
+ os=-none
+@@ -337,7 +346,7 @@ case $basic_machine in
+ | lm32-* \
+ | m32c-* | m32r-* | m32rle-* \
+ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
+- | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
++ | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
+ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
+ | mips16-* \
+ | mips64-* | mips64el-* \
+@@ -365,15 +374,17 @@ case $basic_machine in
+ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
+ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
+ | pyramid-* \
+- | romp-* | rs6000-* \
++ | romp-* | rs6000-* | rx-* \
+ | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
+ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
+ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
+ | sparclite-* \
+ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
+ | tahoe-* | thumb-* \
+- | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
++ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
++ | tile-* | tilegx-* \
+ | tron-* \
++ | ubicom32-* \
+ | v850-* | v850e-* | vax-* \
+ | we32k-* \
+ | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
+@@ -467,6 +478,10 @@ case $basic_machine in
+ basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
+ os=-linux
+ ;;
++ bluegene*)
++ basic_machine=powerpc-ibm
++ os=-cnk
++ ;;
+ c90)
+ basic_machine=c90-cray
+ os=-unicos
+@@ -719,6 +734,9 @@ case $basic_machine in
+ basic_machine=ns32k-utek
+ os=-sysv
+ ;;
++ microblaze)
++ basic_machine=microblaze-xilinx
++ ;;
+ mingw32)
+ basic_machine=i386-pc
+ os=-mingw32
+@@ -1069,6 +1087,11 @@ case $basic_machine in
+ basic_machine=tic6x-unknown
+ os=-coff
+ ;;
++ # This must be matched before tile*.
++ tilegx*)
++ basic_machine=tilegx-unknown
++ os=-linux-gnu
++ ;;
+ tile*)
+ basic_machine=tile-unknown
+ os=-linux-gnu
+@@ -1240,6 +1263,9 @@ case $os in
+ # First match some system type aliases
+ # that might get confused with valid system types.
+ # -solaris* is a basic system type, with this one exception.
++ -auroraux)
++ os=-auroraux
++ ;;
+ -solaris1 | -solaris1.*)
+ os=`echo $os | sed -e 's|solaris1|sunos4|'`
+ ;;
+@@ -1260,9 +1286,9 @@ case $os in
+ # Each alternative MUST END IN A *, to match a version number.
+ # -sysv* is not here because it comes later, after sysvr4.
+ -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
+- | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
+- | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
+- | -kopensolaris* \
++ | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
++ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
++ | -sym* | -kopensolaris* \
+ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
+ | -aos* | -aros* \
+ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
+@@ -1283,7 +1309,7 @@ case $os in
+ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
+ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
+ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
+- | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
++ | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
+ # Remember, each alternative MUST END IN *, to match a version number.
+ ;;
+ -qnx*)
+@@ -1416,6 +1442,8 @@ case $os in
+ -dicos*)
+ os=-dicos
+ ;;
++ -nacl*)
++ ;;
+ -none)
+ ;;
+ *)
+@@ -1613,7 +1641,7 @@ case $basic_machine in
+ -sunos*)
+ vendor=sun
+ ;;
+- -aix*)
++ -cnk*|-aix*)
+ vendor=ibm
+ ;;
+ -beos*)
Modified: desktop/unstable/gnome-applets/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-applets/debian/patches/series?rev=24721&op=diff
==============================================================================
--- desktop/unstable/gnome-applets/debian/patches/series [utf-8] (original)
+++ desktop/unstable/gnome-applets/debian/patches/series [utf-8] Wed Jul 7 20:03:10 2010
@@ -1,3 +1,4 @@
+01_battstat_upower.patch
09_modemlights_use_new_gst.patch
10_network-manager.patch
15_path-max.patch
Modified: desktop/unstable/gnome-applets/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-applets/debian/rules?rev=24721&op=diff
==============================================================================
--- desktop/unstable/gnome-applets/debian/rules [utf-8] (original)
+++ desktop/unstable/gnome-applets/debian/rules [utf-8] Wed Jul 7 20:03:10 2010
@@ -13,7 +13,6 @@
--enable-ipv6 \
--enable-suid=no \
--enable-mixer-applet \
- --disable-battstat \
--without-hal
DEB_MAKE_ENVVARS += echo=/bin/echo
More information about the pkg-gnome-commits
mailing list