--- gnome-power-manager-2.30.0.orig/debian/compat +++ gnome-power-manager-2.30.0/debian/compat @@ -0,0 +1 @@ +5 --- gnome-power-manager-2.30.0.orig/debian/docs +++ gnome-power-manager-2.30.0/debian/docs @@ -0,0 +1,3 @@ +NEWS +README +TODO --- gnome-power-manager-2.30.0.orig/debian/copyright +++ gnome-power-manager-2.30.0/debian/copyright @@ -0,0 +1,39 @@ +This package was debianized by Riccardo Setti + +It was downloaded from http://ftp.gnome.org/pub/GNOME/sources/gnome-power-manager/ + +Copyright Holder: Richard Hughes + William Jon McCann + Jaap A. Haitsma +License: + + This package 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 package 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 package; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +On Debian systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL'. + +src/eggtryicon.c src/eggtryicon.h are copyright of Anders Carlsson +and are relased under the terms of the GPL 2 + +On Debian systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL'. + +src/gtk-stock-icon.c, src/gtk-stock-icon.h are copyright of Colin Walters +XSBC-Original-Maintainer: Debian GNOME Maintainers +XSBC-Original-Uploaders: @GNOME_TEAM@ +Build-Depends: debhelper (>= 5), + cdbs, + quilt, + autotools-dev, + libtool, + libpanel-applet2-dev (>= 2.0.0), + libdbus-glib-1-dev (>= 0.70), + libxml-parser-perl, + libxext-dev, + libx11-dev, + libgtk2.0-dev (>= 2.17.7), + libglib2.0-dev (>= 2.13.0), + libwnck-dev (>= 2.10.0), + docbook-to-man, + intltool, + libnotify-dev (>= 0.4.4-3), + docbook-utils, + libxrandr-dev (>= 1.2.0), + xmlto, + gnome-doc-utils, + scrollkeeper, + gnome-pkg-tools (>= 0.10), + libdevkit-power-gobject-dev (>= 008), + libcanberra-gtk-dev (>= 0.10), + libunique-dev (>= 0.9.4), + libgnome-keyring-dev (>= 0.6.0), + libappindicator-dev (>= 0.0.13), + pkg-config +Standards-Version: 3.8.4 +Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/gnome-power/ubuntu +Homepage: http://www.gnome.org/projects/gnome-power-manager/ + +Package: gnome-power-manager +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends}, + notification-daemon, + dbus-x11, + consolekit, + upower +Breaks: gnome-session (<< 2.28) +Recommends: udisks +Suggests: hal +Description: power management tool for the GNOME desktop + GNOME Power Manager is a session daemon for the GNOME desktop + that takes care of system or desktop events related to power, and + triggers actions accordingly. Its philosophy is to completely hide + these complex tasks and only show some settings important to the user. + . + The GNOME power manager displays and manages battery status, power plug + events, display brightness, CPU, graphics card and hard disk drive + power saving, and can trigger suspend-to-RAM, hibernate or shutdown + events, all integrated to other components of the GNOME desktop. --- gnome-power-manager-2.30.0.orig/debian/gconf-defaults +++ gnome-power-manager-2.30.0/debian/gconf-defaults @@ -0,0 +1,4 @@ +/apps/gnome-power-manager/notify/sleep_failed_uri "" +/apps/gnome-power-manager/ui/icon_policy charge +/apps/gnome-power-manager/lock/use_screensaver_settings false +/apps/gnome-power-manager/lock/blank_screen false --- gnome-power-manager-2.30.0.orig/debian/rules +++ gnome-power-manager-2.30.0/debian/rules @@ -0,0 +1,42 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/gnome.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.mk +include /usr/share/cdbs/1/rules/utils.mk +include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk +-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk + +DEB_AUTO_UPDATE_AUTOCONF = "yes" + +DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH) + +DEB_CONFIGURE_EXTRA_FLAGS += \ + --without-gconf-source \ + --enable-libnotify \ + --enable-policykit \ + --with-dpms-ext \ + --with-dbus-services=/usr/share/dbus-1/services/ \ + --disable-scrollkeeper \ + --with-doc-dir=/usr/share/doc/gnome-power-manager/ \ + --enable-applets \ + --enable-appindicator=yes \ + --enable-hal + +LDFLAGS += -Wl,-O1 -Wl,-z,defs -Wl,--as-needed +CFLAGS += -Wno-cast-align + +clean:: + rm -f po/*.gmo + +binary-install/gnome-power-manager:: + mv debian/gnome-power-manager/usr/bin/gnome-power-bugreport.sh debian/gnome-power-manager/usr/share/gnome-power-manager/gnome-power-bugreport + rm -f debian/gnome-power-manager/usr/share/doc/gnome-power-manager/README.cvs + rm -rf debian/gnome-power-manager/etc/dbus/system.d + rm -f debian/gnome-power-manager/usr/share/applications/gnome-power-statistics.desktop + chmod 755 debian/gnome-power-manager/usr/share/bug/gnome-power-manager/script + +install/gnome-power-manager:: + mkdir -p debian/gnome-power-manager/usr/share/gconf/defaults + cp debian/gconf-defaults debian/gnome-power-manager/usr/share/gconf/defaults/10_gnome-power-manager + --- gnome-power-manager-2.30.0.orig/debian/changelog +++ gnome-power-manager-2.30.0/debian/changelog @@ -0,0 +1,1645 @@ +gnome-power-manager (2.30.0-0ubuntu1.1) lucid-proposed; urgency=low + + * debian/patches/13-lock-on-blank.patch: + - When we blank due to a timeout, make sure to lock (in case + we've blanked before the screensaver is active). LP: #620693 + + -- Michael Terry Wed, 21 Sep 2011 15:28:15 -0400 + +gnome-power-manager (2.30.0-0ubuntu1) lucid; urgency=low + + * New upstream release: + - Check for libpanel only if building the applets + - Check for XRR* functions using library version instead of proto version + - Use pkg-config instead of autoconf macros to find X libs and protos + - Declare GError in gpm_brightness_hal_init to fix build failure + - Do not set a charge warning if the device is on AC + - Do not use EggDbusProxy in GpmScreensaver + - Don't query the capabilities of the notification daemon + - Ensure we close any 'battery low' notifications when we switch to being + on AC + - Fix a problem where the critical action is not done in the case of a UPS + - Fix a race condition where we can miss the idle reset alarm + - Fix up a translation using ngettext rather than assuming the plural. + - Fix wrong suspends with docked laptops + - If a battery charge is low but not critical don't play the sound meant + for a critical charge event + - Play a sound loop if the charge of a laptop battery/ups reaches a + critical level. + - Remove the pointy-finger status icon when the idletime code fails to work + correctly + - Replace devkit-power call with upower in gnome-power-bugreport.sh + * Drop patches which went upstream: + - 01-suspend-on-vt-change.patch + - 10-proxy-by-name.patch + - 13-dont-query-notify-caps.patch + - 14-critical-message-timeout.patch + - 15-declare-gerror.patch + - 16-upower-bugreport.patch + - 18-fix-idletime-reset-race.patch + * Drop 06-bugreport-debian.patch: It's actually wrong for Ubuntu, we use + lsb_release, not /etc/debian_version. + * 90-autotools.patch: Regenerate. + * 08-desktop-bugreport-path.patch, 12-add-appindicators.patch: Update to + current patch tagging guidelines. + * debian/control.in: Set Maintainer from "Ted Gould" to "Ubuntu Developers". + * Synchronize with Debian: + - Build/binary dependency cleanup/shuffling. + - Bump Standards-Version to 3.8.4. + - Add debian/preinst for upgrade conffile cleanup. + - Drop obsolete debian/README.Debian + + -- Martin Pitt Mon, 29 Mar 2010 14:34:27 +0200 + +gnome-power-manager (2.29.91-0ubuntu10) lucid; urgency=low + + * debian/patches/03-dont-dim-when-inactive.patch: + - Don't dim or blank the screen on idle when we are not on the + active console + + -- Chris Coulson Sat, 27 Mar 2010 15:36:42 +0000 + +gnome-power-manager (2.29.91-0ubuntu9) lucid; urgency=low + + * 12-add-appindicators.patch: Drop bogus hunk which always showed "(null) is + present" in the battery status notification. (LP: #546564) + + -- Martin Pitt Fri, 26 Mar 2010 16:39:17 +0100 + +gnome-power-manager (2.29.91-0ubuntu8) lucid; urgency=low + + * Drop 17-unify-power-strings.patch entirely, as per recent discussion we + will not push that into lucid any more. + + -- Martin Pitt Wed, 24 Mar 2010 16:53:40 +0100 + +gnome-power-manager (2.29.91-0ubuntu7) lucid; urgency=low + + [ Chris Coulson ] + * Updated patch tag information now some patches are upstream + + [ Martin Pitt ] + * 17-unify-power-strings.patch: + - Revert "Shut down" → "Switch off" change for lucid, as in other + packages. This is still being debated. + - Revert all the "your computer" → "the computer" (and similar) changes. + No reason to break hundreds of translations for such unimportant changes. + * Add 01-suspend-on-vt-change.patch: Fix wrong suspends with docked laptops. + (LP: #515465) + + -- Martin Pitt Wed, 24 Mar 2010 15:29:44 +0100 + +gnome-power-manager (2.29.91-0ubuntu6) lucid; urgency=low + + [ Chris Coulson ] + * Updated patch tag information + * debian/local/source_gnome-power-manager.py + - Fetch inhibitors from gnome-session and add them to the submitted bug + report (under the 'GnomeSessionInhibitors' key). Also provide an overall + summary indicating if the session has been inhibited from going idle + (the 'GnomeSessionIdleInhibited' key) or if the session has been + inhibited from suspending (the 'GnomeSessionSuspendInhibited' key). + This is copied from the gnome-screensaver apport hook, and can be + useful when debugging issues where a users display doesn't blank or + the machine doesn't sleep. + * debian/patches/14-critical-message-timeout.patch: + - Update to revert another upstream change to use a non-expiring + notification. This prevents it being displayed as a fallback alert + box with notify-osd (LP: #533652) + + [ Jan Arne Petersen ] + * debian/patches/12-add-appindicators.patch: + - Fix icon theme include path (LP: #529911) + + [ Scott Howard ] + * Adds hardware information to apport hook (LP: #522972) + + -- Chris Coulson Fri, 12 Mar 2010 09:47:41 +0000 + +gnome-power-manager (2.29.91-0ubuntu5) lucid; urgency=low + + * debian/patches/18-fix-idletime-reset-race.patch: + - Fix a race condition where we might miss the idle reset alarm, + causing unwanted display blanking later on (LP: #423694) + + -- Chris Coulson Fri, 05 Mar 2010 18:44:26 +0000 + +gnome-power-manager (2.29.91-0ubuntu4) lucid; urgency=low + + * debian/patches/17-unify-power-strings.patch: + - Patch from Ted Gould to change "Shut down" and "Suspend" to + "Switch off" and "Sleep" (LP: #531491) + * debian/patches/12-add-appindicators.patch: + - Update from Jan Arne Petersen to reduce the width of the indicator + menu (LP: #531620) + + -- Chris Coulson Thu, 04 Mar 2010 17:29:37 +0000 + +gnome-power-manager (2.29.91-0ubuntu3) lucid; urgency=low + + * debian/local/source_gnome-power-manager.py, + debian/patches/16-upower-bugreport.patch: + - Call upower rather than devkit-power now + + -- Chris Coulson Tue, 02 Mar 2010 22:14:10 +0000 + +gnome-power-manager (2.29.91-0ubuntu2) lucid; urgency=low + + * debian/patches/15-declare-gerror.patch: + - Update to initialize the GError and fix a crash at startup + (LP: #530365) + + -- Chris Coulson Tue, 02 Mar 2010 01:34:23 +0000 + +gnome-power-manager (2.29.91-0ubuntu1) lucid; urgency=low + + * New upstream version + - DeviceKit-disks is now called UDisks + - Ensure we clear all notification bubbles on resume + - Set the timeout for critical battery notification to never + - Increase the critical action timeout to 20 seconds + - When we're critically low, don't give a time as it's often imprecise + * Dropped 11-add-error-logging.patch - merged upstream + * Refreshed patches: + - 13-dont-query-notify-caps.patch + - 90-autotools.patch + * debian/patches/12-add-appindicators.patch: + - Update labels and remove images from the menu (LP: #528522). + Thanks to Jan Arne Petersen + - Refreshed to apply cleanly again + * debian/patches/14-critical-message-timeout.patch: + - Revert upstream change to set the critical warning to never expire. + This causes a fallback alert to appear with notify-osd + * debian/patches/15-declare-gerror.patch: + - Add a missing declaration to fix FTBFS + + -- Chris Coulson Mon, 01 Mar 2010 16:59:38 +0000 + +gnome-power-manager (2.29.2-0ubuntu9) lucid; urgency=low + + * 12-add-appindicators.patch: Correctly show the menu after construction, to + fix empty battery popup. Thanks Jan Arne Petersen! (LP: #526747) + + -- Martin Pitt Thu, 25 Feb 2010 10:04:55 +0100 + +gnome-power-manager (2.29.2-0ubuntu8) lucid; urgency=low + + * debian/patches/02-notify-osd-support.patch: + - NULL terminate the list of properties passed to g_object_new, to + fix some memory errors and a warning (LP: #525220) + * debian/patches/13-dont-query-notify-caps.patch: + - Don't query the server capabilities for the status and warning + notifications. Knowledge of the capabilities is not used anywhere + and it was causing notify-osd to be activated early in the session + + -- Chris Coulson Tue, 23 Feb 2010 20:36:04 +0000 + +gnome-power-manager (2.29.2-0ubuntu7) lucid; urgency=low + + * Re-enable appindicator, indicator-application was fixed. (LP: #497870) + + -- Martin Pitt Mon, 22 Feb 2010 17:48:14 +0100 + +gnome-power-manager (2.29.2-0ubuntu6) lucid; urgency=low + + * debian/rules: Disable appindicator for now. The patch causes g-p-m to + crash on startup (LP: #523041 ), is very brittle (no + checks for indicator_new() failure/NULL pointers) and does not fall back + to upstream behaviour dynamically if indicator initialization fails. + This reopens LP #497870. + + -- Martin Pitt Wed, 17 Feb 2010 10:02:05 +0100 + +gnome-power-manager (2.29.2-0ubuntu5) lucid; urgency=low + + * debian/control.in + - Added build depends for libappindicator-dev + + -- Ken VanDine Wed, 17 Feb 2010 00:41:43 -0500 + +gnome-power-manager (2.29.2-0ubuntu4) lucid; urgency=low + + * debian/patches/12-add-appindicators.patch + - Adds support for application indicators (LP: #497870) + * debian/rules + - Enable appindicator + + -- Ken VanDine Tue, 16 Feb 2010 21:11:43 -0500 + +gnome-power-manager (2.29.2-0ubuntu3) lucid; urgency=low + + * debian/control.in: Move devicekit-power dependency to upower. + + -- Martin Pitt Tue, 16 Feb 2010 10:39:51 +0100 + +gnome-power-manager (2.29.2-0ubuntu2) lucid; urgency=low + + * debian/patches/02-notify-osd-support.patch: + - Create a new class for the brightness notifications (makes the + code more portable) + - Make the overshoot effects work again + * debian/patches/90-autotools.patch: + - Updated + + -- Chris Coulson Sun, 07 Feb 2010 23:52:18 +0000 + +gnome-power-manager (2.29.2-0ubuntu1) lucid; urgency=low + + * New upstream release: + - Move the power management preferences into the hardware section of the + control center. + - Use the name of 'Power' for the power management preferences capplet + - Don't rely on the cached value of the lid status, to fix a double + suspend issue (LP: #425411) + - Add a flag to inhibit consolekit events just after we resumed + - Don't automatically suspend if there are suspend inhibits + - Do not exit if hal is not available + - Only connect to HAL if there is no xrandr backlight hardware + - Fix compile when using an ld that defaults to --as-needed + - Enable the help action in gnome-power-statistics. Fixes #607005 + - Ensure the window is realized before we invalidate it. Fixes #604918 + - Don't show the user a sleep failed link pointing to the quirk site + - Show the device name even when using UPower + - Translation updates. + * Drop patches accepted upstream: + + 03-run-without-hal.patch + + 04-dont-connect-to-hal-with-xrandr.patch + + 09-fix-double-suspend.patch + * Regenerate 90-autotools.patch. + + -- Martin Pitt Fri, 05 Feb 2010 13:28:09 -0800 + +gnome-power-manager (2.29.1-0ubuntu4) lucid; urgency=low + + * Add upstream bug references to debian/patches/10-proxy-by-name.patch + and debian/patches/11-add-error-logging.patch. + + -- Marc Deslauriers Thu, 04 Feb 2010 14:37:34 -0800 + +gnome-power-manager (2.29.1-0ubuntu3) lucid; urgency=low + + * 10-proxy-by-name.patch: create a new proxy by name, and not by name + owner. Also, don't try to reconnect in the callback. This prevents + screen locking failure when gnome-screensaver now gets respawned by + D-Bus. + * 11-add-error-logging.patch: add an error message to help debugging + when we hit the timeout while waiting for gnome-screensaver. + + -- Marc Deslauriers Thu, 04 Feb 2010 10:16:01 -0800 + +gnome-power-manager (2.29.1-0ubuntu2) lucid; urgency=low + + [ Chow Loong Jin ] + * debian/patches/09-fix-double-suspend.patch: + - Updated to make gpm_button_is_lid_closed return a current value + from DeviceKit instead of its own locally stored (outdated) value. + This fixes another resume race, and really fixes LP: #425411. + + -- Chris Coulson Sun, 24 Jan 2010 18:53:10 +0000 + +gnome-power-manager (2.29.1-0ubuntu1) lucid; urgency=low + + [ Chris Coulson ] + * New upstream version: + - Switch to a single menu design, rather than a seporate left and + right menu. + - Show the sleep failure as a modal dialog box. + - Sets some tooltips for the gnome-power-preferences buttons. + - Throttle screensaver before suspend/hibernate. + - Add a --device parameter to gnome-power-statistics so we can set + the device focus. + - When we click on a battery device in the context menu, show the + gnome-power-statistics dialog. + - Use gnome-settings-daemon popup code. + * debian/control: + - Don't build-depend on libhal-dev, it's not needed even with HAL + support. + * debian/rules: + - Configure with --enable-hal. HAL support is now conditional, and + disabled upstream by default. + * Drop 01-segfault-in-gpm_disks_register.patch - the patch is not needed + anymore. + * 02-notify-osd-support.patch: Re-write, using code shared with + gnome-settings-daemon + * 90-autotools.patch - Autotools update for notify-osd patch + + [ Chow Loong Jin ] + * debian/patches/09-fix-double-suspend.patch: + - Manually check lid status in gpm_manager_client_changed_cb. + Fixes double-suspend bug (LP: #425411) + + -- Chris Coulson Tue, 19 Jan 2010 01:47:54 +0000 + +gnome-power-manager (2.28.1-0ubuntu5) lucid; urgency=low + + * debian/gconf-defaults: remove default preference on + /apps/gnome-power-manager/actions/sleep_type_battery (was set to + "nothing", however sleep_type_ac is "suspend".). Let's keep upstream + default value "hibernate" currently + + -- Didier Roche Fri, 15 Jan 2010 16:43:50 +0100 + +gnome-power-manager (2.28.1-0ubuntu4) lucid; urgency=low + + * 03-run-without-hal.patch: Add upstream bug link. + * Add 04-dont-connect-to-hal-with-xrandr.patch: If we detect xrandr-capable + hardware, do not try to connect to hal. + + -- Martin Pitt Thu, 14 Jan 2010 18:30:45 +0100 + +gnome-power-manager (2.28.1-0ubuntu3) lucid; urgency=low + + * Add 03-run-without-hal.patch: Do not exit if hal is not available. + + -- Martin Pitt Tue, 01 Dec 2009 12:18:30 +0100 + +gnome-power-manager (2.28.1-0ubuntu2) lucid; urgency=low + + * Change dependency on notification-daemon to Recommends (LP: #487224) + + -- Rodney Dawes Mon, 23 Nov 2009 13:22:40 -0500 + +gnome-power-manager (2.28.1-0ubuntu1) karmic; urgency=low + + * New upstream bug fix release: + - Add missing indirection to return value of DriveSetAllSpindownTimeouts + call. + - Fix failure error messages and comments. + - Help the kernel through its sleep key confusion. + - Improve configure summary wrt HAL. + - Use separate variables for dbus and dbus-glib. + - Remove devkit-power tool configure check. + - Correctly set the focus on the last used device in + gnome-power-statistics. + - Do not hide some radio buttons depending on the current machine state. + - Fix up all the issues reported by clang. + - Don't try to match and refresh some devices, to stop g-p-s crashing on + virtual devices. + - DeviceKit-disks is expecting an int as a value, not a uint. + - Throttle screensaver before suspend/hibernate. + - Translation updates. + * Drop 03-fix-dkdisks-arguments.patch, applied upstream. + + -- Martin Pitt Mon, 19 Oct 2009 16:47:02 +0200 + +gnome-power-manager (2.28.0-0ubuntu7) karmic; urgency=low + + * debian/patches/02-notify-osd-support.patch + - this patch wasn't updated in 2.28.0-0ubuntu4 as referenced + in the changelog + + -- Ken VanDine Thu, 15 Oct 2009 14:22:40 -0400 + +gnome-power-manager (2.28.0-0ubuntu6) karmic; urgency=low + + * Add 03-fix-dkdisks-arguments.patch: Fix the underlying problem of the + crash in LP: #431023, thanks to Chris Coulson for spotting this! + + -- Martin Pitt Wed, 14 Oct 2009 00:42:54 +0200 + +gnome-power-manager (2.28.0-0ubuntu5) karmic; urgency=low + + * Add 01-segfault-in-gpm_disks_register.patch: Fix crash when + dbus_g_proxy_call() returned FALSE without setting error. (LP: #431023) + + -- Martin Pitt Tue, 13 Oct 2009 23:53:22 +0200 + +gnome-power-manager (2.28.0-0ubuntu4) karmic; urgency=low + + * debian/patches/02-notify-osd-support.patch + - skip test checking if old brightness-value is equal to new one, thus + g-p-m will still trigger a notification and in case of lowest/highest + value causing a notification with a throbbing effect for under/overshoot + + -- Mirco Müller (MacSlow) Sat, 10 Oct 2009 13:44:44 -0400 + +gnome-power-manager (2.28.0-0ubuntu3) karmic; urgency=low + + * debian/control: Bump dk-power dependencies to >= 011 to ensure that we are + using the renamed DK-P D-Bus properties. + + -- Martin Pitt Tue, 06 Oct 2009 18:10:53 +0200 + +gnome-power-manager (2.28.0-0ubuntu2) karmic; urgency=low + + * debian/patches/02-notify-osd-support.patch + - fixed the regression of not triggering the throbbing-animation if the + user over- or undershoots the screen-brightness value via the special + keys on their (laptop-) keyboads. (LP: #439437) + + -- Ken VanDine Fri, 02 Oct 2009 13:08:54 -0400 + +gnome-power-manager (2.28.0-0ubuntu1) karmic; urgency=low + + * New upstream release: + - Use accessor functions instead direct access. + - Only print the DeviceKit-power device data when debugging. + - Use the correct interface name for DeviceKit-disks. + - Use the correct gnome-screensaver path. (LP: #428115) + - Use g_ptr_array_unref() in more places, which also fixes a few small + memory leaks. + - Comment out the AuthRequest signal handling. + - Change the default of show_actions_in_menu to FALSE. + - Inhibit applet now will inhibit the session from being marked IDLE. + Gnome #593800. + - Many translation updates. + + -- Martin Pitt Mon, 21 Sep 2009 16:04:07 +0200 + +gnome-power-manager (2.27.92-0ubuntu1) karmic; urgency=low + + * New upstream release (LP: #425999): + - When building with hal, link gnome-power-manager against libhal-glib + - Make notifications more reliable at session startup + - Fix a bug where the critical time was not displayed correctly + - Don't crash g-p-s when there are no devices + - Open the gnome-power-manager help, not the 'cheese' help + - Never, never, show 'Unknown time'. Fixes rh#520999 + - Allow compile without HAL. Inspired from a patch from Javier Jardón, many thanks + - Remove small memory leak spotted using clang + - Assign the correct icon when the sleep fails + - Correct some shoddy error checking. Spotted by clang + + -- Robert Ancell Tue, 08 Sep 2009 09:36:34 +1000 + +gnome-power-manager (2.27.91-0ubuntu2) UNRELEASED; urgency=low + + * debian/patches/03-remove-discharging-notify.patch: + - Removed because of new notify OSD spec (LP: #419858) + Upstream accepted our change so the notification matches Ubuntu's spec + + -- Scott Howard Thu, 27 Aug 2009 20:37:29 -0400 + +gnome-power-manager (2.27.91-0ubuntu1) karmic; urgency=low + + * New upstream release (LP: #419637): + - Remove the depricated Encoding= lines from the desktop files. Fixes #590612 (Richard Hughes) + - Fix up quite a few translations, inspired by a patch from Scott Howard (Richard Hughes) + - Add the enumerated actions in a 64bit safe way. Fixes #590991 (Richard Hughes) + - Don't show the brightness OSD when system AC state changes (Richard Hughes) + - Remove all the bodges from the IDLETIMER code now X is fixed (Richard Hughes) + - Only show shutdown in the prefs GUI if ConsoleKit allows it (Richard Hughes) + - Always show the battery status icons in the left click action (Richard Hughes) + - Change the notification default for fully charged to FALSE for #592613 (Richard Hughes) + * debian/control: + - Update BZR link from ~gnome-power-manager-team to ~ubuntu-desktop + * debian/patches/00-git-change-fix-enum-64-issue.patch: + - Applied upstream + * debian/patches/03-remove-discharging-notify.patch: + * debian/patches/06-bugreport-debian.patch: + * debian/patches/08-desktop-bugreport-path.patch: + - Updated + + -- Robert Ancell Thu, 27 Aug 2009 11:54:01 +1000 + +gnome-power-manager (2.27.5-0ubuntu3) karmic; urgency=low + + * Drop 21_idle_key_removal.patch for good, testing showed that it's not + necessary any more. + * Update 02-notify-osd-support.patch for current version, and reenable + patch. Thanks to Mirco Müller! (LP: #415932) + + -- Martin Pitt Mon, 24 Aug 2009 14:27:47 +0200 + +gnome-power-manager (2.27.5-0ubuntu2) karmic; urgency=low + + * debian/patches/22-git-change-fix-enum-64-issue.patch: + - git change to fix a preference storing issue, + thanks Scott Howard for getting and testing the change (lp: #407491) + + -- Sebastien Bacher Thu, 13 Aug 2009 22:19:24 +0200 + +gnome-power-manager (2.27.5-0ubuntu1) karmic; urgency=low + + * Upgrade to final 2.27.5 release. Just some bug fixes compared to previous + git snapshot, but these are the full changes compared to 2.27.2: + - Claim org.freedesktop.Policy.Power on D-BUS. + - Remove PolkitGnome code completely as PolicyKit 1.0 doesn't need this. + - Add a bodge to reset the idletime XAlarm when we are no longer + inhibited. + - Add functionality to debug the idle code by setting GPMIDLEDEBUG on the + command line. + - Use the same composited OSD for brightness notification. + - Add DeviceKit data to the bugreport script. + - Lots of bug fixes. + - Translation updates: zh, sv, fi, et, es, uk, ir, nl, ta + + -- Martin Pitt Mon, 03 Aug 2009 15:31:58 +0100 + +gnome-power-manager (2.27.2+git20090729-0ubuntu2) karmic; urgency=low + + * Drop 01-disable-quirks-reference.patch, add changed key default to + debian/gconf-defaults instead. + * debian/gconf-defaults: Drop backlight/brightness_battery, drop redundant + sleep_computer_battery, drop wrong lid_battery. (LP: #389067) + + -- Martin Pitt Wed, 29 Jul 2009 19:13:35 +0200 + +gnome-power-manager (2.27.2+git20090729-0ubuntu1) karmic; urgency=low + + * Upgrade to current git (d585c3a4e5) to clean up our patch forest, drop + DeviceKit in favor of gudev, and get the porting to the new PolicyKit-1 + API. + * 03-system-policy.patch, 07-bugreport-shebang.patch, + 25_sparc_char_to_int.patch, 22_xfce_desktop_files.patch, + 23_numlock_hotkey.patch: Committed upstream, drop. + * 09_lid_always_blanks.patch: Finally drop this (was already disabled + before). + * Drop 26-notifications.patch. It was disabled before (due to not applying + any more), and upstream fixed it in a better way. + * Drop 14_inhibit_tool.patch: This functionality moved to gnome-session. + * Add patch tag headers to our remaining patches and re-enumerate them. + * Disable 21_idle_key_removal.patch: It is unclear whether this is still + actually an issue in the new world where we just read -evdev events + instead of ACPI events from hal, is pretty hackish, and it potentially + leads to dropping valid events. + * Update dependencies: + - Drop libpolkit-* (not necessary with PK 1.0). + - Drop libdevkit-gobject-dev (DeviceKit is not used any more). + - Bump devicekit-power dependencies to >= 010 (which provides the backend + porting to PK 1.0). + - Add libpanel-applet2-dev, now required for new version. + * 01-disable-quirks-reference.patch: Drop original code patch, replace with + changed default gconf value. + * Disable 02-notify-osd-support.patch for now, upstream rewrote the + notification system and the patch needs to be re-done. See LP #406396. + * 03-remove-discharging-notify.patch: Adapt to new upstream version. + * debian/rules: gnome-power-cmd.sh is no more, drop installation. + + -- Martin Pitt Wed, 29 Jul 2009 16:48:33 +0200 + +gnome-power-manager (2.27.2-0ubuntu2) karmic; urgency=low + + [ Martin Pitt ] + * Add crash-when-battery-charge-full.patch: Fix crash when battery gets + fully charged. Thanks to Arnaud Faucher! (LP: #397248) + + [ Scott Howard ] + * debian/local/source_gnome-power-manager.py: Add gnome-power-bugreport.sh + output. Upstream uses this script for triaging. (LP: #397993) + + -- Martin Pitt Mon, 13 Jul 2009 10:10:56 +0200 + +gnome-power-manager (2.27.2-0ubuntu1) karmic; urgency=low + + * New upstream release (LP: #396437): + - Use composite battery mode by default to fix multi-battery + laptops (Richard Hughes). + - Add manager policy to change the disk spindown based on timeouts + set in GConf (Richard Hughes). + - Add GConf keys for the disk spindown functionality (Richard Hughes). + - Add preferences checkboxes for the disk spindown functionality + (Richard Hughes). + - No longer support HAL legacy buttons (Richard Hughes). + - Add support for recall data provided by DeviceKit-power + (Richard Hughes). + - Prefix GTKBuilder files with gettext/glade (Claude Paroz) + - Use gtk_show_uri i.s.o. gnome-open (Jaap A. Haitsma) + - Remove -Wunitialized because it does not compile on Ubuntu Jaunty + (Jaap A. Haitsma) + - Fix the category in the gnome-power-statistic desktop file. + Fixes rh#489041 (Richard Hughes) + - Make minimum size of th statistics graphs smaller. Fixes rh#491426 + (Richard Hughes) + - Don't show the feedback widget when the brightness changes, + only on key press and when interactive (Richard Hughes) + - If we caught our idletime alarm, then remove from the filter + (Richard Hughes) + - Take the battery capacity into account when using multiple + batteries (Richard Hughes) + - Ignore capacity readings of less than 1% (Richard Hughes) + - Show a label to the user when there is no graph data (Richard Hughes) + - Add statistics devices in visually pleasing order (Richard Hughes) + - Use the composite device for getting the global system warning icon + (Richard Hughes) + - Setup the reset event before we do the idle action, to finally fix + blanking (Richard Hughes) + - Be more paranoid about setting idle in a race (Richard Hughes) + - Remove three unused GConf keys (Richard Hughes) + - Don't show the whole object path in the GUI, just show the ID + (Richard Hughes) + - Only print the DeviceKit device if we are using --verbose + (Richard Hughes) + - Remove a little bit more of our HAL dep, and use the lid-is-present + DK-p property (Richard Hughes) + - Fix compile with DKP_DISABLE_DEPRECATED turned on (Richard Hughes) + - Remove ambient light sensor support, and keyboard backlight devices + (Richard Hughes) + - Support DKP_DEVICE_STATE_PENDING_x in more places (Richard Hughes) + * Refreshed patches: + - 03-system-policy.patch. + - 14_inhibit_tool.patch. + - 21_idle_key_removal.patch. + - 22_xfce_desktop_files.patch. + - 23_numlock_hotkey.patch. + - 25_sparc_char_to_int.patch. + - 74-disable-quirks-reference.patch. + - 97_remove-discharging-notify.patch. + * Dropped 94-fix-light-sensor-scaling.patch: the ambient light sensor + support has gone now. + + -- Chris Coulson Tue, 07 Jul 2009 23:53:51 +0100 + +gnome-power-manager (2.27.1-0ubuntu4) karmic; urgency=low + + * debian/control.in: Bump devicekit-power dependencies. 009 broke ABI + without bumping shlibs. + + -- Martin Pitt Mon, 06 Jul 2009 19:16:04 +0200 + +gnome-power-manager (2.27.1-0ubuntu3) karmic; urgency=low + + * debian/rules: (LP: #380508) + - Added CFLAGS on -Wno-cast-align to disable a warning on ARM that's + generated when GCC changes the size of a struct due to alignment + + -- Michael Casadevall Mon, 15 Jun 2009 11:29:59 +0200 + +gnome-power-manager (2.27.1-0ubuntu2) karmic; urgency=low + + * debian/control.in: Re-add libhal-dev build dependency, upstream build + system still falls over without it. + + -- Martin Pitt Thu, 04 Jun 2009 09:03:33 +0200 + +gnome-power-manager (2.27.1-0ubuntu1) karmic; urgency=low + + * New upstream release: + - Add DOAP file. + - Connect to gnome-session and exit on logout. + - Change the default lid close on AC policy to be suspend, not blank. + - Show the processor device if we have capability, not if we have events. + - Add support for the DeviceKit-power property lid-is-closed so we can now + run without --enable-legacy-buttons. + - Convert from libglade to GtkBuilder. + - Expose graph details as properties on the object, and constrain time to + user value. (GNOME #581910). + - Add a composite device to GpmEngine so we can DTRT for multiple primary + batteries. + - Lots of bug fixes. + - Translation updates. + * debian/rules: Drop --enable-legacy-buttons, not necessary any more. + * debian/control.in: Drop libhal-dev and libglade2-dev build dependencies, + add new libdevkit-power-gobject-dev build dep. + + -- Martin Pitt Wed, 03 Jun 2009 16:06:07 +0200 + +gnome-power-manager (2.26.1-0ubuntu4) karmic; urgency=low + + * debian/patches/96_feedback-notify-osd.patch: + + Drop HAVE_LIBNOTIFY #ifdefs. Upstream does not define it any more + (LP: #381187) + + Move static declarations up in gpm_feedback_display_value to avoid + compilation errors + + -- Chow Loong Jin Tue, 02 Jun 2009 17:49:55 +0200 + +gnome-power-manager (2.26.1-0ubuntu3) karmic; urgency=low + + * debian/control.in: Drop obsolete build dependency libgnomeui-dev. + + -- Martin Pitt Fri, 15 May 2009 15:52:17 +0200 + +gnome-power-manager (2.26.1-0ubuntu2) karmic; urgency=low + + * debian/local/source_gnome-power-manager.py: Drop usage of hal related + hookutils functions, since they got dropped in apport due to general hal + deprecation. Instead, add "devkit-power -d" output. + + -- Martin Pitt Fri, 15 May 2009 11:01:54 +0200 + +gnome-power-manager (2.26.1-0ubuntu1) karmic; urgency=low + + * New upstream release 2.25.91: + - Rewrite engine to support DeviceKit-power + - Rewrite statistics graphing application to support DeviceKit-power + - Start in the GNOME Panel phase, not the GNOME Applications phase so we + work with the fast user switch applet. + - Don't show the discharging icon when the status is unknown. + - Remove translatable flag from gtk-refresh stock button. + - Ask for edge triggers on system idle time, not level triggers. + - Add a configure option for --enable-legacy-buttons to support HAL and Xorg + keys. By default we are now only supporting Xorg events. + - Fix compile failure with gcc-4.4.0 and old versions of glib2. + - Add processor wakeup support into gnome-power-statistics. + - Don't rely on the gnome-screensaver idle key now we are using + gnome-session. + - Lots of bug fixes. + - Translation updates. + * New upstream version 2.25.92: + - Fixed #529214, Need longer timeout periods. + - Fixed #571330, gnome-power-manager shouldn't start on session panel + phase. + - Fixed #571950, make default-button have a floppy in it. + - Fixed #485103, Don't crash if there's no gnome-session. + - Fix double free when passed --version. + - Fix the battery history when using a new DeviceKit-power. + - Fix up the icon when we are state unknown, and very close to the + charging capacity. + - Disable the ambient light sensor by default. + - Translation updates. + * New upstream version 2.26.0: + - Translation updates. + * New upstream version 2.26.1: + - Fix the low capacity warning to fix rh#489832. + - Convert a floating reference to prevent a GTK warning. + - Backport DPMS and IDLETIME fixes from master to fix multiple bugs. + - Connect to gnome-session and exit on logout. + - Use G_GINT64_FORMAT to fix compile on 64 bit computers. + - Trivial build fix. + - Translation updates. + * debian/control.in: + - Add libdevkit-gobject-dev build dependency. Also add devicekit-power + build dep, since configure checks for its path at build time. + - Replace hal dependency with devicekit-power. + - Add new upstream build dependencies: libcanberra-gtk-dev, libunique-dev + * debian/rules: Enable PolicyKit support. + * debian/rules: Drop moving of autostart .desktop, fixed upstream. + * Update patches to new upstream version: + - 03-system-policy.patch + - 25_sparc_char_to_int.patch + - 74-disable-quirks-reference.patch + - 94-fix-light-sensor-scaling.patch + - 96_feedback-notify-osd.patch + * 14_inhibit_tool.patch: Include one-line change of Makefile.in, to avoid + complete autoreconfiscation. + * Drop obsolete patches: + - 11_round_percentage.patch: Does not apply at all any more, no LP# + reference, apparently not upstream. + - 12_warning_gconf_update.patch: Does not apply at all any more (code + rewrite). + - 17_icon_cache.patch: Fixed upstream. + - 18_policy_action_fallback.patch: Does not apply at all any more (code + rewrite). + - 24_interactive_shutdown_dbus.patch: Fixed upstream. + - 70-suppress-pm-actions-on-ltsp.patch: Does not apply at all to DKP + backend, and it seems the DKP backend does not complain about missing + keys at all anyway. + - 75_disable_Werror.patch: Package builds fine with -Werror, and keeping + it is a good idea. Fix the bugs, don't hide them! + - 76_autoreconf.patch: None of the remaining patches change autotools + files any more. + - 77-hal-brightness-in-hardware.patch: Fixed upstream. + - 78-xrandr-hal-fallback.patch: Does not apply at all any more (code + rewrite), no bug/upstream reference, and needs to be completely + re-thought with DKP backend. + - 79-randr13-speed-fix.patch: Fixed upstream. + - 90-Add-guarded-brightness-stepping-functions.patch, + 91-Using-guarded-and-scaled-stepping-when-dimming.patch: Does not apply + any more, no changelog documentation, no bug refs; author contacted via + email, asked for re-doing and opening upstream bug. + - 95_dont_listen_for_suspend_X_key.patch: I believe this isn't necessary + any more, since g-p-m does not listen to hal at all any more. If + this version starts causing suspend-after-resume for you again, please + speak up in LP #306310. + * Disable 09_lid_always_blanks.patch, needs to be redone to apply to current + version, and also sent upstream. + * Disable 26-notifications.patch: needs to be redone due to code rewrite. + (by Canonical Desktop Experience team) + * Drop 04-battery-low-icon-change.patch; it does not apply at all any more, + and wasn't sent upstream. Icons for 2.26 changed a lot, thus this needs + some more work anyway. This reopens LP #344886 for Karmic. + * debian/control.in: Drop unneeded autotools-dev and autoconf build + dependencies. + * 21_idle_key_removal.patch: Add proper declaration, to avoid warning (which + is fatal due to -Werror). + * Add bzr-builddeb configuration (merge mode). + * debian/watch: Look for development versions, too. + * debian/rules: Configure with --enable-legacy-buttons, to receive ACPI + button events from hal (such as lid closing or power button). + + -- Martin Pitt Wed, 29 Apr 2009 12:59:38 +0200 + +gnome-power-manager (2.24.2-2ubuntu8) jaunty; urgency=low + + [ Cody Russell ] + * debian/patches/04-battery-low-icon-change.patch: + - use correct icon on the battery low notification (lp: #344886) + * debian/patches/97_remove-discharging-notify.patch: + - don't display a notification about battery discharging (lp: #355877) + + -- Sebastien Bacher Wed, 08 Apr 2009 16:46:06 +0200 + +gnome-power-manager (2.24.2-2ubuntu7) jaunty; urgency=low + + * Update 96_feedback-notify-osd.patch to notify-osd's new hint names, and + provide a title to notifications for accessibility purposes (the title is + not "displayed" except by readers like gnome-orca). Patch by David Barth. + (LP: #329296) + + -- Martin Pitt Wed, 18 Mar 2009 21:04:49 +0100 + +gnome-power-manager (2.24.2-2ubuntu6) jaunty; urgency=low + + [ Martin Pitt ] + * Add bzr-builddeb configuration (merge mode). + * debian/watch: Look for development versions, too. + * 96_feedback-notify-osd.patch: Update capability name to current notify-osd + (prefix "x-canonical-"). + + [ Steve Beattie ] + * debian/local/source_gnome-power-manager.py: add apport per-package hook + (LP: #341443) + + -- Martin Pitt Fri, 13 Mar 2009 21:20:10 +0100 + +gnome-power-manager (2.24.2-2ubuntu5) jaunty; urgency=low + + * Update 96_feedback-notify-osd.patch to notify-osd's new hint names. + Patch by David Barth. (LP: #329296) + + -- Martin Pitt Tue, 03 Mar 2009 14:50:35 +0100 + +gnome-power-manager (2.24.2-2ubuntu4) jaunty; urgency=low + + * Add 96_feedback-notify-osd.patch: Use notify-osd's synchronous + notifications for brightness changes, if available. Patch by David + Barth. + + -- Martin Pitt Wed, 18 Feb 2009 23:38:15 +0100 + +gnome-power-manager (2.24.2-2ubuntu3) jaunty; urgency=low + + * Add 26-notifications.patch: Show alert boxes for important + situations (“Battery may be recalled”, “Battery may be broken”, + etc., and do not use actions in notifications if the + notification-daemon does not support them. Thanks to Cody Russell! + (LP: #329296) This also fixes the problem of cut-off notifications + for broken batteries. (LP: #155191) + * 74-disable-quirks-reference.patch: Updated for above patch, and + simplified. + + -- Martin Pitt Tue, 17 Feb 2009 16:34:44 +0100 + +gnome-power-manager (2.24.2-2ubuntu2) jaunty; urgency=low + + * Drop debian/postinst: It previously set some gconf key defaults + based on whether the computer was known to support suspend in + acpi-support. However, those parts of acpi-support go away, and + the gconf keys are all obsolete and not evaluated any more. + + -- Martin Pitt Mon, 09 Feb 2009 15:25:23 +0100 + +gnome-power-manager (2.24.2-2ubuntu1) jaunty; urgency=low + + [ Ted Gould ] + * Merge from Debian experimental. + * Remove 20_fix_precentage_closures.patch as already applied upstream. + * Merge in the mactel changes. See mactel changelog entries below. + * Remove 02_cast_align.patch as it only hides the problem and doesn't fix + it as well as 25_sparc_char_to_int.patch + * Remove 13_bugreport_bin_sh.patch as it conflicts with the Debian added + 07-bugreport-shebang.patch patch. + * Remove 26_check_for_active_session.patch as it should no longer be + required with the upstream changes. + * debian/rules: don't disable policy-kit + + [ Steve Langasek ] + * debian/control: point Vcs-Bzr at current branch. + * Drop debian/patches/70_relibtoolize.patch in favor of + 76_autoreconf.patch + * debian/patches/14_inhibit_tool.patch, + debian/patches/17_icon_cache.patch: split out the changes to + Makefile.in, so we can handle these as a batch in 76_autoreconf.patch + * Refresh 76_autoreconf.patch for the above changes + * 95_dont_listen_for_suspend_X_key.patch: handle 'suspend' via hal only, + the same as we already do for 'hibernate', eliminating a double-suspend + on ThinkPads. LP: #306310. + + -- Steve Langasek Sat, 07 Feb 2009 09:17:32 -0500 + +gnome-power-manager (2.24.2-2) experimental; urgency=low + + * Switch to quilt to manage patches; build-depend on quilt. + * 02_cast_align.patch: new patch. Use memcpy instead of casting + pointers with incompatible alignments. Closes: #510011. + * 70_relibtoolize.patch: re-run the autotools on top of the source to + avoid the rpath issue. + * Pass -O1 -z defs --as-needed to the linker. + + -- Josselin Mouette Wed, 31 Dec 2008 11:18:23 +0100 + +gnome-power-manager (2.24.2-1) experimental; urgency=low + + * New upstream release + * debian/patches/02-ups-invalid-free.patch + - Removed, fixed upstream + * debian/patches/03-system-policy.patch + - Updated + * debian/patches/04-graph-labels.patch + - Removed, fixed upstream + * debian/patches/05_translation_crash.patch + - Removed, fixed upstream + * debian/patches/06-bugreport-debian.patch + - Updated + * debian/patches/08-desktop-bugreport-path.patch + - Updated + + -- Sjoerd Simons Wed, 24 Dec 2008 20:46:32 +0100 + +gnome-power-manager (2.24.0-1mactel4) unstable; urgency=low + + * Fix light sensor scaling + + -- Henrik Rydberg Mon, 10 Nov 2008 23:56:16 +0100 + +gnome-power-manager (2.24.0-1mactel3) unstable; urgency=low + + * Nonlinear stepping for smooth dimming + * Patch trimming for upstream + + -- Henrik Rydberg Tue, 28 Oct 2008 02:55:08 +0100 + +gnome-power-manager (2.24.0-1mactel2) unstable; urgency=low + + * Mixed signed/unsigned problem in gpm-brightness-xrandr fixed. + LP: #289520 + + -- Henrik Rydberg Mon, 27 Oct 2008 00:18:40 +0100 + +gnome-power-manager (2.24.0-1mactel1) unstable; urgency=low + + * The gpm-brightness-xrandr smooth brightness function does not take + the number of brightness levels into account. On recent Macbooks, + this leads to some 20000 brightness-set calls on startup, an + activity that takes about one and a half minute. During this time, + gpm is not responsive. This patch introduces scaled stepping, + which fixes the problem. LP: #289520 + + -- Henrik Rydberg Sun, 26 Oct 2008 16:37:07 +0100 + +gnome-power-manager (2.24.0-0ubuntu14) jaunty; urgency=low + + * Add 79-randr13-speed-fix.patch from Gnome SVN to use a less expensive + call when operating with xrandr 1.3. Original patch by Alberto Milone, + much thanks. (LP: #307306) + + -- Mario Limonciello Wed, 28 Jan 2009 13:44:54 -0600 + +gnome-power-manager (2.24.0-0ubuntu13) jaunty; urgency=low + + * Drop 79-enable-battery-hotkey.patch. It appears that HAL is now sending + a dbus event for Battery hotkey presses, so gpm doesn't actually need to + directly listen anymore. (LP: #314547) + + -- Mario Limonciello Thu, 08 Jan 2009 12:40:10 -0600 + +gnome-power-manager (2.24.0-0ubuntu12) jaunty; urgency=low + + * 79-enable-battery-hotkey.patch: Enable hotkey that got disabled + at 2.24.0's release. (LP: #281134) + + -- Mario Limonciello Tue, 02 Dec 2008 13:54:53 -0600 + +gnome-power-manager (2.24.0-0ubuntu11) jaunty; urgency=low + + * 77-hal-brightness-in-hardware.patch: Don't fail to show the OSD + when brightness changing is supported in hardware. (LP: #304187) + * 78-xrandr-hal-fallback.patch: Fall back to HAL if xrandr calls + do fail or will be failing. + + -- Mario Limonciello Mon, 01 Dec 2008 02:56:38 -0500 + +gnome-power-manager (2.24.0-0ubuntu10) jaunty; urgency=low + + * Fix Werror harder (in configure.ac), revert the debian/rules addition to + use --enable-compile-warnings=yes (adding 75_disable_Werror.patch) + * add 76_autoreconf.patch to properly regenerate the autoconf magic after + configure.ac changes + + -- Oliver Grawert Thu, 20 Nov 2008 17:38:17 +0100 + +gnome-power-manager (2.24.0-0ubuntu9) jaunty; urgency=low + + * Added --enable-compile-warnings=yes to the configure string to disable + -Werror, which is neccessary on port architectures due to warnings caused + by gstreamer's headers on those architectures. + + -- Michael Casadevall Wed, 19 Nov 2008 09:22:55 -0500 + +gnome-power-manager (2.24.0-0ubuntu8) intrepid; urgency=low + + * Removing 02_gnome-power-manager.desktop.in.in.patch as it shouldn't be + needed and is causing user feedback with the new GNOME Session in + Intrepid. Fixes LP: #278089 + + -- Ted Gould Fri, 17 Oct 2008 08:45:41 -0500 + +gnome-power-manager (2.24.0-0ubuntu7) intrepid; urgency=low + + * 25_sparc_char_to_int.patch: Changing a variable to be an int * + instead of a char * so that it has the right alignment. This + is a build fix for Sparc. + * 26_check_for_active_session.patch: Checks to ensure that we've + got an active session before accepting commands from the HAL. This + removes the case where a power button event is recieved by all logged + in users. Only active if PolicyKit is configured, which it is not + in current packaging. + + -- Ted Gould Wed, 15 Oct 2008 22:21:46 -0500 + +gnome-power-manager (2.24.0-0ubuntu6) intrepid; urgency=low + + * Adding 21_idle_key_removal.patch which makes it so that the glib + mainloop has to hit the idle state before we'll accept another key + from X. This should remove quickly repeated keys and keys that were + queued before suspend. (LP: #261084) + * Adding 22_xfce_desktop_files.patch which adds XFCE to the ShowIn + properties of the preferences and statistics desktop files. + * Added 23_numlock_hotkey.patch which is the changes from 0ubuntu4 and put + it into a patch. + * Adding 24_interactive_shutdown_dbus.patch which is based on the patch + in GNOME Bug: #507393. Made to build on 2.24.0 and also put in more + error checking and a fallback to XSMP when DBus based session management + is not available. (LP: #252795) + + -- Ted Gould Wed, 15 Oct 2008 11:10:23 -0500 + +gnome-power-manager (2.24.0-0ubuntu5) intrepid; urgency=low + + * debian/patches/20_fix_percentage_closures.patch: When unit->percentage + was changed to a float for 2.24 not all the signals that deal in + percentages had their signatures updated. Use the correct type for + the signals that take a percentage, stopping them from crashing on + platforms where int and float differ in size (LP: #269083) + - http://bugzilla.gnome.org/show_bug.cgi?id=550817 + + -- James Westby Mon, 13 Oct 2008 23:54:30 +0100 + +gnome-power-manager (2.24.0-0ubuntu4) intrepid; urgency=low + + * src/gpm-button.c:gpm_button_grab_keystring: use AnyModifier modmask with + XGrabKey so that hotkeys being handled through gpm-button still work if + e.g. numlock happens to be on (thanks, Bryce Harrington, LP: #280646) + + -- Matt Zimmerman Fri, 10 Oct 2008 09:55:10 +0100 + +gnome-power-manager (2.24.0-0ubuntu3) intrepid; urgency=low + + * Removed 19_fix_critical_message.patch which was applied upstream + but was still getting applied in other areas of gpm-cell-array.c. + (LP: #274681) + + -- Ted Gould Mon, 29 Sep 2008 13:26:44 -0500 + +gnome-power-manager (2.24.0-0ubuntu2) intrepid; urgency=low + + * 03-system-policy.patch: Fixing to remove gpm-main.c.orig + + -- Ted Gould Tue, 23 Sep 2008 09:44:41 -0500 + +gnome-power-manager (2.24.0-0ubuntu1) intrepid; urgency=low + + * Upstream Release + * 75-ignore-long-failed-suspends.patch: Removed. Upstream. + * 03-system-policy.patch: Updated with upstream release + * 09_lid_always_blanks.patch: Updated with upstream release + * 18_policy_action_fallback.patch: Updated with upstream release + + -- Ted Gould Mon, 22 Sep 2008 23:54:21 -0500 + +gnome-power-manager (2.23.91-0ubuntu2) intrepid; urgency=low + + * Added two patches from Joakim Andersson his + comments on the patches are below. + * Added 18_policy_actions_fallback.patch which makes policy actions + fall back to per-percent policy if the battery profile is not good + enough yet. It also ignores the accuracy of the battery profile when + the GCONF key 'use_time_for_policy' is disabled. LP: #135548 + * Added 19_fix_critical_message.patch which fixes an error in the + notification messages for critical battery. These messages would + always show 0% battery remaining, since the cell unit object was + reset while generating one of the strings used in the message. + + * 18_policy_actions_fallback.patch: Modified by Richard Hughes to + make cleaner and smaller. Now keeps most prototypes intact. + * I updated 18_policy_actions_fallback.patch from Richard's version + to make it apply cleanly on 2.23.91. + + -- Ted Gould Wed, 10 Sep 2008 09:36:40 -0500 + +gnome-power-manager (2.23.91-0ubuntu1) intrepid; urgency=low + + * Upstream release: + * Handle "unknown" battery technology in HAL + * Bug fixes (LP: #260314) + * 75-ignore-long-failed-suspends.patch: added to prevent inaccurately + indicating failed suspends when they were >= 6 hours. (LP: #242713) + From Mario Limonciello + * 14_inhibit_tool.patch: A small tool to allow command line apps to + use the inhibit DBus interface easily. + * 17_icon_cache.patch: A patch to build the icon cache in the correct + directory. + * 50-r2882-fix-547766.patch: Removed as merged upstream. + + -- Ted Gould Mon, 08 Sep 2008 10:33:32 -0500 + +gnome-power-manager (2.23.6-0ubuntu2) intrepid; urgency=low + + * debian/patches/50-r2882-fix-547766.patch: upstream fix for crash in + gpm_cell_array_update gpm-cell-array.c:273 (LP: #260314) + + -- Matt Zimmerman Mon, 08 Sep 2008 09:43:04 +0100 + +gnome-power-manager (2.23.6-0ubuntu1) intrepid; urgency=low + + * debian/patches/09_lid_always_blanks.patch: Update for new upstream + * debian/control, added PolicyKit DBus and Grant to reflect changes + in upstream configure files. + * Updated upstream version (2.23.6) + + -- Ted Gould Tue, 19 Aug 2008 13:55:19 -0500 + +gnome-power-manager (2.23.1-0ubuntu1) intrepid; urgency=low + + * 13_bugreport_bin_sh.patch, adding a "#!/bin/sh" to the top of + gnome-power-bugreport.sh so that it is more specific about how it + executes. LP: #238546 + * 11_round_percentage.patch: Adding in math.h to implicitly define + a built in function. New errors are sucking. + * 09_lid_always_blanks.patch: Remove some variables that are now causing + errors as -Werror is set. + * Added patch 11_round_percentage.patch which causes the percentage + to discrete value conversion to use round. This should fix the + bug where the AC plug/unplug causes the backlight to drop. That + bug is LP# + * Added patch 12_warning_gconf_update.patch which causes the warning and + action values from GConf to be updated on GConf changes. Makes debugging + easier. + * control.in: Expanding dependencies to make them easier to read + * control.in: Adding policy kit and xrandr as build dependencies + * 10_keyboard_brightness_gconf.patch: Applied upstream + * 03-system-policy.patch: part of the patch was applied upstream, rebuild + to work with 2.23.1 + * 03_always_get_hw_backlight.patch: Removing as the functionality should + be taken care of by the new 'trust cache' framework. + * 04_brightness_events.patch: Removing. The code upstream has change + significantly and logic is roughly the same now. May require some + additional patching, but will wait on user feedback. + * 06_inhibit_applet_clear.patch: Applied upstream + * 07_inhibit_applet_icon_resize.patch: Applied upstream + * Packing new upstream development version. + + -- Ted Gould Mon, 16 Jun 2008 14:53:04 -0700 + +gnome-power-manager (2.22.1-1ubuntu4) hardy; urgency=low + + * Adding in patch 10_keyboard_brightness_gconf.patch which fixes some + cut-and-paste errors in the keyboard brightness server which set the + wrong gconf keys. + * Updating 04_brightness_events.patch so that idle changes work when + we're not on AC and work in the right direction. Also updating so + that we're not using the GCONF key for AC brightness just a fixed + value as some people have very different values for AC and it isn't + required for the logic. LP: #199522 + + -- Ted Gould Thu, 10 Apr 2008 06:27:11 -0700 + +gnome-power-manager (2.22.1-1ubuntu3) hardy; urgency=low + + * Adding patch 09_lid_always_blanks.patch to make it so that a lid + button will at least blank even when inhibitted. It also makes it so + that inhibit can't block critical battery actions. LP: #193617 + + -- Ted Gould Tue, 08 Apr 2008 08:42:22 -0700 + +gnome-power-manager (2.22.1-1ubuntu2) hardy; urgency=low + + * Removing 01_no_backlight_on_idle.patch as the code is covered + in 04_brightness_events.patch and it is breaking things by being + in the general callback. LP: #207553 + + -- Ted Gould Tue, 01 Apr 2008 15:34:51 -0700 + +gnome-power-manager (2.22.1-1ubuntu1) hardy; urgency=low + + * Removing 01-use-panel-logout.patch we should be logging out using + session managment not calling a command line utility. Consitency + would be better gained by fixing the other applications. + * Removing 05_readd_gnome_client.patch as it was merged upstream + * Removing 08_remove_lid_sounds.patch as it was merged upstream + + -- Ted Gould Tue, 01 Apr 2008 14:11:17 -0700 + +gnome-power-manager (2.22.1-4) unstable; urgency=low + + * Rewrite description. Closes: #388109. + * 06-bugreport-debian.patch: make gnome-power-bugreport.sh output the + correct Debian release. + * 07-bugreport-shebang.patch: add a shebang to it. + * debian/script: this is a bug script that executes g-p-bugreport. + * Install the script to the correct place and make it executable. + * Rename gnome-power-cmd.sh to gnome-power-cmd. + * Move gnome-power-bugreport.sh to /usr/share/gnome-power-manager. + * 08-desktop-bugreport-path.patch: make bug-buddy use this new + location. + * Standards version is 3.8.0. + + -- Josselin Mouette Fri, 24 Oct 2008 20:25:35 +0200 + +gnome-power-manager (2.22.1-3) unstable; urgency=low + + * 05_translation_crash.patch: patch from upstream (SVN r2798 and + r2799). Fixes crashes when some translations exceed 100 characters. + Closes: #495945. + + -- Josselin Mouette Thu, 18 Sep 2008 15:28:38 +0200 + +gnome-power-manager (2.22.1-2) unstable; urgency=low + + [ Josselin Mouette ] + * 02-ups-invalid-free.patch: patch from Avery Fay to fix invalid free + when the UPS level is too low. Closes: #482431. + + [ Sam Morris ] + * 04-graph-labels.patch: fix graph labels (upstream: 528092). + + [ Josselin Mouette ] + * Wrap build-depends and depends. + * Depend on dbus-x11 so that the session is dbus-enabled. + + -- Josselin Mouette Fri, 18 Jul 2008 18:25:04 +0200 + +gnome-power-manager (2.22.1-1) unstable; urgency=low + + * New upstream release. + * debian/patches/73-getbrightness-returns-int.patch: + - Removed. Merged upstream + * Shutdown the gstreamer pipeline after playing a sound. Prevents a memory + exhausting bug. (Closes: #472637) + * debian/control.in: Set the Maintainer to the gnome team. Riccardo hasn't + worked on the package for months. + + -- Sjoerd Simons Sat, 29 Mar 2008 13:52:49 +0100 + +gnome-power-manager (2.22.0-1) unstable; urgency=low + + [ Michael Biebl ] + * debian/control, debian/control.in + - Add Vcs-* fields. + + [ Sjoerd Simons ] + * New upstream release + * debian/patches/01-use-panel-logout.patch: + - Updated + * debian/patches/02.gnome-power-manager.desktop.in.patch: + - Dropped + * debian/patches/73-getbrightness-returns-int.patch: + - Updated + + -- Sjoerd Simons Tue, 18 Mar 2008 14:52:01 +0100 + +gnome-power-manager (2.20.2-3) unstable; urgency=low + + [ Michael Biebl ] + * debian/patches/03-system-policy.patch + - Make gnome-power-manager claim org.freedesktop.Policy.Power on the + D-Bus system bus on startup. This ensures that gnome-power-manager, + kpowersave and powersaved are not stepping on each other's toes and only + one program is acting on power management events. + + -- Loic Minier Tue, 29 Jan 2008 10:15:41 +0100 + +gnome-power-manager (2.20.2-2) unstable; urgency=low + + * 01-use-panel-logout.patch: use gnome-panel-logout if available + instead of the session's logout window, for the sake of consistency + across the desktop. + * Use the new Homepage field. + + -- Josselin Mouette Sat, 12 Jan 2008 15:56:10 +0100 + +gnome-power-manager (2.22.0-0ubuntu2) hardy; urgency=low + + * Adjusting patch 04_brightness_events.patch based on comments + by Richard Hughes on the gnome-power-manager mailing list. + * Adding in 08_remove_lid_sounds.patch which removes all of the lid + sounds. The are silly and can cause embarassing situtions for + Ubuntu users. (LP: 204067) + + -- Ted Gould Thu, 20 Mar 2008 13:35:46 -0700 + +gnome-power-manager (2.22.0-0ubuntu1) hardy; urgency=low + + * Changing 02.gnome-power-manager.desktop.in.patch to + 02_gnome-power-manager.desktop.in.in.patch to patch the source + file instead of the derived one. + * Adding in 07_inhibit_applet_icon_resize.patch which makes it so that + icons changing size make the applet update it's size. Fixing the + inhibit applet with the Human theme. + * Adding patch 06_inhibit_applet_clear.patch which adds a + gdk_window_clear so that the icon refreshes cleanly. (LP: 139820) + * New upstream release + * Removed 75-fix-memleak-brightness-applet.patch as it's been integrated + into the upstream release. + * Adding patch 05_readd_gnome_client.patch which reverts changes to + gpm-main.c to remove gnome_program_init() which makes it so that + later calls to GNOMEClient break. + * Adding patch '04_brightness_events.patch' which changes the + brightness control from being state based to being event + based. + * Adding in a patch '03_always_get_hw_backlight.patch' which forces + the get brightness function to query instead of using a saved value. + Hopefully fixing many of the idle brightness bugs. + * Adding patch 01_no_backlight_on_idle.patch which was attached on to + Bug # 137598 by Tim Hull. Not sure that it fixes the problem, but + seems like good code to include. + + -- Ted Gould Fri, 14 Mar 2008 14:10:01 -0700 + +gnome-power-manager (2.21.92-0ubuntu2) hardy; urgency=low + + * Add debian/patches/75-fix-memleak-brightness-applet.patch: + Don't leak references in the brightness applet (LP: #196688). + Fix picked from upstream SVN trunk (commit 2680). + + -- Daniel T Chen Mon, 03 Mar 2008 15:49:23 -0500 + +gnome-power-manager (2.21.92-0ubuntu1) hardy; urgency=low + + * Upstream version update. + * HAL work arounds + * Updated icons (much smaller) + * Bug fixes + * and more! + + -- Ted Gould Fri, 15 Feb 2008 14:23:05 -0800 + +gnome-power-manager (2.21.1-0ubuntu1) hardy; urgency=low + + * Upstream unstable release + * debian/control.in + - Added build deps for keyring, applet dev and xmlto + - Modify maintainer + * debian/postinst + - Check for ACPI suspend support + * debian/gconf-defaults + - Added defaults for Ubuntu specific configuration + * debian/rules + - Make power manager autostart + - Handle custom GConf properties + + -- Ted Gould Fri, 21 Dec 2007 09:54:05 -0800 + +gnome-power-manager (2.20.2-1) unstable; urgency=low + + * New upstream bugfix release: + + debian/patches/73-getbrightness-returns-int.patch: + - Updated to apply cleanly again, partially merged upstream. + + debian/patches/71-fix-keyboard-brightness-keys.patch, + debian/patches/72-fixbashizms.patch: + - Dropped, merged upstream. + * debian/control.in: + + Update Standards-Version to 3.7.3, no other changes needed. + + -- Sebastian Dröge Sat, 15 Dec 2007 04:42:54 +0100 + +gnome-power-manager (2.20.1-1) unstable; urgency=low + + [ Josselin Mouette ] + * Depend on hal 0.5.10-1, thanks Nathaniel Smith and Hideki Yamane. + Closes: #443796. + * Drop --enable-checkfg, thanks Alban Browaeys. Closes: #444491. + + [ Sebastian Dröge ] + * New upstream bugfix release. + + -- Sebastian Dröge Sat, 01 Dec 2007 19:17:50 +0100 + +gnome-power-manager (2.20.0-1) unstable; urgency=low + + * New upstream release. + * Added patches: + 71-fix-keyboard-brightness-keys.patch + 72-fixbashizms.patch + 73-getbrightness-returns-int.patch + taken from the Ubuntu package. + * Modified patch: + 02.gnome-power-manager.desktop.in.patch + * Dropped patch: + 01_fix_gpm_dbus_conf.patch + + -- Riccardo Setti Sat, 22 Sep 2007 14:53:46 +0200 + +gnome-power-manager (2.18.3-1) unstable; urgency=low + + * New upstream stable release. + + -- Loic Minier Tue, 22 May 2007 15:09:21 +0200 + +gnome-power-manager (2.18.2-1) unstable; urgency=low + + * New upstream release. + * Dropped 40_link-applets-to-dbus.patch, applied upstream + * Dropped 41_automake.patch, no more useful. + * Adjusted libnotify build-dep. + + -- Riccardo Setti Sun, 22 Apr 2007 12:07:10 +0200 + +gnome-power-manager (2.18.1-1) experimental; urgency=low + + * New upstream release. + + -- Riccardo Setti Sat, 24 Mar 2007 20:15:01 +0100 + +gnome-power-manager (2.18.0-1) experimental; urgency=low + + [ Riccardo Setti ] + * New upstream release. + * Dropped 55_lid_state_tracking.patch + + [ Loic Minier ] + * GNOME team uploads; include uploaders.mk and build-dep on gnome-pkg-tools. + * Misc cleanups: whitespaces and indentation; reword README.Debian. + * Drop DEB_AUTO_UPDATE_AUTOCONF. + * Include CDBS's utils.mk. + * Add a get-orig-source target to retrieve the upstream tarball. + * Include the new check-dist Makefile to prevent accidental uploads to + unstable; bump build-dep on gnome-pkg-tools to >= 0.10. + * Track all stable versions in watch file. + * Build-depend on "libnotify-dev (>= 0.4.3), libnotify-dev-gtk2.10" instead + of "libnotify-dev | libnotify-dev-gtk2.10 (>= 0.4.3)". + * Bump up libnotify-dev build-dep to >= 0.4.3-2 to make the package + autobuildable. + * New patch, 40_link-applets-to-dbus, links applets against dbus-glib to fix + build with non-dbus gnome-vfs; GNOME #422345. + * New patch, 41_automake, automake-1.10 run due to 40_link-applets-to-dbus. + + -- Loic Minier Sat, 24 Mar 2007 19:00:58 +0100 + +gnome-power-manager (2.16.3-1) experimental; urgency=low + + * New upstream release. + * Rebuilt with latest libdbus (closes: 405941) + * Fixed a bug in g-p-m that prevents gnome-screensaver + from displaying any screensavers after g-p-m has put + the display into power saving mode. (closes: 398143) + + -- Riccardo Setti Sun, 19 Nov 2006 14:19:55 +0100 + +gnome-power-manager (2.16.0-2) experimental; urgency=low + + * added 55-lid-state-tracking.patch taken from the ubuntu package + . + + -- Riccardo Setti Sun, 17 Sep 2006 16:50:05 +0200 + +gnome-power-manager (2.16.0-1) experimental; urgency=low + + * New upstream release. + + -- Riccardo Setti Tue, 5 Sep 2006 20:40:30 +0200 + +gnome-power-manager (2.15.92-1) experimental; urgency=low + + * New upstream release. + + -- Riccardo Setti Mon, 21 Aug 2006 20:46:32 +0200 + +gnome-power-manager (2.15.91-1) experimental; urgency=low + + * New upstream release. + + -- Riccardo Setti Fri, 18 Aug 2006 14:52:12 +0200 + +gnome-power-manager (2.14.3-3) unstable; urgency=low + + * Gpm now can handle power button. (Closes: #366628) + * Added support for StartupNotify in launcher (closes: #361522 + * Updated pt_BR translation (thank you Goedson) (closes: #361287) + * Bumped to stadard version. No changes needed. + + -- Riccardo Setti Sun, 13 Aug 2006 21:12:08 +0200 + +gnome-power-manager (2.14.3-2) unstable; urgency=low + + * Pass --with-dbus-services option to configure so the services file is + installed in the right location (Closes: #369372) + + -- Sjoerd Simons Thu, 8 Jun 2006 21:19:54 +0200 + +gnome-power-manager (2.14.3-1) unstable; urgency=low + + * New upstream release + + -- Sjoerd Simons Fri, 26 May 2006 23:56:20 +0200 + +gnome-power-manager (2.14.0-1) unstable; urgency=low + + * New upstream version + + -- Sjoerd Simons Sun, 2 Apr 2006 19:41:33 +0200 + +gnome-power-manager (2.13.93-1) experimental; urgency=low + + * New Upstream + - removed debian/patches/02_gpm_struct_type.patch. Fixed upstream. + + -- Riccardo Setti Sun, 5 Mar 2006 19:45:37 +0100 + +gnome-power-manager (2.13.92-2) experimental; urgency=low + + * debian/patches/02_gpm_struct_type.patch + + Added. Fix compatibility with dbus 0.61 + * Build-depend on libdbus-glib-1-dev (>= 0.61) + * Add myself to uploaders + + -- Sjoerd Simons Fri, 3 Mar 2006 11:48:33 +0100 + +gnome-power-manager (2.13.92-1) experimental; urgency=low + + * New upstream + + -- Riccardo Setti Sun, 26 Feb 2006 22:14:18 +0100 + +gnome-power-manager (2.13.91-2) experimental; urgency=low + + [Riccardo Setti] + + * fixed the installation of the gconf schemas. + - thanks to Marco zufus Presi for provide a patch. + * added 01_fix_gpm_dbus_conf.patch which grants permissions to the + group powerdev + * gpm deps on the last hal in experimental + + [Michael Biebl] + + * added a watch file. + * automatic autotools updated via DEB_AUTO_UPDATE_AUTOCONF flag. + - added build-dep on autoconf + * removed debian/dirs since it was useless. + + -- Riccardo Setti Thu, 23 Feb 2006 21:05:20 +0100 + +gnome-power-manager (2.13.91-1) experimental; urgency=low + + * New Upstream Release. + + -- Riccardo Setti Tue, 21 Feb 2006 00:03:15 +0100 + +gnome-power-manager (2.13.90-1) experimental; urgency=low + + * New upstream. + + -- Riccardo Setti Thu, 16 Feb 2006 14:41:29 +0100 + +gnome-power-manager (2.13.5-1) unstable; urgency=low + + * new upstream + - removed 01_port_to_the_new_libnotify because the last notify code works fine + - gpm depends on hal >= 0.5.6, libtool + - added --disable-scrollkeeper switch + * gpm depends on notification-daemon instead of notify-daemon + + -- Riccardo Setti Sun, 12 Feb 2006 20:45:16 +0100 + +gnome-power-manager (0.3.1-1) unstable; urgency=low + + * First Debian release. + * Initial upload to Debian (closes: #303600) + * based on the ubuntu package. + * src/gpm-libnotify.{c,h}: + - ported to new libnotify api (taken from cvs) + + -- Riccardo Setti Fri, 13 Jan 2006 15:53:43 +0100 + +gnome-power-manager (0.3.1-0ubuntu4) dapper; urgency=low + + * src/gpm-libnotify.{c,h}: + - ported to new libnotify api (taken from cvs) + * debian/control: + - changed dependency from notification-daemon to notify-daemon + + -- Michael Vogt Mon, 2 Jan 2006 21:10:43 +0100 + +gnome-power-manager (0.3.1-0ubuntu3) dapper; urgency=low + + * rebuild against latest dbus + + -- Michael Vogt Wed, 21 Dec 2005 11:11:56 +0100 + +gnome-power-manager (0.3.1-0ubuntu2) dapper; urgency=low + + * suspend by calling gdm-signal directly, rather than by going through + hal (allows suspend without requiring privilege escalation) + + -- Matthew Garrett Tue, 6 Dec 2005 05:43:33 +0000 + +gnome-power-manager (0.3.1-0ubuntu1) dapper; urgency=low + + * new upstream release + + -- Oliver Grawert Thu, 17 Nov 2005 02:42:49 +0100 + +gnome-power-manager (0.2.8.1-1ubuntu1) dapper; urgency=low + + * initial dapper upload + + -- Oliver Grawert Tue, 25 Oct 2005 00:24:15 +0200 + +gnome-power-manager (0.2.8.1-1utopia1) breezy; urgency=low + + * Initial import, based from the universe ubuntu package. + + -- Richard Hughes Mon, 24 Oct 2005 00:49:03 +0100 + --- gnome-power-manager-2.30.0.orig/debian/script +++ gnome-power-manager-2.30.0/debian/script @@ -0,0 +1,3 @@ +#! /bin/sh + +exec /usr/share/gnome-power-manager/gnome-power-bugreport >&3 --- gnome-power-manager-2.30.0.orig/debian/preinst +++ gnome-power-manager-2.30.0/debian/preinst @@ -0,0 +1,29 @@ +#! /bin/sh +set -e + +# Remove a no-longer used conffile +rm_conffile() { + PKGNAME="$1" + CONFFILE="$2" + if [ -e "$CONFFILE" ]; then + md5sum="`md5sum \"$CONFFILE\" | sed -e \"s/ .*//\"`" + old_md5sum="`dpkg-query -W -f='${Conffiles}' $PKGNAME | sed -n -e \"\\\\' $CONFFILE '{s/ obsolete$//;s/.* //p}\"`" + if [ "$md5sum" != "$old_md5sum" ]; then + echo "Obsolete conffile $CONFFILE has been modified by you." + echo "Saving as $CONFFILE.dpkg-bak ..." + mv -f "$CONFFILE" "$CONFFILE".dpkg-bak + else + echo "Removing obsolete conffile $CONFFILE ..." + rm -f "$CONFFILE" + fi + fi +} + +case "$1" in +install|upgrade) + if dpkg --compare-versions "$2" lt 2.24.4-2; then + rm_conffile gnome-power-manager /etc/dbus-1/system.d/gnome-power-manager.conf + fi +esac + +#DEBHELPER# --- gnome-power-manager-2.30.0.orig/debian/install +++ gnome-power-manager-2.30.0/debian/install @@ -0,0 +1,2 @@ +debian/script /usr/share/bug/gnome-power-manager/ +debian/local/source_gnome-power-manager.py /usr/share/apport/package-hooks/ --- gnome-power-manager-2.30.0.orig/debian/control +++ gnome-power-manager-2.30.0/debian/control @@ -0,0 +1,64 @@ +# This file is autogenerated. DO NOT EDIT! +# +# Modifications should be made to debian/control.in instead. +# This file is regenerated automatically in the clean target. + +Source: gnome-power-manager +Section: gnome +Priority: optional +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian GNOME Maintainers +XSBC-Original-Uploaders: Debian GNOME Maintainers +Build-Depends: debhelper (>= 5), + cdbs, + quilt, + autotools-dev, + libtool, + libpanel-applet2-dev (>= 2.0.0), + libdbus-glib-1-dev (>= 0.70), + libxml-parser-perl, + libxext-dev, + libx11-dev, + libgtk2.0-dev (>= 2.17.7), + libglib2.0-dev (>= 2.13.0), + libwnck-dev (>= 2.10.0), + docbook-to-man, + intltool, + libnotify-dev (>= 0.4.4-3), + docbook-utils, + libxrandr-dev (>= 1.2.0), + xmlto, + gnome-doc-utils, + scrollkeeper, + gnome-pkg-tools (>= 0.10), + libdevkit-power-gobject-dev (>= 008), + libcanberra-gtk-dev (>= 0.10), + libunique-dev (>= 0.9.4), + libgnome-keyring-dev (>= 0.6.0), + libappindicator-dev (>= 0.0.13), + pkg-config +Standards-Version: 3.8.4 +Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/gnome-power/ubuntu +Homepage: http://www.gnome.org/projects/gnome-power-manager/ + +Package: gnome-power-manager +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends}, + notification-daemon, + dbus-x11, + consolekit, + upower +Breaks: gnome-session (<< 2.28) +Recommends: udisks +Suggests: hal +Description: power management tool for the GNOME desktop + GNOME Power Manager is a session daemon for the GNOME desktop + that takes care of system or desktop events related to power, and + triggers actions accordingly. Its philosophy is to completely hide + these complex tasks and only show some settings important to the user. + . + The GNOME power manager displays and manages battery status, power plug + events, display brightness, CPU, graphics card and hard disk drive + power saving, and can trigger suspend-to-RAM, hibernate or shutdown + events, all integrated to other components of the GNOME desktop. --- gnome-power-manager-2.30.0.orig/debian/watch +++ gnome-power-manager-2.30.0/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://ftp.gnome.org/pub/GNOME/sources/gnome-power-manager/([\d\.]+)/gnome-power-manager-([\d\.]*).tar.gz --- gnome-power-manager-2.30.0.orig/debian/local/source_gnome-power-manager.py +++ gnome-power-manager-2.30.0/debian/local/source_gnome-power-manager.py @@ -0,0 +1,43 @@ +'''apport package hook for gnome-power-manager + +(c) 2009 Canonical Ltd. +Author: Martin Pitt +''' + +from apport.hookutils import * +from os import path +import dbus + +def add_info(report): + report['DevkitPower'] = command_output(['upower', '-d']) + report['gnome-power-bugreport'] = command_output('/usr/share/gnome-power-manager/gnome-power-bugreport') + attach_hardware(report) + attach_gconf(report, 'gnome-power-manager') + + try: + bus = dbus.SessionBus() + session_manager = bus.get_object('org.gnome.SessionManager', '/org/gnome/SessionManager') + session_manager_iface = dbus.Interface(session_manager, dbus_interface='org.gnome.SessionManager') + inhibitors = session_manager_iface.GetInhibitors() + inhibitors_str = '' + master_flag = 0 + j = 1 + for i in inhibitors: + obj = bus.get_object('org.gnome.SessionManager', i) + iface = dbus.Interface(obj, dbus_interface='org.gnome.SessionManager.Inhibitor') + app_id = iface.GetAppId() + flags = iface.GetFlags() + reason = iface.GetReason() + if j > 1: + inhibitors_str += '\n' + inhibitors_str += str(j) + ': AppId = ' + app_id + ', Flags = ' + str(flags) + ', Reason = ' + reason + j = j + 1 + master_flag |= flags + + report['GnomeSessionInhibitors'] = 'None' if inhibitors_str == '' else inhibitors_str + report['GnomeSessionIdleInhibited'] = 'Yes' if master_flag & 8 else 'No' + report['GnomeSessionSuspendInhibited'] = 'Yes' if master_flag & 4 else 'No' + except: + report['GnomeSessionInhibitors'] = 'Failed to acquire' + report['GnomeSessionIdleInhibited'] = 'Unknown' + report['GnomeSessionSuspendInhibited'] = 'Unknown' --- gnome-power-manager-2.30.0.orig/debian/patches/08-desktop-bugreport-path.patch +++ gnome-power-manager-2.30.0/debian/patches/08-desktop-bugreport-path.patch @@ -0,0 +1,12 @@ +Description: We don't install gnome-power-bugreport.sh into $PATH to avoid clutter. Adapt the path in the .desktop file accordingly. +Author: Josselin Mouette +Index: gnome-power-manager-2.27.91/data/gnome-power-preferences.desktop.in.in +=================================================================== +--- gnome-power-manager-2.27.91.orig/data/gnome-power-preferences.desktop.in.in 2009-08-04 01:02:23.000000000 +1000 ++++ gnome-power-manager-2.27.91/data/gnome-power-preferences.desktop.in.in 2009-08-27 12:17:46.000000000 +1000 +@@ -12,4 +12,4 @@ + X-GNOME-Bugzilla-Product=gnome-power-manager + X-GNOME-Bugzilla-Component=gnome-power-preferences + X-GNOME-Bugzilla-Version=@VERSION@ +-X-GNOME-Bugzilla-ExtraInfoScript=gnome-power-bugreport.sh ++X-GNOME-Bugzilla-ExtraInfoScript=/usr/share/gnome-power-manager/gnome-power-bugreport --- gnome-power-manager-2.30.0.orig/debian/patches/12-add-appindicators.patch +++ gnome-power-manager-2.30.0/debian/patches/12-add-appindicators.patch @@ -0,0 +1,509 @@ +Description: Add support for application indicators +Author: Jan Arne Petersen +Bug: https://bugzilla.gnome.org/show_bug.cgi?id=609654 +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/gnome-power-manager/+bug/497870 + +Index: gnome-power-manager-2.29.91/configure.ac +=================================================================== +--- gnome-power-manager-2.29.91.orig/configure.ac 2010-03-01 13:17:42.000000000 +0000 ++++ gnome-power-manager-2.29.91/configure.ac 2010-03-12 09:44:48.483197569 +0000 +@@ -124,6 +124,7 @@ + XRANDR_REQUIRED=1.2.0 + CANBERRA_REQUIRED=0.10 + DEVKIT_POWER_REQUIRED=008 ++APPINDICATOR_REQUIRED=0.0.10 + + dnl --------------------------------------------------------------------------- + dnl - Make above strings available for packaging files (e.g. rpm spec files) +@@ -201,6 +202,27 @@ + AC_SUBST(DEVKIT_CFLAGS) + AC_SUBST(DEVKIT_LIBS) + ++AC_ARG_ENABLE([appindicator], ++ AS_HELP_STRING([--enable-appindicator[=@<:@no/auto/yes@:>@]],[Build support for application indicators]), ++ [enable_appindicator=$enableval], ++ [enable_appindicator="auto"]) ++ ++if test x$enable_appindicator = xauto ; then ++ PKG_CHECK_EXISTS([appindicator-0.1 >= $APPINDICATOR_REQUIRED], ++ [enable_appindicator="yes"], ++ [enable_appindicator="no"]) ++fi ++ ++if test x$enable_appindicator = xyes ; then ++ PKG_CHECK_EXISTS([appindicator-0.1 >= $APPINDICATOR_REQUIRED], ++ [AC_DEFINE(HAVE_APP_INDICATOR, 1, [Have AppIndicator]) ++ PKG_CHECK_MODULES(APP_INDICATOR, [appindicator-0.1 >= $APPINDICATOR_REQUIRED])], ++ [AC_MSG_ERROR([appindicator-0.1 is not installed])]) ++fi ++AM_CONDITIONAL(HAVE_APP_INDICATOR, [test x$enable_appindicator = xyes]) ++AC_SUBST(APP_INDICATOR_CFLAGS) ++AC_SUBST(APP_INDICATOR_LIBS) ++ + AC_PATH_PROG(GCONFTOOL, gconftool-2) + AM_GCONF_SOURCE_2 + +@@ -597,6 +619,7 @@ + Self test support: ${have_tests} + GConf default support: ${have_gconfdefaults} + Docbook support: ${enable_docbook_docs} ++ App indicator support: ${enable_appindicator} + documentation dir: $DOCDIR + dbus-1 services dir: $DBUS_SERVICES_DIR + gconf-schema dir: $GCONF_SCHEMA_FILE_DIR +Index: gnome-power-manager-2.29.91/src/Makefile.am +=================================================================== +--- gnome-power-manager-2.29.91.orig/src/Makefile.am 2010-03-12 09:44:48.353229794 +0000 ++++ gnome-power-manager-2.29.91/src/Makefile.am 2010-03-12 09:44:48.483197569 +0000 +@@ -20,6 +20,7 @@ + $(GSTREAMER_CFLAGS) \ + -DI_KNOW_THE_DEVICEKIT_POWER_API_IS_SUBJECT_TO_CHANGE \ + $(DEVKIT_CFLAGS) \ ++ $(APP_INDICATOR_CFLAGS) \ + -DBINDIR=\"$(bindir)\" \ + -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ + -DDATADIR=\"$(datadir)\" \ +@@ -191,6 +192,7 @@ + $(LIBNOTIFY_LIBS) \ + $(GPM_EXTRA_LIBS) \ + $(DEVKIT_LIBS) \ ++ $(APP_INDICATOR_LIBS) \ + -lm + + if HAVE_HAL +Index: gnome-power-manager-2.29.91/src/gpm-engine.c +=================================================================== +--- gnome-power-manager-2.29.91.orig/src/gpm-engine.c 2010-02-05 10:18:25.000000000 +0000 ++++ gnome-power-manager-2.29.91/src/gpm-engine.c 2010-03-12 09:44:48.483197569 +0000 +@@ -75,6 +75,7 @@ + DISCHARGING, + LOW_CAPACITY, + PERHAPS_RECALL, ++ DEVICES_CHANGED, + LAST_SIGNAL + }; + +@@ -491,6 +492,8 @@ + + gpm_engine_recalculate_state_icon (engine); + gpm_engine_recalculate_state_summary (engine); ++ ++ g_signal_emit (engine, signals [DEVICES_CHANGED], 0); + } + + /** +@@ -1193,6 +1196,13 @@ + G_STRUCT_OFFSET (GpmEngineClass, charge_critical), + NULL, NULL, g_cclosure_marshal_VOID__POINTER, + G_TYPE_NONE, 1, G_TYPE_POINTER); ++ signals [DEVICES_CHANGED] = ++ g_signal_new ("devices-changed", ++ G_TYPE_FROM_CLASS (object_class), ++ G_SIGNAL_RUN_LAST, ++ G_STRUCT_OFFSET (GpmEngineClass, devices_changed), ++ NULL, NULL, g_cclosure_marshal_VOID__VOID, ++ G_TYPE_NONE, 0); + } + + /** +Index: gnome-power-manager-2.29.91/src/gpm-engine.h +=================================================================== +--- gnome-power-manager-2.29.91.orig/src/gpm-engine.h 2010-01-27 16:24:52.000000000 +0000 ++++ gnome-power-manager-2.29.91/src/gpm-engine.h 2010-03-12 09:44:48.483197569 +0000 +@@ -65,6 +65,7 @@ + DkpDevice *device); + void (* discharging) (GpmEngine *engine, + DkpDevice *device); ++ void (* devices_changed) (GpmEngine *engine); + } GpmEngineClass; + + GType gpm_engine_get_type (void); +Index: gnome-power-manager-2.29.91/src/gpm-manager.c +=================================================================== +--- gnome-power-manager-2.29.91.orig/src/gpm-manager.c 2010-02-23 17:33:31.000000000 +0000 ++++ gnome-power-manager-2.29.91/src/gpm-manager.c 2010-03-12 09:44:48.483197569 +0000 +@@ -379,7 +379,7 @@ + gpm_manager_notify_close (manager, *notification_class); + + /* if the status icon is hidden, don't point at it */ +- if (gtk_status_icon_is_embedded (manager->priv->status_icon)) ++ if (manager->priv->status_icon && gtk_status_icon_is_embedded (manager->priv->status_icon)) + notification = notify_notification_new_with_status_icon (title, message, icon, manager->priv->status_icon); + else + notification = notify_notification_new (title, message, icon, NULL); +@@ -1967,7 +1967,8 @@ + g_object_unref (manager->priv->backlight); + g_object_unref (manager->priv->console); + g_object_unref (manager->priv->client); +- g_object_unref (manager->priv->status_icon); ++ if (manager->priv->status_icon) ++ g_object_unref (manager->priv->status_icon); + + G_OBJECT_CLASS (gpm_manager_parent_class)->finalize (object); + } +Index: gnome-power-manager-2.29.91/src/gpm-tray-icon.c +=================================================================== +--- gnome-power-manager-2.29.91.orig/src/gpm-tray-icon.c 2010-02-05 10:18:25.000000000 +0000 ++++ gnome-power-manager-2.29.91/src/gpm-tray-icon.c 2010-03-12 09:47:03.703194589 +0000 +@@ -41,6 +41,10 @@ + #include + #include + ++#ifdef HAVE_APP_INDICATOR ++#include ++#endif ++ + #include "egg-debug.h" + + #include "gpm-upower.h" +@@ -57,15 +61,19 @@ + { + GConfClient *conf; + GpmEngine *engine; ++#ifdef HAVE_APP_INDICATOR ++ AppIndicator *app_indicator; ++#else + GtkStatusIcon *status_icon; ++#endif + gboolean show_actions; + }; + + G_DEFINE_TYPE (GpmTrayIcon, gpm_tray_icon, G_TYPE_OBJECT) + +-/** +- * gpm_tray_icon_enable_actions: +- **/ ++ /** ++ * gpm_tray_icon_enable_actions: ++ **/ + static void + gpm_tray_icon_enable_actions (GpmTrayIcon *icon, gboolean enabled) + { +@@ -81,7 +89,16 @@ + gpm_tray_icon_show (GpmTrayIcon *icon, gboolean enabled) + { + g_return_if_fail (GPM_IS_TRAY_ICON (icon)); ++#ifdef HAVE_APP_INDICATOR ++ if (enabled) ++ app_indicator_set_status (icon->priv->app_indicator, ++ APP_INDICATOR_STATUS_ACTIVE); ++ else ++ app_indicator_set_status (icon->priv->app_indicator, ++ APP_INDICATOR_STATUS_PASSIVE); ++#else + gtk_status_icon_set_visible (icon->priv->status_icon, enabled); ++#endif + } + + /** +@@ -95,11 +112,13 @@ + g_return_val_if_fail (GPM_IS_TRAY_ICON (icon), FALSE); + g_return_val_if_fail (tooltip != NULL, FALSE); + ++#ifndef HAVE_APP_INDICATOR + #if GTK_CHECK_VERSION(2,15,0) + gtk_status_icon_set_tooltip_text (icon->priv->status_icon, tooltip); + #else + gtk_status_icon_set_tooltip (icon->priv->status_icon, tooltip); + #endif ++#endif + return TRUE; + } + +@@ -110,7 +129,11 @@ + gpm_tray_icon_get_status_icon (GpmTrayIcon *icon) + { + g_return_val_if_fail (GPM_IS_TRAY_ICON (icon), NULL); ++#ifdef HAVE_APP_INDICATOR ++ return NULL; ++#else + return g_object_ref (icon->priv->status_icon); ++#endif + } + + /** +@@ -127,7 +150,11 @@ + + if (filename != NULL) { + egg_debug ("Setting icon to %s", filename); ++#ifdef HAVE_APP_INDICATOR ++ app_indicator_set_icon (icon->priv->app_indicator, filename); ++#else + gtk_status_icon_set_from_icon_name (icon->priv->status_icon, filename); ++#endif + + /* make sure that we are visible */ + gpm_tray_icon_show (icon, TRUE); +@@ -171,21 +198,6 @@ + } + + /** +- * gpm_tray_icon_popup_cleared_cd: +- * @widget: The popup Gtkwidget +- * +- * We have to re-enable the tooltip when the popup is removed +- **/ +-static void +-gpm_tray_icon_popup_cleared_cd (GtkWidget *widget, GpmTrayIcon *icon) +-{ +- g_return_if_fail (GPM_IS_TRAY_ICON (icon)); +- egg_debug ("clear tray"); +- g_object_ref_sink (widget); +- g_object_unref (widget); +-} +- +-/** + * gpm_tray_icon_class_init: + **/ + static void +@@ -208,9 +220,11 @@ + gchar *icon_name; + gchar *label; + GtkWidget *item; +- GtkWidget *image; + const gchar *object_path; ++#ifndef HAVE_APP_INDICATOR ++ GtkWidget *image; + const gchar *desc; ++#endif + DkpDevice *device; + DkpDeviceType type_tmp; + gdouble percentage; +@@ -233,6 +247,10 @@ + added++; + + /* generate the label */ ++#ifdef HAVE_APP_INDICATOR ++ label = gpm_upower_get_device_summary (device); ++ item = gtk_menu_item_new_with_label (label); ++#else + desc = gpm_device_type_to_localised_text (type, 1); + label = g_strdup_printf ("%s (%.1f%%)", desc, percentage); + item = gtk_image_menu_item_new_with_label (label); +@@ -242,6 +260,7 @@ + image = gtk_image_new_from_icon_name (icon_name, GTK_ICON_SIZE_MENU); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image); + gtk_image_menu_item_set_always_show_image (GTK_IMAGE_MENU_ITEM (item), TRUE); ++#endif + + /* callback and add the the menu */ + g_signal_connect (G_OBJECT (item), "activate", G_CALLBACK (gpm_tray_icon_show_info_cb), icon); +@@ -257,14 +276,16 @@ + /** + * gpm_tray_icon_create_menu: + * +- * Display the popup menu. ++ * Create the popup menu. + **/ +-static void +-gpm_tray_icon_create_menu (GpmTrayIcon *icon, guint32 timestamp) ++static GtkMenu * ++gpm_tray_icon_create_menu (GpmTrayIcon *icon) + { + GtkMenu *menu = (GtkMenu*) gtk_menu_new (); + GtkWidget *item; ++#ifndef HAVE_APP_INDICATOR + GtkWidget *image; ++#endif + guint dev_cnt = 0; + GPtrArray *array; + +@@ -289,14 +310,63 @@ + } + + /* preferences */ ++#ifdef HAVE_APP_INDICATOR ++ item = gtk_menu_item_new_with_mnemonic (_("_Preferences")); ++#else + item = gtk_image_menu_item_new_with_mnemonic (_("_Preferences")); + image = gtk_image_new_from_icon_name (GTK_STOCK_PREFERENCES, GTK_ICON_SIZE_MENU); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image); ++#endif + g_signal_connect (G_OBJECT (item), "activate", + G_CALLBACK (gpm_tray_icon_show_preferences_cb), icon); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); + + skip_prefs: ++ return menu; ++} ++ ++#ifdef HAVE_APP_INDICATOR ++/** ++ * gpm_tray_icon_devices_changed_cb: ++ * ++ * Callback when devices are changed and menu has to be recreated ++ **/ ++static void ++gpm_tray_icon_devices_changed_cb (GpmEngine *engine, GpmTrayIcon *icon) ++{ ++ GtkMenu *menu; ++ menu = gpm_tray_icon_create_menu (icon); ++ gtk_widget_show_all (GTK_WIDGET (menu)); ++ app_indicator_set_menu (icon->priv->app_indicator, menu); ++} ++#else ++/** ++ * gpm_tray_icon_popup_cleared_cd: ++ * @widget: The popup Gtkwidget ++ * ++ * We have to re-enable the tooltip when the popup is removed ++ **/ ++static void ++gpm_tray_icon_popup_cleared_cd (GtkWidget *widget, GpmTrayIcon *icon) ++{ ++ g_return_if_fail (GPM_IS_TRAY_ICON (icon)); ++ egg_debug ("clear tray"); ++ g_object_ref_sink (widget); ++ g_object_unref (widget); ++} ++ ++/** ++ * gpm_tray_icon_popup_menu: ++ * ++ * Display the popup menu. ++ **/ ++static void ++gpm_tray_icon_popup_menu (GpmTrayIcon *icon, guint32 timestamp) ++{ ++ GtkMenu *menu; ++ ++ menu = gpm_tray_icon_create_menu (icon); ++ + /* show the menu */ + gtk_widget_show_all (GTK_WIDGET (menu)); + gtk_menu_popup (GTK_MENU (menu), NULL, NULL, +@@ -316,7 +386,7 @@ + gpm_tray_icon_popup_menu_cb (GtkStatusIcon *status_icon, guint button, guint32 timestamp, GpmTrayIcon *icon) + { + egg_debug ("icon right clicked"); +- gpm_tray_icon_create_menu (icon, timestamp); ++ gpm_tray_icon_popup_menu (icon, timestamp); + } + + +@@ -330,8 +400,9 @@ + gpm_tray_icon_activate_cb (GtkStatusIcon *status_icon, GpmTrayIcon *icon) + { + egg_debug ("icon left clicked"); +- gpm_tray_icon_create_menu (icon, gtk_get_current_event_time()); ++ gpm_tray_icon_popup_menu (icon, gtk_get_current_event_time()); + } ++#endif + + /** + * gpm_conf_gconf_key_changed_cb: +@@ -363,6 +434,9 @@ + gpm_tray_icon_init (GpmTrayIcon *icon) + { + gboolean allowed_in_menu; ++#ifdef HAVE_APP_INDICATOR ++ GtkMenu *menu; ++#endif + + icon->priv = GPM_TRAY_ICON_GET_PRIVATE (icon); + +@@ -376,6 +450,19 @@ + (GConfClientNotifyFunc) gpm_conf_gconf_key_changed_cb, + icon, NULL, NULL); + ++#ifdef HAVE_APP_INDICATOR ++ icon->priv->app_indicator = app_indicator_new_with_path ("gnome-power-manager", ++ "gnome-power-manager", ++ APP_INDICATOR_CATEGORY_HARDWARE, ++ GPM_DATA G_DIR_SEPARATOR_S "icons"); ++ ++ menu = gpm_tray_icon_create_menu (icon); ++ gtk_widget_show_all (GTK_WIDGET (menu)); ++ app_indicator_set_menu (icon->priv->app_indicator, menu); ++ g_signal_connect_object (G_OBJECT (icon->priv->engine), "devices-changed", ++ G_CALLBACK (gpm_tray_icon_devices_changed_cb), ++ icon, 0); ++#else + icon->priv->status_icon = gtk_status_icon_new (); + g_signal_connect_object (G_OBJECT (icon->priv->status_icon), + "popup_menu", +@@ -385,6 +472,7 @@ + "activate", + G_CALLBACK (gpm_tray_icon_activate_cb), + icon, 0); ++#endif + + allowed_in_menu = gconf_client_get_bool (icon->priv->conf, GPM_CONF_UI_SHOW_ACTIONS, NULL); + gpm_tray_icon_enable_actions (icon, allowed_in_menu); +@@ -404,7 +492,11 @@ + + tray_icon = GPM_TRAY_ICON (object); + ++#ifdef HAVE_APP_INDICATOR ++ g_object_unref (tray_icon->priv->app_indicator); ++#else + g_object_unref (tray_icon->priv->status_icon); ++#endif + g_object_unref (tray_icon->priv->engine); + g_return_if_fail (tray_icon->priv != NULL); + +Index: gnome-power-manager-2.29.91/src/gpm-upower.c +=================================================================== +--- gnome-power-manager-2.29.91.orig/src/gpm-upower.c 2010-02-05 10:18:25.000000000 +0000 ++++ gnome-power-manager-2.29.91/src/gpm-upower.c 2010-03-12 09:44:48.483197569 +0000 +@@ -267,17 +272,28 @@ + time_to_empty_str); + g_free (time_to_empty_str); + } else { ++#ifdef HAVE_APP_INDICATOR ++ /* TRANSLATORS: the device is fully charged */ ++ description = g_strdup_printf (_("%s is charged"), type_desc); ++#else + /* TRANSLATORS: the device is fully charged */ + description = g_strdup_printf (_("%s is fully charged"), type_desc); ++#endif + } + + } else if (state == DKP_DEVICE_STATE_DISCHARGING) { + + if (time_to_empty_round > GPM_DKP_TEXT_MIN_TIME) { + time_to_empty_str = gpm_get_timestring (time_to_empty_round); ++#ifdef HAVE_APP_INDICATOR ++ /* TRANSLATORS: the device is discharging, and we have a time remaining */ ++ description = g_strdup_printf (_("%s %s left"), ++ type_desc, time_to_empty_str); ++#else + /* TRANSLATORS: the device is discharging, and we have a time remaining */ + description = g_strdup_printf (_("%s %s remaining (%.1f%%)"), + type_desc, time_to_empty_str, percentage); ++#endif + g_free (time_to_empty_str); + } else { + /* TRANSLATORS: the device is discharging, but we only have a percentage */ +@@ -294,9 +310,15 @@ + time_to_full_str = gpm_get_timestring (time_to_full_round); + time_to_empty_str = gpm_get_timestring (time_to_empty_round); + ++#ifdef HAVE_APP_INDICATOR ++ /* TRANSLATORS: device is charging, and we have a time to full and a percentage */ ++ description = g_strdup_printf (_("%s %s until charged"), ++ type_desc, time_to_full_str); ++#else + /* TRANSLATORS: the device is charging, and we have a time to full and empty */ + description = g_strdup_printf (_("%s %s until charged (%.1f%%)\nProvides %s battery runtime"), + type_desc, time_to_full_str, percentage, time_to_empty_str); ++#endif + g_free (time_to_full_str); + g_free (time_to_empty_str); + +@@ -305,9 +327,15 @@ + /* display only charge time */ + time_to_full_str = gpm_get_timestring (time_to_full_round); + ++#ifdef HAVE_APP_INDICATOR ++ /* TRANSLATORS: device is charging, and we have a time to full and a percentage */ ++ description = g_strdup_printf (_("%s %s until charged"), ++ type_desc, time_to_full_str); ++#else + /* TRANSLATORS: device is charging, and we have a time to full and a percentage */ + description = g_strdup_printf (_("%s %s until charged (%.1f%%)"), + type_desc, time_to_full_str, percentage); ++#endif + g_free (time_to_full_str); + } else { + --- gnome-power-manager-2.30.0.orig/debian/patches/13-lock-on-blank.patch +++ gnome-power-manager-2.30.0/debian/patches/13-lock-on-blank.patch @@ -0,0 +1,27 @@ +Description: Lock when we blank due to an idle timeout +Author: Michael Terry +Bug-Ubuntu: https://launchpad.net/bugs/620693 + +Index: gnome-power-manager-2.30.0/src/gpm-manager.c +=================================================================== +--- gnome-power-manager-2.30.0.orig/src/gpm-manager.c 2011-09-21 15:04:52.073736261 -0400 ++++ gnome-power-manager-2.30.0/src/gpm-manager.c 2011-09-21 15:19:22.893735482 -0400 +@@ -805,6 +805,18 @@ + return; + gpm_manager_idle_do_sleep (manager); + } ++ ++ if (!gpm_button_is_lid_closed (manager->priv->button) && ++ mode == GPM_IDLE_MODE_BLANK) { ++ /* gpm-backlight will do the blanking, but we lock here */ ++ gboolean do_lock; ++ do_lock = gpm_control_get_lock_policy (manager->priv->control, ++ GPM_CONF_LOCK_ON_BLANK_SCREEN); ++ if (do_lock) { ++ if (!gpm_screensaver_lock (manager->priv->screensaver)) ++ egg_debug ("Could not lock screen via gnome-screensaver"); ++ } ++ } + } + + /** --- gnome-power-manager-2.30.0.orig/debian/patches/90-autotools.patch +++ gnome-power-manager-2.30.0/debian/patches/90-autotools.patch @@ -0,0 +1,1726 @@ +diff -Nur gnome-power-manager-2.30.0/aclocal.m4 gnome-power-manager-2.30.0.new/aclocal.m4 +--- gnome-power-manager-2.30.0/aclocal.m4 2010-03-29 12:17:13.000000000 +0200 ++++ gnome-power-manager-2.30.0.new/aclocal.m4 2010-03-29 13:27:23.451578683 +0200 +@@ -739,14 +739,16 @@ + # _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) + # --------------------------------------------- + m4_define([_PKG_CONFIG], +-[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 ++[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 + fi[]dnl + ])# _PKG_CONFIG + +@@ -790,9 +792,9 @@ + if test $pkg_failed = yes; then + _PKG_SHORT_ERRORS_SUPPORTED + if test $_pkg_short_errors_supported = yes; then +- $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1` ++ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"` + else +- $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1` ++ $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` + fi + # Put the nasty error message in config.log where it belongs + echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD +diff -Nur gnome-power-manager-2.30.0/applets/brightness/Makefile.in gnome-power-manager-2.30.0.new/applets/brightness/Makefile.in +--- gnome-power-manager-2.30.0/applets/brightness/Makefile.in 2010-03-29 12:17:15.000000000 +0200 ++++ gnome-power-manager-2.30.0.new/applets/brightness/Makefile.in 2010-03-29 13:27:32.551576309 +0200 +@@ -121,6 +121,8 @@ + ALL_LINGUAS = @ALL_LINGUAS@ + AMTAR = @AMTAR@ + AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ ++APP_INDICATOR_CFLAGS = @APP_INDICATOR_CFLAGS@ ++APP_INDICATOR_LIBS = @APP_INDICATOR_LIBS@ + AR = @AR@ + AUTOCONF = @AUTOCONF@ + AUTOHEADER = @AUTOHEADER@ +diff -Nur gnome-power-manager-2.30.0/applets/inhibit/Makefile.in gnome-power-manager-2.30.0.new/applets/inhibit/Makefile.in +--- gnome-power-manager-2.30.0/applets/inhibit/Makefile.in 2010-03-29 12:17:15.000000000 +0200 ++++ gnome-power-manager-2.30.0.new/applets/inhibit/Makefile.in 2010-03-29 13:27:32.681576494 +0200 +@@ -120,6 +120,8 @@ + ALL_LINGUAS = @ALL_LINGUAS@ + AMTAR = @AMTAR@ + AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ ++APP_INDICATOR_CFLAGS = @APP_INDICATOR_CFLAGS@ ++APP_INDICATOR_LIBS = @APP_INDICATOR_LIBS@ + AR = @AR@ + AUTOCONF = @AUTOCONF@ + AUTOHEADER = @AUTOHEADER@ +diff -Nur gnome-power-manager-2.30.0/applets/Makefile.in gnome-power-manager-2.30.0.new/applets/Makefile.in +--- gnome-power-manager-2.30.0/applets/Makefile.in 2010-03-29 12:17:15.000000000 +0200 ++++ gnome-power-manager-2.30.0.new/applets/Makefile.in 2010-03-29 13:27:32.401576236 +0200 +@@ -100,6 +100,8 @@ + ALL_LINGUAS = @ALL_LINGUAS@ + AMTAR = @AMTAR@ + AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ ++APP_INDICATOR_CFLAGS = @APP_INDICATOR_CFLAGS@ ++APP_INDICATOR_LIBS = @APP_INDICATOR_LIBS@ + AR = @AR@ + AUTOCONF = @AUTOCONF@ + AUTOHEADER = @AUTOHEADER@ +diff -Nur gnome-power-manager-2.30.0/config.h.in gnome-power-manager-2.30.0.new/config.h.in +--- gnome-power-manager-2.30.0/config.h.in 2010-03-29 12:17:30.000000000 +0200 ++++ gnome-power-manager-2.30.0.new/config.h.in 2010-03-29 13:27:30.000000000 +0200 +@@ -9,6 +9,9 @@ + /* Define if we are building applets */ + #undef HAVE_APPLETS + ++/* Have AppIndicator */ ++#undef HAVE_APP_INDICATOR ++ + /* Define to 1 if you have the `bind_textdomain_codeset' function. */ + #undef HAVE_BIND_TEXTDOMAIN_CODESET + +diff -Nur gnome-power-manager-2.30.0/config.h.in~ gnome-power-manager-2.30.0.new/config.h.in~ +--- gnome-power-manager-2.30.0/config.h.in~ 1970-01-01 01:00:00.000000000 +0100 ++++ gnome-power-manager-2.30.0.new/config.h.in~ 2010-03-29 12:17:30.000000000 +0200 +@@ -0,0 +1,113 @@ ++/* config.h.in. Generated from configure.ac by autoheader. */ ++ ++/* always defined to indicate that i18n is enabled */ ++#undef ENABLE_NLS ++ ++/* foo */ ++#undef GETTEXT_PACKAGE ++ ++/* Define if we are building applets */ ++#undef HAVE_APPLETS ++ ++/* Define to 1 if you have the `bind_textdomain_codeset' function. */ ++#undef HAVE_BIND_TEXTDOMAIN_CODESET ++ ++/* Define to 1 if you have the `dcgettext' function. */ ++#undef HAVE_DCGETTEXT ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_DLFCN_H ++ ++/* Define if have gconf defaults */ ++#undef HAVE_GCONF_DEFAULTS ++ ++/* Define if the GNU gettext() function is already present or preinstalled. */ ++#undef HAVE_GETTEXT ++ ++/* Define if we have HAL support */ ++#undef HAVE_HAL ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_INTTYPES_H ++ ++/* Define if Solaris kstat is support */ ++#undef HAVE_KSTAT ++ ++/* Define if your file defines LC_MESSAGES. */ ++#undef HAVE_LC_MESSAGES ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_LOCALE_H ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_MEMORY_H ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_STDINT_H ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_STDLIB_H ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_STRINGS_H ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_STRING_H ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_SYS_STAT_H ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_SYS_TYPES_H ++ ++/* Define if we want to use the self tests */ ++#undef HAVE_TESTS ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_UNISTD_H ++ ++/* Define if XF86XK_Battery is available */ ++#undef HAVE_XF86XK_BATTERY ++ ++/* Define if XF86XK_Hibernate is available */ ++#undef HAVE_XF86XK_HIBERNATE ++ ++/* Define if XF86XK_Suspend is available */ ++#undef HAVE_XF86XK_SUSPEND ++ ++/* xrandr 1.3 available */ ++#undef HAVE_XRANDR_13 ++ ++/* Define to the sub-directory in which libtool stores uninstalled libraries. ++ */ ++#undef LT_OBJDIR ++ ++/* Define to 1 if your C compiler doesn't accept -c and -o together. */ ++#undef NO_MINUS_C_MINUS_O ++ ++/* Name of package */ ++#undef PACKAGE ++ ++/* Define to the address where bug reports for this package should be sent. */ ++#undef PACKAGE_BUGREPORT ++ ++/* Define to the full name of this package. */ ++#undef PACKAGE_NAME ++ ++/* Define to the full name and version of this package. */ ++#undef PACKAGE_STRING ++ ++/* Define to the one symbol short name of this package. */ ++#undef PACKAGE_TARNAME ++ ++/* Define to the home page for this package. */ ++#undef PACKAGE_URL ++ ++/* Define to the version of this package. */ ++#undef PACKAGE_VERSION ++ ++/* Define to 1 if you have the ANSI C header files. */ ++#undef STDC_HEADERS ++ ++/* Version number of package */ ++#undef VERSION +diff -Nur gnome-power-manager-2.30.0/configure gnome-power-manager-2.30.0.new/configure +--- gnome-power-manager-2.30.0/configure 2010-03-29 12:17:19.000000000 +0200 ++++ gnome-power-manager-2.30.0.new/configure 2010-03-29 13:27:30.121576201 +0200 +@@ -772,6 +772,10 @@ + GCONF_SCHEMA_FILE_DIR + GCONF_SCHEMA_CONFIG_SOURCE + GCONFTOOL ++HAVE_APP_INDICATOR_FALSE ++HAVE_APP_INDICATOR_TRUE ++APP_INDICATOR_LIBS ++APP_INDICATOR_CFLAGS + DEVKIT_LIBS + DEVKIT_CFLAGS + UNIQUE_LIBS +@@ -970,6 +974,7 @@ + with_help_formats + enable_scrollkeeper + enable_strict ++enable_appindicator + with_gconf_source + with_gconf_schema_file_dir + enable_schemas_install +@@ -1009,6 +1014,8 @@ + UNIQUE_LIBS + DEVKIT_CFLAGS + DEVKIT_LIBS ++APP_INDICATOR_CFLAGS ++APP_INDICATOR_LIBS + PANEL_CFLAGS + PANEL_LIBS' + +@@ -1646,6 +1653,8 @@ + --enable-iso-c Try to warn if code is not ISO C + --disable-scrollkeeper do not make updates to the scrollkeeper database + --enable-strict Enable strict compilation options ++ --enable-appindicator=[no/auto/yes] ++ Build support for application indicators + --disable-schemas-install + Disable the schemas installation + --enable-hal Build using HAL support +@@ -1708,6 +1717,10 @@ + DEVKIT_CFLAGS + C compiler flags for DEVKIT, overriding pkg-config + DEVKIT_LIBS linker flags for DEVKIT, overriding pkg-config ++ APP_INDICATOR_CFLAGS ++ C compiler flags for APP_INDICATOR, overriding pkg-config ++ APP_INDICATOR_LIBS ++ linker flags for APP_INDICATOR, overriding pkg-config + PANEL_CFLAGS + C compiler flags for PANEL, overriding pkg-config + PANEL_LIBS linker flags for PANEL, overriding pkg-config +@@ -4987,13 +5000,13 @@ + else + lt_cv_nm_interface="BSD nm" + echo "int some_variable = 0;" > conftest.$ac_ext +- (eval echo "\"\$as_me:4990: $ac_compile\"" >&5) ++ (eval echo "\"\$as_me:5003: $ac_compile\"" >&5) + (eval "$ac_compile" 2>conftest.err) + cat conftest.err >&5 +- (eval echo "\"\$as_me:4993: $NM \\\"conftest.$ac_objext\\\"\"" >&5) ++ (eval echo "\"\$as_me:5006: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) + cat conftest.err >&5 +- (eval echo "\"\$as_me:4996: output\"" >&5) ++ (eval echo "\"\$as_me:5009: output\"" >&5) + cat conftest.out >&5 + if $GREP 'External.*some_variable' conftest.out > /dev/null; then + lt_cv_nm_interface="MS dumpbin" +@@ -6199,7 +6212,7 @@ + ;; + *-*-irix6*) + # Find out which ABI we are using. +- echo '#line 6202 "configure"' > conftest.$ac_ext ++ echo '#line 6215 "configure"' > conftest.$ac_ext + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +@@ -7729,11 +7742,11 @@ + -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:7732: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:7745: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:7736: \$? = $ac_status" >&5 ++ echo "$as_me:7749: \$? = $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. +@@ -8068,11 +8081,11 @@ + -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:8071: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:8084: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:8075: \$? = $ac_status" >&5 ++ echo "$as_me:8088: \$? = $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. +@@ -8173,11 +8186,11 @@ + -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:8176: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:8189: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:8180: \$? = $ac_status" >&5 ++ echo "$as_me:8193: \$? = $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 +@@ -8228,11 +8241,11 @@ + -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:8231: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:8244: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:8235: \$? = $ac_status" >&5 ++ echo "$as_me:8248: \$? = $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 +@@ -10598,7 +10611,7 @@ + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +-#line 10601 "configure" ++#line 10614 "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H +@@ -10694,7 +10707,7 @@ + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +-#line 10697 "configure" ++#line 10710 "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H +@@ -12623,16 +12636,18 @@ + XRANDR_REQUIRED=1.2.0 + CANBERRA_REQUIRED=0.10 + DEVKIT_POWER_REQUIRED=008 ++APPINDICATOR_REQUIRED=0.0.10 + + + pkg_failed=no + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GLIB" >&5 + $as_echo_n "checking for GLIB... " >&6; } + +-if test -n "$GLIB_CFLAGS"; then +- pkg_cv_GLIB_CFLAGS="$GLIB_CFLAGS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ ++if test -n "$PKG_CONFIG"; then ++ if test -n "$GLIB_CFLAGS"; then ++ pkg_cv_GLIB_CFLAGS="$GLIB_CFLAGS" ++ else ++ 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\""; } >&5 + ($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQUIRED gobject-2.0") 2>&5 + ac_status=$? +@@ -12642,13 +12657,15 @@ + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi +-if test -n "$GLIB_LIBS"; then +- pkg_cv_GLIB_LIBS="$GLIB_LIBS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ ++if test -n "$PKG_CONFIG"; then ++ if test -n "$GLIB_LIBS"; then ++ pkg_cv_GLIB_LIBS="$GLIB_LIBS" ++ else ++ 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\""; } >&5 + ($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQUIRED gobject-2.0") 2>&5 + ac_status=$? +@@ -12658,8 +12675,9 @@ + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi + + +@@ -12672,9 +12690,9 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "glib-2.0 >= $GLIB_REQUIRED gobject-2.0" 2>&1` ++ GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "glib-2.0 >= $GLIB_REQUIRED gobject-2.0"` + else +- GLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors "glib-2.0 >= $GLIB_REQUIRED gobject-2.0" 2>&1` ++ GLIB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glib-2.0 >= $GLIB_REQUIRED gobject-2.0"` + fi + # Put the nasty error message in config.log where it belongs + echo "$GLIB_PKG_ERRORS" >&5 +@@ -12716,10 +12734,11 @@ + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CANBERRA" >&5 + $as_echo_n "checking for CANBERRA... " >&6; } + +-if test -n "$CANBERRA_CFLAGS"; then +- pkg_cv_CANBERRA_CFLAGS="$CANBERRA_CFLAGS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ ++if test -n "$PKG_CONFIG"; then ++ if test -n "$CANBERRA_CFLAGS"; then ++ pkg_cv_CANBERRA_CFLAGS="$CANBERRA_CFLAGS" ++ else ++ if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcanberra-gtk >= \$CANBERRA_REQUIRED\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libcanberra-gtk >= $CANBERRA_REQUIRED") 2>&5 + ac_status=$? +@@ -12729,13 +12748,15 @@ + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi +-if test -n "$CANBERRA_LIBS"; then +- pkg_cv_CANBERRA_LIBS="$CANBERRA_LIBS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ ++if test -n "$PKG_CONFIG"; then ++ if test -n "$CANBERRA_LIBS"; then ++ pkg_cv_CANBERRA_LIBS="$CANBERRA_LIBS" ++ else ++ if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcanberra-gtk >= \$CANBERRA_REQUIRED\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libcanberra-gtk >= $CANBERRA_REQUIRED") 2>&5 + ac_status=$? +@@ -12745,8 +12766,9 @@ + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi + + +@@ -12759,9 +12781,9 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- CANBERRA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libcanberra-gtk >= $CANBERRA_REQUIRED" 2>&1` ++ CANBERRA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libcanberra-gtk >= $CANBERRA_REQUIRED"` + else +- CANBERRA_PKG_ERRORS=`$PKG_CONFIG --print-errors "libcanberra-gtk >= $CANBERRA_REQUIRED" 2>&1` ++ CANBERRA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libcanberra-gtk >= $CANBERRA_REQUIRED"` + fi + # Put the nasty error message in config.log where it belongs + echo "$CANBERRA_PKG_ERRORS" >&5 +@@ -12803,10 +12825,11 @@ + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DBUS" >&5 + $as_echo_n "checking for DBUS... " >&6; } + +-if test -n "$DBUS_CFLAGS"; then +- pkg_cv_DBUS_CFLAGS="$DBUS_CFLAGS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ ++if test -n "$PKG_CONFIG"; then ++ if test -n "$DBUS_CFLAGS"; then ++ pkg_cv_DBUS_CFLAGS="$DBUS_CFLAGS" ++ else ++ if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" + dbus-glib-1 >= \$DBUS_GLIB_REQUIRED + dbus-1 >= \$DBUS_REQUIRED +@@ -12825,13 +12848,15 @@ + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi +-if test -n "$DBUS_LIBS"; then +- pkg_cv_DBUS_LIBS="$DBUS_LIBS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ ++if test -n "$PKG_CONFIG"; then ++ if test -n "$DBUS_LIBS"; then ++ pkg_cv_DBUS_LIBS="$DBUS_LIBS" ++ else ++ if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" + dbus-glib-1 >= \$DBUS_GLIB_REQUIRED + dbus-1 >= \$DBUS_REQUIRED +@@ -12850,8 +12875,9 @@ + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi + + +@@ -12864,15 +12890,15 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- DBUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors " ++ DBUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors " + dbus-glib-1 >= $DBUS_GLIB_REQUIRED + dbus-1 >= $DBUS_REQUIRED +- gthread-2.0" 2>&1` ++ gthread-2.0"` + else +- DBUS_PKG_ERRORS=`$PKG_CONFIG --print-errors " ++ DBUS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors " + dbus-glib-1 >= $DBUS_GLIB_REQUIRED + dbus-1 >= $DBUS_REQUIRED +- gthread-2.0" 2>&1` ++ gthread-2.0"` + fi + # Put the nasty error message in config.log where it belongs + echo "$DBUS_PKG_ERRORS" >&5 +@@ -12917,10 +12943,11 @@ + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNOME" >&5 + $as_echo_n "checking for GNOME... " >&6; } + +-if test -n "$GNOME_CFLAGS"; then +- pkg_cv_GNOME_CFLAGS="$GNOME_CFLAGS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ ++if test -n "$PKG_CONFIG"; then ++ if test -n "$GNOME_CFLAGS"; then ++ pkg_cv_GNOME_CFLAGS="$GNOME_CFLAGS" ++ else ++ if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" + libwnck-1.0 >= \$LIBWNCK_REQUIRED + gtk+-2.0 >= \$GTK_REQUIRED +@@ -12945,13 +12972,15 @@ + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi +-if test -n "$GNOME_LIBS"; then +- pkg_cv_GNOME_LIBS="$GNOME_LIBS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ ++if test -n "$PKG_CONFIG"; then ++ if test -n "$GNOME_LIBS"; then ++ pkg_cv_GNOME_LIBS="$GNOME_LIBS" ++ else ++ if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" + libwnck-1.0 >= \$LIBWNCK_REQUIRED + gtk+-2.0 >= \$GTK_REQUIRED +@@ -12976,8 +13005,9 @@ + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi + + +@@ -12990,19 +13020,19 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- GNOME_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors " ++ GNOME_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors " + libwnck-1.0 >= $LIBWNCK_REQUIRED + gtk+-2.0 >= $GTK_REQUIRED + gconf-2.0 >= $GCONF_REQUIRED + gnome-keyring-1 >= $GNOME_KEYRING_REQUIRED +- cairo >= $CAIRO_REQUIRED" 2>&1` ++ cairo >= $CAIRO_REQUIRED"` + else +- GNOME_PKG_ERRORS=`$PKG_CONFIG --print-errors " ++ GNOME_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors " + libwnck-1.0 >= $LIBWNCK_REQUIRED + gtk+-2.0 >= $GTK_REQUIRED + gconf-2.0 >= $GCONF_REQUIRED + gnome-keyring-1 >= $GNOME_KEYRING_REQUIRED +- cairo >= $CAIRO_REQUIRED" 2>&1` ++ cairo >= $CAIRO_REQUIRED"` + fi + # Put the nasty error message in config.log where it belongs + echo "$GNOME_PKG_ERRORS" >&5 +@@ -13049,10 +13079,11 @@ + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GDK" >&5 + $as_echo_n "checking for GDK... " >&6; } + +-if test -n "$GDK_CFLAGS"; then +- pkg_cv_GDK_CFLAGS="$GDK_CFLAGS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ ++if test -n "$PKG_CONFIG"; then ++ if test -n "$GDK_CFLAGS"; then ++ pkg_cv_GDK_CFLAGS="$GDK_CFLAGS" ++ else ++ if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" + gdk-2.0 >= \$GDK_REQUIRED + gdk-x11-2.0 >= \$GDK_REQUIRED\""; } >&5 +@@ -13068,13 +13099,15 @@ + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi +-if test -n "$GDK_LIBS"; then +- pkg_cv_GDK_LIBS="$GDK_LIBS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ ++if test -n "$PKG_CONFIG"; then ++ if test -n "$GDK_LIBS"; then ++ pkg_cv_GDK_LIBS="$GDK_LIBS" ++ else ++ if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" + gdk-2.0 >= \$GDK_REQUIRED + gdk-x11-2.0 >= \$GDK_REQUIRED\""; } >&5 +@@ -13090,8 +13123,9 @@ + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi + + +@@ -13104,13 +13138,13 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- GDK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors " ++ GDK_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors " + gdk-2.0 >= $GDK_REQUIRED +- gdk-x11-2.0 >= $GDK_REQUIRED" 2>&1` ++ gdk-x11-2.0 >= $GDK_REQUIRED"` + else +- GDK_PKG_ERRORS=`$PKG_CONFIG --print-errors " ++ GDK_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors " + gdk-2.0 >= $GDK_REQUIRED +- gdk-x11-2.0 >= $GDK_REQUIRED" 2>&1` ++ gdk-x11-2.0 >= $GDK_REQUIRED"` + fi + # Put the nasty error message in config.log where it belongs + echo "$GDK_PKG_ERRORS" >&5 +@@ -13154,10 +13188,11 @@ + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for X11" >&5 + $as_echo_n "checking for X11... " >&6; } + +-if test -n "$X11_CFLAGS"; then +- pkg_cv_X11_CFLAGS="$X11_CFLAGS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ ++if test -n "$PKG_CONFIG"; then ++ if test -n "$X11_CFLAGS"; then ++ pkg_cv_X11_CFLAGS="$X11_CFLAGS" ++ else ++ if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" + xrandr >= \$XRANDR_REQUIRED + xrender x11 xext xproto\""; } >&5 +@@ -13173,13 +13208,15 @@ + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi +-if test -n "$X11_LIBS"; then +- pkg_cv_X11_LIBS="$X11_LIBS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ ++if test -n "$PKG_CONFIG"; then ++ if test -n "$X11_LIBS"; then ++ pkg_cv_X11_LIBS="$X11_LIBS" ++ else ++ if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" + xrandr >= \$XRANDR_REQUIRED + xrender x11 xext xproto\""; } >&5 +@@ -13195,8 +13232,9 @@ + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi + + +@@ -13209,13 +13247,13 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- X11_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors " ++ X11_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors " + xrandr >= $XRANDR_REQUIRED +- xrender x11 xext xproto" 2>&1` ++ xrender x11 xext xproto"` + else +- X11_PKG_ERRORS=`$PKG_CONFIG --print-errors " ++ X11_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors " + xrandr >= $XRANDR_REQUIRED +- xrender x11 xext xproto" 2>&1` ++ xrender x11 xext xproto"` + fi + # Put the nasty error message in config.log where it belongs + echo "$X11_PKG_ERRORS" >&5 +@@ -13259,10 +13297,11 @@ + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for X11" >&5 + $as_echo_n "checking for X11... " >&6; } + +-if test -n "$X11_CFLAGS"; then +- pkg_cv_X11_CFLAGS="$X11_CFLAGS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ ++if test -n "$PKG_CONFIG"; then ++ if test -n "$X11_CFLAGS"; then ++ pkg_cv_X11_CFLAGS="$X11_CFLAGS" ++ else ++ if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x11 xrender\""; } >&5 + ($PKG_CONFIG --exists --print-errors "x11 xrender") 2>&5 + ac_status=$? +@@ -13272,13 +13311,15 @@ + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi +-if test -n "$X11_LIBS"; then +- pkg_cv_X11_LIBS="$X11_LIBS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ ++if test -n "$PKG_CONFIG"; then ++ if test -n "$X11_LIBS"; then ++ pkg_cv_X11_LIBS="$X11_LIBS" ++ else ++ if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x11 xrender\""; } >&5 + ($PKG_CONFIG --exists --print-errors "x11 xrender") 2>&5 + ac_status=$? +@@ -13288,8 +13329,9 @@ + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi + + +@@ -13302,9 +13344,9 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- X11_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "x11 xrender" 2>&1` ++ X11_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "x11 xrender"` + else +- X11_PKG_ERRORS=`$PKG_CONFIG --print-errors "x11 xrender" 2>&1` ++ X11_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "x11 xrender"` + fi + # Put the nasty error message in config.log where it belongs + echo "$X11_PKG_ERRORS" >&5 +@@ -13357,10 +13399,11 @@ + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBNOTIFY" >&5 + $as_echo_n "checking for LIBNOTIFY... " >&6; } + +-if test -n "$LIBNOTIFY_CFLAGS"; then +- pkg_cv_LIBNOTIFY_CFLAGS="$LIBNOTIFY_CFLAGS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ ++if test -n "$PKG_CONFIG"; then ++ if test -n "$LIBNOTIFY_CFLAGS"; then ++ pkg_cv_LIBNOTIFY_CFLAGS="$LIBNOTIFY_CFLAGS" ++ else ++ 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=$? +@@ -13370,13 +13413,15 @@ + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi +-if test -n "$LIBNOTIFY_LIBS"; then +- pkg_cv_LIBNOTIFY_LIBS="$LIBNOTIFY_LIBS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ ++if test -n "$PKG_CONFIG"; then ++ if test -n "$LIBNOTIFY_LIBS"; then ++ pkg_cv_LIBNOTIFY_LIBS="$LIBNOTIFY_LIBS" ++ else ++ 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=$? +@@ -13386,8 +13431,9 @@ + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi + + +@@ -13400,9 +13446,9 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- LIBNOTIFY_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libnotify >= $LIBNOTIFY_REQUIRED" 2>&1` ++ LIBNOTIFY_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libnotify >= $LIBNOTIFY_REQUIRED"` + else +- LIBNOTIFY_PKG_ERRORS=`$PKG_CONFIG --print-errors "libnotify >= $LIBNOTIFY_REQUIRED" 2>&1` ++ LIBNOTIFY_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libnotify >= $LIBNOTIFY_REQUIRED"` + fi + # Put the nasty error message in config.log where it belongs + echo "$LIBNOTIFY_PKG_ERRORS" >&5 +@@ -13444,10 +13490,11 @@ + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for UNIQUE" >&5 + $as_echo_n "checking for UNIQUE... " >&6; } + +-if test -n "$UNIQUE_CFLAGS"; then +- pkg_cv_UNIQUE_CFLAGS="$UNIQUE_CFLAGS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ ++if test -n "$PKG_CONFIG"; then ++ if test -n "$UNIQUE_CFLAGS"; then ++ pkg_cv_UNIQUE_CFLAGS="$UNIQUE_CFLAGS" ++ else ++ if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"unique-1.0 >= \$UNIQUE_REQUIRED\""; } >&5 + ($PKG_CONFIG --exists --print-errors "unique-1.0 >= $UNIQUE_REQUIRED") 2>&5 + ac_status=$? +@@ -13457,13 +13504,15 @@ + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi +-if test -n "$UNIQUE_LIBS"; then +- pkg_cv_UNIQUE_LIBS="$UNIQUE_LIBS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ ++if test -n "$PKG_CONFIG"; then ++ if test -n "$UNIQUE_LIBS"; then ++ pkg_cv_UNIQUE_LIBS="$UNIQUE_LIBS" ++ else ++ if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"unique-1.0 >= \$UNIQUE_REQUIRED\""; } >&5 + ($PKG_CONFIG --exists --print-errors "unique-1.0 >= $UNIQUE_REQUIRED") 2>&5 + ac_status=$? +@@ -13473,8 +13522,9 @@ + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi + + +@@ -13487,9 +13537,9 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- UNIQUE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "unique-1.0 >= $UNIQUE_REQUIRED" 2>&1` ++ UNIQUE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "unique-1.0 >= $UNIQUE_REQUIRED"` + else +- UNIQUE_PKG_ERRORS=`$PKG_CONFIG --print-errors "unique-1.0 >= $UNIQUE_REQUIRED" 2>&1` ++ UNIQUE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "unique-1.0 >= $UNIQUE_REQUIRED"` + fi + # Put the nasty error message in config.log where it belongs + echo "$UNIQUE_PKG_ERRORS" >&5 +@@ -13531,10 +13581,11 @@ + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DEVKIT" >&5 + $as_echo_n "checking for DEVKIT... " >&6; } + +-if test -n "$DEVKIT_CFLAGS"; then +- pkg_cv_DEVKIT_CFLAGS="$DEVKIT_CFLAGS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ ++if test -n "$PKG_CONFIG"; then ++ if test -n "$DEVKIT_CFLAGS"; then ++ pkg_cv_DEVKIT_CFLAGS="$DEVKIT_CFLAGS" ++ else ++ if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" + devkit-power-gobject >= \$DEVKIT_POWER_REQUIRED\""; } >&5 + ($PKG_CONFIG --exists --print-errors " +@@ -13547,13 +13598,15 @@ + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi +-if test -n "$DEVKIT_LIBS"; then +- pkg_cv_DEVKIT_LIBS="$DEVKIT_LIBS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ ++if test -n "$PKG_CONFIG"; then ++ if test -n "$DEVKIT_LIBS"; then ++ pkg_cv_DEVKIT_LIBS="$DEVKIT_LIBS" ++ else ++ if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" + devkit-power-gobject >= \$DEVKIT_POWER_REQUIRED\""; } >&5 + ($PKG_CONFIG --exists --print-errors " +@@ -13566,8 +13619,9 @@ + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi + + +@@ -13580,11 +13634,11 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- DEVKIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors " +- devkit-power-gobject >= $DEVKIT_POWER_REQUIRED" 2>&1` ++ DEVKIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors " ++ devkit-power-gobject >= $DEVKIT_POWER_REQUIRED"` + else +- DEVKIT_PKG_ERRORS=`$PKG_CONFIG --print-errors " +- devkit-power-gobject >= $DEVKIT_POWER_REQUIRED" 2>&1` ++ DEVKIT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors " ++ devkit-power-gobject >= $DEVKIT_POWER_REQUIRED"` + fi + # Put the nasty error message in config.log where it belongs + echo "$DEVKIT_PKG_ERRORS" >&5 +@@ -13622,6 +13676,142 @@ + : + fi + ++# Check whether --enable-appindicator was given. ++if test "${enable_appindicator+set}" = set; then : ++ enableval=$enable_appindicator; enable_appindicator=$enableval ++else ++ enable_appindicator="auto" ++fi ++ ++ ++if test x$enable_appindicator = xauto ; then ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"appindicator-0.1 >= \$APPINDICATOR_REQUIRED\""; } >&5 ++ ($PKG_CONFIG --exists --print-errors "appindicator-0.1 >= $APPINDICATOR_REQUIRED") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then ++ enable_appindicator="yes" ++else ++ enable_appindicator="no" ++fi ++fi ++ ++if test x$enable_appindicator = xyes ; then ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"appindicator-0.1 >= \$APPINDICATOR_REQUIRED\""; } >&5 ++ ($PKG_CONFIG --exists --print-errors "appindicator-0.1 >= $APPINDICATOR_REQUIRED") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then ++ ++$as_echo "#define HAVE_APP_INDICATOR 1" >>confdefs.h ++ ++ ++pkg_failed=no ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for APP_INDICATOR" >&5 ++$as_echo_n "checking for APP_INDICATOR... " >&6; } ++ ++if test -n "$PKG_CONFIG"; then ++ if test -n "$APP_INDICATOR_CFLAGS"; then ++ pkg_cv_APP_INDICATOR_CFLAGS="$APP_INDICATOR_CFLAGS" ++ else ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"appindicator-0.1 >= \$APPINDICATOR_REQUIRED\""; } >&5 ++ ($PKG_CONFIG --exists --print-errors "appindicator-0.1 >= $APPINDICATOR_REQUIRED") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then ++ pkg_cv_APP_INDICATOR_CFLAGS=`$PKG_CONFIG --cflags "appindicator-0.1 >= $APPINDICATOR_REQUIRED" 2>/dev/null` ++else ++ pkg_failed=yes ++fi ++ fi ++else ++ pkg_failed=untried ++fi ++if test -n "$PKG_CONFIG"; then ++ if test -n "$APP_INDICATOR_LIBS"; then ++ pkg_cv_APP_INDICATOR_LIBS="$APP_INDICATOR_LIBS" ++ else ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"appindicator-0.1 >= \$APPINDICATOR_REQUIRED\""; } >&5 ++ ($PKG_CONFIG --exists --print-errors "appindicator-0.1 >= $APPINDICATOR_REQUIRED") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then ++ pkg_cv_APP_INDICATOR_LIBS=`$PKG_CONFIG --libs "appindicator-0.1 >= $APPINDICATOR_REQUIRED" 2>/dev/null` ++else ++ pkg_failed=yes ++fi ++ fi ++else ++ pkg_failed=untried ++fi ++ ++ ++ ++if test $pkg_failed = yes; then ++ ++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 ++ APP_INDICATOR_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "appindicator-0.1 >= $APPINDICATOR_REQUIRED"` ++ else ++ APP_INDICATOR_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "appindicator-0.1 >= $APPINDICATOR_REQUIRED"` ++ fi ++ # Put the nasty error message in config.log where it belongs ++ echo "$APP_INDICATOR_PKG_ERRORS" >&5 ++ ++ as_fn_error "Package requirements (appindicator-0.1 >= $APPINDICATOR_REQUIRED) were not met: ++ ++$APP_INDICATOR_PKG_ERRORS ++ ++Consider adjusting the PKG_CONFIG_PATH environment variable if you ++installed software in a non-standard prefix. ++ ++Alternatively, you may set the environment variables APP_INDICATOR_CFLAGS ++and APP_INDICATOR_LIBS to avoid the need to call pkg-config. ++See the pkg-config man page for more details. ++" "$LINENO" 5 ++elif test $pkg_failed = untried; then ++ { { $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 ++is in your PATH or set the PKG_CONFIG environment variable to the full ++path to pkg-config. ++ ++Alternatively, you may set the environment variables APP_INDICATOR_CFLAGS ++and APP_INDICATOR_LIBS to avoid the need to call pkg-config. ++See the pkg-config man page for more details. ++ ++To get pkg-config, see . ++See \`config.log' for more details." "$LINENO" 5; } ++else ++ APP_INDICATOR_CFLAGS=$pkg_cv_APP_INDICATOR_CFLAGS ++ APP_INDICATOR_LIBS=$pkg_cv_APP_INDICATOR_LIBS ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 ++$as_echo "yes" >&6; } ++ : ++fi ++else ++ as_fn_error "appindicator-0.1 is not installed" "$LINENO" 5 ++fi ++fi ++ if test x$enable_appindicator = xyes; then ++ HAVE_APP_INDICATOR_TRUE= ++ HAVE_APP_INDICATOR_FALSE='#' ++else ++ HAVE_APP_INDICATOR_TRUE='#' ++ HAVE_APP_INDICATOR_FALSE= ++fi ++ ++ ++ ++ + # Extract the first word of "gconftool-2", so it can be a program name with args. + set dummy gconftool-2; ac_word=$2 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +@@ -13854,10 +14044,11 @@ + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PANEL" >&5 + $as_echo_n "checking for PANEL... " >&6; } + +-if test -n "$PANEL_CFLAGS"; then +- pkg_cv_PANEL_CFLAGS="$PANEL_CFLAGS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ ++if test -n "$PKG_CONFIG"; then ++ if test -n "$PANEL_CFLAGS"; then ++ pkg_cv_PANEL_CFLAGS="$PANEL_CFLAGS" ++ else ++ 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=$? +@@ -13867,13 +14058,15 @@ + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi +-if test -n "$PANEL_LIBS"; then +- pkg_cv_PANEL_LIBS="$PANEL_LIBS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ ++if test -n "$PKG_CONFIG"; then ++ if test -n "$PANEL_LIBS"; then ++ pkg_cv_PANEL_LIBS="$PANEL_LIBS" ++ else ++ 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=$? +@@ -13883,8 +14076,9 @@ + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi + + +@@ -13897,9 +14091,9 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- PANEL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libpanelapplet-2.0 >= $LIBPANEL_REQUIRED" 2>&1` ++ PANEL_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libpanelapplet-2.0 >= $LIBPANEL_REQUIRED"` + else +- PANEL_PKG_ERRORS=`$PKG_CONFIG --print-errors "libpanelapplet-2.0 >= $LIBPANEL_REQUIRED" 2>&1` ++ PANEL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libpanelapplet-2.0 >= $LIBPANEL_REQUIRED"` + fi + # Put the nasty error message in config.log where it belongs + echo "$PANEL_PKG_ERRORS" >&5 +@@ -14275,6 +14469,10 @@ + as_fn_error "conditional \"HAVE_GNOME_DOC_UTILS\" was never defined. + Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi ++if test -z "${HAVE_APP_INDICATOR_TRUE}" && test -z "${HAVE_APP_INDICATOR_FALSE}"; then ++ as_fn_error "conditional \"HAVE_APP_INDICATOR\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 ++fi + if test -z "${GCONF_SCHEMAS_INSTALL_TRUE}" && test -z "${GCONF_SCHEMAS_INSTALL_FALSE}"; then + as_fn_error "conditional \"GCONF_SCHEMAS_INSTALL\" was never defined. + Usually this means the macro was only invoked conditionally." "$LINENO" 5 +@@ -16590,6 +16788,7 @@ + Self test support: ${have_tests} + GConf default support: ${have_gconfdefaults} + Docbook support: ${enable_docbook_docs} ++ App indicator support: ${enable_appindicator} + documentation dir: $DOCDIR + dbus-1 services dir: $DBUS_SERVICES_DIR + gconf-schema dir: $GCONF_SCHEMA_FILE_DIR +diff -Nur gnome-power-manager-2.30.0/data/icons/16x16/actions/Makefile.in gnome-power-manager-2.30.0.new/data/icons/16x16/actions/Makefile.in +--- gnome-power-manager-2.30.0/data/icons/16x16/actions/Makefile.in 2010-03-29 12:17:15.000000000 +0200 ++++ gnome-power-manager-2.30.0.new/data/icons/16x16/actions/Makefile.in 2010-03-29 13:27:33.021576967 +0200 +@@ -84,6 +84,8 @@ + ALL_LINGUAS = @ALL_LINGUAS@ + AMTAR = @AMTAR@ + AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ ++APP_INDICATOR_CFLAGS = @APP_INDICATOR_CFLAGS@ ++APP_INDICATOR_LIBS = @APP_INDICATOR_LIBS@ + AR = @AR@ + AUTOCONF = @AUTOCONF@ + AUTOHEADER = @AUTOHEADER@ +diff -Nur gnome-power-manager-2.30.0/data/icons/16x16/apps/Makefile.in gnome-power-manager-2.30.0.new/data/icons/16x16/apps/Makefile.in +--- gnome-power-manager-2.30.0/data/icons/16x16/apps/Makefile.in 2010-03-29 12:17:15.000000000 +0200 ++++ gnome-power-manager-2.30.0.new/data/icons/16x16/apps/Makefile.in 2010-03-29 13:27:33.131578242 +0200 +@@ -84,6 +84,8 @@ + ALL_LINGUAS = @ALL_LINGUAS@ + AMTAR = @AMTAR@ + AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ ++APP_INDICATOR_CFLAGS = @APP_INDICATOR_CFLAGS@ ++APP_INDICATOR_LIBS = @APP_INDICATOR_LIBS@ + AR = @AR@ + AUTOCONF = @AUTOCONF@ + AUTOHEADER = @AUTOHEADER@ +diff -Nur gnome-power-manager-2.30.0/data/icons/16x16/Makefile.in gnome-power-manager-2.30.0.new/data/icons/16x16/Makefile.in +--- gnome-power-manager-2.30.0/data/icons/16x16/Makefile.in 2010-03-29 12:17:15.000000000 +0200 ++++ gnome-power-manager-2.30.0.new/data/icons/16x16/Makefile.in 2010-03-29 13:27:32.921576407 +0200 +@@ -100,6 +100,8 @@ + ALL_LINGUAS = @ALL_LINGUAS@ + AMTAR = @AMTAR@ + AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ ++APP_INDICATOR_CFLAGS = @APP_INDICATOR_CFLAGS@ ++APP_INDICATOR_LIBS = @APP_INDICATOR_LIBS@ + AR = @AR@ + AUTOCONF = @AUTOCONF@ + AUTOHEADER = @AUTOHEADER@ +diff -Nur gnome-power-manager-2.30.0/data/icons/16x16/status/Makefile.in gnome-power-manager-2.30.0.new/data/icons/16x16/status/Makefile.in +--- gnome-power-manager-2.30.0/data/icons/16x16/status/Makefile.in 2010-03-29 12:17:15.000000000 +0200 ++++ gnome-power-manager-2.30.0.new/data/icons/16x16/status/Makefile.in 2010-03-29 13:27:33.241576858 +0200 +@@ -84,6 +84,8 @@ + ALL_LINGUAS = @ALL_LINGUAS@ + AMTAR = @AMTAR@ + AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ ++APP_INDICATOR_CFLAGS = @APP_INDICATOR_CFLAGS@ ++APP_INDICATOR_LIBS = @APP_INDICATOR_LIBS@ + AR = @AR@ + AUTOCONF = @AUTOCONF@ + AUTOHEADER = @AUTOHEADER@ +diff -Nur gnome-power-manager-2.30.0/data/icons/22x22/actions/Makefile.in gnome-power-manager-2.30.0.new/data/icons/22x22/actions/Makefile.in +--- gnome-power-manager-2.30.0/data/icons/22x22/actions/Makefile.in 2010-03-29 12:17:15.000000000 +0200 ++++ gnome-power-manager-2.30.0.new/data/icons/22x22/actions/Makefile.in 2010-03-29 13:27:33.441576993 +0200 +@@ -84,6 +84,8 @@ + ALL_LINGUAS = @ALL_LINGUAS@ + AMTAR = @AMTAR@ + AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ ++APP_INDICATOR_CFLAGS = @APP_INDICATOR_CFLAGS@ ++APP_INDICATOR_LIBS = @APP_INDICATOR_LIBS@ + AR = @AR@ + AUTOCONF = @AUTOCONF@ + AUTOHEADER = @AUTOHEADER@ +diff -Nur gnome-power-manager-2.30.0/data/icons/22x22/apps/Makefile.in gnome-power-manager-2.30.0.new/data/icons/22x22/apps/Makefile.in +--- gnome-power-manager-2.30.0/data/icons/22x22/apps/Makefile.in 2010-03-29 12:17:15.000000000 +0200 ++++ gnome-power-manager-2.30.0.new/data/icons/22x22/apps/Makefile.in 2010-03-29 13:27:33.551576241 +0200 +@@ -84,6 +84,8 @@ + ALL_LINGUAS = @ALL_LINGUAS@ + AMTAR = @AMTAR@ + AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ ++APP_INDICATOR_CFLAGS = @APP_INDICATOR_CFLAGS@ ++APP_INDICATOR_LIBS = @APP_INDICATOR_LIBS@ + AR = @AR@ + AUTOCONF = @AUTOCONF@ + AUTOHEADER = @AUTOHEADER@ +diff -Nur gnome-power-manager-2.30.0/data/icons/22x22/Makefile.in gnome-power-manager-2.30.0.new/data/icons/22x22/Makefile.in +--- gnome-power-manager-2.30.0/data/icons/22x22/Makefile.in 2010-03-29 12:17:15.000000000 +0200 ++++ gnome-power-manager-2.30.0.new/data/icons/22x22/Makefile.in 2010-03-29 13:27:33.341576785 +0200 +@@ -100,6 +100,8 @@ + ALL_LINGUAS = @ALL_LINGUAS@ + AMTAR = @AMTAR@ + AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ ++APP_INDICATOR_CFLAGS = @APP_INDICATOR_CFLAGS@ ++APP_INDICATOR_LIBS = @APP_INDICATOR_LIBS@ + AR = @AR@ + AUTOCONF = @AUTOCONF@ + AUTOHEADER = @AUTOHEADER@ +diff -Nur gnome-power-manager-2.30.0/data/icons/22x22/status/Makefile.in gnome-power-manager-2.30.0.new/data/icons/22x22/status/Makefile.in +--- gnome-power-manager-2.30.0/data/icons/22x22/status/Makefile.in 2010-03-29 12:17:16.000000000 +0200 ++++ gnome-power-manager-2.30.0.new/data/icons/22x22/status/Makefile.in 2010-03-29 13:27:33.661577585 +0200 +@@ -84,6 +84,8 @@ + ALL_LINGUAS = @ALL_LINGUAS@ + AMTAR = @AMTAR@ + AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ ++APP_INDICATOR_CFLAGS = @APP_INDICATOR_CFLAGS@ ++APP_INDICATOR_LIBS = @APP_INDICATOR_LIBS@ + AR = @AR@ + AUTOCONF = @AUTOCONF@ + AUTOHEADER = @AUTOHEADER@ +diff -Nur gnome-power-manager-2.30.0/data/icons/24x24/actions/Makefile.in gnome-power-manager-2.30.0.new/data/icons/24x24/actions/Makefile.in +--- gnome-power-manager-2.30.0/data/icons/24x24/actions/Makefile.in 2010-03-29 12:17:16.000000000 +0200 ++++ gnome-power-manager-2.30.0.new/data/icons/24x24/actions/Makefile.in 2010-03-29 13:27:33.871577174 +0200 +@@ -84,6 +84,8 @@ + ALL_LINGUAS = @ALL_LINGUAS@ + AMTAR = @AMTAR@ + AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ ++APP_INDICATOR_CFLAGS = @APP_INDICATOR_CFLAGS@ ++APP_INDICATOR_LIBS = @APP_INDICATOR_LIBS@ + AR = @AR@ + AUTOCONF = @AUTOCONF@ + AUTOHEADER = @AUTOHEADER@ +diff -Nur gnome-power-manager-2.30.0/data/icons/24x24/apps/Makefile.in gnome-power-manager-2.30.0.new/data/icons/24x24/apps/Makefile.in +--- gnome-power-manager-2.30.0/data/icons/24x24/apps/Makefile.in 2010-03-29 12:17:16.000000000 +0200 ++++ gnome-power-manager-2.30.0.new/data/icons/24x24/apps/Makefile.in 2010-03-29 13:27:33.971576684 +0200 +@@ -84,6 +84,8 @@ + ALL_LINGUAS = @ALL_LINGUAS@ + AMTAR = @AMTAR@ + AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ ++APP_INDICATOR_CFLAGS = @APP_INDICATOR_CFLAGS@ ++APP_INDICATOR_LIBS = @APP_INDICATOR_LIBS@ + AR = @AR@ + AUTOCONF = @AUTOCONF@ + AUTOHEADER = @AUTOHEADER@ +diff -Nur gnome-power-manager-2.30.0/data/icons/24x24/Makefile.in gnome-power-manager-2.30.0.new/data/icons/24x24/Makefile.in +--- gnome-power-manager-2.30.0/data/icons/24x24/Makefile.in 2010-03-29 12:17:16.000000000 +0200 ++++ gnome-power-manager-2.30.0.new/data/icons/24x24/Makefile.in 2010-03-29 13:27:33.761576325 +0200 +@@ -100,6 +100,8 @@ + ALL_LINGUAS = @ALL_LINGUAS@ + AMTAR = @AMTAR@ + AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ ++APP_INDICATOR_CFLAGS = @APP_INDICATOR_CFLAGS@ ++APP_INDICATOR_LIBS = @APP_INDICATOR_LIBS@ + AR = @AR@ + AUTOCONF = @AUTOCONF@ + AUTOHEADER = @AUTOHEADER@ +diff -Nur gnome-power-manager-2.30.0/data/icons/24x24/status/Makefile.in gnome-power-manager-2.30.0.new/data/icons/24x24/status/Makefile.in +--- gnome-power-manager-2.30.0/data/icons/24x24/status/Makefile.in 2010-03-29 12:17:16.000000000 +0200 ++++ gnome-power-manager-2.30.0.new/data/icons/24x24/status/Makefile.in 2010-03-29 13:27:34.081576213 +0200 +@@ -84,6 +84,8 @@ + ALL_LINGUAS = @ALL_LINGUAS@ + AMTAR = @AMTAR@ + AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ ++APP_INDICATOR_CFLAGS = @APP_INDICATOR_CFLAGS@ ++APP_INDICATOR_LIBS = @APP_INDICATOR_LIBS@ + AR = @AR@ + AUTOCONF = @AUTOCONF@ + AUTOHEADER = @AUTOHEADER@ +diff -Nur gnome-power-manager-2.30.0/data/icons/32x32/actions/Makefile.in gnome-power-manager-2.30.0.new/data/icons/32x32/actions/Makefile.in +--- gnome-power-manager-2.30.0/data/icons/32x32/actions/Makefile.in 2010-03-29 12:17:16.000000000 +0200 ++++ gnome-power-manager-2.30.0.new/data/icons/32x32/actions/Makefile.in 2010-03-29 13:27:34.291576365 +0200 +@@ -84,6 +84,8 @@ + ALL_LINGUAS = @ALL_LINGUAS@ + AMTAR = @AMTAR@ + AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ ++APP_INDICATOR_CFLAGS = @APP_INDICATOR_CFLAGS@ ++APP_INDICATOR_LIBS = @APP_INDICATOR_LIBS@ + AR = @AR@ + AUTOCONF = @AUTOCONF@ + AUTOHEADER = @AUTOHEADER@ +diff -Nur gnome-power-manager-2.30.0/data/icons/32x32/apps/Makefile.in gnome-power-manager-2.30.0.new/data/icons/32x32/apps/Makefile.in +--- gnome-power-manager-2.30.0/data/icons/32x32/apps/Makefile.in 2010-03-29 12:17:16.000000000 +0200 ++++ gnome-power-manager-2.30.0.new/data/icons/32x32/apps/Makefile.in 2010-03-29 13:27:34.401576099 +0200 +@@ -84,6 +84,8 @@ + ALL_LINGUAS = @ALL_LINGUAS@ + AMTAR = @AMTAR@ + AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ ++APP_INDICATOR_CFLAGS = @APP_INDICATOR_CFLAGS@ ++APP_INDICATOR_LIBS = @APP_INDICATOR_LIBS@ + AR = @AR@ + AUTOCONF = @AUTOCONF@ + AUTOHEADER = @AUTOHEADER@ +diff -Nur gnome-power-manager-2.30.0/data/icons/32x32/Makefile.in gnome-power-manager-2.30.0.new/data/icons/32x32/Makefile.in +--- gnome-power-manager-2.30.0/data/icons/32x32/Makefile.in 2010-03-29 12:17:16.000000000 +0200 ++++ gnome-power-manager-2.30.0.new/data/icons/32x32/Makefile.in 2010-03-29 13:27:34.191577206 +0200 +@@ -100,6 +100,8 @@ + ALL_LINGUAS = @ALL_LINGUAS@ + AMTAR = @AMTAR@ + AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ ++APP_INDICATOR_CFLAGS = @APP_INDICATOR_CFLAGS@ ++APP_INDICATOR_LIBS = @APP_INDICATOR_LIBS@ + AR = @AR@ + AUTOCONF = @AUTOCONF@ + AUTOHEADER = @AUTOHEADER@ +diff -Nur gnome-power-manager-2.30.0/data/icons/32x32/status/Makefile.in gnome-power-manager-2.30.0.new/data/icons/32x32/status/Makefile.in +--- gnome-power-manager-2.30.0/data/icons/32x32/status/Makefile.in 2010-03-29 12:17:16.000000000 +0200 ++++ gnome-power-manager-2.30.0.new/data/icons/32x32/status/Makefile.in 2010-03-29 13:27:34.501576659 +0200 +@@ -84,6 +84,8 @@ + ALL_LINGUAS = @ALL_LINGUAS@ + AMTAR = @AMTAR@ + AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ ++APP_INDICATOR_CFLAGS = @APP_INDICATOR_CFLAGS@ ++APP_INDICATOR_LIBS = @APP_INDICATOR_LIBS@ + AR = @AR@ + AUTOCONF = @AUTOCONF@ + AUTOHEADER = @AUTOHEADER@ +diff -Nur gnome-power-manager-2.30.0/data/icons/48x48/actions/Makefile.in gnome-power-manager-2.30.0.new/data/icons/48x48/actions/Makefile.in +--- gnome-power-manager-2.30.0/data/icons/48x48/actions/Makefile.in 2010-03-29 12:17:16.000000000 +0200 ++++ gnome-power-manager-2.30.0.new/data/icons/48x48/actions/Makefile.in 2010-03-29 13:27:34.711576467 +0200 +@@ -84,6 +84,8 @@ + ALL_LINGUAS = @ALL_LINGUAS@ + AMTAR = @AMTAR@ + AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ ++APP_INDICATOR_CFLAGS = @APP_INDICATOR_CFLAGS@ ++APP_INDICATOR_LIBS = @APP_INDICATOR_LIBS@ + AR = @AR@ + AUTOCONF = @AUTOCONF@ + AUTOHEADER = @AUTOHEADER@ +diff -Nur gnome-power-manager-2.30.0/data/icons/48x48/apps/Makefile.in gnome-power-manager-2.30.0.new/data/icons/48x48/apps/Makefile.in +--- gnome-power-manager-2.30.0/data/icons/48x48/apps/Makefile.in 2010-03-29 12:17:16.000000000 +0200 ++++ gnome-power-manager-2.30.0.new/data/icons/48x48/apps/Makefile.in 2010-03-29 13:27:34.821576827 +0200 +@@ -84,6 +84,8 @@ + ALL_LINGUAS = @ALL_LINGUAS@ + AMTAR = @AMTAR@ + AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ ++APP_INDICATOR_CFLAGS = @APP_INDICATOR_CFLAGS@ ++APP_INDICATOR_LIBS = @APP_INDICATOR_LIBS@ + AR = @AR@ + AUTOCONF = @AUTOCONF@ + AUTOHEADER = @AUTOHEADER@ +diff -Nur gnome-power-manager-2.30.0/data/icons/48x48/Makefile.in gnome-power-manager-2.30.0.new/data/icons/48x48/Makefile.in +--- gnome-power-manager-2.30.0/data/icons/48x48/Makefile.in 2010-03-29 12:17:16.000000000 +0200 ++++ gnome-power-manager-2.30.0.new/data/icons/48x48/Makefile.in 2010-03-29 13:27:34.611576467 +0200 +@@ -100,6 +100,8 @@ + ALL_LINGUAS = @ALL_LINGUAS@ + AMTAR = @AMTAR@ + AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ ++APP_INDICATOR_CFLAGS = @APP_INDICATOR_CFLAGS@ ++APP_INDICATOR_LIBS = @APP_INDICATOR_LIBS@ + AR = @AR@ + AUTOCONF = @AUTOCONF@ + AUTOHEADER = @AUTOHEADER@ +diff -Nur gnome-power-manager-2.30.0/data/icons/48x48/status/Makefile.in gnome-power-manager-2.30.0.new/data/icons/48x48/status/Makefile.in +--- gnome-power-manager-2.30.0/data/icons/48x48/status/Makefile.in 2010-03-29 12:17:16.000000000 +0200 ++++ gnome-power-manager-2.30.0.new/data/icons/48x48/status/Makefile.in 2010-03-29 13:27:34.931576420 +0200 +@@ -84,6 +84,8 @@ + ALL_LINGUAS = @ALL_LINGUAS@ + AMTAR = @AMTAR@ + AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ ++APP_INDICATOR_CFLAGS = @APP_INDICATOR_CFLAGS@ ++APP_INDICATOR_LIBS = @APP_INDICATOR_LIBS@ + AR = @AR@ + AUTOCONF = @AUTOCONF@ + AUTOHEADER = @AUTOHEADER@ +diff -Nur gnome-power-manager-2.30.0/data/icons/Makefile.in gnome-power-manager-2.30.0.new/data/icons/Makefile.in +--- gnome-power-manager-2.30.0/data/icons/Makefile.in 2010-03-29 12:17:17.000000000 +0200 ++++ gnome-power-manager-2.30.0.new/data/icons/Makefile.in 2010-03-29 13:27:35.031576771 +0200 +@@ -100,6 +100,8 @@ + ALL_LINGUAS = @ALL_LINGUAS@ + AMTAR = @AMTAR@ + AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ ++APP_INDICATOR_CFLAGS = @APP_INDICATOR_CFLAGS@ ++APP_INDICATOR_LIBS = @APP_INDICATOR_LIBS@ + AR = @AR@ + AUTOCONF = @AUTOCONF@ + AUTOHEADER = @AUTOHEADER@ +diff -Nur gnome-power-manager-2.30.0/data/icons/scalable/actions/Makefile.in gnome-power-manager-2.30.0.new/data/icons/scalable/actions/Makefile.in +--- gnome-power-manager-2.30.0/data/icons/scalable/actions/Makefile.in 2010-03-29 12:17:17.000000000 +0200 ++++ gnome-power-manager-2.30.0.new/data/icons/scalable/actions/Makefile.in 2010-03-29 13:27:35.241576647 +0200 +@@ -84,6 +84,8 @@ + ALL_LINGUAS = @ALL_LINGUAS@ + AMTAR = @AMTAR@ + AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ ++APP_INDICATOR_CFLAGS = @APP_INDICATOR_CFLAGS@ ++APP_INDICATOR_LIBS = @APP_INDICATOR_LIBS@ + AR = @AR@ + AUTOCONF = @AUTOCONF@ + AUTOHEADER = @AUTOHEADER@ +diff -Nur gnome-power-manager-2.30.0/data/icons/scalable/apps/Makefile.in gnome-power-manager-2.30.0.new/data/icons/scalable/apps/Makefile.in +--- gnome-power-manager-2.30.0/data/icons/scalable/apps/Makefile.in 2010-03-29 12:17:17.000000000 +0200 ++++ gnome-power-manager-2.30.0.new/data/icons/scalable/apps/Makefile.in 2010-03-29 13:27:35.351577426 +0200 +@@ -84,6 +84,8 @@ + ALL_LINGUAS = @ALL_LINGUAS@ + AMTAR = @AMTAR@ + AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ ++APP_INDICATOR_CFLAGS = @APP_INDICATOR_CFLAGS@ ++APP_INDICATOR_LIBS = @APP_INDICATOR_LIBS@ + AR = @AR@ + AUTOCONF = @AUTOCONF@ + AUTOHEADER = @AUTOHEADER@ +diff -Nur gnome-power-manager-2.30.0/data/icons/scalable/Makefile.in gnome-power-manager-2.30.0.new/data/icons/scalable/Makefile.in +--- gnome-power-manager-2.30.0/data/icons/scalable/Makefile.in 2010-03-29 12:17:17.000000000 +0200 ++++ gnome-power-manager-2.30.0.new/data/icons/scalable/Makefile.in 2010-03-29 13:27:35.131576425 +0200 +@@ -100,6 +100,8 @@ + ALL_LINGUAS = @ALL_LINGUAS@ + AMTAR = @AMTAR@ + AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ ++APP_INDICATOR_CFLAGS = @APP_INDICATOR_CFLAGS@ ++APP_INDICATOR_LIBS = @APP_INDICATOR_LIBS@ + AR = @AR@ + AUTOCONF = @AUTOCONF@ + AUTOHEADER = @AUTOHEADER@ +diff -Nur gnome-power-manager-2.30.0/data/icons/scalable/status/Makefile.in gnome-power-manager-2.30.0.new/data/icons/scalable/status/Makefile.in +--- gnome-power-manager-2.30.0/data/icons/scalable/status/Makefile.in 2010-03-29 12:17:17.000000000 +0200 ++++ gnome-power-manager-2.30.0.new/data/icons/scalable/status/Makefile.in 2010-03-29 13:27:35.451576586 +0200 +@@ -84,6 +84,8 @@ + ALL_LINGUAS = @ALL_LINGUAS@ + AMTAR = @AMTAR@ + AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ ++APP_INDICATOR_CFLAGS = @APP_INDICATOR_CFLAGS@ ++APP_INDICATOR_LIBS = @APP_INDICATOR_LIBS@ + AR = @AR@ + AUTOCONF = @AUTOCONF@ + AUTOHEADER = @AUTOHEADER@ +diff -Nur gnome-power-manager-2.30.0/data/Makefile.in gnome-power-manager-2.30.0.new/data/Makefile.in +--- gnome-power-manager-2.30.0/data/Makefile.in 2010-03-29 12:17:15.000000000 +0200 ++++ gnome-power-manager-2.30.0.new/data/Makefile.in 2010-03-29 13:27:32.821577595 +0200 +@@ -132,6 +132,8 @@ + ALL_LINGUAS = @ALL_LINGUAS@ + AMTAR = @AMTAR@ + AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ ++APP_INDICATOR_CFLAGS = @APP_INDICATOR_CFLAGS@ ++APP_INDICATOR_LIBS = @APP_INDICATOR_LIBS@ + AR = @AR@ + AUTOCONF = @AUTOCONF@ + AUTOHEADER = @AUTOHEADER@ +diff -Nur gnome-power-manager-2.30.0/docs/Makefile.in gnome-power-manager-2.30.0.new/docs/Makefile.in +--- gnome-power-manager-2.30.0/docs/Makefile.in 2010-03-29 12:17:17.000000000 +0200 ++++ gnome-power-manager-2.30.0.new/docs/Makefile.in 2010-03-29 13:27:35.551576659 +0200 +@@ -60,6 +60,8 @@ + ALL_LINGUAS = @ALL_LINGUAS@ + AMTAR = @AMTAR@ + AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ ++APP_INDICATOR_CFLAGS = @APP_INDICATOR_CFLAGS@ ++APP_INDICATOR_LIBS = @APP_INDICATOR_LIBS@ + AR = @AR@ + AUTOCONF = @AUTOCONF@ + AUTOHEADER = @AUTOHEADER@ +diff -Nur gnome-power-manager-2.30.0/help/Makefile.in gnome-power-manager-2.30.0.new/help/Makefile.in +--- gnome-power-manager-2.30.0/help/Makefile.in 2010-03-29 12:17:17.000000000 +0200 ++++ gnome-power-manager-2.30.0.new/help/Makefile.in 2010-03-29 13:27:35.701576661 +0200 +@@ -85,6 +85,8 @@ + ALL_LINGUAS = @ALL_LINGUAS@ + AMTAR = @AMTAR@ + AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ ++APP_INDICATOR_CFLAGS = @APP_INDICATOR_CFLAGS@ ++APP_INDICATOR_LIBS = @APP_INDICATOR_LIBS@ + AR = @AR@ + AUTOCONF = @AUTOCONF@ + AUTOHEADER = @AUTOHEADER@ +diff -Nur gnome-power-manager-2.30.0/libhal-glib/Makefile.in gnome-power-manager-2.30.0.new/libhal-glib/Makefile.in +--- gnome-power-manager-2.30.0/libhal-glib/Makefile.in 2010-03-29 12:17:17.000000000 +0200 ++++ gnome-power-manager-2.30.0.new/libhal-glib/Makefile.in 2010-03-29 13:27:35.831577259 +0200 +@@ -93,6 +93,8 @@ + ALL_LINGUAS = @ALL_LINGUAS@ + AMTAR = @AMTAR@ + AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ ++APP_INDICATOR_CFLAGS = @APP_INDICATOR_CFLAGS@ ++APP_INDICATOR_LIBS = @APP_INDICATOR_LIBS@ + AR = @AR@ + AUTOCONF = @AUTOCONF@ + AUTOHEADER = @AUTOHEADER@ +diff -Nur gnome-power-manager-2.30.0/Makefile.in gnome-power-manager-2.30.0.new/Makefile.in +--- gnome-power-manager-2.30.0/Makefile.in 2010-03-29 12:17:18.000000000 +0200 ++++ gnome-power-manager-2.30.0.new/Makefile.in 2010-03-29 13:27:36.791576645 +0200 +@@ -121,6 +121,8 @@ + ALL_LINGUAS = @ALL_LINGUAS@ + AMTAR = @AMTAR@ + AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ ++APP_INDICATOR_CFLAGS = @APP_INDICATOR_CFLAGS@ ++APP_INDICATOR_LIBS = @APP_INDICATOR_LIBS@ + AR = @AR@ + AUTOCONF = @AUTOCONF@ + AUTOHEADER = @AUTOHEADER@ +diff -Nur gnome-power-manager-2.30.0/man/Makefile.in gnome-power-manager-2.30.0.new/man/Makefile.in +--- gnome-power-manager-2.30.0/man/Makefile.in 2010-03-29 12:17:17.000000000 +0200 ++++ gnome-power-manager-2.30.0.new/man/Makefile.in 2010-03-29 13:27:35.961576323 +0200 +@@ -85,6 +85,8 @@ + ALL_LINGUAS = @ALL_LINGUAS@ + AMTAR = @AMTAR@ + AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ ++APP_INDICATOR_CFLAGS = @APP_INDICATOR_CFLAGS@ ++APP_INDICATOR_LIBS = @APP_INDICATOR_LIBS@ + AR = @AR@ + AUTOCONF = @AUTOCONF@ + AUTOHEADER = @AUTOHEADER@ +diff -Nur gnome-power-manager-2.30.0/src/Makefile.in gnome-power-manager-2.30.0.new/src/Makefile.in +--- gnome-power-manager-2.30.0/src/Makefile.in 2010-03-29 12:17:18.000000000 +0200 ++++ gnome-power-manager-2.30.0.new/src/Makefile.in 2010-03-29 13:27:36.561576745 +0200 +@@ -95,7 +95,8 @@ + gpm-screensaver.c gpm-session.h gpm-session.c \ + gpm-networkmanager.h gpm-networkmanager.c gpm-stock-icons.h \ + gsd-media-keys-window.h gsd-media-keys-window.c gpm-engine.h \ +- gpm-engine.c gpm-brightness-hal.h gpm-brightness-hal.c ++ gpm-engine.c gsd-osd-notification.h gsd-osd-notification.c \ ++ gpm-brightness-hal.h gpm-brightness-hal.c + @HAVE_HAL_TRUE@am__objects_2 = gnome_power_manager-gpm-brightness-hal.$(OBJEXT) \ + @HAVE_HAL_TRUE@ $(am__objects_1) + am_gnome_power_manager_OBJECTS = \ +@@ -117,8 +118,9 @@ + gnome_power_manager-gpm-session.$(OBJEXT) \ + gnome_power_manager-gpm-networkmanager.$(OBJEXT) \ + gnome_power_manager-gsd-media-keys-window.$(OBJEXT) \ +- gnome_power_manager-gpm-engine.$(OBJEXT) $(am__objects_1) \ +- $(am__objects_2) ++ gnome_power_manager-gpm-engine.$(OBJEXT) \ ++ gnome_power_manager-gsd-osd-notification.$(OBJEXT) \ ++ $(am__objects_1) $(am__objects_2) + gnome_power_manager_OBJECTS = $(am_gnome_power_manager_OBJECTS) + am__DEPENDENCIES_1 = + gnome_power_manager_DEPENDENCIES = libgpmshared.a \ +@@ -126,7 +128,7 @@ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ +- $(am__DEPENDENCIES_1) $(am__append_3) ++ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) $(am__append_3) + AM_V_lt = $(am__v_lt_$(V)) + am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) + am__v_lt_0 = --silent +@@ -240,6 +242,8 @@ + ALL_LINGUAS = @ALL_LINGUAS@ + AMTAR = @AMTAR@ + AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ ++APP_INDICATOR_CFLAGS = @APP_INDICATOR_CFLAGS@ ++APP_INDICATOR_LIBS = @APP_INDICATOR_LIBS@ + AR = @AR@ + AUTOCONF = @AUTOCONF@ + AUTOHEADER = @AUTOHEADER@ +@@ -430,6 +434,7 @@ + $(GSTREAMER_CFLAGS) \ + -DI_KNOW_THE_DEVICEKIT_POWER_API_IS_SUBJECT_TO_CHANGE \ + $(DEVKIT_CFLAGS) \ ++ $(APP_INDICATOR_CFLAGS) \ + -DBINDIR=\"$(bindir)\" \ + -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ + -DDATADIR=\"$(datadir)\" \ +@@ -526,12 +531,13 @@ + gpm-screensaver.h gpm-screensaver.c gpm-session.h \ + gpm-session.c gpm-networkmanager.h gpm-networkmanager.c \ + gpm-stock-icons.h gsd-media-keys-window.h \ +- gsd-media-keys-window.c gpm-engine.h gpm-engine.c $(NULL) \ ++ gsd-media-keys-window.c gpm-engine.h gpm-engine.c \ ++ gsd-osd-notification.h gsd-osd-notification.c $(NULL) \ + $(am__append_2) + gnome_power_manager_LDADD = libgpmshared.a $(GLIB_LIBS) $(X11_LIBS) \ + $(GSTREAMER_LIBS) $(GNOME_LIBS) $(DBUS_LIBS) $(X11_LIBS) \ + $(CANBERRA_LIBS) $(LIBNOTIFY_LIBS) $(GPM_EXTRA_LIBS) \ +- $(DEVKIT_LIBS) -lm $(am__append_3) ++ $(DEVKIT_LIBS) $(APP_INDICATOR_LIBS) -lm $(am__append_3) + gnome_power_manager_CFLAGS = \ + $(WARNINGFLAGS) \ + $(NULL) +@@ -748,6 +754,7 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnome_power_manager-gpm-session.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnome_power_manager-gpm-tray-icon.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnome_power_manager-gsd-media-keys-window.Po@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnome_power_manager-gsd-osd-notification.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnome_power_preferences-gpm-prefs-core.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnome_power_preferences-gpm-prefs.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnome_power_self_test-egg-array-float.Po@am__quote@ +@@ -1110,6 +1117,22 @@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_power_manager_CFLAGS) $(CFLAGS) -c -o gnome_power_manager-gpm-engine.obj `if test -f 'gpm-engine.c'; then $(CYGPATH_W) 'gpm-engine.c'; else $(CYGPATH_W) '$(srcdir)/gpm-engine.c'; fi` + ++gnome_power_manager-gsd-osd-notification.o: gsd-osd-notification.c ++@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_power_manager_CFLAGS) $(CFLAGS) -MT gnome_power_manager-gsd-osd-notification.o -MD -MP -MF $(DEPDIR)/gnome_power_manager-gsd-osd-notification.Tpo -c -o gnome_power_manager-gsd-osd-notification.o `test -f 'gsd-osd-notification.c' || echo '$(srcdir)/'`gsd-osd-notification.c ++@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gnome_power_manager-gsd-osd-notification.Tpo $(DEPDIR)/gnome_power_manager-gsd-osd-notification.Po ++@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gsd-osd-notification.c' object='gnome_power_manager-gsd-osd-notification.o' libtool=no @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_power_manager_CFLAGS) $(CFLAGS) -c -o gnome_power_manager-gsd-osd-notification.o `test -f 'gsd-osd-notification.c' || echo '$(srcdir)/'`gsd-osd-notification.c ++ ++gnome_power_manager-gsd-osd-notification.obj: gsd-osd-notification.c ++@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_power_manager_CFLAGS) $(CFLAGS) -MT gnome_power_manager-gsd-osd-notification.obj -MD -MP -MF $(DEPDIR)/gnome_power_manager-gsd-osd-notification.Tpo -c -o gnome_power_manager-gsd-osd-notification.obj `if test -f 'gsd-osd-notification.c'; then $(CYGPATH_W) 'gsd-osd-notification.c'; else $(CYGPATH_W) '$(srcdir)/gsd-osd-notification.c'; fi` ++@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gnome_power_manager-gsd-osd-notification.Tpo $(DEPDIR)/gnome_power_manager-gsd-osd-notification.Po ++@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gsd-osd-notification.c' object='gnome_power_manager-gsd-osd-notification.obj' libtool=no @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_power_manager_CFLAGS) $(CFLAGS) -c -o gnome_power_manager-gsd-osd-notification.obj `if test -f 'gsd-osd-notification.c'; then $(CYGPATH_W) 'gsd-osd-notification.c'; else $(CYGPATH_W) '$(srcdir)/gsd-osd-notification.c'; fi` ++ + gnome_power_manager-gpm-brightness-hal.o: gpm-brightness-hal.c + @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_power_manager_CFLAGS) $(CFLAGS) -MT gnome_power_manager-gpm-brightness-hal.o -MD -MP -MF $(DEPDIR)/gnome_power_manager-gpm-brightness-hal.Tpo -c -o gnome_power_manager-gpm-brightness-hal.o `test -f 'gpm-brightness-hal.c' || echo '$(srcdir)/'`gpm-brightness-hal.c + @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gnome_power_manager-gpm-brightness-hal.Tpo $(DEPDIR)/gnome_power_manager-gpm-brightness-hal.Po +diff -Nur gnome-power-manager-2.30.0/tools/Makefile.in gnome-power-manager-2.30.0.new/tools/Makefile.in +--- gnome-power-manager-2.30.0/tools/Makefile.in 2010-03-29 12:17:18.000000000 +0200 ++++ gnome-power-manager-2.30.0.new/tools/Makefile.in 2010-03-29 13:27:36.671576411 +0200 +@@ -84,6 +84,8 @@ + ALL_LINGUAS = @ALL_LINGUAS@ + AMTAR = @AMTAR@ + AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ ++APP_INDICATOR_CFLAGS = @APP_INDICATOR_CFLAGS@ ++APP_INDICATOR_LIBS = @APP_INDICATOR_LIBS@ + AR = @AR@ + AUTOCONF = @AUTOCONF@ + AUTOHEADER = @AUTOHEADER@ --- gnome-power-manager-2.30.0.orig/debian/patches/series +++ gnome-power-manager-2.30.0/debian/patches/series @@ -0,0 +1,6 @@ +02-notify-osd-support.patch +03-dont-dim-when-inactive.patch +08-desktop-bugreport-path.patch +12-add-appindicators.patch +13-lock-on-blank.patch +90-autotools.patch --- gnome-power-manager-2.30.0.orig/debian/patches/03-dont-dim-when-inactive.patch +++ gnome-power-manager-2.30.0/debian/patches/03-dont-dim-when-inactive.patch @@ -0,0 +1,56 @@ +Description: Only dim the screen on idle when on the active console +Author: Chris Coulson +Bug: https://bugzilla.gnome.org/show_bug.cgi?id=614207 +Forwarded: https://bugzilla.gnome.org/show_bug.cgi?id=614207 + +Index: gnome-power-manager-2.29.91/src/gpm-backlight.c +=================================================================== +--- gnome-power-manager-2.29.91.orig/src/gpm-backlight.c 2010-03-27 15:46:43.840175311 +0000 ++++ gnome-power-manager-2.29.91/src/gpm-backlight.c 2010-03-27 15:48:01.132669542 +0000 +@@ -55,6 +55,7 @@ + #include "gpm-stock-icons.h" + #include "gpm-prefs-server.h" + #include "gsd-osd-notification.h" ++#include "egg-console-kit.h" + + #define GPM_BACKLIGHT_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GPM_TYPE_BACKLIGHT, GpmBacklightPrivate)) + +@@ -68,6 +69,7 @@ + GpmControl *control; + GpmDpms *dpms; + GpmIdle *idle; ++ EggConsoleKit *consolekit; + GsdOsdNotification *notifier; + gboolean can_dim; + gboolean system_is_idle; +@@ -590,6 +592,12 @@ + if (gpm_button_is_lid_closed (backlight->priv->button)) + return; + ++ /* don't dim or undim the screen unless we are on the active console */ ++ if (!egg_console_kit_is_active (backlight->priv->consolekit)) { ++ egg_debug ("ignoring as not on active console"); ++ return; ++ } ++ + if (mode == GPM_IDLE_MODE_NORMAL) { + /* sync lcd brightness */ + gpm_backlight_notify_system_idle_changed (backlight, FALSE); +@@ -712,6 +720,7 @@ + g_object_unref (backlight->priv->idle); + g_object_unref (backlight->priv->brightness); + g_object_unref (backlight->priv->notifier); ++ g_object_unref (backlight->priv->consolekit); + + g_return_if_fail (backlight->priv != NULL); + G_OBJECT_CLASS (gpm_backlight_parent_class)->finalize (object); +@@ -830,6 +839,9 @@ + g_signal_connect (backlight->priv->control, "resume", + G_CALLBACK (control_resume_cb), backlight); + ++ /* Don't do dimming on inactive console */ ++ backlight->priv->consolekit = egg_console_kit_new (); ++ + /* sync at startup */ + gpm_backlight_brightness_evaluate_and_set (backlight, FALSE); + } --- gnome-power-manager-2.30.0.orig/debian/patches/02-notify-osd-support.patch +++ gnome-power-manager-2.30.0/debian/patches/02-notify-osd-support.patch @@ -0,0 +1,518 @@ +Description: Add support for synchronous brightness notifications using notify-osd. + The patch is based around gsd-osd-notification.[ch] which is shared with gsd +Author: Chris Coulson +Forwarded: no + +Index: gnome-power-manager-2.29.2/src/Makefile.am +=================================================================== +--- gnome-power-manager-2.29.2.orig/src/Makefile.am 2010-01-27 16:24:51.000000000 +0000 ++++ gnome-power-manager-2.29.2/src/Makefile.am 2010-02-23 19:03:10.519523228 +0000 +@@ -168,6 +168,8 @@ + gsd-media-keys-window.c \ + gpm-engine.h \ + gpm-engine.c \ ++ gsd-osd-notification.h \ ++ gsd-osd-notification.c \ + $(NULL) + + if HAVE_HAL +Index: gnome-power-manager-2.29.2/src/gsd-osd-notification.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ gnome-power-manager-2.29.2/src/gsd-osd-notification.c 2010-02-23 19:03:37.929522263 +0000 +@@ -0,0 +1,286 @@ ++/* -*- Mode: C; indent-tabs-mode: nil; c-basic-offset: 8; tab-width: 8 -*- */ ++/* ++ * gsd-osd-notification.c ++ * Copyright (C) 2010 Chris Coulson ++ * Copyright (C) 2009 Canonical Ltd ++ * ++ * gsd-osd-notification.c 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 3 of the License, or ++ * (at your option) any later version. ++ * ++ * gsd-osd-notification.c 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, see . ++ */ ++ ++#include ++#include "gsd-osd-notification.h" ++ ++struct _GsdOsdNotificationPrivate ++{ ++ NotifyNotification *notification; ++ char **icon_names; ++ char *hint; ++ guint icon_array_size; ++}; ++ ++#define GSD_OSD_NOTIFICATION_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSD_TYPE_OSD_NOTIFICATION, GsdOsdNotificationPrivate)) ++ ++enum ++{ ++ PROP_0, ++ PROP_ICON_NAMES, ++ PROP_HINT ++}; ++ ++#define NOTIFY_CAP_PRIVATE_SYNCHRONOUS "x-canonical-private-synchronous" ++#define NOTIFY_CAP_PRIVATE_ICON_ONLY "x-canonical-private-icon-only" ++#define NOTIFY_HINT_TRUE "true" ++ ++G_DEFINE_TYPE (GsdOsdNotification, gsd_osd_notification, G_TYPE_OBJECT); ++ ++static const char* ++_calculate_icon (GsdOsdNotification *notifier, guint value, gboolean muted) ++{ ++ guint s; ++ ++ s = (notifier->priv->icon_array_size -1) * value / 100 + 1; ++ s = MAX (s, 1); ++ s = MIN (s, notifier->priv->icon_array_size -1); ++ if (value <= 0) ++ s = 0; ++ ++ return muted ? notifier->priv->icon_names[0] : notifier->priv->icon_names[s]; ++} ++ ++void ++gsd_osd_notification_set_icon_array (GsdOsdNotification *notifier, const char **icon_names) ++{ ++ g_return_if_fail (GSD_IS_OSD_NOTIFICATION (notifier)); ++ ++ g_strfreev (notifier->priv->icon_names); ++ notifier->priv->icon_names = g_strdupv ((gchar **) icon_names); ++ ++ notifier->priv->icon_array_size = g_strv_length ((gchar **) icon_names); ++} ++ ++void ++gsd_osd_notification_set_hint (GsdOsdNotification *notifier, const char *hint) ++{ ++ g_return_if_fail (GSD_IS_OSD_NOTIFICATION (notifier)); ++ ++ g_free (notifier->priv->hint); ++ notifier->priv->hint = g_strdup (hint); ++} ++ ++gboolean ++gsd_osd_notification_is_supported (void) ++{ ++ GList *caps; ++ gboolean has_cap; ++ ++ caps = notify_get_server_caps (); ++ has_cap = (g_list_find_custom (caps, NOTIFY_CAP_PRIVATE_SYNCHRONOUS, (GCompareFunc) g_strcmp0) != NULL); ++ g_list_foreach (caps, (GFunc) g_free, NULL); ++ g_list_free (caps); ++ ++ return has_cap; ++} ++ ++gboolean ++gsd_osd_notification_show_icon_only (const char *icon, const char *hint) ++{ ++ NotifyNotification *notification; ++ ++ g_return_val_if_fail (icon != NULL, FALSE); ++ g_return_val_if_fail (hint != NULL, FALSE); ++ ++ if (!gsd_osd_notification_is_supported ()) ++ return FALSE; ++ ++ notification = notify_notification_new (" ", "", NULL, NULL); ++ ++ if (notification != NULL) { ++ notify_notification_set_hint_string (notification, NOTIFY_CAP_PRIVATE_SYNCHRONOUS, hint); ++ notify_notification_set_hint_string (notification, NOTIFY_CAP_PRIVATE_ICON_ONLY, NOTIFY_HINT_TRUE); ++ notify_notification_update (notification, " ", "", icon); ++ } else { ++ return FALSE; ++ } ++ ++ if (!notify_notification_show (notification, NULL)) { ++ g_object_unref (notification); ++ return FALSE; ++ } ++ ++ g_object_unref (notification); ++ ++ return TRUE; ++} ++ ++gboolean ++gsd_osd_notification_show_value (GsdOsdNotification *notifier, gint value, gboolean muted) ++{ ++ const char *icon; ++ ++ g_return_val_if_fail (GSD_IS_OSD_NOTIFICATION (notifier), FALSE); ++ g_return_val_if_fail (notifier->priv->icon_names != NULL, FALSE); ++ g_return_val_if_fail (notifier->priv->hint != NULL, FALSE); ++ ++ if (!gsd_osd_notification_is_supported ()) ++ return FALSE; ++ ++ if (notifier->priv->notification == NULL) { ++ notifier->priv->notification = notify_notification_new (" ", "", NULL, NULL); ++ notify_notification_set_hint_string (notifier->priv->notification, NOTIFY_CAP_PRIVATE_SYNCHRONOUS, notifier->priv->hint); ++} ++ if (notifier->priv->notification != NULL) { ++ value = MIN (value, 101); ++ value = MAX (value, -1); ++ icon = _calculate_icon (notifier, value, muted); ++ notify_notification_set_hint_int32(notifier->priv->notification, "value", (muted && value > 0) ? 0 : value); ++ notify_notification_update (notifier->priv->notification, " ", "", icon); ++ } else { ++ return FALSE; ++ } ++ ++ if (!notify_notification_show (notifier->priv->notification, NULL)) ++ return FALSE; ++ ++ return TRUE; ++} ++ ++gboolean ++gsd_osd_notification_show_overshoot (GsdOsdNotification *notifier, GsdOsdNotifierOvershootType type) ++{ ++ gint value; ++ gboolean muted; ++ ++ g_return_val_if_fail (type == GSD_OSD_NOTIFICATION_UNDERSHOOT || type == GSD_OSD_NOTIFICATION_OVERSHOOT, FALSE); ++ ++ switch (type) ++ { ++ case GSD_OSD_NOTIFICATION_UNDERSHOOT: ++ value = -1; ++ muted = TRUE; ++ break; ++ case GSD_OSD_NOTIFICATION_OVERSHOOT: ++ value = 101; ++ muted = FALSE; ++ break; ++ default: ++ g_assert_not_reached (); ++ break; ++ } ++ ++ return gsd_osd_notification_show_value (notifier, value, muted); ++} ++ ++GsdOsdNotification* ++gsd_osd_notification_new (const char **icon_names, const char *hint) ++{ ++ return (GsdOsdNotification *) g_object_new (GSD_TYPE_OSD_NOTIFICATION, ++ "icon-names", icon_names, ++ "hint", hint, ++ NULL); ++} ++ ++static void ++gsd_osd_notification_init (GsdOsdNotification *object) ++{ ++ object->priv = GSD_OSD_NOTIFICATION_PRIVATE (object); ++ ++ if (!notify_is_initted ()) ++ notify_init (g_get_application_name ()); ++ ++ object->priv->hint = NULL; ++ object->priv->icon_names = NULL; ++ object->priv->notification = NULL; ++} ++ ++static void ++gsd_osd_notification_finalize (GObject *object) ++{ ++ GsdOsdNotification *notifier = GSD_OSD_NOTIFICATION (object); ++ ++ g_strfreev (notifier->priv->icon_names); ++ g_free (notifier->priv->hint); ++ ++ if (notifier->priv->notification) ++ g_object_unref (notifier->priv->notification); ++ ++ G_OBJECT_CLASS (gsd_osd_notification_parent_class)->finalize (object); ++} ++ ++static void ++gsd_osd_notification_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec) ++{ ++ g_return_if_fail (GSD_IS_OSD_NOTIFICATION (object)); ++ GsdOsdNotification *notifier = GSD_OSD_NOTIFICATION (object); ++ ++ switch (prop_id) ++ { ++ case PROP_ICON_NAMES: ++ gsd_osd_notification_set_icon_array (notifier, (const char**) g_value_get_boxed (value)); ++ break; ++ case PROP_HINT: ++ gsd_osd_notification_set_hint (notifier, (char**) g_value_get_string (value)); ++ break; ++ default: ++ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); ++ break; ++ } ++} ++ ++static void ++gsd_osd_notification_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec) ++{ ++ g_return_if_fail (GSD_IS_OSD_NOTIFICATION (object)); ++ GsdOsdNotification *notifier = GSD_OSD_NOTIFICATION (object); ++ ++ switch (prop_id) ++ { ++ case PROP_ICON_NAMES: ++ g_value_set_boxed (value, notifier->priv->icon_names); ++ break; ++ case PROP_HINT: ++ g_value_set_string (value, notifier->priv->hint); ++ break; ++ default: ++ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); ++ break; ++ } ++} ++ ++static void ++gsd_osd_notification_class_init (GsdOsdNotificationClass *klass) ++{ ++ GObjectClass* object_class = G_OBJECT_CLASS (klass); ++ ++ object_class->finalize = gsd_osd_notification_finalize; ++ object_class->set_property = gsd_osd_notification_set_property; ++ object_class->get_property = gsd_osd_notification_get_property; ++ ++ g_object_class_install_property (object_class, ++ PROP_ICON_NAMES, ++ g_param_spec_boxed ("icon-names", ++ "Icon name array", ++ "An array of icon names for the notification", ++ G_TYPE_STRV, ++ G_PARAM_WRITABLE | G_PARAM_CONSTRUCT)); ++ ++ g_object_class_install_property (object_class, ++ PROP_HINT, ++ g_param_spec_string ("hint", ++ "Notification hint", ++ "Hint for the notification", ++ NULL, ++ G_PARAM_WRITABLE | G_PARAM_CONSTRUCT)); ++ ++ g_type_class_add_private (klass, sizeof (GsdOsdNotificationPrivate)); ++} +Index: gnome-power-manager-2.29.2/src/gsd-osd-notification.h +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ gnome-power-manager-2.29.2/src/gsd-osd-notification.h 2010-02-23 19:03:10.529523032 +0000 +@@ -0,0 +1,75 @@ ++/* -*- Mode: C; indent-tabs-mode: nil; c-basic-offset: 8; tab-width: 8 -*- */ ++/* ++ * gsd-osd-notification.c ++ * Copyright (C) 2010 Chris Coulson ++ * Copyright (C) 2009 Canonical Ltd ++ * ++ * gsd-osd-notification.c 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 3 of the License, or ++ * (at your option) any later version. ++ * ++ * gsd-osd-notification.c 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, see . ++ */ ++ ++#ifndef _GSD_OSD_NOTIFICATION_H_ ++#define _GSD_OSD_NOTIFICATION_H_ ++ ++#include ++ ++G_BEGIN_DECLS ++ ++#define GSD_TYPE_OSD_NOTIFICATION (gsd_osd_notification_get_type ()) ++#define GSD_OSD_NOTIFICATION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GSD_TYPE_OSD_NOTIFICATION, GsdOsdNotification)) ++#define GSD_OSD_NOTIFICATION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GSD_TYPE_OSD_NOTIFICATION, GsdOsdNotificationClass)) ++#define GSD_IS_OSD_NOTIFICATION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GSD_TYPE_OSD_NOTIFICATION)) ++#define GSD_IS_OSD_NOTIFICATION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GSD_TYPE_OSD_NOTIFICATION)) ++#define GSD_OSD_NOTIFICATION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GSD_TYPE_OSD_NOTIFICATION, GsdOsdNotificationClass)) ++ ++typedef struct _GsdOsdNotificationClass GsdOsdNotificationClass; ++typedef struct _GsdOsdNotification GsdOsdNotification; ++typedef struct _GsdOsdNotificationPrivate GsdOsdNotificationPrivate; ++ ++struct _GsdOsdNotificationClass ++{ ++ GObjectClass parent_class; ++}; ++ ++struct _GsdOsdNotification ++{ ++ GObject parent_instance; ++ ++ GsdOsdNotificationPrivate *priv; ++}; ++ ++typedef enum { ++ GSD_OSD_NOTIFICATION_NO_OVERSHOOT = 0, ++ GSD_OSD_NOTIFICATION_UNDERSHOOT, ++ GSD_OSD_NOTIFICATION_OVERSHOOT, ++} GsdOsdNotifierOvershootType; ++ ++GType gsd_osd_notification_get_type (void) G_GNUC_CONST; ++GsdOsdNotification* gsd_osd_notification_new (const char **icon_names, ++ const char *hint); ++void gsd_osd_notification_set_icon_array (GsdOsdNotification *notifier, ++ const char **icon_names); ++void gsd_osd_notification_set_hint (GsdOsdNotification *notifier, ++ const char *hint); ++gboolean gsd_osd_notification_is_supported (void); ++gboolean gsd_osd_notification_show_value (GsdOsdNotification *notifier, ++ gint value, ++ gboolean muted); ++gboolean gsd_osd_notification_show_overshoot (GsdOsdNotification *notifier, ++ GsdOsdNotifierOvershootType type); ++gboolean gsd_osd_notification_show_icon_only (const char *icon, ++ const char *hint); ++ ++G_END_DECLS ++ ++#endif /* _GSD_OSD_NOTIFICATION_H_ */ +Index: gnome-power-manager-2.29.2/src/gpm-backlight.c +=================================================================== +--- gnome-power-manager-2.29.2.orig/src/gpm-backlight.c 2010-01-27 16:24:52.000000000 +0000 ++++ gnome-power-manager-2.29.2/src/gpm-backlight.c 2010-02-23 19:03:10.529523032 +0000 +@@ -54,6 +54,7 @@ + #include "gpm-marshal.h" + #include "gpm-stock-icons.h" + #include "gpm-prefs-server.h" ++#include "gsd-osd-notification.h" + + #define GPM_BACKLIGHT_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GPM_TYPE_BACKLIGHT, GpmBacklightPrivate)) + +@@ -67,6 +68,7 @@ + GpmControl *control; + GpmDpms *dpms; + GpmIdle *idle; ++ GsdOsdNotification *notifier; + gboolean can_dim; + gboolean system_is_idle; + GTimer *idle_timer; +@@ -81,6 +83,15 @@ + + static guint signals [LAST_SIGNAL] = { 0 }; + ++static const char *backlight_icons[] = { ++ "notification-display-brightness-off", ++ "notification-display-brightness-low", ++ "notification-display-brightness-medium", ++ "notification-display-brightness-high", ++ "notification-display-brightness-full", ++ NULL ++}; ++ + G_DEFINE_TYPE (GpmBacklight, gpm_backlight, G_TYPE_OBJECT) + + /** +@@ -347,10 +358,12 @@ + + /* only show dialog if interactive */ + if (interactive) { +- gpm_backlight_dialog_init (backlight); +- gsd_media_keys_window_set_volume_level (GSD_MEDIA_KEYS_WINDOW (backlight->priv->popup), +- round (brightness)); +- gpm_backlight_dialog_show (backlight); ++ if (!gsd_osd_notification_show_value (backlight->priv->notifier, round (brightness), FALSE)) { ++ gpm_backlight_dialog_init (backlight); ++ gsd_media_keys_window_set_volume_level (GSD_MEDIA_KEYS_WINDOW (backlight->priv->popup), ++ round (brightness)); ++ gpm_backlight_dialog_show (backlight); ++ } + } + + ret = gpm_brightness_set (backlight->priv->brightness, value, &hw_changed); +@@ -431,8 +444,14 @@ + GError *error = NULL; + guint percentage; + gboolean hw_changed; ++ gboolean brightness_at_0; ++ gboolean brightness_at_100; + egg_debug ("Button press event type=%s", type); + ++ gpm_brightness_get (backlight->priv->brightness, &percentage); ++ brightness_at_100 = percentage == 100 ? TRUE : FALSE; ++ brightness_at_0 = percentage == 0 ? TRUE : FALSE; ++ + if (strcmp (type, GPM_BUTTON_BRIGHT_UP) == 0) { + /* go up one step */ + ret = gpm_brightness_up (backlight->priv->brightness, &hw_changed); +@@ -440,10 +459,17 @@ + /* show the new value */ + if (ret) { + gpm_brightness_get (backlight->priv->brightness, &percentage); +- gpm_backlight_dialog_init (backlight); +- gsd_media_keys_window_set_volume_level (GSD_MEDIA_KEYS_WINDOW (backlight->priv->popup), +- percentage); +- gpm_backlight_dialog_show (backlight); ++ if (brightness_at_100) { ++ ret = gsd_osd_notification_show_overshoot (backlight->priv->notifier, GSD_OSD_NOTIFICATION_OVERSHOOT); ++ } else { ++ ret = gsd_osd_notification_show_value (backlight->priv->notifier, percentage, FALSE); ++ } ++ if (!ret) { ++ gpm_backlight_dialog_init (backlight); ++ gsd_media_keys_window_set_volume_level (GSD_MEDIA_KEYS_WINDOW (backlight->priv->popup), ++ percentage); ++ gpm_backlight_dialog_show (backlight); ++ } + /* save the new percentage */ + backlight->priv->master_percentage = percentage; + } +@@ -459,10 +485,17 @@ + /* show the new value */ + if (ret) { + gpm_brightness_get (backlight->priv->brightness, &percentage); +- gpm_backlight_dialog_init (backlight); +- gsd_media_keys_window_set_volume_level (GSD_MEDIA_KEYS_WINDOW (backlight->priv->popup), +- percentage); +- gpm_backlight_dialog_show (backlight); ++ if (brightness_at_0) { ++ ret = gsd_osd_notification_show_overshoot (backlight->priv->notifier, GSD_OSD_NOTIFICATION_UNDERSHOOT); ++ } else { ++ ret = gsd_osd_notification_show_value (backlight->priv->notifier, percentage, FALSE); ++ } ++ if (!ret) { ++ gpm_backlight_dialog_init (backlight); ++ gsd_media_keys_window_set_volume_level (GSD_MEDIA_KEYS_WINDOW (backlight->priv->popup), ++ percentage); ++ gpm_backlight_dialog_show (backlight); ++ } + /* save the new percentage */ + backlight->priv->master_percentage = percentage; + } +@@ -678,6 +711,7 @@ + g_object_unref (backlight->priv->button); + g_object_unref (backlight->priv->idle); + g_object_unref (backlight->priv->brightness); ++ g_object_unref (backlight->priv->notifier); + + g_return_if_fail (backlight->priv != NULL); + G_OBJECT_CLASS (gpm_backlight_parent_class)->finalize (object); +@@ -786,6 +820,8 @@ + TRUE); + gtk_window_set_position (GTK_WINDOW (backlight->priv->popup), GTK_WIN_POS_NONE); + ++ backlight->priv->notifier = gsd_osd_notification_new (backlight_icons, "brightness"); ++ + /* DPMS mode poll class */ + backlight->priv->dpms = gpm_dpms_new (); +