--- gnome-power-manager-2.13.90.orig/debian/compat +++ gnome-power-manager-2.13.90/debian/compat @@ -0,0 +1 @@ +4 --- gnome-power-manager-2.13.90.orig/debian/control +++ gnome-power-manager-2.13.90/debian/control @@ -0,0 +1,21 @@ +Source: gnome-power-manager +Section: gnome +Priority: optional +Maintainer: Richard Hughes +Build-Depends: debhelper (>= 4.0.0), autotools-dev, automake1.7, libgnomeui-dev, libglade2-dev, libhal-dev (>= 0.5.4), libdbus-1-dev (>= 0.60), libdbus-glib-1-dev (>= 0.60), libxml-parser-perl, libgtk2.0-dev, libwnck-dev, libtool, docbook-to-man, intltool, libnotify-dev (>= 0.3.2-0ubuntu2), dbus-1-utils, docbook-utils, libxres-dev, gnome-doc-utils, cdbs, scrollkeeper +Standards-Version: 3.6.2 + +Package: gnome-power-manager +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, notification-daemon, powermanagement-interface, libpam-foreground +Replaces: gnome-power, power-manager +Provides: gnome-power +Description: Power management policy frontend for GNOME + GNOME Power Manager is a GNOME session daemon that acts as a policy + agent on top of the Project Utopia stack, which includes the kernel, + hotplug, udev, and HAL. + . + GNOME Power Manager listens for HAL events and responds with + user-configurable reactions. Currently it supports UPSs, laptop + batteries and AC adapters. Its goal is to be architecture neutral and + free of polling and other hacks. --- gnome-power-manager-2.13.90.orig/debian/copyright +++ gnome-power-manager-2.13.90/debian/copyright @@ -0,0 +1,20 @@ +Copyright Holder: Richard Hughes + +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; version 2 dated June, 1991. + + 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., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. + +On Debian systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL'. --- gnome-power-manager-2.13.90.orig/debian/docs +++ gnome-power-manager-2.13.90/debian/docs @@ -0,0 +1,3 @@ +NEWS +README +TODO --- gnome-power-manager-2.13.90.orig/debian/postinst +++ gnome-power-manager-2.13.90/debian/postinst @@ -0,0 +1,40 @@ +#! /bin/sh +# postinst script for gnome-power-manager +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * `configure' +# * `abort-upgrade' +# * `abort-remove' `in-favour' +# +# * `abort-deconfigure' `in-favour' +# `removing' +# +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package +# + +case "$1" in + configure) + + ;; + + abort-upgrade|abort-remove|abort-deconfigure) + + ;; + + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 --- gnome-power-manager-2.13.90.orig/debian/postrm +++ gnome-power-manager-2.13.90/debian/postrm @@ -0,0 +1,38 @@ +#! /bin/sh +# postrm script for gnome-power-manager +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * `remove' +# * `purge' +# * `upgrade' +# * `failed-upgrade' +# * `abort-install' +# * `abort-install' +# * `abort-upgrade' +# * `disappear' overwrit>r> +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package + + +case "$1" in + purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) + + + ;; + + *) + echo "postrm called with unknown argument \`$1'" >&2 + exit 1 + +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 --- gnome-power-manager-2.13.90.orig/debian/watch +++ gnome-power-manager-2.13.90/debian/watch @@ -0,0 +1,20 @@ +# Example watch control file for uscan +# Rename this file to "watch" and then you can run the "uscan" command +# to check for upstream updates and more. +# See uscan(1) for format + +# Compulsory line, this is a version 3 file +version=3 + +# Uncomment to examine a Webpage +# +#http://www.example.com/downloads.php gnome-power-manager-(.*)\.tar\.gz + +# Uncomment to examine a Webserver directory +#http://www.example.com/pub/gnome-power-manager-(.*)\.tar\.gz + +# Uncommment to examine a FTP server +#ftp://ftp.example.com/pub/gnome-power-manager-(.*)\.tar\.gz debian uupdate + +# Uncomment to use Roland's hack for sourceforge based projects - YMMV! +http://people.debian.org/~lolando/sfdlr.php?project=gnome-power-manager gnome-power-manager-([\d.]*).tar.gz --- gnome-power-manager-2.13.90.orig/debian/patches/10-null-ptr-missing-sleep-button.patch +++ gnome-power-manager-2.13.90/debian/patches/10-null-ptr-missing-sleep-button.patch @@ -0,0 +1,20 @@ +diff -Nur gnome-power-manager-2.13.90/src/gpm-hal.c gnome-power-manager-2.13.90.new/src/gpm-hal.c +--- gnome-power-manager-2.13.90/src/gpm-hal.c 2006-02-16 13:51:29.165978000 +0000 ++++ gnome-power-manager-2.13.90.new/src/gpm-hal.c 2006-02-16 13:52:52.644287720 +0000 +@@ -518,10 +518,12 @@ + for (i = 0; names[i]; i++) { + gchar *type = NULL; + gpm_hal_device_get_string (names[i], key, &type); +- if (strcmp (type, value) == 0) +- valid++; +- g_free (type); +- }; ++ if (type != NULL) { ++ if (strcmp (type, value) == 0) ++ valid++; ++ g_free (type); ++ } ++ } + gpm_hal_free_capability (names); + gpm_debug ("%i devices of capability %s where %s is %s", + valid, capability, key, value); --- gnome-power-manager-2.13.90.orig/debian/patches/20-lock-screen-on-lid-close.patch +++ gnome-power-manager-2.13.90/debian/patches/20-lock-screen-on-lid-close.patch @@ -0,0 +1,13 @@ +diff -Nur gnome-power-manager-2.13.90/src/gpm-manager.c gnome-power-manager-2.13.90.new/src/gpm-manager.c +--- gnome-power-manager-2.13.90/src/gpm-manager.c 2006-02-14 17:19:52.000000000 +0000 ++++ gnome-power-manager-2.13.90.new/src/gpm-manager.c 2006-02-16 16:12:14.794047728 +0000 +@@ -831,6 +831,9 @@ + * http://bugzilla.gnome.org/show_bug.cgi?id=321313 + */ + if (state) { ++ /* Regardless of on_ac we lock the screen if g-s-s allows it */ ++ if (gpm_screensaver_lock_enabled ()) ++ gpm_screensaver_lock (); + /* + * We only do a policy event when the lid is CLOSED + * and we are on battery power. See --- gnome-power-manager-2.13.90.orig/debian/patches/30-remove-sm-disable.patch +++ gnome-power-manager-2.13.90/debian/patches/30-remove-sm-disable.patch @@ -0,0 +1,12 @@ +diff -Nur gnome-power-manager-2.13.90/data/gnome-power-manager.desktop.in gnome-power-manager-2.13.90.new/data/gnome-power-manager.desktop.in +--- gnome-power-manager-2.13.90/data/gnome-power-manager.desktop.in 2006-01-23 12:55:04.000000000 +0000 ++++ gnome-power-manager-2.13.90.new/data/gnome-power-manager.desktop.in 2006-02-16 17:24:26.964457720 +0000 +@@ -3,7 +3,7 @@ + _Name=Power Manager + _Comment=Power management daemon + Icon=gnome-dev-battery +-Exec=gnome-power-manager --sm-disable ++Exec=gnome-power-manager + Terminal=false + Type=Application + Categories= --- gnome-power-manager-2.13.90.orig/debian/patches/40-schema-defaults.patch +++ gnome-power-manager-2.13.90/debian/patches/40-schema-defaults.patch @@ -0,0 +1,21 @@ +diff -Nur gnome-power-manager-2.13.90/data/gnome-power-manager.schemas.in gnome-power-manager-2.13.90.new/data/gnome-power-manager.schemas.in +--- gnome-power-manager-2.13.90/data/gnome-power-manager.schemas.in 2006-02-15 22:50:03.000000000 +0000 ++++ gnome-power-manager-2.13.90.new/data/gnome-power-manager.schemas.in 2006-02-16 17:28:40.143968584 +0000 +@@ -110,7 +110,7 @@ + /schemas/apps/gnome-power-manager/battery_brightness + /apps/gnome-power-manager/battery_brightness + int +- 50 ++ 70 + + Battery LCD brightness hardware value + The hardware brightness the display is set to whilst on battery power +@@ -121,7 +121,7 @@ + /schemas/apps/gnome-power-manager/battery_sleep_computer + /apps/gnome-power-manager/battery_sleep_computer + int +- 1200 ++ 0 + + Computer battery idle timeout value + The idle time in seconds before the computer tries to sleep whilst on battery power --- gnome-power-manager-2.13.90.orig/debian/patches/50-no-critical-on-ac.patch +++ gnome-power-manager-2.13.90/debian/patches/50-no-critical-on-ac.patch @@ -0,0 +1,27 @@ +diff -Nur gnome-power-manager-2.13.90/src/gpm-manager.c gnome-power-manager-2.13.90.new/src/gpm-manager.c +--- gnome-power-manager-2.13.90/src/gpm-manager.c 2006-02-16 17:33:07.570313600 +0000 ++++ gnome-power-manager-2.13.90.new/src/gpm-manager.c 2006-02-16 17:34:11.598579824 +0000 +@@ -1038,15 +1038,20 @@ + } + + if (warning_type == GPM_WARNING_ACTION) { ++ gboolean on_ac; ++ + gpm_tray_icon_notify (GPM_TRAY_ICON (manager->priv->tray_icon), + 5000, + _("Critical action"), + NULL, + _("The battery is below the critical level and " + "this computer is about to shutdown.")); +- /* wait 10 seconds for user-panic */ +- g_usleep (1000 * 1000 * 10); +- manager_policy_do (manager, GPM_PREF_BATTERY_CRITICAL); ++ gpm_power_get_on_ac (manager->priv->power, &on_ac, NULL); ++ if (!on_ac) { ++ /* wait 10 seconds for user-panic */ ++ g_usleep (1000 * 1000 * 10); ++ manager_policy_do (manager, GPM_PREF_BATTERY_CRITICAL); ++ } + } + + /* Always check if we already notified the user */ --- gnome-power-manager-2.13.90.orig/debian/rules +++ gnome-power-manager-2.13.90/debian/rules @@ -0,0 +1,11 @@ +#!/usr/bin/make -f + +DEB_CONFIGURE_USER_FLAGS=--disable-scrollkeeper --with-dpms-ext + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/rules/simple-patchsys.mk +include /usr/share/cdbs/1/class/gnome.mk + +# Nasty hack because currently gnome-power-manager.desktop ends up in the +# evil /etc/xdg/autostart dir which we don't support +DEB_MAKE_INSTALL_TARGET += autostartdir=/usr/share/autostart --- gnome-power-manager-2.13.90.orig/debian/dirs +++ gnome-power-manager-2.13.90/debian/dirs @@ -0,0 +1,3 @@ +usr/bin +usr/sbin + --- gnome-power-manager-2.13.90.orig/debian/changelog +++ gnome-power-manager-2.13.90/debian/changelog @@ -0,0 +1,148 @@ +gnome-power-manager (2.13.90-0ubuntu1) dapper; urgency=low + + * UVF Exception granted by Colin Watson + * New upstream release + Highlights include: + - Updated translations (lots) + - Lid action now only occurs when not on AC + - More yelp help + - Allows hald restart without crashing g-p-m + * Uses cdbs patches this time to make future maintenance easier + * Instead of "lock screen" being an action, we've made it the default on + the lid action, regardless of AC status. + However now it obeys the g-s-s lock options so that will have to be + set to allow locking. + + -- Daniel Silverstone Fri, 17 Feb 2006 12:20:26 +0000 + +gnome-power-manager (0.3.4-0ubuntu10) dapper; urgency=low + + * Remove the --sm-disable from the .desktop file in autostart since the + gnome-power-manager daemon can cope with being run more than one in a + session and it breaks the logout dialog (E.g. on powerbutton) if it + is not run with session access. + closes malone #31103 + + -- Daniel Silverstone Wed, 15 Feb 2006 18:15:27 +0000 + +gnome-power-manager (0.3.4-0ubuntu9) dapper; urgency=low + + * Add libpam-foreground to the dependencies line. + Closes: malone #31176 + * Replace package description with something better. + + -- Daniel Silverstone Wed, 15 Feb 2006 13:22:47 +0000 + +gnome-power-manager (0.3.4-0ubuntu8) dapper; urgency=low + + * set LCD brightness defaults to sane values (100% on ac, + 70% on battery by default now) closes malone #31490 + * set suspend/hibernate on battery to "never" by default + and leave it to the user to set that, to prevent bad surprises + + -- Oliver Grawert Wed, 15 Feb 2006 12:33:18 +0100 + +gnome-power-manager (0.3.4-0ubuntu7) dapper; urgency=low + + * Add support for a 'lock' action in gnome-power-manager + * Added support for such in gnome-power-preferences + * When lid is opened, poke the screensaver if we may have locked it before. + * closes malone #29881 + + -- Daniel Silverstone Tue, 14 Feb 2006 16:08:58 +0000 + +gnome-power-manager (0.3.4-0ubuntu6) dapper; urgency=low + + * src/gpm-hal.c + - Fix NULL dereference - Malone #30718 + * src/gpm-manager.c + - Don't perform critical battery action if on AC power + + -- Matthew Garrett Tue, 7 Feb 2006 17:01:11 +0000 + +gnome-power-manager (0.3.4-0ubuntu5) dapper; urgency=low + + * src/gpm-hal-monitor.c + - Add support for listening to non-ACPI buttons + * src/gpm-manager.c + src/gpm-manager.h + - Add support for hibernating + + -- Matthew Garrett Mon, 6 Feb 2006 16:31:14 +0000 + +gnome-power-manager (0.3.4-0ubuntu4) dapper; urgency=low + + * debian/control: build-dep on libnoitfy >= 0.3.2-0ubuntu2 + + -- Michael Vogt Tue, 24 Jan 2006 16:18:33 +0100 + +gnome-power-manager (0.3.4-0ubuntu3) dapper; urgency=low + + * debian/control: + - switch back to depend on notification-daemon + - build-depend on libnotify-dev >= 0.3.2 + + -- Michael Vogt Tue, 24 Jan 2006 14:18:06 +0100 + +gnome-power-manager (0.3.4-0ubuntu2) dapper; urgency=low + + * remove gdm-signal, should be handled all by hal now + + -- Oliver Grawert Tue, 24 Jan 2006 00:16:37 +0100 + +gnome-power-manager (0.3.4-0ubuntu1) dapper; urgency=low + + * new upstream release + * added patch from g-p-m cvs (1.286) to avoid crashing + * re-added the calls to gdm-signal + + -- Oliver Grawert Wed, 18 Jan 2006 19:44:46 +0100 + +gnome-power-manager (0.3.1-0ubuntu5) dapper; urgency=low + + * configure.in: + - added test on libnotify version, that makes notifications work again + * src/gpm-libnotify.c: + - improved arrow point calculation + + -- Michael Vogt Mon, 16 Jan 2006 10:16:22 +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