--- gnome-power-manager-2.19.6.orig/debian/docs +++ gnome-power-manager-2.19.6/debian/docs @@ -0,0 +1,3 @@ +NEWS +README +TODO --- gnome-power-manager-2.19.6.orig/debian/control +++ gnome-power-manager-2.19.6/debian/control @@ -0,0 +1,27 @@ +Source: gnome-power-manager +Section: gnome +Priority: optional +XSBC-Original-Maintainer: Riccardo Setti +Maintainer: Oliver Grawert +Uploaders: Sjoerd Simons +Build-Depends: debhelper (>= 5), cdbs, libtool, autoconf, libgnomeui-dev, libglade2-dev, libhal-dev (>= 0.5.8), libdbus-1-dev (>= 0.71), libdbus-glib-1-dev (>= 0.71), 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), docbook-utils, libxres-dev, gnome-doc-utils, libpanel-applet2-dev, libgnome-keyring-dev, scrollkeeper, libgstreamer0.10-dev +Standards-Version: 3.7.2 + +Package: gnome-power-manager +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, notification-daemon, libpam-foreground (>= 0.3), hal +Replaces: gnome-power, power-manager +Provides: gnome-power +Description: frontend for gnome-powermanager + 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: + * Suspend to RAM + * Suspend to Disk (Hibernate) + * Shutdown + * Blank screen + . + Homepage: http://www.gnome.org/projects/gnome-power-manager/ --- gnome-power-manager-2.19.6.orig/debian/rules +++ gnome-power-manager-2.19.6/debian/rules @@ -0,0 +1,34 @@ +#!/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/simple-patchsys.mk + +DEB_AUTO_UPDATE_AUTOCONF = "yes" + +DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH) + +DEB_CONFIGURE_EXTRA_FLAGS += \ + --without-gconf-source \ + --enable-libnotify \ + --with-dpms-ext \ + --with-dbus-services=/usr/share/dbus-1/services/ \ + --disable-scrollkeeper \ + --disable-policykit \ + --enable-checkfg + +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 -f debian/gnome-power-manager/usr/share/applications/gnome-power-statistics.desktop + mkdir -p debian/gnome-power-manager/etc/xdg/autostart + mv debian/gnome-power-manager/usr/share/gnome/autostart/gnome-power-manager.desktop \ + debian/gnome-power-manager/etc/xdg/autostart/gnome-power-manager.desktop + + +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.19.6.orig/debian/watch +++ gnome-power-manager-2.19.6/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://ftp.gnome.org/pub/GNOME/sources/gnome-power-manager/2.17/gnome-power-manager-([\d\.]*).tar.gz --- gnome-power-manager-2.19.6.orig/debian/patches-old/55-lid-state-tracking.patch +++ gnome-power-manager-2.19.6/debian/patches-old/55-lid-state-tracking.patch @@ -0,0 +1,121 @@ +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", +Binärdateien gnome-power-manager-2.15.90/src/.gpm-manager.h.swp and gnome-power-manager-2.15.90.new/src/.gpm-manager.h.swp sind verschieden. --- gnome-power-manager-2.19.6.orig/debian/patches-old/50-disable-brightness-keys.patch +++ gnome-power-manager-2.19.6/debian/patches-old/50-disable-brightness-keys.patch @@ -0,0 +1,20 @@ +diff -Nur gnome-power-manager-2.15.4/src/gpm-manager.c gnome-power-manager-2.15.4.new/src/gpm-manager.c +--- gnome-power-manager-2.15.4/src/gpm-manager.c 2006-07-08 11:14:04.000000000 +0200 ++++ gnome-power-manager-2.15.4.new/src/gpm-manager.c 2006-07-11 23:02:44.000000000 +0200 +@@ -1648,14 +1648,14 @@ + } else if (strcmp (type, GPM_BUTTON_LID) == 0) { + lid_button_pressed (manager, state); + +- } else if ((strcmp (type, GPM_BUTTON_BRIGHT_UP) == 0) || ++ /*} else if ((strcmp (type, GPM_BUTTON_BRIGHT_UP) == 0) || + (strcmp (type, GPM_BUTTON_BRIGHT_UP_DEP) == 0)) { + gpm_brightness_up (manager->priv->brightness); + + } else if ((strcmp (type, GPM_BUTTON_BRIGHT_DOWN) == 0) || + (strcmp (type, GPM_BUTTON_BRIGHT_DOWN_DEP) == 0)) { + gpm_brightness_down (manager->priv->brightness); +- ++ */ + } else if (strcmp (type, GPM_BUTTON_LOCK) == 0) { + gpm_screensaver_lock (manager->priv->screensaver); + --- gnome-power-manager-2.19.6.orig/debian/patches-old/45-suspend-warning-dialog-and-sleep-button-combo.patch +++ gnome-power-manager-2.19.6/debian/patches-old/45-suspend-warning-dialog-and-sleep-button-combo.patch @@ -0,0 +1,389 @@ +diff -Nur gnome-power-manager-2.15.4/data/gpm-prefs.glade gnome-power-manager-2.15.4.new/data/gpm-prefs.glade +--- gnome-power-manager-2.15.4/data/gpm-prefs.glade 2006-07-08 11:32:18.000000000 +0200 ++++ gnome-power-manager-2.15.4.new/data/gpm-prefs.glade 2006-07-12 22:31:02.000000000 +0200 +@@ -5,7 +5,6 @@ + + + 5 +- True + Power Management Preferences + GTK_WINDOW_TOPLEVEL + GTK_WIN_POS_CENTER +@@ -911,7 +910,7 @@ + + + True +- When battery _power critical: ++ When battery _power is critical: + True + False + GTK_JUSTIFY_LEFT +@@ -1338,7 +1337,7 @@ + + + +- True ++ False + When power _button is pressed: + True + False +@@ -1366,6 +1365,52 @@ + + + ++ False ++ ++ False ++ True ++ ++ ++ 1 ++ 2 ++ 1 ++ 2 ++ fill ++ fill ++ ++ ++ ++ ++ ++ True ++ Sleep _button action: ++ True ++ False ++ GTK_JUSTIFY_LEFT ++ False ++ False ++ 0 ++ 0 ++ 0 ++ 0 ++ combobox_sleep_type ++ PANGO_ELLIPSIZE_NONE ++ -1 ++ False ++ 0 ++ ++ ++ 0 ++ 1 ++ 1 ++ 2 ++ fill ++ ++ ++ ++ ++ ++ + True + + False +@@ -1689,4 +1734,306 @@ + + + ++ ++ 6 ++ ++ GTK_WINDOW_TOPLEVEL ++ GTK_WIN_POS_CENTER_ON_PARENT ++ True ++ False ++ False ++ ++ True ++ False ++ False ++ GDK_WINDOW_TYPE_HINT_DIALOG ++ GDK_GRAVITY_NORTH_WEST ++ True ++ False ++ ++ ++ ++ True ++ False ++ 6 ++ ++ ++ ++ 6 ++ True ++ False ++ 12 ++ ++ ++ ++ True ++ gtk-dialog-warning ++ 6 ++ 0.5 ++ 0.5 ++ 0 ++ 0 ++ ++ ++ 0 ++ True ++ True ++ ++ ++ ++ ++ ++ True ++ False ++ 12 ++ ++ ++ ++ True ++ <b>Are you sure that you wish to enable suspend?</b> ++ False ++ True ++ GTK_JUSTIFY_LEFT ++ False ++ False ++ 0 ++ 0.5 ++ 0 ++ 0 ++ PANGO_ELLIPSIZE_NONE ++ -1 ++ False ++ 0 ++ ++ ++ 0 ++ False ++ False ++ ++ ++ ++ ++ ++ True ++ Suspend mode is not guaranteed to work on all systems and may cause data loss. ++ False ++ False ++ GTK_JUSTIFY_LEFT ++ True ++ False ++ 0.5 ++ 0.5 ++ 0 ++ 0 ++ PANGO_ELLIPSIZE_NONE ++ -1 ++ False ++ 0 ++ ++ ++ 0 ++ False ++ False ++ ++ ++ ++ ++ 0 ++ True ++ True ++ ++ ++ ++ ++ 0 ++ True ++ True ++ ++ ++ ++ ++ ++ 6 ++ True ++ True ++ Never _ask me about this again ++ True ++ GTK_RELIEF_NORMAL ++ True ++ False ++ False ++ True ++ ++ ++ 0 ++ False ++ False ++ ++ ++ ++ ++ ++ 6 ++ True ++ GTK_BUTTONBOX_END ++ 12 ++ ++ ++ ++ True ++ True ++ True ++ GTK_RELIEF_NORMAL ++ True ++ ++ ++ ++ True ++ 0.5 ++ 0.5 ++ 0 ++ 0 ++ 0 ++ 0 ++ 0 ++ 0 ++ ++ ++ ++ True ++ False ++ 2 ++ ++ ++ ++ True ++ gtk-no ++ 4 ++ 0.5 ++ 0.5 ++ 0 ++ 0 ++ ++ ++ 0 ++ False ++ False ++ ++ ++ ++ ++ ++ True ++ Do _not enable suspend ++ True ++ False ++ GTK_JUSTIFY_LEFT ++ False ++ False ++ 0.5 ++ 0.5 ++ 0 ++ 0 ++ PANGO_ELLIPSIZE_NONE ++ -1 ++ False ++ 0 ++ ++ ++ 0 ++ False ++ False ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ True ++ True ++ True ++ GTK_RELIEF_NORMAL ++ True ++ ++ ++ ++ True ++ 0.5 ++ 0.5 ++ 0 ++ 0 ++ 0 ++ 0 ++ 0 ++ 0 ++ ++ ++ ++ True ++ False ++ 2 ++ ++ ++ ++ True ++ gtk-yes ++ 4 ++ 0.5 ++ 0.5 ++ 0 ++ 0 ++ ++ ++ 0 ++ False ++ False ++ ++ ++ ++ ++ ++ True ++ _Enable suspend ++ True ++ False ++ GTK_JUSTIFY_LEFT ++ False ++ False ++ 0.5 ++ 0.5 ++ 0 ++ 0 ++ PANGO_ELLIPSIZE_NONE ++ -1 ++ False ++ 0 ++ ++ ++ 0 ++ False ++ False ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ 0 ++ True ++ True ++ ++ ++ ++ ++ ++ + --- gnome-power-manager-2.19.6.orig/debian/patches-old/91-reset-brightness-state.patch +++ gnome-power-manager-2.19.6/debian/patches-old/91-reset-brightness-state.patch @@ -0,0 +1,65 @@ +diff -ur src/gpm-brightness.c /tmp/gnome-power-manager-2.14.3/src/gpm-brightness.c +--- src/gpm-brightness.c 2006-02-25 18:45:04 +0000 ++++ gnome-power-manager-2.14.3/src/gpm-brightness.c 2006-05-13 11:09:13 +0100 +@@ -355,19 +355,17 @@ + gpm_brightness_level_dim_hw (brightness, new_level_hw); + } + +-/* same as gpm_brightness_level_dim, but saves value for resume */ ++/* set the saved brightness level */ + void + gpm_brightness_level_save (GpmBrightness *brightness, + int brightness_level) + { +- int new_level_hw; ++ gpm_debug ("Saving brightness as %i%%", brightness_level); + +- gpm_debug ("Saving and setting brightness to %i%%", brightness_level); +- brightness->priv->saved_value_hw = brightness->priv->current_hw; +- +- new_level_hw = gpm_brightness_percent_to_hw (brightness_level, +- brightness->priv->levels); +- gpm_brightness_level_dim_hw (brightness, new_level_hw); ++ if (brightness_level == LAPTOP_PANEL_CURRENT_BRIGHTNESS) ++ brightness->priv->saved_value_hw = brightness->priv->current_hw; ++ else ++ brightness->priv->saved_value_hw = gpm_brightness_percent_to_hw (brightness_level, brightness->priv->levels); + } + + void +diff -ur src/gpm-brightness.h /tmp/gnome-power-manager-2.14.3/src/gpm-brightness.h +--- src/gpm-brightness.h 2006-02-25 18:45:04 +0000 ++++ gnome-power-manager-2.14.3/src/gpm-brightness.h 2006-05-13 11:08:27 +0100 +@@ -48,6 +48,8 @@ + + } GpmBrightnessClass; + ++#define LAPTOP_PANEL_CURRENT_BRIGHTNESS -1 ++ + GType + gpm_brightness_get_type (void); + +diff -ur src/gpm-manager.c /tmp/gnome-power-manager-2.14.3/src/gpm-manager.c +--- src/gpm-manager.c 2006-05-13 11:02:41 +0100 ++++ gnome-power-manager-2.14.3/src/gpm-manager.c 2006-05-13 11:08:47 +0100 +@@ -568,6 +568,9 @@ + sleep_display = gconf_client_get_int (client, GPM_PREF_BATTERY_SLEEP_DISPLAY, NULL); + } + ++ /* The power state may have changed while the screen is dimmed, so ++ we have to save the new value for when the screen is undimmed */ ++ gpm_brightness_level_save (manager->priv->brightness, brightness); + gpm_brightness_level_dim (manager->priv->brightness, brightness); + gpm_hal_enable_power_save (!on_ac); + +@@ -1038,7 +1041,9 @@ + if (do_laptop_dim) { + /* save this brightness and dim the screen, fixes #328564 */ + gpm_brightness_level_save (manager->priv->brightness, +- LAPTOP_PANEL_DIM_BRIGHTNESS); ++ LAPTOP_PANEL_CURRENT_BRIGHTNESS); ++ gpm_brightness_level_dim (manager->priv->brightness, ++ LAPTOP_PANEL_DIM_BRIGHTNESS); + } + + /* sync timeouts */ --- gnome-power-manager-2.19.6.orig/debian/patches-old/68-suspend-warning-and-sleep-button-impl.patch-unmerged +++ gnome-power-manager-2.19.6/debian/patches-old/68-suspend-warning-and-sleep-button-impl.patch-unmerged @@ -0,0 +1,244 @@ +diff -Nur gnome-power-manager-2.14.0/src/gpm-prefs.c gnome-power-manager-2.14.0.new/src/gpm-prefs.c +--- gnome-power-manager-2.14.0/src/gpm-prefs.c 2006-03-13 19:10:01.000000000 +0000 ++++ gnome-power-manager-2.14.0.new/src/gpm-prefs.c 2006-03-29 17:42:30.890080048 +0100 +@@ -66,6 +66,9 @@ + /* If sleep time in a slider is set to 61 it is considered as never sleep */ + const int NEVER_TIME_ON_SLIDER = 61; + ++static GtkWidget *suspend_dialog = NULL; ++static GladeXML *glade_xml = NULL; ++ + static gboolean + gpm_dbus_method_bool (const char *method) + { +@@ -110,7 +113,11 @@ + static gboolean + gpm_can_suspend (void) + { +- return gpm_dbus_method_bool ("CanSuspend"); ++ return TRUE; ++ /* ++ * Always return TRUE because we want the user to choose ++ * return gpm_dbus_method_bool ("CanSuspend"); ++ */ + } + + static gboolean +@@ -224,6 +231,58 @@ + g_object_unref (client); + } + ++static void ++gpm_prefs_suspend_warning_no (GtkWidget *widget, ++ gpointer ignored) ++{ ++ /* User pressed "no" on the suspend warning dialog. unset all suspends */ ++ char *value; ++ GConfClient *client; ++ client = gconf_client_get_default (); ++#define GPM_PREF_CLEANUP(X, Y) \ ++ value = gconf_client_get_string (client, X, NULL); \ ++ if (strcmp (value, "suspend") == 0) { \ ++ gconf_client_set_string (client, X, \ ++ "nothing", NULL); \ ++ gtk_combo_box_set_active (GTK_COMBO_BOX (glade_xml_get_widget (glade_xml, #Y)), 0); \ ++ } \ ++ g_free (value) ++ ++ ++ GPM_PREF_CLEANUP (GPM_PREF_BUTTON_SUSPEND, combobox_sleep_button); ++ GPM_PREF_CLEANUP (GPM_PREF_SLEEP_TYPE, combobox_sleep_type); ++ GPM_PREF_CLEANUP (GPM_PREF_AC_BUTTON_LID, combobox_ac_lid_close); ++ GPM_PREF_CLEANUP (GPM_PREF_BATTERY_BUTTON_LID, combobox_battery_lid_close); ++ GPM_PREF_CLEANUP (GPM_PREF_BATTERY_CRITICAL, combobox_battery_critical); ++ ++ gconf_client_set_bool (client, GPM_PREF_CAN_SUSPEND, FALSE, NULL); ++ ++ gtk_widget_hide (suspend_dialog); ++ ++ g_object_unref (client); ++} ++ ++static void ++gpm_prefs_suspend_warning_yes (GtkWidget *widget, ++ gpointer ignored) ++{ ++ /* User pressed "yes" on the suspend warning dialog. */ ++ gtk_widget_hide (suspend_dialog); ++} ++ ++static void ++gpm_prefs_suspend_warning_tickybox (GtkWidget *widget, ++ gpointer ignored) ++{ ++ /* User adjusted the tickybox for the suspend warning suppression */ ++ GConfClient *client; ++ ++ client = gconf_client_get_default (); ++ gconf_client_set_bool (client, GPM_PREF_SUPPRESS_WARNING, ++ gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget)), NULL); ++ g_object_unref (client); ++} ++ + static GtkWidget * + gpm_prefs_setup_sleep_slider (GladeXML *dialog, + char *widget_name, +@@ -333,6 +392,11 @@ + + client = gconf_client_get_default (); + gconf_client_set_string (client, gpm_pref_key, action, NULL); ++ ++ if (action == ACTION_SUSPEND) { ++ gconf_client_set_bool (client, GPM_PREF_CAN_SUSPEND, TRUE, NULL); ++ } ++ + g_object_unref (client); + } + +@@ -524,19 +588,26 @@ + { + GtkWidget *label_sleep_type; + GtkWidget *combo_sleep_type; ++ GtkWidget *combo_sleep_button; + GtkWidget *checkbutton_dim_idle; + gboolean can_set_brightness; + const char *sleep_type_actions[] = {ACTION_NOTHING, ACTION_SUSPEND, ACTION_HIBERNATE, NULL}; ++ const char *sleep_button_actions[] = {ACTION_NOTHING, ACTION_BLANK, ACTION_SUSPEND, ACTION_HIBERNATE, NULL}; + + /* Sleep Type Combo Box */ + label_sleep_type = glade_xml_get_widget (xml, "label_sleep_type"); + combo_sleep_type = glade_xml_get_widget (xml, "combobox_sleep_type"); ++ combo_sleep_button = glade_xml_get_widget (xml, "combobox_sleep_button"); + + gpm_prefs_setup_action_combo (combo_sleep_type, + GPM_PREF_SLEEP_TYPE, + sleep_type_actions); + +- /* set up the "do we dim screen on idle checkbox */ ++ gpm_prefs_setup_action_combo (combo_sleep_button, ++ GPM_PREF_BUTTON_SUSPEND, ++ sleep_button_actions); ++ ++ /* set up the "do we dim screen on idle checkbox */ + checkbutton_dim_idle = glade_xml_get_widget (xml, "checkbutton_dim_idle"); + can_set_brightness = gpm_has_lcd (); + if (can_set_brightness) { +@@ -693,20 +764,23 @@ + { + GtkWidget *main_window; + GtkWidget *widget; +- GladeXML *glade_xml; + gboolean has_batteries; + + glade_xml = glade_xml_new (GPM_DATA "/gpm-prefs.glade", NULL, NULL); + + main_window = glade_xml_get_widget (glade_xml, "window_preferences"); ++ suspend_dialog = glade_xml_get_widget (glade_xml, "window_suspend_warning"); + + /* Hide window first so that the dialogue resizes itself without redrawing */ + gtk_widget_hide (main_window); ++ gtk_widget_hide (suspend_dialog); + + gtk_window_set_icon_from_file (GTK_WINDOW (main_window), + GPM_DATA "gnome-power-manager.png", NULL); + +- /* Get the main window quit */ ++ gtk_widget_set_parent (suspend_dialog, main_window); ++ ++ /* Get the main window quit */ + g_signal_connect (main_window, "delete_event", + G_CALLBACK (gtk_main_quit), NULL); + +@@ -725,7 +799,20 @@ + setup_battery_sliders (glade_xml); + setup_sleep_type (glade_xml); + +- /* if no options then disable frame as it will be empty */ ++ /* Set up the suspend dialog signals */ ++ g_signal_connect (suspend_dialog, "delete_event", ++ G_CALLBACK (gpm_prefs_suspend_warning_no), NULL); ++ widget = glade_xml_get_widget (glade_xml, "button_no"); ++ g_signal_connect (widget, "clicked", ++ G_CALLBACK (gpm_prefs_suspend_warning_no), NULL); ++ widget = glade_xml_get_widget (glade_xml, "button_yes"); ++ g_signal_connect (widget, "clicked", ++ G_CALLBACK (gpm_prefs_suspend_warning_yes), NULL); ++ widget = glade_xml_get_widget (glade_xml, "checkbutton_suppress_warning"); ++ g_signal_connect (widget, "clicked", ++ G_CALLBACK (gpm_prefs_suspend_warning_tickybox), NULL); ++ ++ /* if no options then disable frame as it will be empty */ + has_batteries = gpm_has_batteries (); + if (! has_batteries) { + widget = glade_xml_get_widget (glade_xml, "gpm_notebook"); +@@ -734,12 +821,37 @@ + return main_window; + } + ++static void ++callback_gconf_key_changed (GConfClient *client, ++ guint cnxn_id, ++ GConfEntry *entry, ++ gpointer user_data) ++{ ++ gpm_debug ("Key %s changed", entry->key); ++ ++ if (strcmp (entry->key, GPM_PREF_CAN_SUSPEND) == 0) { ++ gboolean value; ++ value = gconf_client_get_bool (client, entry->key, NULL); ++ gpm_debug ("Can suspend set to %d", value); ++ if (value) { ++ value = gconf_client_get_bool (client, ++ GPM_PREF_SUPPRESS_WARNING, NULL); ++ gpm_debug ("Suppression warning at %d", value); ++ if (!value) { ++ gpm_debug("Running warning dialog"); ++ gtk_widget_show (suspend_dialog); ++ } ++ } ++ } ++} ++ + int + main (int argc, char **argv) + { + GtkWidget *dialog; + gboolean verbose = FALSE; + gint i; ++ GConfClient *client; + + struct poptOption options[] = { + { "verbose", '\0', POPT_ARG_NONE, NULL, 0, +@@ -767,7 +879,19 @@ + + dialog = gpm_prefs_create (); + gtk_widget_show (dialog); +- ++ ++ client = gconf_client_get_default (); ++ ++ gconf_client_add_dir (client, ++ GPM_PREF_DIR, ++ GCONF_CLIENT_PRELOAD_NONE, ++ NULL); ++ ++ gconf_client_notify_add(client, ++ GPM_PREF_DIR, ++ callback_gconf_key_changed, ++ NULL, NULL, NULL); ++ + gtk_main (); + + gpm_debug_shutdown (); +diff -Nur gnome-power-manager-2.14.0/src/gpm-prefs.h gnome-power-manager-2.14.0.new/src/gpm-prefs.h +--- gnome-power-manager-2.14.0/src/gpm-prefs.h 2006-03-13 18:54:48.000000000 +0000 ++++ gnome-power-manager-2.14.0.new/src/gpm-prefs.h 2006-03-29 17:38:34.664991720 +0100 +@@ -89,6 +89,8 @@ + #define GPM_PREF_UPS_LOWPOWER GPM_PREF_DIR "/use_lowpower_ups" + #define GPM_PREF_BATTERY_LOWPOWER GPM_PREF_DIR "/use_lowpower_battery" + ++#define GPM_PREF_SUPPRESS_WARNING GPM_PREF_DIR "/suppress_suspend_warning" ++ + typedef enum { + GPM_ICON_POLICY_ALWAYS, + GPM_ICON_POLICY_PRESENT, --- gnome-power-manager-2.19.6.orig/debian/patches-old/41-schema-for-warning.patch +++ gnome-power-manager-2.19.6/debian/patches-old/41-schema-for-warning.patch @@ -0,0 +1,32 @@ +diff -Nur gnome-power-manager-2.14.0/data/gnome-power-manager.schemas.in gnome-power-manager-2.14.0.new/data/gnome-power-manager.schemas.in +--- gnome-power-manager-2.14.0/data/gnome-power-manager.schemas.in 2006-03-29 17:21:20.919144976 +0100 ++++ gnome-power-manager-2.14.0.new/data/gnome-power-manager.schemas.in 2006-03-29 17:21:21.912993888 +0100 +@@ -550,5 +550,28 @@ + + + ++ ++ /schemas/apps/gnome-power-manager/suppress_suspend_warning ++ /apps/gnome-power-manager/suppress_suspend_warning ++ gnome-power-manager ++ bool ++ false ++ ++ Suppress warning about suspend ++ Whether or not gnome-power-preferences suppresses its warning whenever you turn on suspend capability. ++ ++ ++ ++ ++ /schemas/apps/gnome-power-manager/policy_suppression_timeout ++ /apps/gnome-power-manager/policy_suppression_timeout ++ int ++ 5 ++ ++ Number of seconds to suppress policy after resume ++ After resume, gnome-power-manager will suppress policy actions for a number of seconds to allow messages to settle. Commonly five seconds is enough while not being so long that the user gets confused. ++ ++ ++ + + --- gnome-power-manager-2.19.6.orig/debian/patches-old/75-ignore_acpi_button.patch +++ gnome-power-manager-2.19.6/debian/patches-old/75-ignore_acpi_button.patch @@ -0,0 +1,15 @@ +diff -Nur gnome-power-manager-2.18.2/src/gpm-button.c gnome-power-manager-2.18.2.new/src/gpm-button.c +--- gnome-power-manager-2.18.2/src/gpm-button.c 2007-03-20 12:45:36.000000000 +0100 ++++ gnome-power-manager-2.18.2.new/src/gpm-button.c 2007-04-13 13:03:19.000000000 +0200 +@@ -322,6 +322,11 @@ + atype = GPM_BUTTON_BRIGHT_DOWN; + } + ++ if (strcmp (type, GPM_BUTTON_POWER) == 0 && g_pattern_match_simple("*acpi*", udi)) { ++ gpm_debug ("ignoring acpi event in favor of inputdevice event"); ++ return; ++ } ++ + /* we now emit all buttons, even the ones we don't know */ + gpm_debug ("emitting button-pressed : %s", atype); + g_signal_emit (button, signals [BUTTON_PRESSED], 0, atype); --- gnome-power-manager-2.19.6.orig/debian/patches-old/70-suppress-pm-actions-on-ltsp.patch +++ gnome-power-manager-2.19.6/debian/patches-old/70-suppress-pm-actions-on-ltsp.patch @@ -0,0 +1,21 @@ +diff -Nur gnome-power-manager-2.17.91/src/gpm-hal.c gnome-power-manager-2.17.91.new/src/gpm-hal.c +--- gnome-power-manager-2.17.91/src/gpm-hal.c 2007-02-11 21:07:50.000000000 +0100 ++++ gnome-power-manager-2.17.91.new/src/gpm-hal.c 2007-02-13 11:49:23.000000000 +0100 +@@ -1142,7 +1142,7 @@ + exists = gpm_hal_device_get_bool (hal, HAL_ROOT_COMPUTER, + "power_management.can_suspend_to_ram", + &can_suspend, NULL); +- if (exists == FALSE) { ++ if (exists == FALSE || g_getenv("LTSP_CLIENT")) { + gpm_warning ("gpm_hal_can_suspend: Key can_suspend_to_ram missing"); + return FALSE; + } +@@ -1169,7 +1169,7 @@ + exists = gpm_hal_device_get_bool (hal, HAL_ROOT_COMPUTER, + "power_management.can_suspend_to_disk", + &can_hibernate, NULL); +- if (exists == FALSE) { ++ if (exists == FALSE || g_getenv("LTSP_CLIENT")) { + gpm_warning ("gpm_hal_can_hibernate: Key can_suspend_to_disk missing"); + return FALSE; + } --- gnome-power-manager-2.19.6.orig/debian/changelog +++ gnome-power-manager-2.19.6/debian/changelog @@ -0,0 +1,1311 @@ +gnome-power-manager (2.19.6-0ubuntu2) gutsy; urgency=low + + * debian/patches/72-fixbashizms.patchs + - fixes issue with dash (LP: #130598) + + -- Aron Sisak Mon, 06 Aug 2007 11:55:39 +0200 + +gnome-power-manager (2.19.6-0ubuntu1) gutsy; urgency=low + + * New upstream release + * Connecting the phone for the self test requires manual intervention, + it's not automatic. + * Try to discover the laptop backlight type by checking the backlight + state before we try and set it. Fixes #436717 + If this breaks for people with 2.19.6, I'll revert it for 2.20. + * Ignore second coldplug, which can happen if you run make check and + g-p-m at the same time. + * Apply a patch from Cosimo Cecchi to fix the position + and the style of the brightness widget. Fixes #405421 + * Split up the lock/gnome_keyring options into lock/gnome_keyring_suspend + and lock/gnome_keyring_hibernate to fix #459747. + We default to off for suspend and on for hibernate. + * Better hi-res icons. + * Monitor phone AC state, so we can put the charging state in the tooltip. + * Correct title case in mobile phone text. + * Add in checks for the object type, and also remember to disconnect the + signal when GpmCell is unref'ed, else we segfault on phone connect, + disconnect, connect. + * Correct the function type to correct a crash. + * Pass the reason on. Needed to debug #456489 + * Fix a potential crasher after resume. + * Only do the percentage override if we have enough data on a primary + battery. Pretty major bugfix, not sure why we haven't hit this. + * Use the percentage, not the charge level. Also add translation. + * Support the correct methods to update the icon when the phone device + changes. + * Add support for GpmPhone devices. These show as laptop batteries for + now, soon to be fixed. + * Listen for the correct signals, and add the correct GpmCell device. + * Add the phone self-checks. + * Drop the inhibit when gnome-power-manager disconnects from the bus. + * Fix a memory leak. 14 bytes. + * Don't unref the context, it makes valgrind unhappy. + * Add some more tests. + * Fix the profile test. Also default to estimating the 5-95% data for + unknown profile data. + * The following files contain translations and are currently not in use. + Please consider adding these to the POTFILES.in file, located in the + po/ directory: + applets/brightness/GNOME_BrightnessApplet.server.in + applets/inhibit/GNOME_InhibitApplet.server.in + * Add initial gnome-phone-manager support. Untested. + * Rename some methods to allow gnome-phone-manager integration. + * Move the tests into src/ to be able to to run make check. + * More icons... + * Only do gpm_control_convert_hal_error if false. + * Convert the HAL error to a localised error to avoid a crash in GDM. + * Be more careful with errors. retval != 0 doesn't mean that an error + is set. + * Remove a broken string that we don't ever use. Fixes #459099 + * Add some more tests. + * Add translator comment before the occurrences of the Q_ macro. + Fixes #458609. + * Correct some broken UI test. Invalid isn't a great word to use. + * Correct some broken UI text. Fixes #458613 + * Correct test, and make more specific. Test now passes. + * Correct the colours to be more bold, and support the extrapolated data. + * Rearrange some tests. + * Add better wording when accuracy is truely zero. + * Update some more API to match the docs. + * Use the service name from the spec so we can activate + in gdm greeter. + * Log to syslog if name is already taken. + * Log to syslog when we exit because of an error. + * Temporarily don't do the system bus check for gdm session activation. + * Propogate the error from hal to the session DBUS. + * Try setting profile code from average. Nothing works yet. + * Rescan the cell array when we resume as the primary battery may have + been changed or removed. This hopefully fixes the big where the wrong + profile is used when the battery is swapped whilst hibernating. + * Watch the session bus for g-p-m, which prevents a race at startup. + * Add another icon to signify the inhibit applet is unable to connect. + * Add the initial phone code for mobile phone support. + No backend stuff yet, I need to write the backend stuff before it will + work. + * Add the guessed data into the key. + * Fix the build. Fixes #457414. + * Try to use gconfaudiosink, and set the profile, so that + right output is used when playing an alert sound, use + g_build_filename to create the URI for playbin to play + * Don't show the brightness UI on idle dim. Fixes #455148 + * Add translation comment for "quirk website". Fixes #455499. + * Add libidletime for querying IDLETIME. + * Use GpmControl to notify GpmProfile when a suspend is about to happen, + or when it has just happened so the data valid flag is made false. + This stops oddball readings where the percentage time is used when + the machine is a sleep state. The profile code now waits for the start + of the next complete percentage point. Fixes #453853 + Many thanks to Christopher Halse Rogers for the excellent debugging. + * Now we are using gpm-control in gpm-profile, pull it in as a dep. + * Fix a small memory leak on exit. + * Remove duplicate includes. + + -- Oliver Grawert Thu, 02 Aug 2007 11:44:34 +0200 + +gnome-power-manager (2.19.5-0ubuntu1) gutsy; urgency=low + + * New upstream release + * Don't mark text translatable. This program is not installed, and is not + used by end users. Fixes #453721 + * Lower the value of GPM_CELL_UNIT_MIN_CHARGED_PERCENTAGE to 60 to cope + with really broken batteries, or when using smapi-tools. Fixes #411932 + * Provide a link to the quirk self-help site when sleep fails. + Fixes #442425 + * Fix power units confusion. Fixes #423289 + * Use a more professional warning sound. Fixes #406144 + * Fix some memory leaks. + * Don't push debugging text to stderr. + * Set an error when we return false for the UnInhibit. + * Try a better infrastructure for the self tests. It's better. Trust me. + * Add functionality so that g-p-m warns the user when manually inhibited + and the lid action on battery is suspend or hibernate. Fixes #452244 + * If the webcam brightness capture fails we exit because the image + generated in ~/.gnome2/gnome-power-manager/webcam.png has zero length. + Patch by nadir@users.sourceforge.net, many thanks. Fixes #451241. + * Don't mention profiles (instead use 'time'), and remove the warning as + users are not going to know what to do. Fixes #450362 + * Don't do crazy things when adding points. We already do clever things + to remove points, so just add them. + * Increase the size of the gaussian array to further smooth the data. + * Correct a typo. We should never not add, even when zero. + * Don't try to save the 100% profile point, which can happen the moment + the percentage charge hits 100% from 99% a split second before being + marked as non-discharging. + * Match on any primary battery, rather than a specific UDI. + * Don't stop running the interactive test after the graph check. + * Fix the event dot stacking. + * Monitor and log powersave events. + * Allow clearing of the event data. + * Cosmetic adjustments to ranging for time. + * Report the installed g-p-m version in bugreports. + * src/gpm-info.c: Move the colour defines here. + * Allow the graph data to be cleared, so rename the function to create. + * Add lots more tests. + * Fix the no-legend bug, and the autoranging bugs. We need more + unit-tests, but this should fix the most glaring errors. + * use g_option_context_set_translation_domain to translate + application description. Closes bug #450154. + * Rip out some unused API. + * Add a self test module for the graph. It's incomplete, and already + shows numerous bugs with the graphing code. More to come. + * Correct axis label, the unit is already encoded in the value. + * Make about dialog work with GTK 2.12 + * Add website label. Closed #448570 + * src/gpm-manager.c: (gpm_manager_init): + * Add a special key to detect if the gconf schema has been correctly + installed. I'm getting more and more bugreports from people compiling + g-p-m from source, but not installing the default schema and thus + getting odd unreproducable crashes. + * Allow different translations for the same string in two different + contexts. Closed #413642. + * Only do the sound if we configured sound effects to be on. + * Do the sounds in-process, rather than executing gst-launch. + * Emit a sound when the lid state changes, which I need for debugging. + * Initialise a variable to maybe fix #446496. + * brightness-applet: + * Refresh the value when g-p-m re-appears back on the bus, so the value + on the slider is correct. + * Use the new invalid icon when g-p-m is not running. Fixes #433367 + * docs/backlight-interactions.svg: Add this useful diagram. + * Add some new icons so we can tell the difference between no hardware + and no gnome-power-manager. + * Watch the gnome-screensaver keys to fix #422124. + * src/gpm-engine.c: Make wording better. + + -- Oliver Grawert Fri, 06 Jul 2007 11:34:20 +0200 + +gnome-power-manager (2.19.3-0ubuntu2) gutsy; urgency=low + + * re-add 70-suppress-pm-actions-on-ltsp.patch to make sure Thin Client users + can not suspend the server. + + -- Oliver Grawert Sat, 16 Jun 2007 10:32:07 +0200 + +gnome-power-manager (2.19.3-0ubuntu1) gutsy; urgency=low + + * New upstream version + - Gnome #428401, Clicking the brightness applet dims the screen + - Gnome #438838, crash when g-p-m can't connect with assertion enabled + - Gnome #440409, Failed to build when using SUN C compiler + - Gnome #445173, Strings in server.in files are not marked for translation + - Don't try to do the policy action when the average accuracy is low. + - Make the brightness dim code "learn" to take longer to dim if you keep + undimming the screen shortly after auto-dimming it. + - Change default of /apps/gnome-power-manager/general/network_sleep to + false, as we now do the system action in pm-utils. + - Add initial code to use a webcam as a brightness sensor. + - Rework the brightness interactions, and rename a large part of the + gconf schemas. + + -- Oliver Grawert Thu, 14 Jun 2007 13:15:11 +0200 + +gnome-power-manager (2.19.2-0ubuntu4) gutsy; urgency=low + + * New upstream version + * drop LTSP patch that prevented suspend/hibernate on thin clients + the base for that is gone and we need to move it to hal apparently + * drop the acpi button patch that supressed double events, thats supposed + to be fixed in hal now and there is no code in g-p-m anymore to base it + on. + * drop pmi dependency, we dont need it anymore + * keep the fix for brightness down keys (71-fix-keyboard-brightness-keys) + + -- Oliver Grawert Sat, 26 May 2007 16:08:55 +0200 + +gnome-power-manager (2.18.2-0ubuntu3) feisty; urgency=low + + * fix #81227 harder by matching all acpi power buttons instead of only + these which have an udi with acpi_PWRF + + -- Oliver Grawert Thu, 12 Apr 2007 15:49:49 +0200 + +gnome-power-manager (2.18.2-0ubuntu2) feisty; urgency=low + + * add 75-ignore_acpi_button.patch, the kernel sends an acpi and a + inputdevice event for a powerbutton press, we only want one event + so we ignore the acpi one (closes LP #81227) + + -- Oliver Grawert Tue, 10 Apr 2007 20:17:31 +0200 + +gnome-power-manager (2.18.2-0ubuntu1) feisty; urgency=low + + * new upstream release + * Add bugzilla information to applet .server files. (#425000) + * Substitute @VERSION@ in .server files. + * Add a configurable --enable-keyring so we can disable the lock + of the GNOME keyring at build time. Defaults to off for now. + See http://hughsient.livejournal.com/19481.html for reasoning. + * Link applets against dbus-glib to fix build with non-dbus gnome-vfs; + fixes #422345. + * Patch from Young-Ho Cha, to sync dpms policy setting when starting. + + -- Oliver Grawert Tue, 10 Apr 2007 14:29:35 +0200 + +gnome-power-manager (2.18.1-0ubuntu2) feisty; urgency=low + + * Fix a typo in the keyboard brightness handling code - decreasing + brightness now works. + + -- Matthew Garrett Mon, 2 Apr 2007 21:18:09 +0100 + +gnome-power-manager (2.18.1-0ubuntu1) feisty; urgency=low + + * new upstream release + * src/gpm-debug.c: Don't put up a GTK dialogue on critical error. + Fixes rh#233689 + * src/gpm-hal.c: Disable these two methods as they are causing + errors. Fixes #420491 + * src/gpm-hal.c: Exit on startup if HAL is not running. We can't + do anything. + * src/gpm-hal.c, src/gpm-hal.h: Set an error if HAL is not running. + Fixes #84997 and lots of duplicates. Many thanks to Ed Martin + for the debuging information. + * src/gpm-button.c: Don't assert if we cannot get the type of + button from HAL for a ButtonPressed device condition, just print + an error and ignore. Should fix #420491, although I'm not sure + why HAL isn't providing the data when we need it. It may be some + sort of resume race. + * src/gpm-graph-widget.c: Don't mark "sans" translatable. Oops. + Apologies. + * src/gpm-graph-widget.c: Set font face that translatable in + graph widget. Patch from Young-Ho Cha, many thanks. The + other patch in bugzilla adds pango support, and we should + play with it on trunk and then backport it if it proves stable. + Fixes #418605 + * src/gpm-statistics-core.c: Don't assert if we try to + run an older g-p-s with a newer g-p-m. + * configure.in: Turn off -Werror to fix #418282 + + -- Oliver Grawert Tue, 27 Mar 2007 10:24:50 +0200 + +gnome-power-manager (2.18.0-0ubuntu1) feisty; urgency=low + + * new upstream release + * data/gnome-power-preferences.desktop.in: + * data/gnome-power-statistics.desktop.in: + Add StartupNotify to get the pretty busy cursor when loading. + Patch from Sven Arvidsson, fixes #414311 + * src/gpm-graph-widget.c: (gpm_graph_widget_draw_line): + * src/gpm-statistics-core.c: (gpm_statistics_graph_refresh): + Fix the segfault when we try to draw a graph that does not exist. + Fixes #412345 and plenty more duplicates. + * src/gpm-notify.c: (gpm_notify_create): + Don't point to the icon if it's not currently showing. Fixes #414010 + * src/gpm-power.c: (battery_key_changed): + Merge a modified patch from Peter Jones (thanks!) to properly + handle when a battery is removed and inserted when hibernated, or + just replaced with really broken ACPI. + * src/gpm-power.c: (battery_device_cache_entry_update_all): + Merge a patch from Peter Jones to actually get the vendor of the + battery. We should have been using battery.vendor and not info.vendor. + + -- Oliver Grawert Mon, 12 Mar 2007 21:52:05 +0100 + +gnome-power-manager (2.17.92-0ubuntu1) feisty; urgency=low + + * Add dependency on scrollkeeper + * Update maintainer field + * New upstream release + * applets/brightness/brightness-applet.c: + * data/gnome-power-manager.schemas.in: + Fix two trivial spelling typos to fix #411592 + * src/gpm-power.c: Don't ref and unref hal twice for no reason. + * src/gpm-srv-backlight.c: Check to see if we can do the action + to fix #407613 + * src/gpm-proxy.c: Save the signal connection id's and remove + then when we finalize. Prevents a very difficult to trigger + and even more difficult to debug crasher where proxy instances + are connecting to GpmDbusMonitor + * src/gpm-hal.c: Check for a NULL proxy when we access HAL to + help debug #408705 + * applets/brightness/brightness-applet.c: Patch against the SVN + trunk to enable scroll and keyboard events. It corrects also + corrects two little bugs too: tooltips are not shown anymore when + popped, and a comment was wrong. There's still a bug: themes + using an image as background are not handled correctly. I'll try + to correct it soon. Fixes #383653 + * src/gpm-srv-backlight.c: Check we have the hardware before + trying to set the brightness. Trivial patch. Fixes #407613 + + -- Oliver Grawert Wed, 28 Feb 2007 10:51:55 +0100 + +gnome-power-manager (2.17.91-0ubuntu1) feisty; urgency=low + + * new upstream release + * drop 65-fix-ppc-crasher.patch, included upstream + * 60-suppress-policy-unless-foreground.patch dropped, upstream included + --enable-checkfg in configure for us now (thanks hughsie !) + * drop 68-fix-sans-backlight-crasher.patch, also included upstream :) + * update 70-suppress-pm-actions-on-ltsp.patch + + -- Oliver Grawert Tue, 13 Feb 2007 11:03:01 +0100 + +gnome-power-manager (2.17.90-0ubuntu6) feisty; urgency=low + + * add upstream fix 68-fix-sans-backlight-crasher + * src/gpm-button.c: (gpm_button_is_lid_closed): + * src/gpm-srv-backlight.c: (gpm_srv_backlight_init): + Fix a difficult-to-find crasher which would only happen sometimes when + the session became idle on a laptop without a backlight. + + -- Oliver Grawert Fri, 2 Feb 2007 16:38:04 +0100 + +gnome-power-manager (2.17.90-0ubuntu5) feisty; urgency=low + + * fix autostart .desktop installation + + -- Oliver Grawert Thu, 1 Feb 2007 17:27:30 +0100 + +gnome-power-manager (2.17.90-0ubuntu4) feisty; urgency=low + + * make sure we apply both parts of the fix for 65-fix-ppc-crasher + + -- Oliver Grawert Tue, 30 Jan 2007 12:58:04 +0100 + +gnome-power-manager (2.17.90-0ubuntu3) feisty; urgency=low + + * fix native packaging + * add 65-fix-ppc-crasher, fixes malone 81427, thanks to Colin Watson + * sanitize the gconf defaults so we dont end up with the most possible + display darkness on battery + + -- Oliver Grawert Mon, 29 Jan 2007 17:45:37 +0100 + +gnome-power-manager (2.17.90-0ubuntu2) feisty; urgency=low + + * remove /usr/share/gnome/autostart/gnome-power-manager.desktop (closes 81304) + + -- Oliver Grawert Wed, 24 Jan 2007 18:02:11 +0100 + +gnome-power-manager (2.17.90-0ubuntu1) feisty; urgency=low + + * New upstream release + * Don't poke the screensaver when we remove the ac adapter when the lid + is closed. Fixes #384254. + * data/gnome-power-preferences.desktop.in: use correct category name. + Fixes #394701 + * As discussed, having two interfaces for backlight control is crazy. + Merge BrightnessLcd and Dpms into Backlight so we can use this interface + in a more generic way. + * Merge the two interfaces into one new GObject. + * Add scoping information. Whoops. + * Add tests for the GpmProxy class. + * GPM uses UINT32 for brightness but HAL uses INT32. Fix the crasher + of #395174. This is only become apparent as the new DELL smbios addon + enforces correct signedness but the old method did not. + * Clear up some more guint and gint problems. + * Make sure an invalid proxy doesn't segfault gnome-power-manager. + This is due to a critical log message, where we should probably + only be a developer warning. + * data/gnome-power-preferences.desktop.in: Categorize + gnome-power-preferences for the control center shell. Fixes bug 394701. + Patch by: Denis Washington + * Move back to the indervidual interface definition after Rob pointed out + this breaks glib bindings. OOps. + * Update docs. + * Make sure we always use an unsigned int for brightness. + This should fix #395174. + * Update to reflect the current API. + NOTE TO PEOPLE STRESSING OUT: The old API still exists as a + compatibility API, it's just not documented. + * Add some more comments, no functional changes. + * Add a BrightnessChanged signal, and convert the method names to similar + style to DPMS. + * Use the new method names. + * Add /apps/gnome-power-manager/show_cpufreq_ui GConf key. + It's not something I wanted to do, as 99% of people don't need to + ever change this, but the 1% will need to for specific systems. + Default to hiding the control. Distros can patch this if required. + * Add 'Do nothing' back as a valid UI object, else this policy is + reverted to ondemand the first time the prefs tool is run. + By default we don't show the UI. This is not a new string as we + already use it for the action text. + * Fix a metric ton of spelling errors. + * Replace instances of g_debug with gpm_debug. + * README: Update to better reflect release dependencies. + * Emit the DAEMON_START and DAEMON_STOP signals when HAL + disconnects or connects. This fixes the problem where the + icon does not change when HAL is restarted. + * Remove all the _("foo") strings for gnome program init as + they are not required and I don't want to be accused of + breaking string freeze. + * Add gpm-self-test.c - no string additions - this is a new + test module that should not be translated and only used by + developers. + * Add some more self tests. + * Add the start of a self-test framework. + * Convert to the new API, and remove the incorrect interface. + * Add IsValid method to Inhibit interface so we can test the + inhibit status in the self-test framework. + * Remove some cvs'isms. + * Remove obsolete .cvsignore files. + * Don't localise string as this is used internally for icon name. + * Use octal UTF-8, not \uxxxx. Bug #390809. + * Fix popup_menu callback signature. Bug #390172. + * Use "\u2212" rather than "-" for a bigger horizontal line, + complementing the plus sign. + * Add the request signal to the GpmControl class. + This prevents a warning on startup. + * Add the icon changed and description changed signals to the + UI class. This prevents a warning on startup. + * Add the file I missed off the last commit. Fixes #389121. + Sometimes, I wish I tested things harder. Apologies. + * Add some more debugging. + * Move some stuff from the manager to GpmControl. + * Move to the signal event model of GpmControl, rather than the + monolithic GpmManager. + * Move the defines from the C to the H. Also make a singleton. + * Rename GpmPolicy to GpmControl. + * Use the new GpmControl interface, and start to add the + registrations interface. + * Remove the custom suffix for each of the interfaces. + As we have a custom path for each one, we have no need for + indervidual interfaces. + * Add the new inhibit interface. + * Deal with the DBUS interface here, rather than using the + manager class to proxy requests. + * Proxy the old Inhibit and UnInihibit calls to the new interface. + * Add the Inhibit DBUS path. + * Add the notify_low_power gconf key to supress the low battery + warnings. Fixes #350018. + * Add a section in the help file for the applets. + * Point to the applets section in the help file. Should fix #388904. + * Make the applets look in the right place for the help file. + Not that one exists: we need to write then or remove the + help option. Starts fixing #388904. + * Correct the name of the XML yelp file. Not sure who changed + this, but it was wrong. Fixes #388905. + * When running in a custom root Elijah gets: + 'gnome-keyring-1/gnome-keyring.h: No such file or directory' + The fix is trivial, just remove the 'gnome-keyring-1/' from the + #include line. + I'm not sure why no body has mentioned this before, but + it seems to work either with or without on FC6. Fixes #388815. + * Add this new dbus interface so we can provide an alternate UI + environment, for instance for XFCE or OLPC. + * Use ondemand, not conservative. + * Change default to be ondemand at 85 performance on AC and + ondemand at 25 performance on battery. Ubuntu set ondemand + by default, and have had no bad reports. + The rationale for this change is that we should still save + power on AC, there's no point having the processor run at + 100 percent when the system is idle. + * Allow setting the performance for the dynamic policies. + * Fixed typo + * Change the accesskeys to be unique. + * redo 60-suppress-policy-unless-foreground.patch and send it upstream for + inclusion before 2.18 comes out. + * remove redudant gnome-power-statistics.desktop file, its accessible + through the context menu of the power manager systray icon (closes bug 78633) + + -- Oliver Grawert Tue, 23 Jan 2007 09:32:13 +0100 + +gnome-power-manager (2.17.4-0ubuntu2) feisty; urgency=low + + * drop 56-disable-session-save-on-shutdown.patch and merge the seeting into + the gconf-defaults file we install now, thanks Riccardo Setti for pointing + + -- Oliver Grawert Tue, 19 Dec 2006 15:52:53 +0100 + +gnome-power-manager (2.17.4-0ubuntu1) feisty; urgency=low + + * New upstream release + * dropped 40-ubuntu-schema-defaults.patch in favor of installing a + gconf-defaults file in /usr/share/gconf/defaults + + -- Oliver Grawert Mon, 18 Dec 2006 13:28:25 +0100 + +gnome-power-manager (2.17.3-0ubuntu1) feisty; urgency=low + + [Riccardo Setti] + * New upstream release. + * Removed patche: + - 65-suppress-fake-user-input.patch + * Updated patches: + - 40-ubuntu-schema-defaults.patch + - 56-disable-session-save-on-shutdown.patch + - 60-suppress-policy-unless-foreground.patch + [Oliver Grawert] + * added build dependency to libpanel-applet2-dev to fix ftbfs + * added build dependency on libgnome-keyring-dev to fix ftbfs + * fix typos in 60-suppress-policy-unless-foreground.patch to fix ftbfs + * fix typos in 70-suppress-pm-actions-on-ltsp.patch to fix ftbfs + + -- Riccardo Setti Mon, 11 Dec 2006 14:56:48 +0100 + +gnome-power-manager (2.17.2-0ubuntu1) feisty; urgency=low + + * New upstream release + * Bumped libhal-dev Build-Dep to >= 0.5.8. + * Put 55-lid-state-tracking.patch in patches-old. + + -- Riccardo Setti Mon, 20 Nov 2006 13:38:53 +0100 + +gnome-power-manager (2.16.1-0ubuntu3) edgy; urgency=low + + * make sure the /apps/gnome-power-manager/action_button_suspend key is + set to "suspend". (closes malone #63303) + + -- Oliver Grawert Tue, 17 Oct 2006 13:09:01 +0200 + +gnome-power-manager (2.16.1-0ubuntu2) edgy; urgency=low + + * fix 56-disable-session-save-on-shutdown.patch to not also disable the + logout dialog (why did that work in dapper with the same patch ?) + (closes malone #57872) + + -- Oliver Grawert Tue, 10 Oct 2006 16:52:57 +0200 + +gnome-power-manager (2.16.1-0ubuntu1) edgy; urgency=low + + * New upstream release: + * src/gpm-brightness.c: (gpm_brightness_down): Use the step value we + computed (rather than one) to fix pressing brightness-down on the Macbook Pro. + David Zeuthen , fixes #358067 + * src/gpm-power.c: Remove the FIXME to fix #334212. It's breaking + more laptops that it was intended to fix and also breaks my (already broken) iBook. + * src/gpm-hal.c: (gpm_hal_handle_error): Also ignore + DBUS_GERROR_REMOTE_EXCEPTION as this prevents the 'HAL failed to suspend' + when actually it suspended fine but the bus timed out. + * src/gpm-manager.c: Fix a couple of small memory leaks where we don't + free the icon name. + * src/gpm-manager.c: (gpm_manager_init): Don't rescan buttons every minute. + This belongs in HAL. Fixes #356170. The HAL patch will be submitted this week. + * src/gpm-power.c: (gpm_power_status_for_device_more): Revert the string + change. Noticed by Wouter Bolsterlee. + * src/gpm-hal-monitor.c: Fix hotplug add and remove of wireless mice. + * src/gpm-power.c: Don't express the decimal point for the / 7 csr scale. + Also add the new battery types so we don't print a warning with greater + than HAL 0.5.8. + * configure.in: Increase dep of libgnome to 2.14.0 because we are + using GNOME_PARAM_GOPTION_CONTEXT, which was introduced in 2.14.0 + Spotted by Mart Raudsepp, to fix #355437, many thanks. + + -- Oliver Grawert Mon, 2 Oct 2006 15:13:08 +0200 + +gnome-power-manager (2.16.0-0ubuntu3) edgy; urgency=low + + * disable 50-disable-brightness-keys.patch, according to upstream comment in + malone (#29527) it should work now + + -- Oliver Grawert Fri, 8 Sep 2006 22:57:20 +0200 + +gnome-power-manager (2.16.0-0ubuntu2) edgy; urgency=low + + * added 70-suppress-pm-actions-on-ltsp.patch closes malone (#49503) + + -- Oliver Grawert Thu, 7 Sep 2006 10:30:43 +0200 + +gnome-power-manager (2.16.0-0ubuntu1) edgy; urgency=low + + * New upstream relese + * Patch from Paolo Borelli to cure some + small memory leaks. Many Thanks. Fixes #352858. + * Manually hardcode the version to 2.16.x to fix #352840. + * Be more specific for our device checks in the expanded device + information to fix the display of CSR properties. Fixes rh:203849 + * Turn off Werror for the impending release. Fixes #352448. + + -- Oliver Grawert Mon, 4 Sep 2006 11:46:02 +0200 + +gnome-power-manager (2.15.92-0ubuntu3) edgy; urgency=low + + * Rebuild for dbus 0.90 + + -- Sebastian Dröge Tue, 29 Aug 2006 15:45:43 +0200 + +gnome-power-manager (2.15.92-0ubuntu2) edgy; urgency=low + + * debian/patched-icons/*: + - dropped, we can ship them with Human. + * debian/control: + - dropped sharutils Build-Depends. + * debian/rules: + - removed uudecode hack. + + -- Daniel Holbach Tue, 29 Aug 2006 12:03:23 +0200 + +gnome-power-manager (2.15.92-0ubuntu1) edgy; urgency=low + + * New upstream release + - Fix a double free in the new smartcard code. (William Jon McCann) #350436 + - Work round a compiler bug which caused compilation to fail when using a + high optimising setting. (Ed Catmur) #352104. + - Beep to warn if the suspend or hibernate failed. #346542 + - Fix up the desktop files with the version number. + - Change the spelling of loose to lose throughout the project. (Bruce Cowan) + - Add a copy of the 24x24 icons instead of generating them at install time. + Doing clever tricks with imagemagick didn't work very well. #350321 + - Add a timed exit option to the daemon (--timed-exit). #350334 + + -- Brandon Hale Sun, 20 Aug 2006 21:36:11 -0400 + +gnome-power-manager (2.15.90-0ubuntu1) edgy; urgency=low + + * New upstream version + - Rewrite the GpmHal and GpmHalMonitor as the old versions were + confusingand had hard to replicate bugs. No string changes. + - Added Hungarian translation of the help file. (Gabor Kelemen) + - Default to policykit support being default off. + Translations: + - Ankit Patel (gu) + - Changwoo Ryu (ko) + - Clytie Siddall (vi) + - Francisco Javier F. Serrador (es) + - Ilkka Tuohela (fi) + - Mindu Dorji (dz) + + -- Oliver Grawert Mon, 24 Jul 2006 11:51:43 +0200 + +gnome-power-manager (2.15.4-0ubuntu1) edgy; urgency=low + + * New Upstream release and first merge with debian package + - drop 20-enable-xfce-startup.patch (included upstream) + - drop 30-transparent-notification-icon.patch (included upstream) + - drop 97-brightness-button-names.patch (included upstream) + - 91-reset-brightness-state.patch needs to be redone, no brightness + state saving support upstream anymore. + - the suspend warning patches (41-schema-for-warning.patch, + 45-suspend-warning-dialog-and-sleep-button-combo.patch, + 68-suspend-warning-and-sleep-button-impl.patch-unmerged) + have no codebase to apply to anymore, this part was rewritten upstream + (patches stored for further consideration in debian/patches-old) + - disabled icon changes from dapper temporary (the new icon scheme has + way more icons and all icon names changed). new icons required (gpm + now needs 22x22 sized ones) + - suspend and hibernate support need the new hal policy kit now so + please dont file bugs about either before that is avaliable in ubuntu + + -- Oliver Grawert Mon, 03 Jul 2006 19:46:21 +0100 + +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.3-0ubuntu11) dapper; urgency=low + + * debian/control: + - added as hal as Depends. + * debian/patched-icons: + - added two more icons. (Malone: #46539) + + -- Daniel Holbach Mon, 29 May 2006 12:05:29 +0200 + +gnome-power-manager (2.14.3-0ubuntu10) dapper; urgency=low + + * debian/patched-icons/: + - update. + + -- Daniel Holbach Wed, 24 May 2006 11:44:57 +0200 + +gnome-power-manager (2.14.3-0ubuntu9) dapper; urgency=low + + * One line manpage fix. (Closes: Ubuntu #45623) + + -- Paul Sladen Fri, 19 May 2006 21:09:28 +0100 + +gnome-power-manager (2.14.3-0ubuntu8) dapper; urgency=low + + * Make sure that the patch actually get applied + + -- Matthew Garrett Mon, 15 May 2006 18:27:37 +0100 + +gnome-power-manager (2.14.3-0ubuntu7) dapper; urgency=low + + * Don't send poke events to the screensaver on hotkey presses + + -- Matthew Garrett Mon, 15 May 2006 18:21:16 +0100 + +gnome-power-manager (2.14.3-0ubuntu6) dapper; urgency=low + + * Disable brightness hotkeys for now + + -- Matthew Garrett Sat, 13 May 2006 11:50:12 +0100 + +gnome-power-manager (2.14.3-0ubuntu5) dapper; urgency=low + + * Reset the saved brightness on power transitions + + -- Matthew Garrett Sat, 13 May 2006 11:14:33 +0100 + +gnome-power-manager (2.14.3-0ubuntu4) dapper; urgency=low + + * Patches added in this version: + - 98-suppress-policy-unless-foreground.patch + Attempt to suppress policy actions when we are not the user on the + foreground console. + * debian/control: + Update to depend on libpam-foreground (>= 0.3) + + -- Daniel Silverstone Thu, 11 May 2006 21:03:57 +0100 + +gnome-power-manager (2.14.3-0ubuntu3) dapper; urgency=low + + * Patches changed in this version: + - 95-lid-state-tracking.patch + Fix to ensure we don't discard non-duplicated events by accident. + Closes: launchpad #43862 + * Patches added in this version: + - 97-brightness-button-names.patch + Fix to make sure we track the hal 0.5.7 button names for brightness + We can remove this when g-p-m can depend on hal 0.5.8 + Closes: launchpad #43770 + + -- Daniel Silverstone Wed, 10 May 2006 11:30:29 +0100 + +gnome-power-manager (2.14.3-0ubuntu2) dapper; urgency=low + + * Patches added in this version: + - 20-enable-xfce-startup.patch + Enable XFCE in the .desktop file so that it starts up for xubuntu too. + Closes: launchpad #43077 + - 30-transparent-notification-icon.patch + Enable the eggtrayicon stuff to do transparency. + Closes: launchpad #40446 + - 95-lid-state-tracking.patch + Augment lid state tracking to use hal if hal reports it is capable + of tracking the lid state. + If hal reports an acpi_LID with button.has_state == true then we use + that state information whenever we want to consider the lid switch + This should deal with LP #33072 and thus its duplicates #42988, + #42823, #40730, #40662, #37442, #36459 and #33952 + - 96-disable-session-save-on-shutdown.patch + Disable the saving of the session during critical power shutdown. + This confuses too many people for now. + Closes: launchpad #35691 + * Patches changed in this version: + - 40-ubuntu-schema-defaults.patch + Alter screen lock defaults to always lock, regardless of screensaver. + Closes: launchpad #39448 + + -- Daniel Silverstone Mon, 8 May 2006 15:23:59 +0100 + +gnome-power-manager (2.14.3-0ubuntu1) dapper; urgency=low + + * UVF Exception under general GNOME exception, granted by Colin Watson + * New upstream release on stable branch + Highlights since 2.14.0 include: + - Critical action ignored when battery is 0% (stops some resume->shutdown) + - Deal sanely with hal/dbus restarts + - Use 'battery' rather than 'www' closes: launchpad #22451: + - Throttle when lid is shut, rather than inhibiting. + - Fix a logic problem related to random suspends wrt. lid closure. + - Only reenable "fully-charged" notifications when the battery drops + below 95% to cope with laptops which fluctuate between 99% and 100% + - Updated translations for Hungarian, Lithuanian, Spanish, Japanese, + Netherlands, Greek, German and Vietnamese + * Patches removed from this version: + - 80-policy-timeout-reset-on-startup.patch + 30-remove-sm-disable.patch + Rolled into upstream + + -- Daniel Silverstone Tue, 2 May 2006 16:40:05 +0100 + +gnome-power-manager (2.14.0-1ubuntu1) dapper; urgency=low + + * debian/control: + - add sharutils as Build-Depends. + * debian/patched-icons/*: + new icons + * debian/rules: + - add magic to handle uuencoded pixmaps and replace the icons we have. + + -- Daniel Holbach Fri, 28 Apr 2006 10:38:43 +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.93-0ubuntu4) dapper; urgency=low + + * Don't depend on acpi-support directly; powermanagement-interface (which + we depend on) will pull it in when appropriate (Closes: malone #35735) + * The above makes ubuntu-desktop installable on hppa and sparc again. + + -- Adam Conrad Tue, 21 Mar 2006 16:07:05 +1100 + +gnome-power-manager (2.13.93-0ubuntu3) dapper; urgency=low + + * debian/postinst + Fix it up to only use the acpi whitelist if on an acpi machine. + * debian/control debian/rules + Depend on acpi-support if on i386 + * Closes: malone #34113 + * Closes: malone #34185 + * Closes: malone #34193 + + -- Daniel Silverstone Thu, 9 Mar 2006 10:58:10 +0000 + +gnome-power-manager (2.13.93-0ubuntu2) dapper; urgency=low + + * debian/postinst + Using the acpi-support whitelist, set the suspend defaults to + can_suspend=true, action_button_suspend=suspend, and + suppress_suspend_warning=true; when the whitelist suggests it + is capable of suspending anyway + NOTE: This will not take effect if you have already customised your + configuration. + $ gconftool-2 --recursive-unset /apps/gnome-power-manager + will reset you to defaults. You may have to restart gconfd also. + + -- Daniel Silverstone Wed, 8 Mar 2006 11:51:55 +0000 + +gnome-power-manager (2.13.93-0ubuntu1) dapper; urgency=low + + * UVF Exception under general GNOME exception, granted by Colin Watson + * New upstream release + Highlights since last CVS version include: + - Support for dbus 0.61 (when it happens) + - Better battery charge decisions + - Standardised longer timeouts for notifications + - Fix repeated "battery is fully charged" messages + - Finnish, Vietnamese, Japanese and Spanish translation updates. + - Clamp internally calculated values for battery percentages + Obsoletes 60-clamp-battery-percentage + - Better lid-closed behaviour + - Adds action_button_power to configure behaviour of power button. + - Adds "interactive logout" option to the actions. + * Fix .desktop to go into /etc/xdg/autostart + Closes: malone #33730 + Closes: malone #33664 + * Patches removed from this version: + - 60-clamp-batter-percentage + Upstream has incorporated percentage clamping + * Patches updated for this version: + - 80-suppress-policy-timeout + Upstream now has power button passing through the policy engine. + Removed the power-button specific timeout check. + * Patches added in this version: + - 50-ignore-timeout-on-dbus + Ignore timeouts when resuming from suspend/hibernate. + Taken from redhat's package. + Closes: malone #33612 + - 55-laptops-always-show-icon + When policy is 'always' and machine is laptop, show the icon + even if not using the desktop fallback policy + Closes: malone #33388 + * This release should also fix: + Closes: malone #32552 -- better charge/discharge behaviour now + Closes: malone #32650 -- better repeat-notification suppression + Closes: malone #33072 -- better lid behaviour now + + -- Daniel Silverstone Mon, 6 Mar 2006 13:30:29 +0000 + +gnome-power-manager (2.13.92+CVS20060302-0ubuntu1) dapper; urgency=low + + * UVF Exception under general GNOME exception, granted by Colin Watson + * Pulled from CVS a large number of changes + - Wait for gnome-screensaver to lock before continuing suspend/hibernate + Obsoletes patch 15-try-wait-for-lock + - Rearrange icon theme slightly to be more correct. New bluecurve icons. + - Ignore timeout events when lid is closed so that policy doesn't + cause the screen to be re-enabled. + - Inhibit screensaver when lid is closed + Closes: malone #22522 + * Patches removed from this version: + - 00-CVS-50-2.13.92-to-HEAD-of-2006-03-01 + - 15-try-wait-for-lock + All the above rolled into orig tarball + + -- Daniel Silverstone Thu, 2 Mar 2006 13:00:20 +0000 + +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.92-0ubuntu1) dapper; urgency=low + + * UVF Exception granted by Colin Watson + * New upstream release + Highlights include: + - Updated help screenshots + - Icon naming scheme rationalised for themeing purposes + - UPS charge/discharge icons + - Better notification timeouts + - Screen dim on idle + - Better desktop support + - French, Lithuanian, Finnish, Vietnamese, Japanese, Georgian, + Norwegian bokmal and Greek translation updates + * Patches removed from this version: + - 10-null-ptr-missing-sleep-button + - 20-dont-show-disabled-ac-notifications + - 25-magical-buttons + - 50-no-critical-on-ac + - 70-gpm-watch-can-hibernate-or-suspend-keys + - 95-do-not-suppress-warnings-on-ac + - 96-STOLEN-FROM-CVS-critical-warnings + All the above are rolled into CVS patch below + - 40-schema-defaults + Split into 40-ubuntu-schema-defaults and 41-schema-for-warning + * Patches added this version: + - 00-CVS-50-2.13.92-to-HEAD-of-2006-03-01 + - Pull all the CVS changes which incorporate a lot of what the + Ubuntu patch set used to do (should make my life easier) + - This includes the following: + + Hibernate button support + + can_suspend/can_hibernate activated by g-p-p + + Fix potential NULL dereference + + Suppress blank notifys + + Add a battery button notify + - Also this fixes: + + Fix potential crasher when a low power mouse is plugged in + - 40-ubuntu-schema-defaults + All the schema defaults for Ubuntu's policy + - 41-schema-for-warning + GConf Schema for the suspend warning dialog box and for suppressing + warnings during the first few seconds after resume. + * Patches retained in this version: + - 15-try-wait-for-lock + Try to wait for gnome-screensaver to have claimed to have locked. + - 30-remove-sm-disable + Remove --sm-disable from the .desktop file so that it can talk to + the session. + - 60-clamp-battery-percentage + Ensure that battery percentage remains within the 0-100 range. + * Patches updated for this version: + - 45-suspend-warning-dialog-and-sleep-button-combo + Updated to fit the new dialog structure properly + - 80-suppress-policy-timeout: + Updated to fit new code shape. + Also made sure we never suppress a lid open event + Log messages now prefixed with UBUNTU-DEBUG: to be clear in debug traces + - 90-suspend-warning-and-sleep-button-impl + Updated to fit new code shape. + * Force the autostart .desktop file into /etc/xdg so a sysadmin can control + its presence as a way to prevent it starting. (debian/rules) + + -- Daniel Silverstone Wed, 1 Mar 2006 15:30:40 +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.91-0ubuntu3) dapper; urgency=low + + * 25-magical-buttons: + - Add hibernate button support to gpm-manager + Closes: malone #31932 + * 40-schema-defaults: + - Add a hibernate button schema item + * 45-suspend-warning-dialog-and-sleep-button-combo: + - Add an 'is' to battery-critical label + * 80-suppress-policy-timeout: + - Add support to suppress the critical action after resume also + * 95-do-not-suppress-warnings-on-ac + - Permit warnings to reset when on ac power + Closes: malone #32644 + * 96-STOLEN-FROM-CVS-critical-warnings + - Ensures the critical power warning is relevant to the action + - Performs critical action as a g_timeout rather than a g_usleep + - I added a check just before performing the action to abort it if + we're on AC by the time the critical action occurs. + Closes: malone #32632 + Closes: malone #32630 + Closes: malone #32250 + + -- Daniel Silverstone Sat, 25 Feb 2006 08:56:30 +0000 + +gnome-power-manager (2.13.91-0ubuntu2) dapper; urgency=low + + * 15-try-wait-for-lock: + Try and wait for gnome-screensaver to complete locking before continuing + with the action. (Wait a maximum of five seconds) + * 25-magical-buttons: + Ensure all the interesting keypress events from hal get dispatched as + button push events. Also implements the battery button event. + - Battery button event (currently bound to KEY_WWW) displays the current + power information as a notification when the key is pressed. + Iconless notifications appear in the bottom right it seems. + * 40-schema-defaults: + - Add in the following keys: + + notify_battery_status + + suppress_suspend_warning + + policy_suppression_timeout + - Set can_suspend to false by default + - Set icon policy to 'charge' by default + - Set suspend type to 'nothing' by default + - Set sleep type to 'nothing' by default + - Set lid-close-on-battery to 'suspend' by default + * 45-suspend-warning-dialog-and-sleep-button-combo: + - Add in a dialog to the glade XML for warning the user when the + can_suspend gconf key goes active. + - Resurrect the combo box for controlling what the sleep button does. + * 70-gpm-watch-can-hibernate-or-suspend-keys: + Add support for gpm-manager.c to watch the can_hibernate and can_suspend + gconf keys to enable-disable the entry on the menu. + * 80-suppress-policy-timeout: + Add support for supressing policy and button events until after a timeout + from the last resume phase. + * 90-suspend-warning-and-sleep-button-impl: + Implement the suspend warning dialog with the following properties: + - When can_suspend goes active, display the dialog unless suppressed + * Deals with the following bugs: + - Closes: malone #31255 -- We wait for gnome-screensaver now + - Closes: malone #3626 -- We suppress the second suspend operation + - Closes: malone #31104 -- Ditto + - Closes: malone #31316 -- Default icon policy is 'charge' now + - Closes: malone #32447 -- We pass through the synthesised sleep key now + + -- Daniel Silverstone Wed, 22 Feb 2006 15:05:36 +0000 + +gnome-power-manager (2.13.91-0ubuntu1) dapper; urgency=low + + * UVF Exception granted by Colin Watson + * New upstream release + Highlights include: + - Several actions predicate on AC + - Screen locking options (in gconf) are enhanced + - Documentation for the locking policy is provided + - Lid close action for battery performed if ac removed while lid closed. + - Separated out AC/Battery UI + - Re-added suspend action for low-power situations + - Spanish, Norwegian, Japanese translation updates + * 20-lock-screen-on-lid-close: Removed, no longer needed + * 20-dont-show-disabled-ac-notifications: Added to suppress unwanted empty + notification dialog. + * This upload addresses the following bugs: + Closes: malone #31967 -- lid close action for battery is now performed when + ac is removed while lid is closed + Closes: malone #31944 -- suspend is now permitted on critical battery + Closes: malone #31940 -- notifications should be less manic + Closes: malone #31822 -- lid action now split into battery and ac policies + Closes: malone #30168 -- Wording is more clear now about sleep etc. + Closes: malone #30167 -- There are gconf keys which can be set. Upstream + and I believe that UI for it is unnecessary. + + -- Daniel Silverstone Tue, 21 Feb 2006 10:26:08 +0000 + +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.90-0ubuntu2) dapper; urgency=low + + * Clamp battery percentages from zero to 100 to avoid amusing bugs where + last known charge is zero. + Closes: malone #31871 + + -- Daniel Silverstone Mon, 20 Feb 2006 12:18:49 +0000 + +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 (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.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-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-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 + --- gnome-power-manager-2.19.6.orig/debian/postinst +++ gnome-power-manager-2.19.6/debian/postinst @@ -0,0 +1,43 @@ +#! /bin/sh +# postinst script for gnome-power-manager + +set -e + +#DEBHELPER# + +case "$1" in + configure) + if [ -r /usr/share/acpi-support/device-funcs ]; then + . /usr/share/acpi-support/device-funcs + DeviceConfig + fi + if [ "x$ACPI_SLEEP" = "xtrue" ]; then + gconftool-2 --direct \ + --config-source xml:readwrite:/var/lib/gconf/defaults \ + --set --type bool \ + /apps/gnome-power-manager/can_suspend true + + gconftool-2 --direct \ + --config-source xml:readwrite:/var/lib/gconf/defaults \ + --set --type string \ + /apps/gnome-power-manager/action_button_suspend suspend + + gconftool-2 --direct \ + --config-source xml:readwrite:/var/lib/gconf/defaults \ + --set --type bool \ + /apps/gnome-power-manager/suppress_suspend_warning true + + fi + ;; + + abort-upgrade|abort-remove|abort-deconfigure) + + ;; + + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +exit 0 --- gnome-power-manager-2.19.6.orig/debian/compat +++ gnome-power-manager-2.19.6/debian/compat @@ -0,0 +1 @@ +5 --- gnome-power-manager-2.19.6.orig/debian/README.Debian +++ gnome-power-manager-2.19.6/debian/README.Debian @@ -0,0 +1,7 @@ +(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-power-manager-2.19.6.orig/debian/patches/72-fixbashizms.patch +++ gnome-power-manager-2.19.6/debian/patches/72-fixbashizms.patch @@ -0,0 +1,33 @@ +diff -Nur gnome-power-manager-2.19.6/tools/gnome-power-cmd.sh gnome-power-manager-2.19.6.new/tools/gnome-power-cmd.sh +--- gnome-power-manager-2.19.6/tools/gnome-power-cmd.sh 2007-07-19 01:48:02.000000000 +0200 ++++ gnome-power-manager-2.19.6.new/tools/gnome-power-cmd.sh 2007-08-06 11:53:26.691908267 +0200 +@@ -1,3 +1,4 @@ ++#!/bin/sh + # Copyright (C) 2007 Richard Hughes + # + # Licensed under the GNU General Public License Version 2 +@@ -24,19 +25,19 @@ + fi + } + +-if [ "$1" == "suspend" ]; then ++if [ "$1" = "suspend" ]; then + echo "Suspending" + execute_dbus_method "Suspend" +-elif [ "$1" == "hibernate" ]; then ++elif [ "$1" = "hibernate" ]; then + echo "Hibernating" + execute_dbus_method "Hibernate" +-elif [ "$1" == "reboot" ]; then ++elif [ "$1" = "reboot" ]; then + echo "Rebooting" + execute_dbus_method "Reboot" +-elif [ "$1" == "shutdown" ]; then ++elif [ "$1" = "shutdown" ]; then + echo "Shutting down" + execute_dbus_method "Shutdown" +-elif [ "$1" == "" ]; then ++elif [ "$1" = "" ]; then + echo "command required: suspend, shutdown, hibernate or reboot" + else + echo "command '$1' not recognised, only suspend, shutdown, hibernate or reboot are valid" --- gnome-power-manager-2.19.6.orig/debian/patches/71-fix-keyboard-brightness-keys.patch +++ gnome-power-manager-2.19.6/debian/patches/71-fix-keyboard-brightness-keys.patch @@ -0,0 +1,12 @@ +diff -ur src.bak/gpm-srv-brightness-kbd.c src/gpm-srv-brightness-kbd.c +--- a/src.bak/gpm-srv-brightness-kbd.c 2007-03-04 17:35:32.000000000 +0000 ++++ b/src/gpm-srv-brightness-kbd.c 2007-04-02 21:16:40.000000000 +0100 +@@ -144,7 +144,7 @@ + if ((strcmp (type, GPM_BUTTON_KBD_BRIGHT_UP) == 0)) { + gpm_brightness_kbd_up (srv_brightness->priv->brightness); + +- } else if ((strcmp (type, GPM_BUTTON_KBD_BRIGHT_UP) == 0)) { ++ } else if ((strcmp (type, GPM_BUTTON_KBD_BRIGHT_DOWN) == 0)) { + gpm_brightness_kbd_down (srv_brightness->priv->brightness); + + } else if (strcmp (type, GPM_BUTTON_KBD_BRIGHT_TOGGLE) == 0) { --- gnome-power-manager-2.19.6.orig/debian/patches/70-suppress-pm-actions-on-ltsp.patch +++ gnome-power-manager-2.19.6/debian/patches/70-suppress-pm-actions-on-ltsp.patch @@ -0,0 +1,25 @@ +diff -Nur gnome-power-manager-2.19.3/libhal-glib/libhal-gpower.c gnome-power-manager-2.19.3.new/libhal-glib/libhal-gpower.c +--- gnome-power-manager-2.19.3/libhal-glib/libhal-gpower.c 2007-03-29 16:05:00.000000000 +0200 ++++ gnome-power-manager-2.19.3.new/libhal-glib/libhal-gpower.c 2007-06-16 10:31:46.000000000 +0200 +@@ -162,8 +162,8 @@ + exists = hal_gdevice_get_bool (power->priv->computer, + "power_management.can_suspend", + &can_suspend, NULL); +- if (exists == FALSE) { +- g_warning ("Key can_suspend missing"); ++ if (exists == FALSE || g_getenv("LTSP_CLIENT")) { ++ g_warning ("Key can_suspend missing or running on Thin Client"); + return FALSE; + } + return can_suspend; +@@ -189,8 +189,8 @@ + exists = hal_gdevice_get_bool (power->priv->computer, + "power_management.can_hibernate", + &can_hibernate, NULL); +- if (exists == FALSE) { +- g_warning ("Key can_hibernate missing"); ++ if (exists == FALSE || g_getenv("LTSP_CLIENT")) { ++ g_warning ("Key can_hibernate missing or running on Thin Client"); + return FALSE; + } + return can_hibernate; --- gnome-power-manager-2.19.6.orig/debian/copyright +++ gnome-power-manager-2.19.6/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