r17469 - in /desktop/unstable/gnome-settings-daemon/debian: changelog patches/08_extra_touchpad_options.patch patches/11_sleepkey.patch

[joss at users.alioth.debian.org]

Author: joss
Date: Tue Nov 11 15:14:59 2008
New Revision: 17469

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=17469
Log:
* 08_extra_touchpad_options.patch: removed broken patch from Ubuntu. 
  Closes: #481191.
* 11_sleepkey.patch: use gnome-power-cmd to suspend the computer 
  instead of the nonexistent gdm-signal.

Removed:
    desktop/unstable/gnome-settings-daemon/debian/patches/08_extra_touchpad_options.patch
Modified:
    desktop/unstable/gnome-settings-daemon/debian/changelog
    desktop/unstable/gnome-settings-daemon/debian/patches/11_sleepkey.patch

Modified: desktop/unstable/gnome-settings-daemon/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-settings-daemon/debian/changelog?rev=17469&op=diff
==============================================================================
--- desktop/unstable/gnome-settings-daemon/debian/changelog (original)
+++ desktop/unstable/gnome-settings-daemon/debian/changelog Tue Nov 11 15:14:59 2008
@@ -1,3 +1,12 @@
+gnome-settings-daemon (2.22.2.1-2) unstable; urgency=low
+
+  * 08_extra_touchpad_options.patch: removed broken patch from Ubuntu. 
+    Closes: #481191.
+  * 11_sleepkey.patch: use gnome-power-cmd to suspend the computer 
+    instead of the nonexistent gdm-signal.
+
+ -- Josselin Mouette <joss at debian.org>  Tue, 11 Nov 2008 16:08:08 +0100
+
 gnome-settings-daemon (2.22.2.1-1) unstable; urgency=low
 
   [ Josselin Mouette ]

Modified: desktop/unstable/gnome-settings-daemon/debian/patches/11_sleepkey.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-settings-daemon/debian/patches/11_sleepkey.patch?rev=17469&op=diff
==============================================================================
--- desktop/unstable/gnome-settings-daemon/debian/patches/11_sleepkey.patch (original)
+++ desktop/unstable/gnome-settings-daemon/debian/patches/11_sleepkey.patch Tue Nov 11 15:14:59 2008
@@ -1,12 +1,11 @@
-diff -Nur -x '*.orig' -x '*~' gnome-settings-daemon-2.21.5.2/plugins/media-keys/gsd-media-keys-manager.c gnome-settings-daemon-2.21.5.2.new/plugins/media-keys/gsd-media-keys-manager.c
---- gnome-settings-daemon-2.21.5.2/plugins/media-keys/gsd-media-keys-manager.c	2008-01-14 16:12:58.000000000 +0100
-+++ gnome-settings-daemon-2.21.5.2.new/plugins/media-keys/gsd-media-keys-manager.c	2008-01-16 15:23:45.000000000 +0100
-@@ -869,7 +869,7 @@
+--- plugins/media-keys/gsd-media-keys-manager.c.orig	2008-04-07 13:00:13.000000000 +0200
++++ plugins/media-keys/gsd-media-keys-manager.c	2008-11-11 15:52:13.128637020 +0100
+@@ -875,7 +875,7 @@
                  do_mail_action (manager);
                  break;
          case SLEEP_KEY:
 -                do_sleep_action ("apm", "xset dpms force off");
-+                do_sleep_action ("gdm-signal -s", "xset dpms force off");
++                do_sleep_action ("gnome-power-cmd suspend", "xset dpms force off");
                  break;
          case SCREENSAVER_KEY:
                  if ((cmd = g_find_program_in_path ("gnome-screensaver-command"))) {