--- gnome-power-manager-2.28.1.orig/debian/install +++ gnome-power-manager-2.28.1/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.28.1.orig/debian/control.in +++ gnome-power-manager-2.28.1/debian/control.in @@ -0,0 +1,55 @@ +Source: gnome-power-manager +Section: gnome +Priority: optional +Maintainer: Ted Gould +XSBC-Original-Maintainer: Debian GNOME Maintainers +XSBC-Original-Uploaders: @GNOME_TEAM@ +Build-Depends: debhelper (>= 5), + cdbs, + quilt, + libtool, + libpanel-applet2-dev, + libdevkit-power-gobject-dev (>= 011), + libdbus-glib-1-dev (>= 0.70), + libhal-dev (>= 0.5.8), + libcanberra-gtk-dev, + libunique-dev, + libxml-parser-perl, + libxext-dev, + libx11-dev, + libgtk2.0-dev (>= 2.11), + libwnck-dev (>= 2.10), + docbook-to-man, + intltool, + libnotify-dev (>= 0.4.4-3), + docbook-utils, + libxres-dev, + xmlto, + gnome-doc-utils, + libgnome-keyring-dev, + libpanel-applet2-dev (>= 2.0), + scrollkeeper, + gnome-pkg-tools (>= 0.10), + libxrandr-dev (>= 1.2.0), + libgstreamer0.10-dev +Standards-Version: 3.8.0 +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}, + devicekit-power (>= 011), + dbus-x11 +Recommends: notification-daemon +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.28.1.orig/debian/watch +++ gnome-power-manager-2.28.1/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.28.1.orig/debian/rules +++ gnome-power-manager-2.28.1/debian/rules @@ -0,0 +1,40 @@ +#!/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 + +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.28.1.orig/debian/control +++ gnome-power-manager-2.28.1/debian/control @@ -0,0 +1,60 @@ +# 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: Ted Gould +XSBC-Original-Maintainer: Debian GNOME Maintainers +XSBC-Original-Uploaders: Debian GNOME Maintainers +Build-Depends: debhelper (>= 5), + cdbs, + quilt, + libtool, + libpanel-applet2-dev, + libdevkit-power-gobject-dev (>= 011), + libdbus-glib-1-dev (>= 0.70), + libhal-dev (>= 0.5.8), + libcanberra-gtk-dev, + libunique-dev, + libxml-parser-perl, + libxext-dev, + libx11-dev, + libgtk2.0-dev (>= 2.11), + libwnck-dev (>= 2.10), + docbook-to-man, + intltool, + libnotify-dev (>= 0.4.4-3), + docbook-utils, + libxres-dev, + xmlto, + gnome-doc-utils, + libgnome-keyring-dev, + libpanel-applet2-dev (>= 2.0), + scrollkeeper, + gnome-pkg-tools (>= 0.10), + libxrandr-dev (>= 1.2.0), + libgstreamer0.10-dev +Standards-Version: 3.8.0 +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}, + devicekit-power (>= 011), + dbus-x11 +Recommends: notification-daemon +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.28.1.orig/debian/changelog +++ gnome-power-manager-2.28.1/debian/changelog @@ -0,0 +1,1312 @@ +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.28.1.orig/debian/gconf-defaults +++ gnome-power-manager-2.28.1/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.28.1.orig/debian/docs +++ gnome-power-manager-2.28.1/debian/docs @@ -0,0 +1,3 @@ +NEWS +README +TODO --- gnome-power-manager-2.28.1.orig/debian/README.Debian +++ gnome-power-manager-2.28.1/debian/README.Debian @@ -0,0 +1,10 @@ +GNOME Users: Starting GNOME Power Manager with your GNOME Session +================================================================= + +1) Add yourself to the powerdev group; this group is created by hal + >= 0.5.6+cvs20060219-1. +2) Open System -> Preferences -> Sessions +3) In the Startup Programs tab, click Add +4) Type "gnome-power-manager", click OK. +5) Log out of your gnome session, and log back in again. + --- gnome-power-manager-2.28.1.orig/debian/copyright +++ gnome-power-manager-2.28.1/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 &3 --- gnome-power-manager-2.28.1.orig/debian/compat +++ gnome-power-manager-2.28.1/debian/compat @@ -0,0 +1 @@ +5 --- gnome-power-manager-2.28.1.orig/debian/local/source_gnome-power-manager.py +++ gnome-power-manager-2.28.1/debian/local/source_gnome-power-manager.py @@ -0,0 +1,13 @@ +'''apport package hook for gnome-power-manager + +(c) 2009 Canonical Ltd. +Author: Martin Pitt +''' + +from apport.hookutils import * +from os import path + +def add_info(report): + report['DevkitPower'] = command_output(['devkit-power', '-d']) + report['gnome-power-bugreport'] = command_output('/usr/share/gnome-power-manager/gnome-power-bugreport') + attach_gconf(report, 'gnome-power-manager') --- gnome-power-manager-2.28.1.orig/debian/patches/04-dont-connect-to-hal-with-xrandr.patch +++ gnome-power-manager-2.28.1/debian/patches/04-dont-connect-to-hal-with-xrandr.patch @@ -0,0 +1,43 @@ +From 9d8c97f7118d6ce512147c011914ebf3b1015be2 Mon Sep 17 00:00:00 2001 +From: Martin Pitt +Date: Thu, 14 Jan 2010 18:12:22 +0100 +Subject: [PATCH 2/2] only connect to HAL if there is no xrandr hardware + +Nowadays it is a valid setup to have hal installed, but only start on demand +via D-Bus activation (instead of during boot). If we detect xrandr-capable +hardware, do not try to connect to hal. + +Bug: https://bugzilla.gnome.org/show_bug.cgi?id=603470 +--- + src/gpm-brightness.c | 14 ++++++++------ + 1 files changed, 8 insertions(+), 6 deletions(-) + +diff --git a/src/gpm-brightness.c b/src/gpm-brightness.c +index 6d2d3a1..ecbe819 100644 +--- a/src/gpm-brightness.c ++++ b/src/gpm-brightness.c +@@ -439,13 +439,15 @@ gpm_brightness_init (GpmBrightness *brightness) + g_signal_connect (brightness->priv->xrandr, "brightness-changed", + G_CALLBACK (gpm_brightness_xrandr_changed_cb), brightness); + #ifdef HAVE_HAL +- brightness->priv->hal = gpm_brightness_hal_new (); +- if (gpm_brightness_hal_has_hw (brightness->priv->hal)) { +- egg_debug ("detected HAL hardware"); +- brightness->priv->use_hal = TRUE; ++ if (!brightness->priv->use_xrandr) { ++ brightness->priv->hal = gpm_brightness_hal_new (); ++ if (gpm_brightness_hal_has_hw (brightness->priv->hal)) { ++ egg_debug ("detected HAL hardware"); ++ brightness->priv->use_hal = TRUE; ++ } ++ g_signal_connect (brightness->priv->hal, "brightness-changed", ++ G_CALLBACK (gpm_brightness_hal_changed_cb), brightness); + } +- g_signal_connect (brightness->priv->hal, "brightness-changed", +- G_CALLBACK (gpm_brightness_hal_changed_cb), brightness); + #endif + } + +-- +1.6.5 + --- gnome-power-manager-2.28.1.orig/debian/patches/03-run-without-hal.patch +++ gnome-power-manager-2.28.1/debian/patches/03-run-without-hal.patch @@ -0,0 +1,13 @@ +# Bug: https://bugzilla.gnome.org/show_bug.cgi?id=603470 +Index: gnome-power-manager-2.28.1/libhal-glib/hal-manager.c +=================================================================== +--- gnome-power-manager-2.28.1.orig/libhal-glib/hal-manager.c 2009-11-29 15:23:14.000000000 +0100 ++++ gnome-power-manager-2.28.1/libhal-glib/hal-manager.c 2009-11-29 15:23:21.000000000 +0100 +@@ -303,7 +303,6 @@ + HAL_DBUS_INTERFACE_MANAGER); + if (DBUS_IS_G_PROXY (proxy) == FALSE) { + g_warning ("Either HAL or DBUS are not working!"); +- exit (0); + } + + g_signal_connect (manager->priv->gproxy, "proxy-status", --- gnome-power-manager-2.28.1.orig/debian/patches/01-segfault-in-gpm_disks_register.patch +++ gnome-power-manager-2.28.1/debian/patches/01-segfault-in-gpm_disks_register.patch @@ -0,0 +1,41 @@ +From 1bb9e7dd4b87f4576563151f914479e4c0623365 Mon Sep 17 00:00:00 2001 +From: Martin Pitt +Date: Tue, 13 Oct 2009 23:43:06 +0200 +Subject: [PATCH 2/2] =?utf-8?q?Bug=20598339=20=E2=80=93=20segfault=20in=20gpm=5Fdisks=5Fregister()=20on=20error=20=3D=3D=20NULL?= +MIME-Version: 1.0 +Content-Type: text/plain; charset=utf-8 +Content-Transfer-Encoding: 8bit + +In some cases, dbus_g_proxy_call() returned FALSE without setting error. Do not +crash when that happens. + +https://launchpad.net/bugs/431023 +--- + src/gpm-disks.c | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/gpm-disks.c b/src/gpm-disks.c +index 05dfacc..d8c1473 100644 +--- a/src/gpm-disks.c ++++ b/src/gpm-disks.c +@@ -61,7 +61,7 @@ gpm_disks_unregister (GpmDisks *disks) + G_TYPE_STRING, disks->priv->cookie, + G_TYPE_INVALID, + G_TYPE_INVALID); +- if (!ret) { ++ if (error) { + egg_warning ("failed to clear spindown timeout: %s", error->message); + g_error_free (error); + goto out; +@@ -97,7 +97,7 @@ gpm_disks_register (GpmDisks *disks, guint timeout) + G_TYPE_INVALID, + G_TYPE_STRING, disks->priv->cookie, + G_TYPE_INVALID); +- if (!ret) { ++ if (error) { + egg_warning ("failed to set spindown timeout: %s", error->message); + g_error_free (error); + goto out; +-- +1.6.3.3 + --- gnome-power-manager-2.28.1.orig/debian/patches/series +++ gnome-power-manager-2.28.1/debian/patches/series @@ -0,0 +1,6 @@ +01-segfault-in-gpm_disks_register.patch +02-notify-osd-support.patch +03-run-without-hal.patch +04-dont-connect-to-hal-with-xrandr.patch +06-bugreport-debian.patch +08-desktop-bugreport-path.patch --- gnome-power-manager-2.28.1.orig/debian/patches/08-desktop-bugreport-path.patch +++ gnome-power-manager-2.28.1/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. +# UbuntuSpecific: Yes +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.28.1.orig/debian/patches/06-bugreport-debian.patch +++ gnome-power-manager-2.28.1/debian/patches/06-bugreport-debian.patch @@ -0,0 +1,17 @@ +Index: gnome-power-manager-2.27.91/tools/gnome-power-bugreport.sh +=================================================================== +--- gnome-power-manager-2.27.91.orig/tools/gnome-power-bugreport.sh 2009-07-23 17:38:10.000000000 +1000 ++++ gnome-power-manager-2.27.91/tools/gnome-power-bugreport.sh 2009-08-27 12:17:43.000000000 +1000 +@@ -37,7 +37,11 @@ + } + + echo -n "Distro version: " +-cat /etc/*release | uniq ++if [ -f /etc/debian_version ] ; then ++ cat /etc/debian_version ++else ++ cat /etc/*release | uniq ++fi + + echo -n "Kernel version: " + uname -r --- gnome-power-manager-2.28.1.orig/debian/patches/02-notify-osd-support.patch +++ gnome-power-manager-2.28.1/debian/patches/02-notify-osd-support.patch @@ -0,0 +1,244 @@ +# Description: If notify-osd is available, use its brightness notifications instead of the builtin popup windows; this takes care to not break with notification-daemon. +# Upstream: knows about it, but still hesitant + +Index: gnome-power-manager-2.28.0/src/gpm-popup-window.c +=================================================================== +--- gnome-power-manager-2.28.0.orig/src/gpm-popup-window.c 2009-10-10 18:05:44.000000000 -0400 ++++ gnome-power-manager-2.28.0/src/gpm-popup-window.c 2009-10-10 18:05:56.000000000 -0400 +@@ -25,10 +25,12 @@ + #include + #include + #include ++#include + + #include "egg-debug.h" + + #include "gpm-popup-window.h" ++#include "gpm-stock-icons.h" + + #define GPM_POPUP_WINDOW_DIALOG_TIMEOUT 2000 /* dialog timeout in ms */ + #define GPM_POPUP_WINDOW_DIALOG_FADE_TIMEOUT 1500 /* timeout before fade starts */ +@@ -50,10 +52,31 @@ + GtkImage *image; + GtkWidget *progress; + GtkWidget *frame; ++ NotifyNotification *n; + }; + + G_DEFINE_TYPE (GpmPopupWindow, gpm_popup_window, GTK_TYPE_WINDOW) + ++static gboolean ++_check_notification_server () ++{ ++ gboolean supports_sync = FALSE; ++ GList *caps = NULL; ++ ++ caps = notify_get_server_caps (); ++ if (caps != NULL) { ++ if (g_list_find_custom (caps, ++ "x-canonical-private-synchronous", ++ (GCompareFunc) g_strcmp0) != NULL) ++ supports_sync = TRUE; ++ ++ g_list_foreach(caps, (GFunc)g_free, NULL); ++ g_list_free (caps); ++ } ++ ++ return supports_sync; ++} ++ + /** + * gpm_popup_window_fade_timeout_cb: + **/ +@@ -169,10 +192,61 @@ + void + gpm_popup_window_set_value (GpmPopupWindow *popup, gfloat level) + { ++ static const char *display_icon_name[] = { ++ "notification-display-brightness-off", ++ "notification-display-brightness-low", ++ "notification-display-brightness-medium", ++ "notification-display-brightness-high", ++ "notification-display-brightness-full", ++ NULL ++ }; ++ int i; ++ + g_return_if_fail (GPM_IS_POPUP_WINDOW (popup)); + +- if (popup->priv->value != level) { +- popup->priv->value = level; ++ popup->priv->value = level; ++ ++ i = 4 * popup->priv->value + 1; ++ ++ if (popup->priv->value < 0) ++ i = 0; ++ else if (i < 1) ++ i = 1; ++ else if (i > 4) ++ i = 4; ++ ++ if (_check_notification_server ()) { ++ int ivalue; ++ ++ if (level == 1.01f) ++ ivalue = 101; ++ else if (level == -0.01f) ++ ivalue = -1; ++ else ++ ivalue = popup->priv->value * 100; ++ ++ notify_notification_set_hint_int32 (popup->priv->n, ++ "value", ++ ivalue); ++ ++ if (!g_strcmp0 (popup->priv->icon_name, ++ GPM_STOCK_BRIGHTNESS_LCD)) { ++ notify_notification_set_hint_string ( ++ popup->priv->n, ++ "x-canonical-private-synchronous", ++ "brightness"); ++ notify_notification_update ( ++ popup->priv->n, ++ " ", ++ "", ++ display_icon_name[i]); ++ } ++ ++ notify_notification_show (popup->priv->n, NULL); ++ } ++ ++ if (GTK_WIDGET_VISIBLE (GTK_WIDGET (popup))) ++ { + gpm_popup_window_update_window (popup); + + /* set value straight away */ +@@ -579,6 +653,8 @@ + popup = GPM_POPUP_WINDOW (object); + popup->priv = GPM_POPUP_WINDOW_GET_PRIVATE (popup); + ++ g_object_unref (popup->priv->n); ++ + g_free (popup->priv->icon_name); + if (popup->priv->hide_timeout_id != 0) + g_source_remove (popup->priv->hide_timeout_id); +@@ -693,6 +769,11 @@ + popup->priv->fade_out_alpha = 1.0; + popup->priv->frame = NULL; + ++ if (!notify_is_initted()) ++ notify_init ("gnome-power-manager"); ++ ++ popup->priv->n = notify_notification_new (" ", "", NULL, NULL); ++ + screen = gtk_widget_get_screen (GTK_WIDGET (popup)); + + popup->priv->is_composited = gdk_screen_is_composited (screen); +Index: gnome-power-manager-2.28.0/src/gpm-backlight.c +=================================================================== +--- gnome-power-manager-2.28.0.orig/src/gpm-backlight.c 2009-10-10 18:05:44.000000000 -0400 ++++ gnome-power-manager-2.28.0/src/gpm-backlight.c 2009-10-10 18:07:18.000000000 -0400 +@@ -194,7 +194,8 @@ + gboolean battery_reduce; + gboolean hw_changed; + guint value; +- guint old_value; ++ gboolean brightness_at_0; ++ gboolean brightness_at_100; + + if (backlight->priv->can_dim == FALSE) { + egg_warning ("no dimming hardware"); +@@ -209,6 +210,8 @@ + + /* get the last set brightness */ + brightness = backlight->priv->master_percentage / 100.0f; ++ brightness_at_0 = brightness == 0.0f ? TRUE : FALSE; ++ brightness_at_100 = brightness == 1.0f ? TRUE : FALSE; + egg_debug ("1. main brightness %f", brightness); + + /* get battery status */ +@@ -252,17 +255,22 @@ + /* convert to percentage */ + value = (guint) ((brightness * 100.0f) + 0.5); + +- /* only do stuff if the brightness is different */ +- gpm_brightness_get (backlight->priv->brightness, &old_value); +- if (old_value == value) { +- egg_debug ("values are the same, no action"); +- return FALSE; +- } +- + /* only show dialog if interactive */ + if (interactive) { +- gpm_popup_window_set_value (GPM_POPUP_WINDOW (backlight->priv->popup), (float) brightness); +- gtk_widget_show (backlight->priv->popup); ++ if (brightness_at_0 && brightness == 0.0f) ++ gpm_popup_window_set_value (GPM_POPUP_WINDOW ( ++ backlight->priv->popup), ++ -0.01f); ++ else if (brightness_at_100 && brightness == 1.0f) ++ gpm_popup_window_set_value (GPM_POPUP_WINDOW ( ++ backlight->priv->popup), ++ 1.01f); ++ else { ++ gpm_popup_window_set_value (GPM_POPUP_WINDOW ( ++ backlight->priv->popup), ++ (float) brightness); ++ //gtk_widget_show (backlight->priv->popup); ++ } + } + + ret = gpm_brightness_set (backlight->priv->brightness, value, &hw_changed); +@@ -343,8 +351,15 @@ + GError *error = NULL; + guint percentage; + gboolean hw_changed; ++ gboolean percentage_at_0; ++ gboolean percentage_at_100; ++ + egg_debug ("Button press event type=%s", type); + ++ gpm_brightness_get (backlight->priv->brightness, &percentage); ++ percentage_at_0 = percentage == 0 ? TRUE : FALSE; ++ percentage_at_100 = percentage == 100 ? TRUE : FALSE; ++ + if (strcmp (type, GPM_BUTTON_BRIGHT_UP) == 0) { + /* go up one step */ + ret = gpm_brightness_up (backlight->priv->brightness, &hw_changed); +@@ -352,8 +367,15 @@ + /* show the new value */ + if (ret) { + gpm_brightness_get (backlight->priv->brightness, &percentage); +- gpm_popup_window_set_value (GPM_POPUP_WINDOW (backlight->priv->popup), (gfloat) percentage/100.0f); +- gtk_widget_show (backlight->priv->popup); ++ if (percentage_at_100) ++ gpm_popup_window_set_value (GPM_POPUP_WINDOW ( ++ backlight->priv->popup), 1.01f); ++ else ++ gpm_popup_window_set_value (GPM_POPUP_WINDOW ( ++ backlight->priv->popup), ++ (float) percentage/100.0f); ++ ++ //gtk_widget_show (backlight->priv->popup); + /* save the new percentage */ + backlight->priv->master_percentage = percentage; + } +@@ -369,8 +391,15 @@ + /* show the new value */ + if (ret) { + gpm_brightness_get (backlight->priv->brightness, &percentage); +- gpm_popup_window_set_value (GPM_POPUP_WINDOW (backlight->priv->popup), (gfloat) percentage/100.0f); +- gtk_widget_show (backlight->priv->popup); ++ if (percentage_at_0) ++ gpm_popup_window_set_value (GPM_POPUP_WINDOW ( ++ backlight->priv->popup), -0.01f); ++ else ++ gpm_popup_window_set_value (GPM_POPUP_WINDOW ( ++ backlight->priv->popup), ++ (float) percentage/100.0f); ++ ++ //gtk_widget_show (backlight->priv->popup); + /* save the new percentage */ + backlight->priv->master_percentage = percentage; + }