--- gnome-power-manager-2.13.93.orig/help/Makefile.in +++ gnome-power-manager-2.13.93/help/Makefile.in @@ -1003,7 +1003,7 @@ uninstall-local: \ $(if $(DOC_MODULE),uninstall-doc-docs) \ $(if $(_DOC_HTML_ALL),uninstall-doc-html) \ - $(if $(DOC_FIGURES),uninstall-doc-figs) \ + $(if $(_DOC_C_FIGURES),uninstall-doc-figs) \ $(if $(_DOC_OMF_IN),uninstall-doc-omf) # $(if $(_DOC_DSK_IN),uninstall-doc-dsk) --- gnome-power-manager-2.13.93.orig/debian/compat +++ gnome-power-manager-2.13.93/debian/compat @@ -0,0 +1 @@ +4 --- gnome-power-manager-2.13.93.orig/debian/copyright +++ gnome-power-manager-2.13.93/debian/copyright @@ -0,0 +1,20 @@ +Copyright Holder: Richard Hughes + +License: + + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 dated June, 1991. + + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this package; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. + +On Debian systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL'. --- gnome-power-manager-2.13.93.orig/debian/docs +++ gnome-power-manager-2.13.93/debian/docs @@ -0,0 +1,3 @@ +NEWS +README +TODO --- gnome-power-manager-2.13.93.orig/debian/postrm +++ gnome-power-manager-2.13.93/debian/postrm @@ -0,0 +1,38 @@ +#! /bin/sh +# postrm script for gnome-power-manager +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * `remove' +# * `purge' +# * `upgrade' +# * `failed-upgrade' +# * `abort-install' +# * `abort-install' +# * `abort-upgrade' +# * `disappear' overwrit>r> +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package + + +case "$1" in + purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) + + + ;; + + *) + echo "postrm called with unknown argument \`$1'" >&2 + exit 1 + +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 --- gnome-power-manager-2.13.93.orig/debian/watch +++ gnome-power-manager-2.13.93/debian/watch @@ -0,0 +1,20 @@ +# Example watch control file for uscan +# Rename this file to "watch" and then you can run the "uscan" command +# to check for upstream updates and more. +# See uscan(1) for format + +# Compulsory line, this is a version 3 file +version=3 + +# Uncomment to examine a Webpage +# +#http://www.example.com/downloads.php gnome-power-manager-(.*)\.tar\.gz + +# Uncomment to examine a Webserver directory +#http://www.example.com/pub/gnome-power-manager-(.*)\.tar\.gz + +# Uncommment to examine a FTP server +#ftp://ftp.example.com/pub/gnome-power-manager-(.*)\.tar\.gz debian uupdate + +# Uncomment to use Roland's hack for sourceforge based projects - YMMV! +http://people.debian.org/~lolando/sfdlr.php?project=gnome-power-manager gnome-power-manager-([\d.]*).tar.gz --- gnome-power-manager-2.13.93.orig/debian/patches/30-remove-sm-disable.patch +++ gnome-power-manager-2.13.93/debian/patches/30-remove-sm-disable.patch @@ -0,0 +1,12 @@ +diff -Nur gnome-power-manager-2.13.90/data/gnome-power-manager.desktop.in gnome-power-manager-2.13.90.new/data/gnome-power-manager.desktop.in +--- gnome-power-manager-2.13.90/data/gnome-power-manager.desktop.in 2006-01-23 12:55:04.000000000 +0000 ++++ gnome-power-manager-2.13.90.new/data/gnome-power-manager.desktop.in 2006-02-16 17:24:26.964457720 +0000 +@@ -3,7 +3,7 @@ + _Name=Power Manager + _Comment=Power management daemon + Icon=gnome-dev-battery +-Exec=gnome-power-manager --sm-disable ++Exec=gnome-power-manager + Terminal=false + Type=Application + Categories= --- gnome-power-manager-2.13.93.orig/debian/patches/41-schema-for-warning.patch +++ gnome-power-manager-2.13.93/debian/patches/41-schema-for-warning.patch @@ -0,0 +1,32 @@ +diff -Nur gnome-power-manager-2.13.92/data/gnome-power-manager.schemas.in gnome-power-manager-2.13.92.new/data/gnome-power-manager.schemas.in +--- gnome-power-manager-2.13.92/data/gnome-power-manager.schemas.in 2006-03-01 14:10:09.303036480 +0100 ++++ gnome-power-manager-2.13.92.new/data/gnome-power-manager.schemas.in 2006-03-01 14:11:42.444876768 +0100 +@@ -313,5 +313,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.13.93.orig/debian/patches/45-suspend-warning-dialog-and-sleep-button-combo.patch +++ gnome-power-manager-2.13.93/debian/patches/45-suspend-warning-dialog-and-sleep-button-combo.patch @@ -0,0 +1,397 @@ +diff -Nur gnome-power-manager-2.13.92/data/gpm-prefs.glade gnome-power-manager-2.13.92.new/data/gpm-prefs.glade +--- gnome-power-manager-2.13.92/data/gpm-prefs.glade 2006-03-01 14:14:20.401863656 +0100 ++++ gnome-power-manager-2.13.92.new/data/gpm-prefs.glade 2006-03-01 14:16:50.376064112 +0100 +@@ -6,7 +6,6 @@ + + + 5 +- True + Power Management Preferences + GTK_WINDOW_TOPLEVEL + GTK_WIN_POS_CENTER +@@ -19,6 +18,7 @@ + GDK_WINDOW_TYPE_HINT_DIALOG + GDK_GRAVITY_NORTH_WEST + True ++ False + + + +@@ -721,7 +721,7 @@ + + + True +- When battery _power critical: ++ When battery _power is critical: + True + False + GTK_JUSTIFY_LEFT +@@ -889,7 +889,7 @@ + + + True +- 1 ++ 2 + 2 + False + 4 +@@ -939,6 +939,52 @@ + 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 ++ True ++ ++ ++ 1 ++ 2 ++ 1 ++ 2 ++ fill ++ fill ++ ++ + + + 0 +@@ -1210,4 +1256,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.13.93.orig/debian/patches/90-suspend-warning-and-sleep-button-impl.patch +++ gnome-power-manager-2.13.93/debian/patches/90-suspend-warning-and-sleep-button-impl.patch @@ -0,0 +1,243 @@ +diff -Nur gnome-power-manager-2.13.92/src/gpm-prefs.c gnome-power-manager-2.13.92.new/src/gpm-prefs.c +--- gnome-power-manager-2.13.92/src/gpm-prefs.c 2006-03-01 14:31:36.125409744 +0100 ++++ gnome-power-manager-2.13.92.new/src/gpm-prefs.c 2006-03-01 14:35:04.866676248 +0100 +@@ -65,6 +65,8 @@ + /* 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 +112,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 +230,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 +391,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); + } + +@@ -522,19 +585,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) { +@@ -681,18 +751,21 @@ + { + 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_name (GTK_WINDOW (main_window), "gnome-dev-battery"); + ++ 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); +@@ -704,7 +777,20 @@ + widget = glade_xml_get_widget (glade_xml, "button_help"); + g_signal_connect (widget, "clicked", + G_CALLBACK (gpm_prefs_help_cb), NULL); +- ++ ++ /* 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); ++ + has_batteries = gpm_has_batteries (); + + setup_icon_policy (glade_xml, has_batteries); +@@ -722,13 +808,38 @@ + 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, + N_("Show extra debugging information"), NULL }, +@@ -755,7 +866,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.13.92/src/gpm-prefs.h gnome-power-manager-2.13.92.new/src/gpm-prefs.h +--- gnome-power-manager-2.13.92/src/gpm-prefs.h 2006-03-01 14:31:36.937286320 +0100 ++++ gnome-power-manager-2.13.92.new/src/gpm-prefs.h 2006-03-01 14:33:46.769548816 +0100 +@@ -64,6 +64,8 @@ + /* This allows us to ignore policy on resume for a bit */ + #define GPM_PREF_POLICY_TIMEOUT GPM_PREF_DIR "/policy_suppression_timeout" + ++#define GPM_PREF_SUPPRESS_WARNING GPM_PREF_DIR "/suppress_suspend_warning" ++ + typedef enum { + GPM_ICON_POLICY_ALWAYS, + GPM_ICON_POLICY_CHARGE, --- gnome-power-manager-2.13.93.orig/debian/patches/40-ubuntu-schema-defaults.patch +++ gnome-power-manager-2.13.93/debian/patches/40-ubuntu-schema-defaults.patch @@ -0,0 +1,66 @@ +diff -Nur gnome-power-manager-2.13.92/data/gnome-power-manager.schemas.in gnome-power-manager-2.13.92.new/data/gnome-power-manager.schemas.in +--- gnome-power-manager-2.13.92/data/gnome-power-manager.schemas.in 2006-03-01 14:07:30.208222568 +0100 ++++ gnome-power-manager-2.13.92.new/data/gnome-power-manager.schemas.in 2006-03-01 14:09:24.786803976 +0100 +@@ -66,7 +66,7 @@ + /apps/gnome-power-manager/can_suspend + gnome-power-manager + bool +- true ++ false + + Suspend enabled + Whether or not the user can suspend the computer +@@ -126,7 +126,7 @@ + /apps/gnome-power-manager/display_icon_policy + gnome-power-manager + string +- always ++ charge + + When to show the notification icon + Option when to show the notification icon. Valid options are "never", "critical", "charge" and "always" +@@ -170,7 +170,7 @@ + /schemas/apps/gnome-power-manager/battery_brightness + /apps/gnome-power-manager/battery_brightness + int +- 50 ++ 70 + + LCD brightness when on battery + The brightness of the display when on battery power. Valid values are between 0 and 100. +@@ -181,7 +181,7 @@ + /schemas/apps/gnome-power-manager/battery_sleep_computer + /apps/gnome-power-manager/battery_sleep_computer + int +- 1200 ++ 0 + + Sleep timeout computer when on battery + The number of seconds the computer on battery power needs to be inactive before it goes to sleep. +@@ -203,7 +203,7 @@ + /schemas/apps/gnome-power-manager/action_button_suspend + /apps/gnome-power-manager/action_button_suspend + string +- suspend ++ nothing + + Suspend button action + The action to take when the system suspend button is pressed. Valid values are "suspend", "hibernate" and "nothing". +@@ -236,7 +236,7 @@ + /schemas/apps/gnome-power-manager/action_battery_button_lid + /apps/gnome-power-manager/action_battery_button_lid + string +- suspend ++ blank + + Laptop lid close action on battery + The action to take when the laptop lid is closed and the laptop is on battery power. Valid values are "suspend", "hibernate" and "blank". +@@ -247,7 +247,7 @@ + /schemas/apps/gnome-power-manager/action_sleep_type + /apps/gnome-power-manager/action_sleep_type + string +- suspend ++ nothing + + Whether to hibernate, suspend or do nothing when inactive + The type of sleeping that should be performed when the computer is inactive. Valid values are "hibernate", "suspend" and "nothing". --- gnome-power-manager-2.13.93.orig/debian/patches/80-suppress-policy-timeout.patch +++ gnome-power-manager-2.13.93/debian/patches/80-suppress-policy-timeout.patch @@ -0,0 +1,101 @@ +diff -Nur gnome-power-manager-2.13.93/src/gpm-manager.c gnome-power-manager-2.13.93.new/src/gpm-manager.c +--- gnome-power-manager-2.13.93/src/gpm-manager.c 2006-03-03 19:41:51.000000000 +0000 ++++ gnome-power-manager-2.13.93.new/src/gpm-manager.c 2006-03-06 12:50:11.063381880 +0000 +@@ -112,7 +112,9 @@ + gboolean lid_is_closed; + + const char *reason; +- ++ ++ time_t last_resume_event; ++ + }; + + enum { +@@ -643,7 +645,14 @@ + if (! action) { + return; + } +- ++ ++ if ((time (NULL) - manager->priv->last_resume_event) <= ++ gconf_client_get_int (manager->priv->gconf_client, ++ GPM_PREF_POLICY_TIMEOUT, NULL)) { ++ gpm_debug("UBUNTU-SPECIFIC: Skipping suppressed policy event"); ++ return; ++ } ++ + if (strcmp (action, ACTION_NOTHING) == 0) { + + gpm_debug ("*ACTION* Doing nothing"); +@@ -836,6 +845,8 @@ + } + gpm_networkmanager_wake (); + ++ manager->priv->last_resume_event = time (NULL); ++ + return ret; + } + +@@ -892,7 +903,9 @@ + gpm_screensaver_poke (); + } + gpm_networkmanager_wake (); +- ++ ++ manager->priv->last_resume_event = time (NULL); ++ + return ret; + } + +@@ -1116,7 +1129,7 @@ + GpmManager *manager) + { + gpm_debug ("Button press event type=%s state=%d", type, state); +- ++ + if (strcmp (type, GPM_BUTTON_POWER) == 0) { + power_button_pressed (manager, state); + +@@ -1312,7 +1325,17 @@ + gpm_debug ("No warning"); + return; + } +- ++ ++ /* If we're in policy suppression timeout then don't do critical ++ * warnings or anything else either. ++ */ ++ if ((time (NULL) - manager->priv->last_resume_event) <= ++ gconf_client_get_int (manager->priv->gconf_client, ++ GPM_PREF_POLICY_TIMEOUT, NULL)) { ++ gpm_debug("UBUNTU-DEBUG: Skipping suppressed power warning"); ++ return; ++ } ++ + if (warning_type == GPM_WARNING_ACTION) { + const char *warning = NULL; + const char *action; +@@ -1828,6 +1851,9 @@ + gpm_debug ("Using percentage notification policy"); + } + manager->priv->use_time_to_notify = use_time; ++ ++ /* Pretend we just resumed when we start to let actions settle */ ++ manager->priv->last_resume_event = time (NULL); + } + + static void +diff -Nur gnome-power-manager-2.13.93/src/gpm-prefs.h gnome-power-manager-2.13.93.new/src/gpm-prefs.h +--- gnome-power-manager-2.13.93/src/gpm-prefs.h 2006-03-03 10:52:14.000000000 +0000 ++++ gnome-power-manager-2.13.93.new/src/gpm-prefs.h 2006-03-06 12:50:11.064381728 +0000 +@@ -62,6 +62,9 @@ + #define GPM_PREF_IDLE_CHECK_NET GPM_PREF_DIR "/check_type_net" + #define GPM_PREF_IDLE_DIM_SCREEN GPM_PREF_DIR "/dim_on_idle" + ++/* This allows us to ignore policy on resume for a bit */ ++#define GPM_PREF_POLICY_TIMEOUT GPM_PREF_DIR "/policy_suppression_timeout" ++ + typedef enum { + GPM_ICON_POLICY_ALWAYS, + GPM_ICON_POLICY_CHARGE, --- gnome-power-manager-2.13.93.orig/debian/patches/50-ignore-timeout-on-dbus.patch +++ gnome-power-manager-2.13.93/debian/patches/50-ignore-timeout-on-dbus.patch @@ -0,0 +1,73 @@ +diff -Nur gnome-power-manager-2.13.93/src/gpm-hal.c gnome-power-manager-2.13.93.new/src/gpm-hal.c +--- gnome-power-manager-2.13.93/src/gpm-hal.c 2006-02-28 17:01:49.000000000 +0000 ++++ gnome-power-manager-2.13.93.new/src/gpm-hal.c 2006-03-06 13:00:14.876588320 +0000 +@@ -182,7 +182,7 @@ + gboolean + gpm_hal_suspend (gint wakeup) + { +- gint ret; ++ guint ret; + DBusGConnection *system_connection = NULL; + DBusGProxy *hal_proxy = NULL; + GError *error = NULL; +@@ -195,15 +195,21 @@ + HAL_ROOT_COMPUTER, + HAL_DBUS_INTERFACE_POWER); + retval = TRUE; ++ ret = 0; + if (!dbus_g_proxy_call (hal_proxy, "Suspend", &error, + G_TYPE_INT, wakeup, G_TYPE_INVALID, + G_TYPE_UINT, &ret, G_TYPE_INVALID)) { +- if (error) { +- gpm_warning ("%s", error->message); ++ ++ if (error && g_error_matches (error, DBUS_GERROR, DBUS_GERROR_NO_REPLY)) { + g_error_free (error); ++ } else { ++ if (error) { ++ gpm_warning ("%s", error->message); ++ g_error_free (error); ++ } ++ gpm_warning (HAL_DBUS_INTERFACE_POWER ".Suspend failed (HAL error)"); ++ retval = FALSE; + } +- gpm_warning (HAL_DBUS_INTERFACE_POWER ".Suspend failed (HAL error)"); +- retval = FALSE; + } + if (ret != 0) + retval = FALSE; +@@ -220,7 +226,7 @@ + static gboolean + hal_pm_method_void (const gchar* method) + { +- gint ret; ++ guint ret; + DBusGConnection *system_connection = NULL; + DBusGProxy *hal_proxy = NULL; + GError *error = NULL; +@@ -233,16 +239,20 @@ + HAL_ROOT_COMPUTER, + HAL_DBUS_INTERFACE_POWER); + retval = TRUE; ++ ret = 0; + if (!dbus_g_proxy_call (hal_proxy, method, &error, + G_TYPE_INVALID, + G_TYPE_UINT, &ret, G_TYPE_INVALID)) { +- if (error) { +- gpm_warning ("%s", error->message); ++ if (error && g_error_matches (error, DBUS_GERROR, DBUS_GERROR_NO_REPLY)) { + g_error_free (error); ++ } else { ++ if (error) { ++ gpm_warning ("%s", error->message); ++ g_error_free (error); ++ } ++ gpm_warning (HAL_DBUS_INTERFACE_POWER ".%s failed (HAL error)", method); ++ retval = FALSE; + } +- gpm_warning (HAL_DBUS_INTERFACE_POWER +- ".%s failed (HAL error)", method); +- retval = FALSE; + } + if (ret != 0) + retval = FALSE; --- gnome-power-manager-2.13.93.orig/debian/patches/55-laptops-always-show-icon.patch +++ gnome-power-manager-2.13.93/debian/patches/55-laptops-always-show-icon.patch @@ -0,0 +1,24 @@ +diff -Nur gnome-power-manager-2.13.93/data/gpm-prefs.glade gnome-power-manager-2.13.93.new/data/gpm-prefs.glade +--- gnome-power-manager-2.13.93/data/gpm-prefs.glade 2006-03-06 13:23:31.773227752 +0000 ++++ gnome-power-manager-2.13.93.new/data/gpm-prefs.glade 2006-03-06 13:23:46.767948208 +0000 +@@ -1147,7 +1147,7 @@ + + True + True +- _Always display icon when battery present ++ _Always display icon + True + GTK_RELIEF_NORMAL + True +diff -Nur gnome-power-manager-2.13.93/src/gpm-manager.c gnome-power-manager-2.13.93.new/src/gpm-manager.c +--- gnome-power-manager-2.13.93/src/gpm-manager.c 2006-03-06 13:23:26.117087000 +0000 ++++ gnome-power-manager-2.13.93.new/src/gpm-manager.c 2006-03-06 13:23:32.588103872 +0000 +@@ -396,7 +396,7 @@ + use_fallback = gconf_client_get_bool (manager->priv->gconf_client, + GPM_PREF_USE_ICON_DESKTOPS, + NULL); +- if (use_fallback) { ++ if (use_fallback || gpm_hal_is_laptop ()) { + /* we fallback to the ac_adapter icon */ + gpm_debug ("Using fallback"); + return g_strdup_printf (GPM_STOCK_AC_ADAPTER); --- gnome-power-manager-2.13.93.orig/debian/dirs +++ gnome-power-manager-2.13.93/debian/dirs @@ -0,0 +1,3 @@ +usr/bin +usr/sbin + --- gnome-power-manager-2.13.93.orig/debian/control +++ gnome-power-manager-2.13.93/debian/control @@ -0,0 +1,21 @@ +Source: gnome-power-manager +Section: gnome +Priority: optional +Maintainer: Richard Hughes +Build-Depends: debhelper (>= 4.0.0), autotools-dev, automake1.7, libgnomeui-dev, libglade2-dev, libhal-dev (>= 0.5.4), libdbus-1-dev (>= 0.60), libdbus-glib-1-dev (>= 0.60), libxml-parser-perl, libgtk2.0-dev, libwnck-dev, libtool, docbook-to-man, intltool, libnotify-dev (>= 0.3.2-0ubuntu2), dbus-1-utils, docbook-utils, libxres-dev, gnome-doc-utils, cdbs, scrollkeeper +Standards-Version: 3.6.2 + +Package: gnome-power-manager +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, notification-daemon, powermanagement-interface, libpam-foreground +Replaces: gnome-power, power-manager +Provides: gnome-power +Description: Power management policy frontend for GNOME + GNOME Power Manager is a GNOME session daemon that acts as a policy + agent on top of the Project Utopia stack, which includes the kernel, + hotplug, udev, and HAL. + . + GNOME Power Manager listens for HAL events and responds with + user-configurable reactions. Currently it supports UPSs, laptop + batteries and AC adapters. Its goal is to be architecture neutral and + free of polling and other hacks. --- gnome-power-manager-2.13.93.orig/debian/changelog +++ gnome-power-manager-2.13.93/debian/changelog @@ -0,0 +1,407 @@ +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-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-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-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 (0.3.4-0ubuntu10) dapper; urgency=low + + * Remove the --sm-disable from the .desktop file in autostart since the + gnome-power-manager daemon can cope with being run more than one in a + session and it breaks the logout dialog (E.g. on powerbutton) if it + is not run with session access. + closes malone #31103 + + -- Daniel Silverstone Wed, 15 Feb 2006 18:15:27 +0000 + +gnome-power-manager (0.3.4-0ubuntu9) dapper; urgency=low + + * Add libpam-foreground to the dependencies line. + Closes: malone #31176 + * Replace package description with something better. + + -- Daniel Silverstone Wed, 15 Feb 2006 13:22:47 +0000 + +gnome-power-manager (0.3.4-0ubuntu8) dapper; urgency=low + + * set LCD brightness defaults to sane values (100% on ac, + 70% on battery by default now) closes malone #31490 + * set suspend/hibernate on battery to "never" by default + and leave it to the user to set that, to prevent bad surprises + + -- Oliver Grawert Wed, 15 Feb 2006 12:33:18 +0100 + +gnome-power-manager (0.3.4-0ubuntu7) dapper; urgency=low + + * Add support for a 'lock' action in gnome-power-manager + * Added support for such in gnome-power-preferences + * When lid is opened, poke the screensaver if we may have locked it before. + * closes malone #29881 + + -- Daniel Silverstone Tue, 14 Feb 2006 16:08:58 +0000 + +gnome-power-manager (0.3.4-0ubuntu6) dapper; urgency=low + + * src/gpm-hal.c + - Fix NULL dereference - Malone #30718 + * src/gpm-manager.c + - Don't perform critical battery action if on AC power + + -- Matthew Garrett Tue, 7 Feb 2006 17:01:11 +0000 + +gnome-power-manager (0.3.4-0ubuntu5) dapper; urgency=low + + * src/gpm-hal-monitor.c + - Add support for listening to non-ACPI buttons + * src/gpm-manager.c + src/gpm-manager.h + - Add support for hibernating + + -- Matthew Garrett Mon, 6 Feb 2006 16:31:14 +0000 + +gnome-power-manager (0.3.4-0ubuntu4) dapper; urgency=low + + * debian/control: build-dep on libnoitfy >= 0.3.2-0ubuntu2 + + -- Michael Vogt Tue, 24 Jan 2006 16:18:33 +0100 + +gnome-power-manager (0.3.4-0ubuntu3) dapper; urgency=low + + * debian/control: + - switch back to depend on notification-daemon + - build-depend on libnotify-dev >= 0.3.2 + + -- Michael Vogt Tue, 24 Jan 2006 14:18:06 +0100 + +gnome-power-manager (0.3.4-0ubuntu2) dapper; urgency=low + + * remove gdm-signal, should be handled all by hal now + + -- Oliver Grawert Tue, 24 Jan 2006 00:16:37 +0100 + +gnome-power-manager (0.3.4-0ubuntu1) dapper; urgency=low + + * new upstream release + * added patch from g-p-m cvs (1.286) to avoid crashing + * re-added the calls to gdm-signal + + -- Oliver Grawert Wed, 18 Jan 2006 19:44:46 +0100 + +gnome-power-manager (0.3.1-0ubuntu5) dapper; urgency=low + + * configure.in: + - added test on libnotify version, that makes notifications work again + * src/gpm-libnotify.c: + - improved arrow point calculation + + -- Michael Vogt Mon, 16 Jan 2006 10:16:22 +0100 + +gnome-power-manager (0.3.1-0ubuntu4) dapper; urgency=low + + * src/gpm-libnotify.{c,h}: + - ported to new libnotify api (taken from cvs) + * debian/control: + - changed dependency from notification-daemon to notify-daemon + + -- Michael Vogt Mon, 2 Jan 2006 21:10:43 +0100 + +gnome-power-manager (0.3.1-0ubuntu3) dapper; urgency=low + + * rebuild against latest dbus + + -- Michael Vogt Wed, 21 Dec 2005 11:11:56 +0100 + +gnome-power-manager (0.3.1-0ubuntu2) dapper; urgency=low + + * suspend by calling gdm-signal directly, rather than by going through + hal (allows suspend without requiring privilege escalation) + + -- Matthew Garrett Tue, 6 Dec 2005 05:43:33 +0000 + +gnome-power-manager (0.3.1-0ubuntu1) dapper; urgency=low + + * new upstream release + + -- Oliver Grawert Thu, 17 Nov 2005 02:42:49 +0100 + +gnome-power-manager (0.2.8.1-1ubuntu1) dapper; urgency=low + + * initial dapper upload + + -- Oliver Grawert Tue, 25 Oct 2005 00:24:15 +0200 + +gnome-power-manager (0.2.8.1-1utopia1) breezy; urgency=low + + * Initial import, based from the universe ubuntu package. + + -- Richard Hughes Mon, 24 Oct 2005 00:49:03 +0100 --- gnome-power-manager-2.13.93.orig/debian/postinst +++ gnome-power-manager-2.13.93/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.13.93.orig/debian/rules +++ gnome-power-manager-2.13.93/debian/rules @@ -0,0 +1,13 @@ +#!/usr/bin/make -f + +DEB_CONFIGURE_USER_FLAGS=--disable-scrollkeeper --with-dpms-ext + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/rules/simple-patchsys.mk +include /usr/share/cdbs/1/class/gnome.mk + +# gnome-power-manager.desktop now ends up in /usr/share/gnome/autostart +# but we want it in /etc/xdg/autostart so that sysadmins can fiddle at will. +DEB_MAKE_INSTALL_TARGET += autostartdir=/etc/xdg/autostart + +DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH)