Hello community,
here is the log from the commit of package hal
checked in at Fri Aug 17 18:48:39 CEST 2007.
--------
--- hal/hal.changes 2007-08-07 18:21:21.000000000 +0200
+++ /mounts/work_src_done/STABLE/hal/hal.changes 2007-08-16 16:22:51.000000000 +0200
@@ -1,0 +2,13 @@
+Thu Aug 16 15:33:52 CEST 2007 - dkukawka@suse.de
+
+- updated hal/hal-info to current git (20070816)
+- removed upstream gone patches:
+ - hal_remove_sysfs_and_proc_helpers_v2.diff
+- added new patches:
+ - hal-fix-computer_probing_v2.diff: fix detection if machine is
+ a laptop, but dmidecode return something other
+- fixed bugs:
+ - b.n.c #300539: obsolete hal-gnome for > 10.2
+ - detect again pci.vendor_id
+
+-------------------------------------------------------------------
Old:
----
hal-0.5.9_git20070807.tar.bz2
hal-info-20070807.tar.bz2
hal_remove_sysfs_and_proc_helpers_v2.diff
New:
----
hal-0.5.9_git20070816.tar.bz2
hal-fix-computer_probing_v2.diff
hal-info-20070816.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ hal-doc.spec ++++++
--- /var/tmp/diff_new_pack.sQ4196/_old 2007-08-17 18:48:21.000000000 +0200
+++ /var/tmp/diff_new_pack.sQ4196/_new 2007-08-17 18:48:21.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package hal-doc (Version 0.5.9_git20070807)
+# spec file for package hal-doc (Version 0.5.9_git20070816)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -18,12 +18,12 @@
Summary: Daemon for Collecting Hardware Information
%define dbus_version 0.61
%define dbus_release 1
-%define hal_info_version 20070807
+%define hal_info_version 20070816
URL: http://freedesktop.org/Software/hal
License: Other uncritical OpenSource License, HAL is licensed to you under your choice of the Academic Free
Group: System/Daemons
-Version: 0.5.9_git20070807
-Release: 2
+Version: 0.5.9_git20070816
+Release: 1
Autoreqprov: on
Requires: pm-utils
BuildRequires: ConsoleKit-devel PolicyKit-devel dbus-1-glib-devel glib2-devel gperf intltool libexpat-devel libusb libusb-devel libvolume_id-devel parted parted-devel pciutils pciutils-devel perl-XML-Parser popt-devel python-devel update-desktop-files
@@ -34,6 +34,7 @@
%endif
%if 0%{?suse_version} > 1020
BuildRequires: fdupes
+Obsoletes: hal-gnome
%endif
#
%if %build_doc
@@ -71,7 +72,7 @@
Patch102: hal-fix-acpi_on_battery_discharging.diff
Patch103: hal-allow_uid_gid_on_hfs_v2.diff
Patch104: hal-cleanup-deprecated_libhal-storage.diff
-Patch105: hal_remove_sysfs_and_proc_helpers_v2.diff
+Patch105: hal-fix-computer_probing_v2.diff
# need to backport
#Patch300: hal-temp.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -151,6 +152,10 @@
#%patch104 -p1
%patch105 -p1
#%patch300 -p1
+# patch hal-info files if needed
+pushd hal-info-%{hal_info_version}
+#%patch500 -p1
+popd
%build
export CFLAGS="${RPM_OPT_FLAGS} -fstack-protector"
++++++ hal.spec ++++++
--- /var/tmp/diff_new_pack.sQ4196/_old 2007-08-17 18:48:21.000000000 +0200
+++ /var/tmp/diff_new_pack.sQ4196/_new 2007-08-17 18:48:21.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package hal (Version 0.5.9_git20070807)
+# spec file for package hal (Version 0.5.9_git20070816)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -18,12 +18,12 @@
Summary: Daemon for Collecting Hardware Information
%define dbus_version 0.61
%define dbus_release 1
-%define hal_info_version 20070807
+%define hal_info_version 20070816
URL: http://freedesktop.org/Software/hal
-License: Other uncritical OpenSource License, HAL is licensed to you under your choice of the Academic Free
+License: HAL is licensed to you under your choice of the Academic Free
Group: System/Daemons
-Version: 0.5.9_git20070807
-Release: 2
+Version: 0.5.9_git20070816
+Release: 1
Autoreqprov: on
Requires: pm-utils
BuildRequires: ConsoleKit-devel PolicyKit-devel dbus-1-glib-devel glib2-devel gperf intltool libexpat-devel libusb libusb-devel libvolume_id-devel parted parted-devel pciutils pciutils-devel perl-XML-Parser popt-devel python-devel update-desktop-files
@@ -34,6 +34,7 @@
%endif
%if 0%{?suse_version} > 1020
BuildRequires: fdupes
+Obsoletes: hal-gnome
%endif
#
%if %build_doc
@@ -71,7 +72,7 @@
Patch102: hal-fix-acpi_on_battery_discharging.diff
Patch103: hal-allow_uid_gid_on_hfs_v2.diff
Patch104: hal-cleanup-deprecated_libhal-storage.diff
-Patch105: hal_remove_sysfs_and_proc_helpers_v2.diff
+Patch105: hal-fix-computer_probing_v2.diff
# need to backport
#Patch300: hal-temp.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -151,6 +152,10 @@
#%patch104 -p1
%patch105 -p1
#%patch300 -p1
+# patch hal-info files if needed
+pushd hal-info-%{hal_info_version}
+#%patch500 -p1
+popd
%build
export CFLAGS="${RPM_OPT_FLAGS} -fstack-protector"
@@ -306,6 +311,16 @@
%endif
%changelog
+* Thu Aug 16 2007 - dkukawka@suse.de
+- updated hal/hal-info to current git (20070816)
+- removed upstream gone patches:
+ - hal_remove_sysfs_and_proc_helpers_v2.diff
+- added new patches:
+ - hal-fix-computer_probing_v2.diff: fix detection if machine is
+ a laptop, but dmidecode return something other
+- fixed bugs:
+ - b.n.c #300539: obsolete hal-gnome for > 10.2
+ - detect again pci.vendor_id
* Tue Aug 07 2007 - dkukawka@suse.de
- updated hal/hal-info to current git ()
- removed upstream gone patches:
++++++ hal-0.5.9_git20070807.tar.bz2 -> hal-0.5.9_git20070816.tar.bz2 ++++++
++++ 41729 lines of diff (skipped)
++++++ hal-fix-computer_probing_v2.diff ++++++
diff --git a/hald/linux/acpi.c b/hald/linux/acpi.c
index 2aa14a4..cc97f15 100644
--- a/hald/linux/acpi.c
+++ b/hald/linux/acpi.c
@@ -739,13 +739,14 @@ acpi_synthesize_item (const gchar *fullpath, int acpi_type)
* acpi_synthesize:
* @path: The ACPI path, e.g. "/proc/acpi/battery"
* @acpi_type: The type of device, e.g. ACPI_TYPE_BATTERY
+ * @synthesize: If a device should get synthesized
*
* Synthesizes generic acpi objects, i.e. registers all the objects of type
* into HAL. This lets us have more than one type of device e.g. BATx
* in the same battery class.
*/
static void
-acpi_synthesize (const gchar *path, int acpi_type)
+acpi_synthesize (const gchar *path, int acpi_type, gboolean synthesize)
{
const gchar *f;
gboolean is_laptop = FALSE;
@@ -786,8 +787,10 @@ acpi_synthesize (const gchar *path, int acpi_type)
}
}
- snprintf (buf, sizeof (buf), "%s/%s", path, f);
- acpi_synthesize_item (buf, acpi_type);
+ if (synthesize) {
+ snprintf (buf, sizeof (buf), "%s/%s", path, f);
+ acpi_synthesize_item (buf, acpi_type);
+ }
}
/* close directory */
@@ -899,18 +902,18 @@ acpi_synthesize_hotplug_events (void)
}
/* collect batteries */
- acpi_synthesize ("/proc/acpi/battery", ACPI_TYPE_BATTERY);
+ acpi_synthesize ("/proc/acpi/battery", ACPI_TYPE_BATTERY, TRUE);
/* collect processors */
- acpi_synthesize ("/proc/acpi/processor", ACPI_TYPE_PROCESSOR);
+ acpi_synthesize ("/proc/acpi/processor", ACPI_TYPE_PROCESSOR, TRUE);
/* collect fans */
- acpi_synthesize ("/proc/acpi/fan", ACPI_TYPE_FAN);
+ acpi_synthesize ("/proc/acpi/fan", ACPI_TYPE_FAN, TRUE);
/* collect AC adapters */
- acpi_synthesize ("/proc/acpi/ac_adapter", ACPI_TYPE_AC_ADAPTER);
+ acpi_synthesize ("/proc/acpi/ac_adapter", ACPI_TYPE_AC_ADAPTER, TRUE);
/* collect buttons */
- acpi_synthesize ("/proc/acpi/button/lid", ACPI_TYPE_BUTTON);
- acpi_synthesize ("/proc/acpi/button/power", ACPI_TYPE_BUTTON);
- acpi_synthesize ("/proc/acpi/button/sleep", ACPI_TYPE_BUTTON);
+ acpi_synthesize ("/proc/acpi/button/lid", ACPI_TYPE_BUTTON, TRUE);
+ acpi_synthesize ("/proc/acpi/button/power", ACPI_TYPE_BUTTON, TRUE);
+ acpi_synthesize ("/proc/acpi/button/sleep", ACPI_TYPE_BUTTON, TRUE);
/*
* Collect video adaptors (from vendor added modules)
@@ -1275,3 +1278,16 @@ acpi_generate_remove_hotplug_event (HalDevice *d)
hotplug_event->acpi.acpi_type = acpi_type;
return hotplug_event;
}
+
+void
+acpi_check_is_laptop (const gchar *acpi_type)
+{
+ if (acpi_type != NULL) {
+
+ if (strcmp (acpi_type, "BATTERY") == 0) {
+ acpi_synthesize ("/proc/acpi/battery", ACPI_TYPE_BATTERY, FALSE);
+ } else if (strcmp (acpi_type, "LID") == 0) {
+ acpi_synthesize ("/proc/acpi/button/lid", ACPI_TYPE_BUTTON, FALSE);
+ }
+ }
+}
diff --git a/hald/linux/acpi.h b/hald/linux/acpi.h
index be02c70..5f8e326 100644
--- a/hald/linux/acpi.h
+++ b/hald/linux/acpi.h
@@ -33,6 +33,7 @@ void hotplug_event_begin_remove_acpi (const gchar *acpi_path, int acpi_type, voi
gboolean acpi_rescan_device (HalDevice *d);
HotplugEvent *acpi_generate_add_hotplug_event (HalDevice *d);
HotplugEvent *acpi_generate_remove_hotplug_event (HalDevice *d);
+void acpi_check_is_laptop (const gchar *acpi_type);
#else /* HAVE_ACPI */
static inline gboolean acpi_synthesize_hotplug_events (void) {return FALSE;}
static inline void hotplug_event_begin_add_acpi (const gchar *acpi_path, int acpi_type, HalDevice *parent, void *end_token) {return;}
diff --git a/hald/linux/osspec.c b/hald/linux/osspec.c
index 3512c6a..5ba7131 100644
--- a/hald/linux/osspec.c
+++ b/hald/linux/osspec.c
@@ -393,6 +393,13 @@ hotplug_queue_now_empty (void)
static void
computer_probing_helper_done (HalDevice *d)
{
+ /* check if this is may a laptop */
+ if (!hal_device_has_property (d, "system.formfactor") ||
+ (strcmp (hal_device_property_get_string (d, "system.formfactor"), "laptop") != 0)) {
+ HAL_INFO (("Check if the machine is may a laptop ..."));
+ acpi_check_is_laptop("BATTERY");
+ acpi_check_is_laptop("LID");
+ }
/* if not set, set a default value */
if (!hal_device_has_property (d, "system.formfactor")) {
hal_device_property_set_string (d, "system.formfactor", "unknown");
++++++ hal-info-20070807.tar.bz2 -> hal-info-20070816.tar.bz2 ++++++
++++ 4165 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/hal-info-20070807/ChangeLog new/hal-info-20070816/ChangeLog
--- old/hal-info-20070807/ChangeLog 2007-08-07 18:02:56.000000000 +0200
+++ new/hal-info-20070816/ChangeLog 2007-08-16 15:29:03.000000000 +0200
@@ -1,3 +1,205 @@
+commit 3d6b1649f772310dba7e67a60bbf0b061524cecf
+Author: Danny Kukawka
+Date: Thu Aug 16 15:11:54 2007 +0200
+
+ add more keymaps for Acer and Hewlett-Packard laptops
+
+ Added new keymaps for the following laptops:
+ - HP: nc6230, nc6400, nw8440, nx6125, nx6325, nx7400
+ - Acer: TM C300, TM 3000, TM 4650
+
+ fdi/information/10freedesktop/30-keymap-acer.fdi | 33 +++++++++++++++
+ fdi/information/10freedesktop/30-keymap-hp.fdi | 48
+ ++++++++++++++++++++++
+ 2 files changed, 81 insertions(+), 0 deletions(-)
+
+commit 042b780cb92d8121db0e33749f046be1623cef7a
+Author: Danny Kukawka
+Date: Wed Aug 15 13:27:10 2007 +0200
+
+ removed not needed match from 30-keymap-module-sony-laptop.fdi
+
+ Removed not needed match from 30-keymap-module-sony-laptop.fdi.
+
+ .../10freedesktop/30-keymap-module-sony-laptop.fdi | 3 +--
+ 1 files changed, 1 insertions(+), 2 deletions(-)
+
+commit d580bfcb45793a85e18cc2ed9b3383221e8c3d28
+Author: Danny Kukawka
+Date: Wed Aug 15 13:23:15 2007 +0200
+
+ sort keymap entries for machines listed in 30-keymap-misc.fdi
+
+ Sort the keymap entries for machines listed in 30-keymap-misc.fdi
+ to find easier duplicates.
+
+ fdi/information/10freedesktop/30-keymap-misc.fdi | 26
+ +++++++++++-----------
+ 1 files changed, 13 insertions(+), 13 deletions(-)
+
+commit aaac8e3628e44eb0dbfabd7bf07a5bffd8dd940f
+Author: Danny Kukawka
+Date: Wed Aug 15 13:13:18 2007 +0200
+
+ sort keymap entries for Compaq/HP machines
+
+ Sort the keymap entries for Compaq/HP machines to find easier
+ duplicates.
+
+ fdi/information/10freedesktop/30-keymap-compaq.fdi | 2 +-
+ fdi/information/10freedesktop/30-keymap-hp.fdi | 8 ++++----
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+commit e1a30ab4d8c5808611b1d0efe29d9272d1c1fcf5
+Author: Danny Kukawka
+Date: Wed Aug 15 13:08:14 2007 +0200
+
+ sort keymap entries for ACER machines
+
+ Sort the keymap entries for ACER machines to find easier duplicates.
+
+ fdi/information/10freedesktop/30-keymap-dell.fdi | 86
+ +++++++++++-----------
+ 1 files changed, 43 insertions(+), 43 deletions(-)
+
+commit 99aaae3e58698f75ebbcb88c8d27e6bf45b579c7
+Author: osma ahvenlampi
+Date: Tue Aug 14 12:52:35 2007 +0100
+
+ add keymap for Acer TravelMate 6292
+
+ New computer, new hal-info patch :)
+
+ No quirks needed, though I find VBE POST doesn't hurt and might even
+ be helpful, but this makes the special keys work:
+
+ fdi/information/10freedesktop/30-keymap-acer.fdi | 16 ++++++++++++++++
+ 1 files changed, 16 insertions(+), 0 deletions(-)
+
+commit 1e35ae7ec96ee063b9868c59a85b956710fdb32c
+Author: Pekka Pietikainen
+Date: Mon Aug 13 09:03:06 2007 +0100
+
+ add suspend quirk for X31 (2672CBG) backlight quirk
+
+ Well, the attached patch makes the backlight on my X31 really go
+ off when
+ suspending (it doesn't, and the battery runs out in a few hours).
+
+ There's something funny about the current quirk though, mine is
+ matched by a entry that is commented as X40,
+ <match key=system.hardware.product prefix=2672>
+
+ system.chassis.manufacturer = 'IBM' (string)
+ system.chassis.type = 'Notebook' (string)
+ system.firmware.release_date = '09/22/2005' (string)
+ system.firmware.vendor = 'IBM' (string)
+ system.firmware.version = '1QET97WW (3.02 )' (string)
+ system.formfactor = 'laptop' (string)
+ system.hardware.primary_video.product = 19545 (0x4c59) (int)
+ system.hardware.primary_video.vendor = 4098 (0x1002) (int)
+ system.hardware.product = '2672CBG' (string)
+ system.hardware.serial = '99CDPCY' (string)
+ system.hardware.uuid = 'DCA94A01-4757-11CB-B939-E5EBFBD084DE'
+ (string)
+ system.hardware.vendor = 'IBM' (string)
+ system.hardware.version = 'ThinkPad X31' (string)
+ system.kernel.machine = 'i686' (string)
+ system.kernel.name = 'Linux' (string)
+ system.kernel.version = '2.6.23-0.71.rc2.fc8' (string)
+ system.product = '2672CBG ThinkPad X31' (string)
+
+ In fact, dpms_suspend is the only quirk I need,
+ radeon_off/s3_bios&mode
+ seem to do neither help nor hinder (maybe make suspend/resume
+ slower)...
+
+ .../10freedesktop/20-video-quirk-pm-ibm.fdi | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit 0fa94ede0b504850a616466b17c5cefba050cbe4
+Author: Aurelien Bompard
+Date: Mon Aug 13 08:59:14 2007 +0100
+
+ add suspend quirk for hp 6320
+
+ Hi all,
+
+ This patch fixes suspend on my HP 6320. It should be pretty
+ straightforward,
+ it's a simple copy of the 6120 entry.
+
+ FYI, on this laptop I'm running Fedora 7 with hal-info 20070725,
+ kernel
+ 2.6.22.1 and the intel video driver.
+ With the patch, it works like a charm :)
+
+ .../10freedesktop/20-video-quirk-pm-hp.fdi | 4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
+commit 3e00518ed2f0d48d106a32200507a2a7ce4985df
+Author: Frederic Crozat
+Date: Fri Aug 10 19:28:02 2007 +0200
+
+ remove vbestate_restore quirk for Dell M65
+
+ Remove vbestate_restore quirk, it might break suspend for this laptop
+ (it is known to work with only vbe-post)
+
+ .../10freedesktop/20-video-quirk-pm-dell.fdi | 1 -
+ 1 files changed, 0 insertions(+), 1 deletions(-)
+
+commit 7dde0e41a0ad0a10170dbe4549561d61580f2353
+Author: Angel Marin
+Date: Fri Aug 10 19:24:20 2007 +0200
+
+ quirk for Dell XPS M1210
+
+ Since the last set of fedora updates, the attached quirk is needed to
+ make a dell xps m1210 (with the integrated intel graphics card)
+ suspend
+ reliably.
+
+ On iwl land, it now suspends and resumes without unloading the module
+ since fedora's 2.6.22.1-41 kernel. Though with the iwl patch
+ included in
+ that kernel removing module does no longer works, so to the general
+ advise (on hal quirk site) to put iwl3945 in SUSPEND_MODULES, a note
+ should be added to try suspending without it first on recent kernels.
+ Otherwise adding the module will just put the system in a mostly
+ useless
+ state when trying to suspend.
+
+ .../10freedesktop/20-video-quirk-pm-dell.fdi | 4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
+commit cdd641dc9133cdc43ca351cde1b15775cedd4905
+Author: Danny Kukawka
+Date: Fri Aug 10 17:58:28 2007 +0200
+
+ add support for M-Cody M20 USB mp3 player
+
+ Applied adopted patch from Doug Goldstein to
+ add support for a M-Cody M20 USB mp3 player.
+
+ .../10freedesktop/10-usb-music-players.fdi | 13 ++++++++++++-
+ 1 files changed, 12 insertions(+), 1 deletions(-)
+
+commit 381d55fe8238efed31459bc21d8623215f81cc97
+Author: Theo van Klaveren
+Date: Fri Aug 10 17:51:57 2007 +0200
+
+ Keymap for Acer Aspire 3620
+
+ > Just saw the committed keymap for the Acer Aspire 3610. I can
+ > confirm that that keymap is identical to the keymap for the
+ > Aspire 3620.
+ > Something like the attached patch should do it, I think.
+
+ fdi/information/10freedesktop/30-keymap-acer.fdi | 19
+ +++++++++++++++++++
+ 1 files changed, 19 insertions(+), 0 deletions(-)
+
commit 0011a3c481acd835432fc08244e7889b4dec299a
Author: Danny Kukawka
Date: Mon Aug 6 17:40:47 2007 +0200
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/hal-info-20070807/configure.in new/hal-info-20070816/configure.in
--- old/hal-info-20070807/configure.in 2007-08-07 18:01:58.000000000 +0200
+++ new/hal-info-20070816/configure.in 2007-08-16 15:28:03.000000000 +0200
@@ -1,6 +1,6 @@
AC_PREREQ(2.57)
-AC_INIT(hal-info, 20070807, hal@lists.freedesktop.org)
+AC_INIT(hal-info, 20070816, dkukawka@suse.de)
AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
AM_CONFIG_HEADER(config.h)
@@ -50,7 +50,7 @@
dnl ---------------------------------------------------------------------------
AC_ARG_ENABLE(killswitch_ipw_wlan, [ --enable-killswitch-ipw-wlan Include support for WLAN killswitch (requires hal >= 0.5.10)],enable_killswitch_ipw_wlan=$enableval,enable_killswitch_ipw_wlan=yes)
-#if ! $PKG_CONFIG --atleast-version 0.5.9 hal; then
+#if ! $PKG_CONFIG --atleast-version 0.5.10 hal; then
# if test x$enable_killswitch_ipw_wlan == xyes ; then
# AC_MSG_WARN([hal 0.5.10 or later is required for ipw killswitch. Disabling this feature.])
# enable_killswitch_ipw_wlan=no
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/hal-info-20070807/fdi/information/10freedesktop/10-usb-music-players.fdi new/hal-info-20070816/fdi/information/10freedesktop/10-usb-music-players.fdi
--- old/hal-info-20070807/fdi/information/10freedesktop/10-usb-music-players.fdi 2007-08-07 17:51:16.000000000 +0200
+++ new/hal-info-20070816/fdi/information/10freedesktop/10-usb-music-players.fdi 2007-08-16 15:15:37.000000000 +0200
@@ -844,8 +844,19 @@
</match>
</match>
- <!-- Maxfield -->
+ <!-- Maxfield, M-Cody -->
<match key="@storage.originating_device:usb.vendor_id" int="0x1890">
+ <!-- M-Cody M20 -->
+ <match key="@storage.originating_device:usb.product_id" int="0x0001">
+ <merge key="portable_audio_player.type" type="string">generic</merge>
+ <merge key="portable_audio_player.access_method" type="string">storage</merge>
+ <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
+ <append key="portable_audio_player.output_formats" type="strlist">application/ogg</append>
+ <append key="portable_audio_player.input_formats" type="strlist">audio/x-wav</append>
+ <append key="portable_audio_player.audio_folders" type="strlist">Music/</append>
+ <append key="portable_audio_player.audio_folders" type="strlist">voice/</append>
+ <append key="portable_audio_player.audio_folders" type="strlist">fm/</append>
+ </match>
<!-- Maxfield MAX-SIN TOUCH -->
<match key="@storage.originating_device:usb.product_id" int="0x0110">
<merge key="portable_audio_player.type" type="string">generic</merge>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/hal-info-20070807/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi new/hal-info-20070816/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
--- old/hal-info-20070807/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi 2007-08-07 17:51:16.000000000 +0200
+++ new/hal-info-20070816/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi 2007-08-16 15:15:37.000000000 +0200
@@ -6,7 +6,6 @@
<match key="system.hardware.product" contains="M65">
<merge key="power_management.quirk.dpms_on" type="bool">true</merge>
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
</match>
<match key="system.hardware.product" prefix="Latitude">
@@ -86,6 +85,10 @@
<merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
</match>
+ <!-- Dell XPS M1210 -->
+ <match key="system.hardware.product" prefix="MXC062">
+ <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
+ </match>
</match>
</device>
</deviceinfo>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/hal-info-20070807/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi new/hal-info-20070816/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi
--- old/hal-info-20070807/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi 2007-08-07 17:51:16.000000000 +0200
+++ new/hal-info-20070816/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi 2007-08-16 15:15:37.000000000 +0200
@@ -66,6 +66,10 @@
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
<merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
</match>
+ <match key="system.hardware.product" contains="nc6320">
+ <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
+ <merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
+ </match>
</match>
</device>
</deviceinfo>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/hal-info-20070807/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi new/hal-info-20070816/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi
--- old/hal-info-20070807/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi 2007-08-07 17:51:16.000000000 +0200
+++ new/hal-info-20070816/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi 2007-08-16 15:15:37.000000000 +0200
@@ -18,6 +18,7 @@
</match>
<!-- X40 -->
<match key="system.hardware.product" prefix="2672">
+ <merge key="power_management.quirk.dpms_suspend" type="bool">true</merge>
<merge key="power_management.quirk.s3_bios" type="bool">true</merge>
<merge key="power_management.quirk.s3_mode" type="bool">true</merge>
<merge key="power_management.quirk.radeon_off" type="bool">true</merge>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/hal-info-20070807/fdi/information/10freedesktop/30-keymap-acer.fdi new/hal-info-20070816/fdi/information/10freedesktop/30-keymap-acer.fdi
--- old/hal-info-20070807/fdi/information/10freedesktop/30-keymap-acer.fdi 2007-08-07 17:51:17.000000000 +0200
+++ new/hal-info-20070816/fdi/information/10freedesktop/30-keymap-acer.fdi 2007-08-16 15:15:37.000000000 +0200
@@ -112,6 +112,7 @@
<append key="input.keymap.data" type="strlist">e074:prog1</append> <!-- "e" Acer eManager button -->
<append key="info.capabilities" type="strlist">input.keymap</append>
</match>
+ <!-- Aspire 3610 and Aspire 3620 are identical -->
<match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="3610">
<append key="input.keymap.data" type="strlist">e025:help</append> <!-- Fn+F1 Hotkey help -->
<append key="input.keymap.data" type="strlist">e026:setup</append> <!-- Fn+F2 Acer eSettings -->
@@ -129,6 +130,24 @@
<append key="input.keymap.data" type="strlist">e074:prog1</append> <!-- "e" Acer eManager button -->
<append key="info.capabilities" type="strlist">input.keymap</append>
</match>
+ <!-- Aspire 3610 and Aspire 3620 are identical -->
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="3620">
+ <append key="input.keymap.data" type="strlist">e025:help</append> <!-- Fn+F1 Hotkey help -->
+ <append key="input.keymap.data" type="strlist">e026:setup</append> <!-- Fn+F2 Acer eSettings -->
+ <append key="input.keymap.data" type="strlist">e027:battery</append> <!-- Fn+F3 Power Management -->
+ <append key="input.keymap.data" type="strlist">e029:switchvideomode</append> <!-- Fn+F5 Display toggle -->
+ <append key="input.keymap.data" type="strlist">e033:f14</append> <!-- FIXME Euro symbol -->
+ <append key="input.keymap.data" type="strlist">e034:f15</append> <!-- FIXME Dollar symbol -->
+ <append key="input.keymap.data" type="strlist">e055:wlan</append> <!-- Wireless (toggle) on-to-off -->
+ <append key="input.keymap.data" type="strlist">e056:wlan</append> <!-- Wireless (toggle) off-to-on -->
+ <append key="input.keymap.data" type="strlist">e057:bluetooth</append> <!-- Bluetooth (toggle) on-to-off -->
+ <append key="input.keymap.data" type="strlist">e058:bluetooth</append> <!-- Bluetooth (toggle) off-to-on -->
+ <append key="input.keymap.data" type="strlist">e071:f22</append> <!-- Fn+F7 Touchpad toggle (off-to-on) -->
+ <append key="input.keymap.data" type="strlist">e072:f22</append> <!-- Fn+F7 Touchpad toggle (on-to-off) -->
+ <append key="input.keymap.data" type="strlist">e073:prog2</append> <!-- "P" programmable button -->
+ <append key="input.keymap.data" type="strlist">e074:prog1</append> <!-- "e" Acer eManager button -->
+ <append key="info.capabilities" type="strlist">input.keymap</append>
+ </match>
<!-- Aspire 3020 and Aspire 5020 are identical -->
<match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="5020">
<append key="input.keymap.data" type="strlist">e025:help</append> <!-- Fn+F1 Hotkey help -->
@@ -204,6 +223,39 @@
</match>
</match>
<match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" prefix="TravelMate">
+ <!-- TravelMate C300 -->
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="C300">
+ <append key="input.keymap.data" type="strlist">0x68:f22</append> <!-- FIXME: rotate screen -->
+ <append key="input.keymap.data" type="strlist">0x68:up</append>
+ <append key="input.keymap.data" type="strlist">0x69:down</append>
+ <append key="input.keymap.data" type="strlist">0x6b:fn</append>
+ <append key="input.keymap.data" type="strlist">0x6c:lockscreen</append>
+ <append key="info.capabilities" type="strlist">input.keymap</append>
+ </match>
+ <!-- TravelMate 3000 -->
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="3000">
+ <append key="input.keymap.data" type="strlist">e025:help</append> <!-- Fn+F1 Hotkey help -->
+ <append key="input.keymap.data" type="strlist">e026:setup</append> <!-- Fn+F2 Acer eSettings -->
+ <append key="input.keymap.data" type="strlist">e027:battery</append> <!-- Fn+F3 Power Management -->
+ <append key="input.keymap.data" type="strlist">e029:switchvideomode</append> <!-- Fn+F5 Display toggle -->
+ <append key="input.keymap.data" type="strlist">e055:wlan</append> <!-- Wireless (toggle) on-to-off -->
+ <append key="input.keymap.data" type="strlist">e056:wlan</append> <!-- Wireless (toggle) off-to-on -->
+ <append key="input.keymap.data" type="strlist">e057:bluetooth</append> <!-- Bluetooth (toggle) on-to-off -->
+ <append key="input.keymap.data" type="strlist">e058:bluetooth</append> <!-- Bluetooth (toggle) off-to-on -->
+ <append key="input.keymap.data" type="strlist">e06e:brightnessup</append> <!-- Fn+Right Brightness Up -->
+ <append key="input.keymap.data" type="strlist">e071:f22</append> <!-- Fn+F7 Touchpad toggle (off-to-on) -->
+ <append key="input.keymap.data" type="strlist">e072:f23</append> <!-- Fn+F7 Touchpad toggle (on-to-off) -->
+ <append key="input.keymap.data" type="strlist">e073:prog2</append> <!-- "P" programmable button -->
+ <append key="input.keymap.data" type="strlist">e074:prog1</append> <!-- "e" Acer eManager button -->
+ <append key="info.capabilities" type="strlist">input.keymap</append>
+ </match>
+ <!-- TravelMate 4650 -->
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="4650">
+ <append key="input.keymap.data" type="strlist">e059:brightnessup</append> <!-- Fn+Right Brightness Up -->
+ <append key="input.keymap.data" type="strlist">e033:prog2</append> <!-- "P" programmable button -->
+ <append key="input.keymap.data" type="strlist">e034:prog1</append> <!-- "e" Acer eManager button -->
+ <append key="info.capabilities" type="strlist">input.keymap</append>
+ </match>
<!-- TravelMate 5110, TravelMate 5610 and TravelMate 5620 are identical -->
<match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="5110">
<append key="input.keymap.data" type="strlist">e025:help</append> <!-- Fn+F1 Hotkey help -->
@@ -261,6 +313,22 @@
<append key="input.keymap.data" type="strlist">e074:prog1</append> <!-- "e" Acer eManager button -->
<append key="info.capabilities" type="strlist">input.keymap</append>
</match>
+ <!-- TravelMate 6292 -->
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="6292">
+ <append key="input.keymap.data" type="strlist">e025:help</append> <!-- Fn+F1 Hotkey help -->
+ <append key="input.keymap.data" type="strlist">e026:setup</append> <!-- Fn+F2 Acer eSettings -->
+ <append key="input.keymap.data" type="strlist">e027:battery</append> <!-- Fn+F3 Power Management -->
+ <append key="input.keymap.data" type="strlist">e029:switchvideomode</append> <!-- Fn+F5 Display toggle -->
+ <append key="input.keymap.data" type="strlist">e055:wlan</append> <!-- Wireless (toggle) on-to-off -->
+ <append key="input.keymap.data" type="strlist">e056:wlan</append> <!-- Wireless (toggle) off-to-on -->
+ <append key="input.keymap.data" type="strlist">e059:bluetooth</append> <!-- Bluetooth (toggle) on-to-off -->
+ <append key="input.keymap.data" type="strlist">e054:bluetooth</append> <!-- Bluetooth (toggle) off-to-on -->
+ <append key="input.keymap.data" type="strlist">e071:f22</append> <!-- Fn+F7 Touchpad toggle (off-to-on) -->
+ <append key="input.keymap.data" type="strlist">e072:f22</append> <!-- Fn+F7 Touchpad toggle (on-to-off) -->
+ <append key="input.keymap.data" type="strlist">e073:prog2</append> <!-- "P" programmable button -->
+ <append key="input.keymap.data" type="strlist">e074:prog1</append> <!-- "e" Acer eManager button -->
+ <append key="info.capabilities" type="strlist">input.keymap</append>
+ </match>
</match>
</match>
</match>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/hal-info-20070807/fdi/information/10freedesktop/30-keymap-compaq.fdi new/hal-info-20070816/fdi/information/10freedesktop/30-keymap-compaq.fdi
--- old/hal-info-20070807/fdi/information/10freedesktop/30-keymap-compaq.fdi 2007-08-07 17:51:17.000000000 +0200
+++ new/hal-info-20070816/fdi/information/10freedesktop/30-keymap-compaq.fdi 2007-08-16 15:15:37.000000000 +0200
@@ -9,9 +9,9 @@
<match key="/org/freedesktop/Hal/devices/computer:system.hardware.vendor" prefix="Compaq">
<match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="E500">
<append key="input.keymap.data" type="strlist">e023:www</append> <!-- I key -->
- <append key="input.keymap.data" type="strlist">e01f:homepage</append> <!-- Home key -->
<append key="input.keymap.data" type="strlist">e01a:search</append> <!-- Search key -->
<append key="input.keymap.data" type="strlist">e01e:email</append> <!-- Email -->
+ <append key="input.keymap.data" type="strlist">e01f:homepage</append> <!-- Home key -->
<append key="info.capabilities" type="strlist">input.keymap</append>
</match>
</match>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/hal-info-20070807/fdi/information/10freedesktop/30-keymap-dell.fdi new/hal-info-20070816/fdi/information/10freedesktop/30-keymap-dell.fdi
--- old/hal-info-20070807/fdi/information/10freedesktop/30-keymap-dell.fdi 2007-08-07 17:51:17.000000000 +0200
+++ new/hal-info-20070816/fdi/information/10freedesktop/30-keymap-dell.fdi 2007-08-16 15:15:37.000000000 +0200
@@ -9,56 +9,56 @@
<match key="/org/freedesktop/Hal/devices/computer:system.hardware.vendor" prefix="Dell">
<match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" prefix="Latitude">
<match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="D420">
- <append key="input.keymap.data" type="strlist">e007:battery</append> <!-- Fn+F3 battery icon -->
- <append key="input.keymap.data" type="strlist">e00f:switchvideomode</append> <!-- Fn+F7 aspect ratio -->
- <append key="input.keymap.data" type="strlist">e00b:displaytoggle</append> <!-- Fn+F8 CRT/LCD -->
- <append key="input.keymap.data" type="strlist">e006:brightnessup</append> <!-- Fn+Up arrow Brightness Up -->
<append key="input.keymap.data" type="strlist">e005:brightnessdown</append> <!-- Fn+Down arrow Brightness Down -->
<append key="input.keymap.data" type="strlist">e005:f23</append> <!-- FIXME Fn+Left arrow Auto Brightness -->
+ <append key="input.keymap.data" type="strlist">e006:brightnessup</append> <!-- Fn+Up arrow Brightness Up -->
+ <append key="input.keymap.data" type="strlist">e007:battery</append> <!-- Fn+F3 battery icon -->
<append key="input.keymap.data" type="strlist">e00a:suspend</append> <!-- Fn+F1 hibernate -->
+ <append key="input.keymap.data" type="strlist">e00b:displaytoggle</append> <!-- Fn+F8 CRT/LCD -->
+ <append key="input.keymap.data" type="strlist">e00f:switchvideomode</append> <!-- Fn+F7 aspect ratio -->
<append key="info.capabilities" type="strlist">input.keymap</append>
</match>
<match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="D610">
- <append key="input.keymap.data" type="strlist">e007:battery</append> <!-- Fn+F3 battery icon -->
- <append key="input.keymap.data" type="strlist">e00b:displaytoggle</append> <!-- Fn+F8 CRT/LCD -->
- <append key="input.keymap.data" type="strlist">e006:brightnessup</append> <!-- Fn+Up arrow Brightness Up -->
<append key="input.keymap.data" type="strlist">e005:brightnessdown</append> <!-- Fn+Down arrow Brightness Down -->
- <append key="input.keymap.data" type="strlist">e00a:suspend</append> <!-- Fn+F1 hibernate -->
+ <append key="input.keymap.data" type="strlist">e006:brightnessup</append> <!-- Fn+Up arrow Brightness Up -->
+ <append key="input.keymap.data" type="strlist">e007:battery</append> <!-- Fn+F3 battery icon -->
<append key="input.keymap.data" type="strlist">e008:wlan</append> <!-- Fn+F2 Turn On/Off Wireless -->
<append key="input.keymap.data" type="strlist">e009:ejectclosecd</append> <!-- Fn+F10 Eject CD -->
+ <append key="input.keymap.data" type="strlist">e00a:suspend</append> <!-- Fn+F1 hibernate -->
+ <append key="input.keymap.data" type="strlist">e00b:displaytoggle</append> <!-- Fn+F8 CRT/LCD -->
<append key="info.capabilities" type="strlist">input.keymap</append>
</match>
<match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="D620">
+ <append key="input.keymap.data" type="strlist">e005:brightnessdown</append> <!-- Fn+Down arrow Brightness Down -->
+ <append key="input.keymap.data" type="strlist">e006:brightnessup</append> <!-- Fn+Up arrow Brightness Up -->
<append key="input.keymap.data" type="strlist">e007:battery</append> <!-- Fn+F3 battery icon -->
- <append key="input.keymap.data" type="strlist">e00f:switchvideomode</append> <!-- Fn+F7 aspect ratio -->
+ <append key="input.keymap.data" type="strlist">e008:wlan</append> <!-- Turn On/Off Wireless -->
+ <append key="input.keymap.data" type="strlist">e00a:suspend</append> <!-- Fn+F1 hibernate -->
<append key="input.keymap.data" type="strlist">e00b:displaytoggle</append> <!-- Fn+F8 CRT/LCD -->
- <append key="input.keymap.data" type="strlist">e006:brightnessup</append> <!-- Fn+Up arrow Brightness Up -->
- <append key="input.keymap.data" type="strlist">e005:brightnessdown</append> <!-- Fn+Down arrow Brightness Down -->
+ <append key="input.keymap.data" type="strlist">e00f:switchvideomode</append> <!-- Fn+F7 aspect ratio -->
<append key="input.keymap.data" type="strlist">e013:f23</append> <!-- Fn+Left arrow Auto Brightness -->
- <append key="input.keymap.data" type="strlist">e00a:suspend</append> <!-- Fn+F1 hibernate -->
- <append key="input.keymap.data" type="strlist">e008:wlan</append> <!-- Turn On/Off Wireless -->
<append key="info.capabilities" type="strlist">input.keymap</append>
</match>
<match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="D630">
- <append key="input.keymap.data" type="strlist">e007:battery</append> <!-- Fn+F3 battery icon -->
- <append key="input.keymap.data" type="strlist">e00f:switchvideomode</append> <!-- Fn+F7 aspect ratio -->
- <append key="input.keymap.data" type="strlist">e00b:displaytoggle</append> <!-- Fn+F8 CRT/LCD -->
- <append key="input.keymap.data" type="strlist">e006:brightnessup</append> <!-- Fn+Up arrow Brightness Up -->
<append key="input.keymap.data" type="strlist">e005:brightnessdown</append> <!-- Fn+Down arrow Brightness Down -->
- <append key="input.keymap.data" type="strlist">e013:f23</append> <!-- Fn+Left arrow Auto Brightness -->
- <append key="input.keymap.data" type="strlist">e00a:suspend</append> <!-- Fn+F1 hibernate -->
+ <append key="input.keymap.data" type="strlist">e006:brightnessup</append> <!-- Fn+Up arrow Brightness Up -->
+ <append key="input.keymap.data" type="strlist">e007:battery</append> <!-- Fn+F3 battery icon -->
<append key="input.keymap.data" type="strlist">e008:wlan</append> <!-- Turn On/Off Wireless -->
+ <append key="input.keymap.data" type="strlist">e00a:suspend</append> <!-- Fn+F1 hibernate -->
+ <append key="input.keymap.data" type="strlist">e00b:displaytoggle</append> <!-- Fn+F8 CRT/LCD -->
+ <append key="input.keymap.data" type="strlist">e00f:switchvideomode</append> <!-- Fn+F7 aspect ratio -->
<append key="input.keymap.data" type="strlist">e011:prog1</append> <!-- Wifi Catcher (DELL Specific) -->
+ <append key="input.keymap.data" type="strlist">e013:f23</append> <!-- Fn+Left arrow Auto Brightness -->
<append key="info.capabilities" type="strlist">input.keymap</append>
</match>
<match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="D820">
+ <append key="input.keymap.data" type="strlist">e005:brightnessdown</append> <!-- Fn+Down arrow Brightness Down -->
+ <append key="input.keymap.data" type="strlist">e006:brightnessup</append> <!-- Fn+Up arrow Brightness Up -->
<append key="input.keymap.data" type="strlist">e007:battery</append> <!-- Fn+F3 battery icon -->
- <append key="input.keymap.data" type="strlist">e00f:switchvideomode</append> <!-- Fn+F7 aspect ratio -->
+ <append key="input.keymap.data" type="strlist">e00a:suspend</append> <!-- Fn+F1 hibernate -->
<append key="input.keymap.data" type="strlist">e00b:displaytoggle</append> <!-- Fn+F8 CRT/LCD -->
- <append key="input.keymap.data" type="strlist">e006:brightnessup</append> <!-- Fn+Up arrow Brightness Up -->
- <append key="input.keymap.data" type="strlist">e005:brightnessdown</append> <!-- Fn+Down arrow Brightness Down -->
+ <append key="input.keymap.data" type="strlist">e00f:switchvideomode</append> <!-- Fn+F7 aspect ratio -->
<append key="input.keymap.data" type="strlist">e013:f23</append> <!-- FIXME Fn+Left arrow Auto Brightness -->
- <append key="input.keymap.data" type="strlist">e00a:suspend</append> <!-- Fn+F1 hibernate -->
<append key="info.capabilities" type="strlist">input.keymap</append>
</match>
</match> <!-- prefix="Latitude" -->
@@ -77,25 +77,25 @@
</match>
<match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" prefix="MXC061"> <!-- Dell Inspiron 640m -->
- <append key="input.keymap.data" type="strlist">e00a:suspend</append> <!-- Fn+F1 hibernate -->
- <append key="input.keymap.data" type="strlist">e008:wlan</append> <!-- Fn+F2 Toggle WiFi -->
+ <append key="input.keymap.data" type="strlist">e005:brightnessdown</append> <!-- Fn+Down arrow Brightness Down -->
+ <append key="input.keymap.data" type="strlist">e006:brightnessup</append> <!-- Fn+Up arrow Brightness Up -->
<append key="input.keymap.data" type="strlist">e007:battery</append> <!-- Fn+F3 battery icon -->
- <append key="input.keymap.data" type="strlist">e00b:switchvideomode</append> <!-- Fn+F8 CRT/LCD -->
+ <append key="input.keymap.data" type="strlist">e008:wlan</append> <!-- Fn+F2 Toggle WiFi -->
<append key="input.keymap.data" type="strlist">e009:ejectclosecd</append> <!-- Fn+F10 Eject CD -->
- <append key="input.keymap.data" type="strlist">e006:brightnessup</append> <!-- Fn+Up arrow Brightness Up -->
- <append key="input.keymap.data" type="strlist">e005:brightnessdown</append> <!-- Fn+Down arrow Brightness Down -->
+ <append key="input.keymap.data" type="strlist">e00a:suspend</append> <!-- Fn+F1 hibernate -->
+ <append key="input.keymap.data" type="strlist">e00b:switchvideomode</append> <!-- Fn+F8 CRT/LCD -->
<append key="input.keymap.data" type="strlist">e012:media</append> <!-- MediaDirect button (house icon) -->
<append key="info.capabilities" type="strlist">input.keymap</append>
</match>
<match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" prefix="MXC062"> <!-- Dell XPS M1210 -->
- <append key="input.keymap.data" type="strlist">e007:battery</append> <!-- Fn+F3 Battery icon -->
- <append key="input.keymap.data" type="strlist">e00b:switchvideomode</append> <!-- Fn+F8 CRT/LCD -->
- <append key="input.keymap.data" type="strlist">e006:brightnessup</append> <!-- Fn+Up arrow Brightness Up -->
<append key="input.keymap.data" type="strlist">e005:brightnessdown</append> <!-- Fn+Down arrow Brightness Down -->
- <append key="input.keymap.data" type="strlist">e00a:suspend</append> <!-- Fn+F1 Hibernate -->
+ <append key="input.keymap.data" type="strlist">e006:brightnessup</append> <!-- Fn+Up arrow Brightness Up -->
+ <append key="input.keymap.data" type="strlist">e007:battery</append> <!-- Fn+F3 Battery icon -->
<append key="input.keymap.data" type="strlist">e008:wlan</append> <!-- Wirelesss switch -->
<append key="input.keymap.data" type="strlist">e008:bluetooth</append> <!-- FIXME Bluetooth switch (same as wireless) -->
+ <append key="input.keymap.data" type="strlist">e00a:suspend</append> <!-- Fn+F1 Hibernate -->
+ <append key="input.keymap.data" type="strlist">e00b:switchvideomode</append> <!-- Fn+F8 CRT/LCD -->
<append key="input.keymap.data" type="strlist">e012:media</append> <!-- Dell MediaDirect button Opens Dell Media Experience (a sort of media player) -->
<append key="input.keymap.data" type="strlist">e015:camera</append> <!-- Shutter button Takes a picture if optional camera available -->
<append key="info.capabilities" type="strlist">input.keymap</append>
@@ -103,24 +103,24 @@
<match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" prefix="Inspiron">
<match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="8500">
- <append key="input.keymap.data" type="strlist">e007:battery</append> <!-- Fn+F3 battery icon -->
- <append key="input.keymap.data" type="strlist">e006:brightnessup</append> <!-- Fn+Up arrow Brightness Up -->
<append key="input.keymap.data" type="strlist">e005:brightnessdown</append> <!-- Fn+Down arrow Brightness Down -->
+ <append key="input.keymap.data" type="strlist">e006:brightnessup</append> <!-- Fn+Up arrow Brightness Up -->
+ <append key="input.keymap.data" type="strlist">e007:battery</append> <!-- Fn+F3 battery icon -->
<append key="input.keymap.data" type="strlist">e008:wlan</append> <!-- Fn+F2 Toggle WiFi -->
<append key="input.keymap.data" type="strlist">e009:ejectclosecd</append> <!-- Fn+F10 Eject CD -->
<append key="info.capabilities" type="strlist">input.keymap</append>
</match>
</match>
<match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" prefix="MM061"> <!-- Inspiron E1505/6400 -->
- <append key="input.keymap.data" type="strlist">e005:brightnessdown</append> <!-- Fn+Down arrow Brightness Down -->
- <append key="input.keymap.data" type="strlist">e006:brightnessup</append> <!-- Fn+Up arrow Brightness Up -->
- <append key="input.keymap.data" type="strlist">e007:battery</append> <!-- Fn+F3 battery icon -->
- <append key="input.keymap.data" type="strlist">e008:bluetooth</append> <!-- Fn+F2 bluetooth -->
- <append key="input.keymap.data" type="strlist">e009:ejectclosecd</append> <!-- Fn+F10 Eject CD -->
- <append key="input.keymap.data" type="strlist">e00a:suspend</append> <!-- Fn+F1 Hibernate -->
- <append key="input.keymap.data" type="strlist">e00b:switchvideomode</append> <!-- Fn+F8 CRT/LCD -->
- <append key="input.keymap.data" type="strlist">e012:media</append> <!-- MediaDirect button (house icon) -->
- <append key="info.capabilities" type="strlist">input.keymap</append>
+ <append key="input.keymap.data" type="strlist">e005:brightnessdown</append> <!-- Fn+Down arrow Brightness Down -->
+ <append key="input.keymap.data" type="strlist">e006:brightnessup</append> <!-- Fn+Up arrow Brightness Up -->
+ <append key="input.keymap.data" type="strlist">e007:battery</append> <!-- Fn+F3 battery icon -->
+ <append key="input.keymap.data" type="strlist">e008:bluetooth</append> <!-- Fn+F2 bluetooth -->
+ <append key="input.keymap.data" type="strlist">e009:ejectclosecd</append> <!-- Fn+F10 Eject CD -->
+ <append key="input.keymap.data" type="strlist">e00a:suspend</append> <!-- Fn+F1 Hibernate -->
+ <append key="input.keymap.data" type="strlist">e00b:switchvideomode</append> <!-- Fn+F8 CRT/LCD -->
+ <append key="input.keymap.data" type="strlist">e012:media</append> <!-- MediaDirect button (house icon) -->
+ <append key="info.capabilities" type="strlist">input.keymap</append>
</match>
</match>
</match>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/hal-info-20070807/fdi/information/10freedesktop/30-keymap-hp.fdi new/hal-info-20070816/fdi/information/10freedesktop/30-keymap-hp.fdi
--- old/hal-info-20070807/fdi/information/10freedesktop/30-keymap-hp.fdi 2007-08-07 17:51:17.000000000 +0200
+++ new/hal-info-20070816/fdi/information/10freedesktop/30-keymap-hp.fdi 2007-08-16 15:15:37.000000000 +0200
@@ -16,15 +16,63 @@
<append key="info.capabilities" type="strlist">input.keymap</append>
</match>
<match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="nc6120">
- <append key="input.keymap.data" type="strlist">e059:www</append> <!-- I key -->
+ <append key="input.keymap.data" type="strlist">e008:tv</append> <!-- SVideo -->
<append key="input.keymap.data" type="strlist">e009:battery</append> <!-- FnF8 (battery) -->
+ <append key="input.keymap.data" type="strlist">e059:www</append> <!-- I key -->
+ <append key="info.capabilities" type="strlist">input.keymap</append>
+ </match>
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="nc6230">
+ <append key="input.keymap.data" type="strlist">e001:fn_esc</append> <!-- FnEsc -->
<append key="input.keymap.data" type="strlist">e008:tv</append> <!-- SVideo -->
+ <append key="input.keymap.data" type="strlist">e009:battery</append> <!-- FnF8 (battery) -->
+ <append key="input.keymap.data" type="strlist">e00a:screenlock</append> <!-- FnF6 Lock -->
+ <append key="input.keymap.data" type="strlist">e033:f22</append> <!-- FIXME: Auto brightness -->
+ <append key="input.keymap.data" type="strlist">e059:www</append> <!-- I key -->
<append key="info.capabilities" type="strlist">input.keymap</append>
</match>
<match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="nc6320">
+ <append key="input.keymap.data" type="strlist">e008:tv</append> <!-- SVideo -->
+ <append key="input.keymap.data" type="strlist">e009:battery</append> <!-- FnF8 (battery) -->
+ <append key="input.keymap.data" type="strlist">e059:www</append> <!-- I key -->
+ <append key="info.capabilities" type="strlist">input.keymap</append>
+ </match>
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="nc6400">
+ <append key="input.keymap.data" type="strlist">e001:fn_esc</append> <!-- FnEsc -->
+ <append key="input.keymap.data" type="strlist">e008:tv</append> <!-- SVideo -->
+ <append key="input.keymap.data" type="strlist">e009:battery</append> <!-- FnF8 (battery) -->
+ <append key="input.keymap.data" type="strlist">e059:www</append> <!-- I key -->
+ <append key="info.capabilities" type="strlist">input.keymap</append>
+ </match>
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="nw8440">
+ <append key="input.keymap.data" type="strlist">e001:fn_esc</append> <!-- FnEsc -->
+ <append key="input.keymap.data" type="strlist">e008:tv</append> <!-- SVideo -->
+ <append key="input.keymap.data" type="strlist">e009:battery</append> <!-- FnF8 (battery) -->
+ <append key="input.keymap.data" type="strlist">e00a:screenlock</append> <!-- FnF6 Lock -->
+ <append key="input.keymap.data" type="strlist">e033:f22</append> <!-- FIXME: Auto brightness -->
<append key="input.keymap.data" type="strlist">e059:www</append> <!-- I key -->
+ <append key="info.capabilities" type="strlist">input.keymap</append>
+ </match>
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="nx6125">
+ <append key="input.keymap.data" type="strlist">e001:fn_esc</append> <!-- FnEsc -->
+ <append key="input.keymap.data" type="strlist">e008:tv</append> <!-- SVideo -->
<append key="input.keymap.data" type="strlist">e009:battery</append> <!-- FnF8 (battery) -->
+ <append key="input.keymap.data" type="strlist">e059:www</append> <!-- I key -->
+ <append key="info.capabilities" type="strlist">input.keymap</append>
+ </match>
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="nx6325">
+ <append key="input.keymap.data" type="strlist">e001:fn_esc</append> <!-- FnEsc -->
<append key="input.keymap.data" type="strlist">e008:tv</append> <!-- SVideo -->
+ <append key="input.keymap.data" type="strlist">e009:battery</append> <!-- FnF8 (battery) -->
+ <append key="input.keymap.data" type="strlist">e00a:screenlock</append> <!-- FnF6 Lock -->
+ <append key="input.keymap.data" type="strlist">e033:f22</append> <!-- FIXME: Auto brightness -->
+ <append key="input.keymap.data" type="strlist">e059:www</append> <!-- I key -->
+ <append key="info.capabilities" type="strlist">input.keymap</append>
+ </match>
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="nx7400">
+ <append key="input.keymap.data" type="strlist">e001:fn_esc</append> <!-- FnEsc -->
+ <append key="input.keymap.data" type="strlist">e009:battery</append> <!-- FnF8 (battery) -->
+ <append key="input.keymap.data" type="strlist">e00a:screenlock</append> <!-- FnF6 Lock -->
+ <append key="input.keymap.data" type="strlist">e033:f22</append> <!-- FIXME: Auto brightness -->
<append key="info.capabilities" type="strlist">input.keymap</append>
</match>
</match>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/hal-info-20070807/fdi/information/10freedesktop/30-keymap-misc.fdi new/hal-info-20070816/fdi/information/10freedesktop/30-keymap-misc.fdi
--- old/hal-info-20070807/fdi/information/10freedesktop/30-keymap-misc.fdi 2007-08-07 17:51:15.000000000 +0200
+++ new/hal-info-20070816/fdi/information/10freedesktop/30-keymap-misc.fdi 2007-08-16 15:15:37.000000000 +0200
@@ -16,17 +16,17 @@
<match key="/org/freedesktop/Hal/devices/computer:system.hardware.vendor" prefix="MICRO-STAR">
<match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="INFINITY">
- <append key="input.keymap.data" type="strlist">e064:f22</append> <!-- Fn-F3 Touchpad disable -->
- <append key="input.keymap.data" type="strlist">e077:brightnessdown</append> <!-- Fn-F4 Brightness down -->
- <append key="input.keymap.data" type="strlist">e078:brightnessup</append> <!-- Fn-F5 Brightness up -->
+ <append key="input.keymap.data" type="strlist">e020:mute</append> <!-- Fn-F9 Sound On/Off -->
<append key="input.keymap.data" type="strlist">e02e:volumedown</append> <!-- Fn-F7 Volume down -->
<append key="input.keymap.data" type="strlist">e030:volumeup</append> <!-- Fn-F8 Volume up -->
- <append key="input.keymap.data" type="strlist">e020:mute</append> <!-- Fn-F9 Sound On/Off -->
+ <append key="input.keymap.data" type="strlist">e032:www</append> <!-- e button -->
<append key="input.keymap.data" type="strlist">e05f:sleep</append> <!-- Fn-F12 Sleep -->
+ <append key="input.keymap.data" type="strlist">e062:bluetooth</append> <!-- satellite dish2 -->
+ <append key="input.keymap.data" type="strlist">e064:f22</append> <!-- Fn-F3 Touchpad disable -->
<append key="input.keymap.data" type="strlist">e06c:email</append> <!-- envelope button -->
- <append key="input.keymap.data" type="strlist">e032:www</append> <!-- e button -->
<append key="input.keymap.data" type="strlist">e076:wlan</append> <!-- satellite dish1 -->
- <append key="input.keymap.data" type="strlist">e062:bluetooth</append> <!-- satellite dish2 -->
+ <append key="input.keymap.data" type="strlist">e077:brightnessdown</append> <!-- Fn-F4 Brightness down -->
+ <append key="input.keymap.data" type="strlist">e078:brightnessup</append> <!-- Fn-F5 Brightness up -->
<append key="input.keymap.data" type="strlist">e079:search</append> <!-- Search -->
<append key="info.capabilities" type="strlist">input.keymap</append>
</match>
@@ -34,28 +34,28 @@
<match key="/org/freedesktop/Hal/devices/computer:system.chassis.manufacturer" prefix="MICRO-STAR">
<match key="/org/freedesktop/Hal/devices/computer:system.hardware.version" string="0131">
- <append key="input.keymap.data" type="strlist">e078:brightnessup</append> <!-- Fn-F4 Brightness up -->
- <append key="input.keymap.data" type="strlist">e077:brightnessdown</append> <!-- Fn-F5 Brightness down -->
+ <append key="input.keymap.data" type="strlist">e020:mute</append> <!-- Fn-F9 Sound On/Off -->
<append key="input.keymap.data" type="strlist">e02e:volumedown</append> <!-- Fn-F7 Volume down -->
<append key="input.keymap.data" type="strlist">e030:volumeup</append> <!-- Fn-F8 Volume up -->
- <append key="input.keymap.data" type="strlist">e020:mute</append> <!-- Fn-F9 Sound On/Off -->
+ <append key="input.keymap.data" type="strlist">e032:www</append> <!-- www button -->
<append key="input.keymap.data" type="strlist">e05f:sleep</append> <!-- Fn-F12 Sleep -->
+ <append key="input.keymap.data" type="strlist">e062:bluetooth</append> <!-- satellite dish: bluetooth -->
<append key="input.keymap.data" type="strlist">e06c:email</append> <!-- envelope button -->
- <append key="input.keymap.data" type="strlist">e032:www</append> <!-- www button -->
<append key="input.keymap.data" type="strlist">e076:wlan</append> <!-- satellite dish: wlan -->
- <append key="input.keymap.data" type="strlist">e062:bluetooth</append> <!-- satellite dish: bluetooth -->
- <append key="input.keymap.data" type="strlist">e079:search</append> <!-- search button -->
<append key="input.keymap.data" type="strlist">e071:unknown</append> <!-- plug -->
<append key="input.keymap.data" type="strlist">e072:unknown</append> <!-- unplug -->
+ <append key="input.keymap.data" type="strlist">e077:brightnessdown</append> <!-- Fn-F5 Brightness down -->
+ <append key="input.keymap.data" type="strlist">e078:brightnessup</append> <!-- Fn-F4 Brightness up -->
+ <append key="input.keymap.data" type="strlist">e079:search</append> <!-- search button -->
<append key="info.capabilities" type="strlist">input.keymap</append>
</match>
</match>
<match key="/org/freedesktop/Hal/devices/computer:system.vendor" string="MEDIONNB">
<match key="/org/freedesktop/Hal/devices/computer:system.product" prefix="A555">
- <append key="input.keymap.data" type="strlist">67:email</append> <!-- envelope button -->
<append key="input.keymap.data" type="strlist">63:www</append> <!-- N button -->
<append key="input.keymap.data" type="strlist">66:prog1</append> <!-- link 1 button -->
+ <append key="input.keymap.data" type="strlist">67:email</append> <!-- envelope button -->
<append key="input.keymap.data" type="strlist">69:prog2</append> <!-- link 2 button -->
<append key="info.capabilities" type="strlist">input.keymap</append>
</match>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/hal-info-20070807/fdi/information/10freedesktop/30-keymap-module-sony-laptop.fdi new/hal-info-20070816/fdi/information/10freedesktop/30-keymap-module-sony-laptop.fdi
--- old/hal-info-20070807/fdi/information/10freedesktop/30-keymap-module-sony-laptop.fdi 2007-08-07 17:51:16.000000000 +0200
+++ new/hal-info-20070816/fdi/information/10freedesktop/30-keymap-module-sony-laptop.fdi 2007-08-16 15:15:37.000000000 +0200
@@ -16,8 +16,7 @@
<append key="input.keymap.data" type="strlist">0x10:suspend</append> <!-- Fn+F12 hibernate -->
<append key="info.capabilities" type="strlist">input.keymap</append>
</match>
- </match>
- <match key="/org/freedesktop/Hal/devices/computer:system.hardware.vendor" prefix="Sony">
+
<match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" string="VGN-FS790B">
<append key="input.keymap.data" type="strlist">0x06:mute</append> <!-- Fn+F2 mute -->
<append key="input.keymap.data" type="strlist">0x07:volumedown</append> <!-- Fn+F3 mixer down -->
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org