Index: /pkg/main/gnome-power-manager/trunk/debian/README.Debian =================================================================== --- /pkg/main/gnome-power-manager/trunk/debian/README.Debian (revision 607) +++ /pkg/main/gnome-power-manager/trunk/debian/README.Debian (revision 608) @@ -1,7 +1,10 @@ -(instructions for gnome only) -First add yourself to the powerdev group (this group is created by the latest hal in experimental -or in version >= 0.5.6+cvs20060219-1 ) -Go to System -> Preferences -> Sessions -In the Startup Programs tab, click Add -type "gnome-power-manager", click OK. -log out of your gnome session, and log back in again. +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. + Index: /pkg/main/gnome-power-manager/trunk/debian/control =================================================================== --- /pkg/main/gnome-power-manager/trunk/debian/control (revision 607) +++ /pkg/main/gnome-power-manager/trunk/debian/control (revision 608) @@ -3,6 +3,6 @@ Priority: optional Maintainer: Riccardo Setti -Uploaders: Sjoerd Simons -Build-Depends: debhelper (>= 5), cdbs, autotools-dev, libtool, autoconf, libgnomeui-dev, libglade2-dev, libhal-dev (>= 0.5.6), libdbus-glib-1-dev (>= 0.61), libxml-parser-perl, libxext-dev, libx11-dev, libgtk2.0-dev (>= 2.6), libwnck-dev (>= 2.10), docbook-to-man, intltool, libnotify-dev (>= 0.4.3), docbook-utils, libxres-dev, xmlto, gnome-doc-utils +Uploaders: Debian GNOME Maintainers , Andrew Lau , Clément Stenac , Dafydd Harries , Guilherme de S. Pastore , Gustavo Franco , Gustavo Noronha Silva , J.H.M. Dassen (Ray) , Jordi Mallach , Jose Carlos Garcia Sogo , Josselin Mouette , Kilian Krause , Loic Minier , Marc 'HE' Brockschmidt , Marco Cabizza , Oystein Gisnas , Ondřej SurÃœ , Ross Burton , Sebastien Bacher , Sjoerd Simons +Build-Depends: debhelper (>= 5), cdbs, autotools-dev, libtool, autoconf, libgnomeui-dev, libpanel-applet2-dev, libglade2-dev, libhal-dev (>= 0.5.6), libdbus-glib-1-dev (>= 0.61), libxml-parser-perl, libxext-dev, libx11-dev, libgtk2.0-dev (>= 2.10), libwnck-dev (>= 2.10), docbook-to-man, intltool, libnotify-dev (>= 0.4.3-2), libnotify-dev-gtk2.10, docbook-utils, libxres-dev, xmlto, gnome-doc-utils, scrollkeeper, gnome-pkg-tools (>= 0.10) Standards-Version: 3.7.2 @@ -11,8 +11,8 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, notification-daemon, hal (>= 0.5.6+cvs20060219-1) Description: frontend for gnome-powermanager - GNOME Power Manager is a session daemon for the GNOME - desktop environment that makes it easy to + GNOME Power Manager is a session daemon for the GNOME + desktop environment that makes it easy to manage your laptop or desktop system. - . + . gnome-power-manager manages battery status, events, powermanagement settings and actions like: @@ -22,3 +22,3 @@ * Blank screen . - Homepage: http://www.gnome.org/projects/gnome-power-manager/ + Homepage: http://www.gnome.org/projects/gnome-power-manager/ Index: /pkg/main/gnome-power-manager/trunk/debian/changelog =================================================================== --- /pkg/main/gnome-power-manager/trunk/debian/changelog (revision 607) +++ /pkg/main/gnome-power-manager/trunk/debian/changelog (revision 608) @@ -1,7 +1,38 @@ -gnome-power-manager (2.16.3-parsix1) unstable; urgency=low - - * New upstream release. - - -- Alan Baghumian Wed, 31 Jan 2007 12:30:21 +0330 +gnome-power-manager (2.18.1-parsix1) barry; urgency=low + + * Parsix build + + -- Alan Baghumian Wed, 4 Apr 2007 20:13:44 +0330 + +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 Index: /pkg/main/gnome-power-manager/trunk/debian/patches/01_fix_gpm_dbus_conf.patch =================================================================== --- /pkg/main/gnome-power-manager/trunk/debian/patches/01_fix_gpm_dbus_conf.patch (revision 607) +++ /pkg/main/gnome-power-manager/trunk/debian/patches/01_fix_gpm_dbus_conf.patch (revision 608) @@ -1,4 +1,4 @@ ---- data/gnome-power-manager.conf 2006-01-10 18:46:13.000000000 +0100 -+++ data/gnome-power-manager.conf.new 2006-02-23 21:02:03.000000000 +0100 +--- data/gnome-power-manager.conf 2007-03-04 18:35:48.000000000 +0100 ++++ data/gnome-power-manager.conf.new 2007-03-18 18:06:08.000000000 +0100 @@ -2,7 +2,7 @@ "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN" Index: g/main/gnome-power-manager/trunk/debian/patches/55-lid-state-tracking.patch =================================================================== --- /pkg/main/gnome-power-manager/trunk/debian/patches/55-lid-state-tracking.patch (revision 607) +++ (revision ) @@ -1,120 +1,0 @@ -diff -Nur gnome-power-manager-2.15.90/src/gpm-hal.c gnome-power-manager-2.15.90.new/src/gpm-hal.c ---- gnome-power-manager-2.15.90/src/gpm-hal.c 2006-07-22 16:38:40.000000000 +0200 -+++ gnome-power-manager-2.15.90.new/src/gpm-hal.c 2006-07-24 15:18:11.000000000 +0200 -@@ -214,6 +214,40 @@ - return can_suspend; - } - -+/** Finds out if HAL indicates it can monitor lid status -+ * -+ * @return TRUE if hal has state information for the lid -+ */ -+gboolean -+gpm_hal_lid_is_closed_capable (GpmHal *hal) -+{ -+ gboolean exists; -+ gboolean can_monitor; -+ exists = gpm_hal_device_get_bool (hal, HAL_ACPI_LID_SWITCH, -+ "button.has_state", -+ &can_monitor); -+ return exists && can_monitor; -+} -+ -+/** Assuming we can monitor, returns the status of the lid switch -+ * -+ * @return TRUE if lid is closed -+ */ -+gboolean -+gpm_hal_lid_is_closed (GpmHal *hal) -+{ -+ gboolean exists; -+ gboolean lid_state; -+ exists = gpm_hal_device_get_bool (hal, HAL_ACPI_LID_SWITCH, -+ "button.state.value", -+ &lid_state); -+ if (!exists) -+ gpm_warning ("gpm_hal_lid_is_closed: button.state.value does not exist in acpi_LID object"); -+ gpm_debug ("Lid status: %s", (exists && lid_state)?"closed":"open"); -+ return exists && lid_state; -+} -+ -+ - /** - * gpm_hal_can_hibernate: - * -diff -Nur gnome-power-manager-2.15.90/src/gpm-hal.h gnome-power-manager-2.15.90.new/src/gpm-hal.h ---- gnome-power-manager-2.15.90/src/gpm-hal.h 2006-07-12 00:19:30.000000000 +0200 -+++ gnome-power-manager-2.15.90.new/src/gpm-hal.h 2006-07-24 15:18:11.000000000 +0200 -@@ -33,6 +33,7 @@ - #define HAL_DBUS_INTERFACE_LAPTOP_PANEL "org.freedesktop.Hal.Device.LaptopPanel" - #define HAL_DBUS_INTERFACE_POWER "org.freedesktop.Hal.Device.SystemPowerManagement" - #define HAL_ROOT_COMPUTER "/org/freedesktop/Hal/devices/computer" -+#define HAL_ACPI_LID_SWITCH "/org/freedesktop/Hal/devices/acpi_LID" - - #define GPM_TYPE_HAL (gpm_hal_get_type ()) - #define GPM_HAL(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GPM_TYPE_HAL, GpmHal)) -@@ -96,6 +97,8 @@ - gboolean gpm_hal_is_running (GpmHal *hal); - gboolean gpm_hal_is_laptop (GpmHal *hal); - gboolean gpm_hal_is_on_ac (GpmHal *hal); -+gboolean gpm_hal_lid_is_closed (GpmHal *hal); -+gboolean gpm_hal_lid_is_closed_capable (GpmHal *hal); - gboolean gpm_hal_can_suspend (GpmHal *hal); - gboolean gpm_hal_suspend (GpmHal *hal, - gint wakeup); -diff -Nur gnome-power-manager-2.15.90/src/gpm-manager.c gnome-power-manager-2.15.90.new/src/gpm-manager.c ---- gnome-power-manager-2.15.90/src/gpm-manager.c 2006-07-24 15:18:10.000000000 +0200 -+++ gnome-power-manager-2.15.90.new/src/gpm-manager.c 2006-07-24 15:44:33.000000000 +0200 -@@ -126,6 +126,7 @@ - - gboolean use_time_to_notify; - gboolean lid_is_closed; -+ gboolean lid_can_use_hal; - gboolean done_notify_fully_charged; - gboolean enable_beeping; - gboolean ignore_inhibits; -@@ -359,6 +360,15 @@ - return TRUE; - } - -+static gboolean -+gpm_manager_lid_is_closed(GpmManager *manager) -+{ -+ /* Can we use hal? */ -+ if (manager->priv->lid_can_use_hal) -+ return gpm_hal_lid_is_closed (manager->priv->hal); -+ return manager->priv->lid_is_closed; -+} -+ - /** - * get_stock_id: - * @manager: This manager class instance -@@ -1351,7 +1361,7 @@ - the screen when the user moves the mouse on systems that do not - support hardware blanking. - Details are here: https://launchpad.net/malone/bugs/22522 */ -- if (manager->priv->lid_is_closed) { -+ if (gpm_manager_lid_is_closed(manager)) { - gpm_debug ("lid is closed, so we are ignoring idle state changes"); - return; - } -@@ -1715,7 +1725,7 @@ - gboolean event_when_closed; - event_when_closed = gconf_client_get_bool (manager->priv->gconf_client, - GPM_PREF_BATT_EVENT_WHEN_CLOSED, NULL); -- if (event_when_closed && (!on_ac) && manager->priv->lid_is_closed) { -+ if (event_when_closed && (!on_ac) && gpm_manager_lid_is_closed (manager)) { - manager_policy_do (manager, - GPM_PREF_BATTERY_BUTTON_LID, - _("the lid has been closed, and the ac adapter " -@@ -2575,6 +2585,10 @@ - - /* FIXME: We shouldn't assume the lid is open at startup */ - manager->priv->lid_is_closed = FALSE; -+ manager->priv->lid_can_use_hal = gpm_hal_lid_is_closed_capable (manager->priv->hal); -+ if (manager->priv->lid_can_use_hal) -+ gpm_debug("Using hal to monitor lid status"); -+ manager->priv->lid_is_closed = gpm_manager_lid_is_closed (manager); - - /* we need these to refresh the tooltip and icon */ - g_signal_connect (manager->priv->power, "battery-removed", Index: /pkg/main/gnome-power-manager/trunk/debian/rules =================================================================== --- /pkg/main/gnome-power-manager/trunk/debian/rules (revision 607) +++ /pkg/main/gnome-power-manager/trunk/debian/rules (revision 608) @@ -4,6 +4,8 @@ include /usr/share/cdbs/1/class/gnome.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk - -DEB_AUTO_UPDATE_AUTOCONF = "yes" +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/check-dist.mk +-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk DEB_CONFIGURE_EXTRA_FLAGS += \ @@ -14,10 +16,9 @@ --disable-scrollkeeper \ --with-doc-dir=/usr/share/doc/gnome-power-manager/ + clean:: - rm -f po/*.gmo binary-install/gnome-power-manager:: - 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 -rf debian/gnome-power-manager/etc/dbus/system.d