--- gnome-settings-daemon-2.24.0.orig/debian/gnome-settings-daemon-dev.install +++ gnome-settings-daemon-2.24.0/debian/gnome-settings-daemon-dev.install @@ -0,0 +1,2 @@ +debian/tmp/usr/include +debian/tmp/usr/lib/pkgconfig --- gnome-settings-daemon-2.24.0.orig/debian/rules +++ gnome-settings-daemon-2.24.0/debian/rules @@ -0,0 +1,12 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/rules/simple-patchsys.mk +include /usr/share/cdbs/1/rules/utils.mk +include /usr/share/cdbs/1/class/gnome.mk +include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk +-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk + +binary-install/gnome-settings-daemon:: + find debian -name '*.a' -delete + find debian -name '*.la' -delete --- gnome-settings-daemon-2.24.0.orig/debian/changelog +++ gnome-settings-daemon-2.24.0/debian/changelog @@ -0,0 +1,316 @@ +gnome-settings-daemon (2.24.0-0ubuntu3.2) intrepid-proposed; urgency=low + + * debian/patches/20_mouse_devicepresencenotify.patch: + - Fix the DevicePresenceNotify storm. Now we only watch for DeviceEnabled + (rather than DeviceAdded) events. (LP: #293318) + * debian/patches/08_extra_touchpad_options.patch: + - device_is_touchpad: Decide that it's not a touchpad unless it is of type + XI_TOUCHPAD. + - set_tap_to_click: Fix a couple of potential memory leaks. + + -- William Grant Sat, 08 Nov 2008 11:46:30 +1100 + +gnome-settings-daemon (2.24.0-0ubuntu3.1) intrepid-proposed; urgency=low + + * debian/patches/20_mouse_devicepresencenotify.patch: Listen for X input + device changes, and reconfigure pointers if necessary. This makes + hotplugged pointing devices respect user settings. (LP: #280148) + + -- William Grant Mon, 03 Nov 2008 19:35:58 +1100 + +gnome-settings-daemon (2.24.0-0ubuntu3) intrepid; urgency=low + + * debian/control.in: Add a build-depend on libxi-dev + (>= 2:1.1.3-1ubuntu4) (FTBFS). + + -- Timo Aaltonen Fri, 10 Oct 2008 12:59:21 +0300 + +gnome-settings-daemon (2.24.0-0ubuntu2) intrepid; urgency=low + + [ William Grant ] + * debian/patches/08_extra_touchpad_options.patch: + - Update for the new property API. (LP: #274728) + + No longer use XQueryDeviceProperty to check if a property exists - the + function has been removed. + + Remove the 'pending' argument from calls to XGetDeviceProperty. + - Don't trust that a device that looks like a touchpad has all properties + that a real touchpad does, as properties can be added by a user, and + things segfault. + - Label set failure warnings with the device name to make things a bit + less scary. + - Fix a couple of compiler warnings. + + -- Timo Aaltonen Fri, 10 Oct 2008 12:40:40 +0300 + +gnome-settings-daemon (2.24.0-0ubuntu1) intrepid; urgency=low + + * New upstream version: + - Fix the fix for read-only home directories + - Make the volume popup not crash when invoking it on any screen but + the first when using a compositing manager + - Add GPLv2 copyright notice explicitly so that newer versions of + autotools don't declare us GPLv3 + - Specify GTK modules to load in a GConf directory instead of the + single /desktop/gnome/gtk-modules key + - Also allow linking the module state to other boolean keys by using + a string value that is the name of the key to use + - Made the housekeeping plugin less aggressive by default + + -- Sebastien Bacher Tue, 23 Sep 2008 12:48:51 +0200 + +gnome-settings-daemon (2.23.92-0ubuntu3) intrepid; urgency=low + + * Rebuild due to libgnomekbd soname change + + -- Sebastien Bacher Wed, 10 Sep 2008 14:39:44 +0200 + +gnome-settings-daemon (2.23.92-0ubuntu2) intrepid; urgency=low + + * Drop 80_evdev_no_model.patch, since there's no need to force the + model anymore. The evdev driver uses evdev rules instead, and so + the user is able to change the kb model again. + + -- Timo Aaltonen Tue, 09 Sep 2008 18:21:36 +0300 + +gnome-settings-daemon (2.23.92-0ubuntu1) intrepid; urgency=low + + * New upstream version: + - Try harder to use the keyboard layout passed by GDM + - Updated translations + + -- Sebastien Bacher Mon, 08 Sep 2008 13:35:27 +0200 + +gnome-settings-daemon (2.23.91-0ubuntu2) intrepid; urgency=low + + * debian/patches/08_extra_touchpad_options.patch: + - Look for the "Synaptics Off" XInput property to determine whether + a given device is a touchpad, rather than hardcoding the device + name. (LP: #207781) + - Use XInput device properties to set touchpad settings. + + -- William Grant Tue, 02 Sep 2008 09:07:34 +1000 + +gnome-settings-daemon (2.23.91-0ubuntu1) intrepid; urgency=low + + * New upstream version: + - Removed translatable property on stock gtk-close + - Fix a constness warning + - Fix a crash due to an incorrect signal handler definition + - Use a scale factor instead of a fixed DPI + - Use g_warning instead of g_error when setup fails so we don't abort + + -- Sebastien Bacher Mon, 01 Sep 2008 16:54:56 +0200 + +gnome-settings-daemon (2.23.90-0ubuntu1) intrepid; urgency=low + + * New upstream version: + - PulseAudio check to not ouput "no" twice + - Add status icon when a11y hotkeys are enabled, and display Universal + Access preferences when it is clicked + - Simplify libnotify check, fix fontconfig result output + - Put the Glade file where all the others are + - Remove some unnecessary boilerplate + - Use g_file_monitor instead of g_file_monitor_file/_directory + - Remove warning that isn't + - Fixed crash in randr startup + - Fail xrandr initialization if we couldn't start xrandr + - Try harder to clean up xrandr in _stop so we can enable/disable + the plugin on the fly + - For LIBSOUNDS, check for libgnomeui, not just libgnome + - Add sexy labels when setting up dual monitors + - Add a separator to the menu before "Configure display settings" + - Use GDK to get DPI + * debian/control.in: + - updated the requirements + + -- Sebastien Bacher Tue, 19 Aug 2008 00:11:28 +0200 + +gnome-settings-daemon (2.23.6-0ubuntu2) intrepid; urgency=low + + * debian/patches/80_evdev_no_model.patch: + - don't set a keyboard model when evdev is being used (lp: #255008) + + -- Sebastien Bacher Wed, 13 Aug 2008 23:27:21 +0200 + +gnome-settings-daemon (2.23.6-0ubuntu1) intrepid; urgency=low + + * New upstream version: + - Remove libgnomeui dependency + - Bump glib dependency to 2.15 + - Use standard icon names for the OSD + - Make the display notification icon configurable (lp: #252546) + - Resolve NumLock dynamically + * debian/control.in: + - don't use libgnomeui + + -- Sebastien Bacher Mon, 04 Aug 2008 18:43:28 +0200 + +gnome-settings-daemon (2.23.5-0ubuntu1) intrepid; urgency=low + + * New upstream version: + - New settings for event sounds + - Fix include path for building against uninstalled package. + - Remove 'daemon' from the warning message + - Make more shortcuts with shift work + - Update RandR code to use new gnome-desktop API + - Fix accelerator check + - Detect and enable PulseAudio + * debian/control.in: + - build-depends on libpulse-dev + - updated libgnome-desktop requirement + * debian/gnome-settings-daemon.install: + - install new icons + * debian/patches/91_gsd-add-randr-12.patch, + debian/patches/92_gsd-xrandr-version-check.patch: + - dropped, the new version has similar changes + * debian/rules: + - no need to workaround timestamp issue those are correct in the new version + + -- Sebastien Bacher Fri, 25 Jul 2008 14:23:09 +0200 + +gnome-settings-daemon (2.23.3-0ubuntu3) intrepid; urgency=low + + * rebuild due to the libgnome-desktop soname change + + -- Sebastien Bacher Fri, 06 Jun 2008 11:11:50 +0200 + +gnome-settings-daemon (2.23.3-0ubuntu2) intrepid; urgency=low + + * debian/rules: + - the new tarball has broken timestamps again, workaround the issue + + -- Sebastien Bacher Wed, 04 Jun 2008 10:30:06 +0200 + +gnome-settings-daemon (2.23.3-0ubuntu1) intrepid; urgency=low + + * New upstream version: + - Execute the correct action when there are multiple keyboard shortcuts with + the same keycode but different keysyms + - Fix wallpaper handling for people running a session without nautilus + - Try to keep the keyboard layout from gdm + - Don't die when the user's home directory is read-only + - Fix artifacts from the locate pointer animation in non-composited mode + - Pass clicks to the media popup window through to the underlying window + - Use new gnome-desktop background API and get rid of libbackground + - Don't eat keypresses for multimedia key events in the mouse plugin + - Shutdown when receiving the "SessionOver" signal from gnome-session + - Fix memory leaks in the font plugin + - Move the locate pointer animation with the mouse cursor + - Fix build without GStreamer + * debian/control.in: + - updated libgnome-desktop requirement + * debian/gnome-settings-daemon.install: + - install the new autostart and the dbus service + * debian/rules: + - don't remove the dbus service + + -- Sebastien Bacher Tue, 03 Jun 2008 23:09:04 +0200 + +gnome-settings-daemon (2.23.1.1-0ubuntu1) intrepid; urgency=low + + * New upstream version: + - Sound server startup based on GConf setting, even when esd is disabled + - Added a new "housekeeping" plugin to set limits on the size and age of the + thumbnail cache (lp: #37643) + - Fix mismatched modifier maping between egg and GTK + - Replace some custom functionality with stock GTK + - Mark string for translation + - Use G_DEFINE_TYPE instead of open-coding + - Change data types to match glib, avoid using time_t + - Add mapping for Gtk/Modules xsetting using GConf + - Set GConf keys back to false if mousetweaks is not installed + - Don't try to add grabas with invalid modifiers + - Remove trailing newlines from messages since g_warning already takes care + of those + - Fix various leaks + - Fix TYPE macro and remove unimplemented prototype + - Add a special volume subclass for better support of IBM Thinkpad hardware + volume buttons + - Initialize inited_ok or behaviour is undefined when xkb setup fails + - Continued attempt at making XKB setup and error handling a bit less arcane + and crufty + - Only use the built-in default for volume_step if we get an + error from GConf, not just when the value is 0 which might be what + the user wants + - Adds a "threshold" property to the AcmeVolume class that denotes + the minimum percentage required to actually affect the volume + - Don't install any listeners or callbacks when XKB is not available + - Remove excessive key grab logging + - Make plugins deactivation work + - Properly null-terminate g_build_filename + - Turn into a daemon by default and make --no-daemon work + - DBus API has been stable for a while; + don't define DBUS_API_SUBJECT_TO_CHANGE anymore + - Drop GConf backup for xkb + - Extract some functionality used by several plugins into a separate + shared helper library + - Reset GConf keys when we can't launch the daemon + - Updated translations + * Sync on Debian + * debian/control.in: + - updated maintainer information + * debian/gnome-settings-daemon.install: + - install the xrdb files in the correct directory + * debian/rules: + - don't do timestamps change since this tarball has no issue + + -- Sebastien Bacher Tue, 03 Jun 2008 15:46:21 +0200 + +gnome-settings-daemon (2.22.2.1-1) unstable; urgency=low + + [ Josselin Mouette ] + * Fix priority. + + [ Sebastian Dröge ] + * New upstream bugfix release: + + debian/rules: + - Run touch on every file to fix up timestamps. + + -- Sebastian Dröge Thu, 29 May 2008 10:31:39 +0200 + +gnome-settings-daemon (2.22.1-2) unstable; urgency=high + + * Conflict against gnome-control-center < 2.21.5. Closes: #476802. + + -- Josselin Mouette Sat, 19 Apr 2008 22:17:49 +0200 + +gnome-settings-daemon (2.22.1-1) unstable; urgency=low + + * New upstream bugfix release: + + debian/patches/09_locate_pointer.patch: + - Dropped, fixed upstream. + + -- Sebastian Dröge Mon, 07 Apr 2008 14:44:12 +0200 + +gnome-settings-daemon (2.22.0-4) unstable; urgency=low + + * debian/control.in: + + Also conflict with totem (<< 2.22.0) for the same reason. + * debian/gnome-settings-daemon.install: + + Install xrdb files into /etc/gnome/config again. + + -- Sebastian Dröge Sat, 22 Mar 2008 14:56:12 +0100 + +gnome-settings-daemon (2.22.0-3) unstable; urgency=low + + * Upload to unstable. + * debian/control.in: + + Add conflicts with rhythmbox (<< 0.11.5) and banshee (<< 0.13.2+dfsg-7) + as the multimedia keys DBus interface changed. + + -- Sebastian Dröge Wed, 19 Mar 2008 01:47:15 +0100 + +gnome-settings-daemon (2.22.0-2) experimental; urgency=low + + * debian/rules: + + Don't install the dbus service file. This is not meant to be autostarted + but should be started by gnome-session. + + -- Sebastian Dröge Sun, 16 Mar 2008 17:39:52 +0100 + +gnome-settings-daemon (2.22.0-1) experimental; urgency=low + + * New package, based on the Ubuntu packaging. + + -- Sebastian Dröge Wed, 12 Mar 2008 15:17:19 +0100 + --- gnome-settings-daemon-2.24.0.orig/debian/copyright +++ gnome-settings-daemon-2.24.0/debian/copyright @@ -0,0 +1,72 @@ +This package was debianized by Sebastien Bacher on +Wed, 16 Jan 2008 11:12:19 +0100. + +It was downloaded from http://ftp.acc.umu.se/pub/GNOME/sources/gnome-settings-daemon + +Upstream Authors: + + Jonathan Blandford + William Jon McCann + +Copyright: + + Copyright © 2001 Ximian, Inc. + Copyright (C) 2007 William Jon McCann + Copyright (C) 2000 Helix Code, Inc + Copyright © 2007 Matthias Clasen + Copyright (C) 2007 Rodrigo Moya + Copyright (C) 2007 Anders Carlsson + Copyright © 2004 Red Hat, Inc. + Copyright 2002 Sun Microsystems, Inc. + Copyright © 2005,2006 Novell, Inc. + Copyright © 2007 The GNOME Foundation + Copyright (C) 2002-2005 - Paolo Maggi + Copyright (C) 2002 Red Hat, Inc. + Copyright 1998, 2001 Tim Janik + Copyright � 2001 Udaltsoft + Copyright (C) 2001, 2002, 2003 Bastien Nocera + Copyright (C) 2003 Ross Burton + Copyright © 2001 Jonathan Blandford + +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'. + +eggaccelerators.h, eggaccelerators.c + +License: + + This package is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser 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 Lesser General +Public License can be found in `/usr/share/common-licenses/LGPL'. + +The Debian packaging is (C) 2008, Sebastien Bacher and +is licensed under the GPL, see above. --- gnome-settings-daemon-2.24.0.orig/debian/gnome-settings-daemon.links +++ gnome-settings-daemon-2.24.0/debian/gnome-settings-daemon.links @@ -0,0 +1 @@ +usr/lib/gnome-settings-daemon/gnome-settings-daemon usr/bin/gnome-settings-daemon --- gnome-settings-daemon-2.24.0.orig/debian/compat +++ gnome-settings-daemon-2.24.0/debian/compat @@ -0,0 +1 @@ +5 --- gnome-settings-daemon-2.24.0.orig/debian/gnome-settings-daemon.install +++ gnome-settings-daemon-2.24.0/debian/gnome-settings-daemon.install @@ -0,0 +1,9 @@ +debian/tmp/etc/gconf/schemas +debian/tmp/etc/xdg/autostart +debian/tmp/usr/lib/gnome-settings-daemon* +debian/tmp/usr/share/locale +debian/tmp/usr/share/icons/hicolor +debian/tmp/usr/share/dbus-1/services +debian/tmp/usr/share/gnome-settings-daemon/*.glade +debian/tmp/usr/share/gnome-settings-daemon/*.png +debian/tmp/usr/share/gnome-settings-daemon/xrdb/* /etc/gnome/config --- gnome-settings-daemon-2.24.0.orig/debian/control.in +++ gnome-settings-daemon-2.24.0/debian/control.in @@ -0,0 +1,55 @@ +Source: gnome-settings-daemon +Section: gnome +Priority: optional +Maintainer: Ubuntu Desktop Team +XSBC-Original-Maintainer: Debian GNOME Maintainers +Uploaders: @GNOME_TEAM@ +Build-Depends: cdbs, + debhelper (>= 5), + dpkg-dev (>= 1.13.19), + autotools-dev, + libdbus-glib-1-dev (>= 0.74), + libglib2.0-dev (>= 2.17.3), + libgtk2.0-dev (>= 2.10.0), + libgconf2-dev (>= 2.6.1), + gconf2, + libgnomeui-dev, + libgnome-desktop-dev (>= 1:2.23.90), + libglade2-dev, + libgnomekbd-dev (>= 2.21.4), + libgstreamer0.10-dev (>= 0.10.1.2), + libgstreamer-plugins-base0.10-dev (>= 0.10.1.2), + libxklavier12-dev, + libx11-dev, + libxi-dev (>= 2:1.1.3-1ubuntu4), + libxrandr-dev, + libxft2-dev, + libxxf86misc-dev, + libesd0-dev (>= 0.2.28), + libpulse-dev, + libxml-parser-perl, + gnome-pkg-tools +Standards-Version: 3.7.3 + +Package: gnome-settings-daemon +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends} +Replaces: capplets-data (<< 1:2.21.5), + gnome-control-center (<< 1:2.21.5) +Conflicts: rhythmbox (<< 0.11.5), + banshee (<< 0.13.2+dfsg-7), + totem (<< 2.22.0), + gnome-control-center (<< 1:2.21.5) +Description: GNOME settings daemon + The package contains the GNOME daemon which handles the session settings + +Package: gnome-settings-daemon-dev +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends}, + libdbus-glib-1-dev (>= 0.74), + libglib2.0-dev (>= 2.15.0) +Replaces: libgnome-settings-daemon-dev +Description: Utility library for accessing gnome-settings-daemon over DBUS + The package contains what is required to access gnome-settings-daemon over DBUS --- gnome-settings-daemon-2.24.0.orig/debian/control +++ gnome-settings-daemon-2.24.0/debian/control @@ -0,0 +1,55 @@ +Source: gnome-settings-daemon +Section: gnome +Priority: optional +Maintainer: Ubuntu Desktop Team +XSBC-Original-Maintainer: Debian GNOME Maintainers +Uploaders: Debian GNOME Maintainers +Build-Depends: cdbs, + debhelper (>= 5), + dpkg-dev (>= 1.13.19), + autotools-dev, + libdbus-glib-1-dev (>= 0.74), + libglib2.0-dev (>= 2.17.3), + libgtk2.0-dev (>= 2.10.0), + libgconf2-dev (>= 2.6.1), + gconf2, + libgnomeui-dev, + libgnome-desktop-dev (>= 1:2.23.90), + libglade2-dev, + libgnomekbd-dev (>= 2.21.4), + libgstreamer0.10-dev (>= 0.10.1.2), + libgstreamer-plugins-base0.10-dev (>= 0.10.1.2), + libxklavier12-dev, + libx11-dev, + libxi-dev (>= 2:1.1.3-1ubuntu4), + libxrandr-dev, + libxft2-dev, + libxxf86misc-dev, + libesd0-dev (>= 0.2.28), + libpulse-dev, + libxml-parser-perl, + gnome-pkg-tools +Standards-Version: 3.7.3 + +Package: gnome-settings-daemon +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends} +Replaces: capplets-data (<< 1:2.21.5), + gnome-control-center (<< 1:2.21.5) +Conflicts: rhythmbox (<< 0.11.5), + banshee (<< 0.13.2+dfsg-7), + totem (<< 2.22.0), + gnome-control-center (<< 1:2.21.5) +Description: GNOME settings daemon + The package contains the GNOME daemon which handles the session settings + +Package: gnome-settings-daemon-dev +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends}, + libdbus-glib-1-dev (>= 0.74), + libglib2.0-dev (>= 2.15.0) +Replaces: libgnome-settings-daemon-dev +Description: Utility library for accessing gnome-settings-daemon over DBUS + The package contains what is required to access gnome-settings-daemon over DBUS --- gnome-settings-daemon-2.24.0.orig/debian/patches/19_extra_keybindings.patch +++ gnome-settings-daemon-2.24.0/debian/patches/19_extra_keybindings.patch @@ -0,0 +1,52 @@ +diff -Nur -x '*.orig' -x '*~' gnome-settings-daemon-2.21.91/data/apps_gnome_settings_daemon_keybindings.schemas.in gnome-settings-daemon-2.21.91.new/data/apps_gnome_settings_daemon_keybindings.schemas.in +--- gnome-settings-daemon-2.21.91/data/apps_gnome_settings_daemon_keybindings.schemas.in 2008-02-08 06:29:12.000000000 -0600 ++++ gnome-settings-daemon-2.21.91.new/data/apps_gnome_settings_daemon_keybindings.schemas.in 2008-02-28 15:04:31.000000000 -0600 +@@ -132,6 +132,16 @@ + + + ++ ++ /schemas/apps/gnome_settings_daemon/keybindings/xrandr ++ /apps/gnome_settings_daemon/keybindings/xrandr ++ string ++ 0xd6 ++ ++ Activate connected display ++ Activate a connected display using xrandr ++ ++ + + + /schemas/apps/gnome_settings_daemon/keybindings/help +diff -Nur -x '*.orig' -x '*~' gnome-settings-daemon-2.21.91/plugins/media-keys/actions/acme.h gnome-settings-daemon-2.21.91.new/plugins/media-keys/actions/acme.h +--- gnome-settings-daemon-2.21.91/plugins/media-keys/actions/acme.h 2007-12-24 05:18:48.000000000 -0600 ++++ gnome-settings-daemon-2.21.91.new/plugins/media-keys/actions/acme.h 2008-02-28 15:04:31.000000000 -0600 +@@ -33,6 +33,7 @@ + HOME_KEY, + MEDIA_KEY, + CALCULATOR_KEY, ++ XRANDR_KEY, + SEARCH_KEY, + EMAIL_KEY, + SLEEP_KEY, +@@ -66,6 +67,7 @@ + { HOME_KEY, GCONF_BINDING_DIR "/home", NULL }, + { MEDIA_KEY, GCONF_BINDING_DIR "/media", NULL }, + { CALCULATOR_KEY, GCONF_BINDING_DIR "/calculator", NULL }, ++ { XRANDR_KEY, GCONF_BINDING_DIR "/xrandr", NULL }, + { SEARCH_KEY, GCONF_BINDING_DIR "/search", NULL }, + { EMAIL_KEY, GCONF_BINDING_DIR "/email", NULL }, + { SLEEP_KEY, GCONF_BINDING_DIR "/sleep", NULL }, +diff -Nur -x '*.orig' -x '*~' gnome-settings-daemon-2.21.91/plugins/media-keys/gsd-media-keys-manager.c gnome-settings-daemon-2.21.91.new/plugins/media-keys/gsd-media-keys-manager.c +--- gnome-settings-daemon-2.21.91/plugins/media-keys/gsd-media-keys-manager.c 2008-02-28 15:04:30.000000000 -0600 ++++ gnome-settings-daemon-2.21.91.new/plugins/media-keys/gsd-media-keys-manager.c 2008-02-28 15:05:14.000000000 -0600 +@@ -903,6 +903,9 @@ + case NEXT_KEY: + return do_multimedia_player_action (manager, "Next"); + break; ++ case XRANDR_KEY: ++ execute (manager, "xrandr --auto", FALSE, FALSE); ++ break; + default: + g_assert_not_reached (); + } --- gnome-settings-daemon-2.24.0.orig/debian/patches/30_pkgconfig-path.patch +++ gnome-settings-daemon-2.24.0/debian/patches/30_pkgconfig-path.patch @@ -0,0 +1,11 @@ +--- gnome-settings-daemon/data/gnome-settings-daemon.pc.in.orig 2007-11-03 02:19:59.340704956 +0100 ++++ gnome-settings-daemon/data/gnome-settings-daemon.pc.in 2007-11-03 02:20:30.994508804 +0100 +@@ -2,6 +2,8 @@ + exec_prefix=@exec_prefix@ + libdir=@libdir@ + includedir=@includedir@ ++libexecdir=@libexecdir@ ++binary=${libexecdir}/gnome-settings-daemon + + Name: gnome-settings-daemon + Description: Utility library for accessing gnome-settings-daemon over DBUS --- gnome-settings-daemon-2.24.0.orig/debian/patches/01_xrdb.patch +++ gnome-settings-daemon-2.24.0/debian/patches/01_xrdb.patch @@ -0,0 +1,12 @@ +diff -Nur -x '*.orig' -x '*~' gnome-settings-daemon-2.21.5.2/plugins/xrdb/gsd-xrdb-manager.c gnome-settings-daemon-2.21.5.2.new/plugins/xrdb/gsd-xrdb-manager.c +--- gnome-settings-daemon-2.21.5.2/plugins/xrdb/gsd-xrdb-manager.c 2007-12-24 12:18:48.000000000 +0100 ++++ gnome-settings-daemon-2.21.5.2.new/plugins/xrdb/gsd-xrdb-manager.c 2008-01-16 15:20:14.000000000 +0100 +@@ -41,7 +41,7 @@ + + #define GSD_XRDB_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSD_TYPE_XRDB_MANAGER, GsdXrdbManagerPrivate)) + +-#define SYSTEM_AD_DIR DATADIR "/xrdb" ++#define SYSTEM_AD_DIR "/etc/gnome/config" + #define GENERAL_AD SYSTEM_AD_DIR "/General.ad" + #define USER_AD_DIR ".gnome2/xrdb" + #define USER_X_RESOURCES ".Xresources" --- gnome-settings-daemon-2.24.0.orig/debian/patches/20_mouse_devicepresencenotify.patch +++ gnome-settings-daemon-2.24.0/debian/patches/20_mouse_devicepresencenotify.patch @@ -0,0 +1,111 @@ +diff -Nur -x '*.orig' -x '*~' gnome-settings-daemon-2.24.0/plugins/mouse/gsd-mouse-manager.c gnome-settings-daemon-2.24.0.new/plugins/mouse/gsd-mouse-manager.c +--- gnome-settings-daemon-2.24.0/plugins/mouse/gsd-mouse-manager.c 2008-11-08 11:42:44.517802911 +1100 ++++ gnome-settings-daemon-2.24.0.new/plugins/mouse/gsd-mouse-manager.c 2008-11-08 11:43:05.703945806 +1100 +@@ -77,6 +77,7 @@ + static void gsd_mouse_manager_class_init (GsdMouseManagerClass *klass); + static void gsd_mouse_manager_init (GsdMouseManager *mouse_manager); + static void gsd_mouse_manager_finalize (GObject *object); ++static void set_mouse_settings (GsdMouseManager *manager); + + G_DEFINE_TYPE (GsdMouseManager, gsd_mouse_manager, G_TYPE_OBJECT) + +@@ -308,6 +309,40 @@ + if (device_info != NULL) + XFreeDeviceList (device_info); + } ++ ++static GdkFilterReturn ++devicepresence_filter (GdkXEvent *xevent, ++ GdkEvent *event, ++ gpointer data) ++{ ++ XEvent *xev = (XEvent *) xevent; ++ XEventClass class_presence; ++ int xi_presence; ++ ++ DevicePresence (gdk_x11_get_default_xdisplay (), xi_presence, class_presence); ++ ++ if (xev->type == xi_presence) ++ { ++ XDevicePresenceNotifyEvent *dpn = (XDevicePresenceNotifyEvent *) xev; ++ if (dpn->devchange == DeviceEnabled) ++ set_mouse_settings ((GsdMouseManager *) data); ++ } ++ return GDK_FILTER_CONTINUE; ++} ++ ++static void ++set_devicepresence_handler (GsdMouseManager *manager) ++{ ++ Display *display = gdk_x11_get_default_xdisplay (); ++ XEventClass class_presence; ++ int xi_presence; ++ ++ DevicePresence (display, xi_presence, class_presence); ++ XSelectExtensionEvent (display, ++ RootWindow (display, DefaultScreen (display)), ++ &class_presence, 1); ++ gdk_window_add_filter (NULL, devicepresence_filter, manager); ++} + #endif + + static void +@@ -717,6 +752,23 @@ + } + + static void ++set_mouse_settings (GsdMouseManager *manager) ++{ ++ GConfClient *client = gconf_client_get_default (); ++ ++ set_left_handed (manager, gconf_client_get_bool (client, KEY_LEFT_HANDED, NULL)); ++ set_motion_acceleration (manager, gconf_client_get_float (client, KEY_MOTION_ACCELERATION , NULL)); ++ set_motion_threshold (manager, gconf_client_get_int (client, KEY_MOTION_THRESHOLD, NULL)); ++ ++ set_touchpad_enabled (gconf_client_get_bool (client, KEY_TOUCHPAD_ENABLED, NULL)); ++ set_tap_to_click (gconf_client_get_bool (client, KEY_TAP_TO_CLICK, NULL)); ++ set_edge_scroll (0, gconf_client_get_bool (client, KEY_PAD_VERT_SCROLL, NULL)); ++ set_edge_scroll (1, gconf_client_get_bool (client, KEY_PAD_HORIZ_SCROLL, NULL)); ++ ++ g_object_unref (client); ++} ++ ++static void + mouse_callback (GConfClient *client, + guint cnxn_id, + GConfEntry *entry, +@@ -803,19 +855,15 @@ + GCONF_MOUSE_A11Y_DIR, + (GConfClientNotifyFunc) mouse_callback); + +- set_left_handed (manager, gconf_client_get_bool (client, KEY_LEFT_HANDED, NULL)); +- set_motion_acceleration (manager, gconf_client_get_float (client, KEY_MOTION_ACCELERATION , NULL)); +- set_motion_threshold (manager, gconf_client_get_int (client, KEY_MOTION_THRESHOLD, NULL)); ++#ifdef HAVE_XINPUT ++ set_devicepresence_handler (manager); ++#endif ++ set_mouse_settings (manager); + set_locate_pointer (manager, gconf_client_get_bool (client, KEY_LOCATE_POINTER, NULL)); + set_mousetweaks_daemon (manager, + gconf_client_get_bool (client, KEY_DWELL_ENABLE, NULL), + gconf_client_get_bool (client, KEY_DELAY_ENABLE, NULL)); + +- set_touchpad_enabled (gconf_client_get_bool (client, KEY_TOUCHPAD_ENABLED, NULL)); +- set_tap_to_click (gconf_client_get_bool (client, KEY_TAP_TO_CLICK, NULL)); +- set_edge_scroll (0, gconf_client_get_bool (client, KEY_PAD_VERT_SCROLL, NULL)); +- set_edge_scroll (1, gconf_client_get_bool (client, KEY_PAD_HORIZ_SCROLL, NULL)); +- + g_object_unref (client); + + gnome_settings_profile_end (NULL); +@@ -848,6 +896,10 @@ + g_object_unref (client); + + set_locate_pointer (manager, FALSE); ++ ++#ifdef HAVE_XINPUT ++ gdk_window_remove_filter (NULL, devicepresence_filter, manager); ++#endif + } + + static void --- gnome-settings-daemon-2.24.0.orig/debian/patches/11_sleepkey.patch +++ gnome-settings-daemon-2.24.0/debian/patches/11_sleepkey.patch @@ -0,0 +1,12 @@ +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 @@ + 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"); + break; + case SCREENSAVER_KEY: + if ((cmd = g_find_program_in_path ("gnome-screensaver-command"))) { --- gnome-settings-daemon-2.24.0.orig/debian/patches/08_extra_touchpad_options.patch +++ gnome-settings-daemon-2.24.0/debian/patches/08_extra_touchpad_options.patch @@ -0,0 +1,193 @@ +diff -Nur -x '*.orig' -x '*~' gnome-settings-daemon-2.24.0/plugins/mouse/gsd-mouse-manager.c gnome-settings-daemon-2.24.0.new/plugins/mouse/gsd-mouse-manager.c +--- gnome-settings-daemon-2.24.0/plugins/mouse/gsd-mouse-manager.c 2008-11-07 22:43:43.312366000 +1100 ++++ gnome-settings-daemon-2.24.0.new/plugins/mouse/gsd-mouse-manager.c 2008-11-08 11:50:46.059965033 +1100 +@@ -38,9 +38,11 @@ + #include + #include + #include ++#include + + #ifdef HAVE_XINPUT + #include ++#include + #endif + #include + #include +@@ -61,6 +63,10 @@ + #define KEY_LOCATE_POINTER "/desktop/gnome/peripherals/mouse/locate_pointer" + #define KEY_DWELL_ENABLE "/desktop/gnome/accessibility/mouse/dwell_enable" + #define KEY_DELAY_ENABLE "/desktop/gnome/accessibility/mouse/delay_enable" ++#define KEY_TOUCHPAD_ENABLED "/desktop/gnome/peripherals/mouse/touchpad_enabled" ++#define KEY_TAP_TO_CLICK "/desktop/gnome/peripherals/mouse/tap_to_click" ++#define KEY_PAD_VERT_SCROLL "/desktop/gnome/peripherals/mouse/pad_vert_scroll" ++#define KEY_PAD_HORIZ_SCROLL "/desktop/gnome/peripherals/mouse/pad_horiz_scroll" + + struct GsdMouseManagerPrivate + { +@@ -390,6 +396,135 @@ + 0, 0, motion_threshold); + } + ++static XDevice ++*device_is_touchpad (XDeviceInfo deviceinfo) ++{ ++ XDevice *device; ++ Atom realtype, prop; ++ int realformat; ++ unsigned long nitems, bytes_after; ++ unsigned char *data; ++ ++ if (deviceinfo.type != XInternAtom(GDK_DISPLAY(), XI_TOUCHPAD, False)) ++ return NULL; ++ ++ prop = XInternAtom(GDK_DISPLAY(), "Synaptics Off", False); ++ ++ gdk_error_trap_push(); ++ device = XOpenDevice(GDK_DISPLAY(), deviceinfo.id); ++ if (gdk_error_trap_pop() || (device == NULL)) ++ return NULL; ++ ++ gdk_error_trap_push(); ++ if ((XGetDeviceProperty(GDK_DISPLAY(), device, prop, 0, 1, False, ++ XA_INTEGER, &realtype, &realformat, &nitems, ++ &bytes_after, &data) == Success) && (realtype != None)) ++ { ++ gdk_error_trap_pop(); ++ XFree(data); ++ return device; ++ } ++ gdk_error_trap_pop(); ++ ++ XCloseDevice(GDK_DISPLAY(), device); ++ return NULL; ++} ++ ++static int ++set_touchpad_enabled (gboolean state) ++{ ++ int numdevices, i; ++ XDeviceInfo *devicelist = XListInputDevices (GDK_DISPLAY(), &numdevices); ++ XDevice * device; ++ unsigned char data; ++ Atom prop; ++ ++ prop = XInternAtom(GDK_DISPLAY(), "Synaptics Off", False); ++ data = (char)!state; ++ ++ for (i = 0; i < numdevices; i++) { ++ if ((device = device_is_touchpad(devicelist[i]))) { ++ gdk_error_trap_push(); ++ XChangeDeviceProperty(GDK_DISPLAY(), device, prop, XA_INTEGER, 8, ++ PropModeReplace, &data, 1); ++ XCloseDevice (GDK_DISPLAY(), device); ++ if (gdk_error_trap_pop()) { ++ g_warning("Error in setting touchpad enabled on \"%s\"", devicelist[i].name); ++ continue; ++ } ++ } ++ } ++ ++ XFreeDeviceList(devicelist); ++ return 0; ++} ++ ++static int ++set_tap_to_click (gboolean state) ++{ ++ int numdevices, i; ++ XDeviceInfo *devicelist = XListInputDevices (GDK_DISPLAY(), &numdevices); ++ XDevice * device; ++ unsigned long data; ++ Atom prop; ++ ++ prop = XInternAtom(GDK_DISPLAY(), "Synaptics Tap Time", False); ++ data = state ? 180 : 0; ++ ++ for (i = 0; i < numdevices; i++) { ++ if ((device = device_is_touchpad(devicelist[i]))) { ++ gdk_error_trap_push(); ++ XChangeDeviceProperty(GDK_DISPLAY(), device, prop, XA_INTEGER, 32, ++ PropModeReplace, (unsigned char *)&data, 1); ++ XCloseDevice (GDK_DISPLAY(), device); ++ if (gdk_error_trap_pop()) { ++ g_warning("Error in setting tap to click on \"%s\"", devicelist[i].name); ++ continue; ++ } ++ } ++ } ++ ++ XFreeDeviceList(devicelist); ++ return 0; ++} ++ ++static int ++set_edge_scroll (int which, gboolean state) ++{ ++ int numdevices, i; ++ XDeviceInfo *devicelist = XListInputDevices (GDK_DISPLAY(), &numdevices); ++ XDevice *device; ++ Atom act_type, prop; ++ int act_format; ++ unsigned long nitems, bytes_after; ++ unsigned char *data; ++ ++ prop = XInternAtom(GDK_DISPLAY(), "Synaptics Edge Scrolling", False); ++ ++ for (i = 0; i < numdevices; i++) { ++ if ((device = device_is_touchpad(devicelist[i]))) { ++ gdk_error_trap_push(); ++ XGetDeviceProperty(GDK_DISPLAY(), device, prop, 0, 3, False, ++ XA_INTEGER, &act_type, &act_format, &nitems, ++ &bytes_after, &data); ++ if (which < nitems) ++ { ++ data[which] = state; ++ XChangeDeviceProperty(GDK_DISPLAY(), device, prop, XA_INTEGER, 8, ++ PropModeReplace, data, 3); ++ } ++ XFree(data); ++ XCloseDevice (GDK_DISPLAY(), device); ++ if (gdk_error_trap_pop() || (which >= nitems)) { ++ g_warning("Error in setting edge scroll on \"%s\"", devicelist[i].name); ++ continue; ++ } ++ } ++ } ++ ++ XFreeDeviceList(devicelist); ++ return 0; ++} + + #define KEYBOARD_GROUP_SHIFT 13 + #define KEYBOARD_GROUP_MASK ((1 << 13) | (1 << 14)) +@@ -602,6 +737,18 @@ + if (entry->value->type == GCONF_VALUE_INT) { + set_motion_threshold (manager, gconf_value_get_int (entry->value)); + } ++ } else if (! strcmp (entry->key, KEY_TOUCHPAD_ENABLED)) { ++ if (entry->value->type == GCONF_VALUE_BOOL) ++ set_touchpad_enabled (gconf_value_get_bool (entry->value)); ++ } else if (! strcmp (entry->key, KEY_TAP_TO_CLICK)) { ++ if (entry->value->type == GCONF_VALUE_BOOL) ++ set_tap_to_click (gconf_value_get_bool (entry->value)); ++ } else if (! strcmp (entry->key, KEY_PAD_VERT_SCROLL)) { ++ if (entry->value->type == GCONF_VALUE_BOOL) ++ set_edge_scroll (0, gconf_value_get_bool (entry->value)); ++ } else if (! strcmp (entry->key, KEY_PAD_HORIZ_SCROLL)) { ++ if (entry->value->type == GCONF_VALUE_BOOL) ++ set_edge_scroll (1, gconf_value_get_bool (entry->value)); + } else if (! strcmp (entry->key, KEY_LOCATE_POINTER)) { + if (entry->value->type == GCONF_VALUE_BOOL) { + set_locate_pointer (manager, gconf_value_get_bool (entry->value)); +@@ -667,6 +814,11 @@ + gconf_client_get_bool (client, KEY_DWELL_ENABLE, NULL), + gconf_client_get_bool (client, KEY_DELAY_ENABLE, NULL)); + ++ set_touchpad_enabled (gconf_client_get_bool (client, KEY_TOUCHPAD_ENABLED, NULL)); ++ set_tap_to_click (gconf_client_get_bool (client, KEY_TAP_TO_CLICK, NULL)); ++ set_edge_scroll (0, gconf_client_get_bool (client, KEY_PAD_VERT_SCROLL, NULL)); ++ set_edge_scroll (1, gconf_client_get_bool (client, KEY_PAD_HORIZ_SCROLL, NULL)); ++ + g_object_unref (client); + + gnome_settings_profile_end (NULL);