Hello community, here is the log from the commit of package hal checked in at Thu Mar 15 01:39:51 CET 2007. -------- --- hal/hal.changes 2007-03-11 12:04:56.000000000 +0100 +++ /mounts/work_src_done/STABLE/hal/hal.changes 2007-03-14 21:45:02.166100000 +0100 @@ -1,0 +2,17 @@ +Wed Mar 14 19:31:54 CET 2007 - dkukawka@suse.de + +- updated to actual HAL and hal-info git master: + - this package include now fixes for there b.n.c bugs: #205669 + and #145416 +- removed upstream gone patches: + - hal-fix-compiler_warning_dell-addon.diff + - hal-fix-compiler_warning_storage-cleanup-mountpoint.diff + - hal-fix-compiler_warning_libhal.diff + - hal-fix-compiler_warning_create_cache.diff + - hal-fix-compiler_warning_UID_data_type.diff + - hal-fix-libhal_validate_parameter_fd.o_bug10133_v2.diff +- added new patch: + - hal-add-cdrom_capabilities.diff: add more information about + cdrom devices and capabilities + +------------------------------------------------------------------- Old: ---- hal-0.5.8_git20070305.tar.bz2 hal-add-IBMHotkey_Support_v2_incl_TabletPC.diff hal-add-standby-support.diff hal-add-tabletPC_support_v2.diff hal-allow_uid_for_ntfs.diff hal-fix-compiler_warning_create_cache.diff hal-fix-compiler_warning_dell-addon.diff hal-fix-compiler_warning_libhal.diff hal-fix-compiler_warning_storage-cleanup-mountpoint.diff hal-fix-compiler_warning_UID_data_type.diff hal-fix-libhal_validate_parameter_fd.o_bug10133_v2.diff hal-fix-power-privileges.diff hal-fix-storage-policy-fixed-drives.diff hal-fix-util_compute_time_remaining_warning_highTime.diff hal-info-20070305.tar.bz2 hal-panasonic-acpi-suse.diff hal-pci.diff hal-performance_pci.ids_v5.diff hal-revert-git-multisession.diff hal-usb_speed_and_version_in_double.diff New: ---- hal-0.5.8_git20070314.tar.bz2 hal-info-20070314.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hal.spec ++++++ --- /var/tmp/diff_new_pack.H10603/_old 2007-03-15 01:39:12.000000000 +0100 +++ /var/tmp/diff_new_pack.H10603/_new 2007-03-15 01:39:12.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package hal (Version 0.5.8_git20070305) +# spec file for package hal (Version 0.5.8_git20070314) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -22,37 +22,13 @@ %define dbus_release 1 License: Other uncritical OpenSource License Group: System/Daemons -Version: 0.5.8_git20070305 -Release: 4 +Version: 0.5.8_git20070314 +Release: 1 Autoreqprov: on Summary: Daemon for Collecting Hardware Information -# SUSE specific patches -Patch0: %{name}-add-tabletPC_support_v2.diff -Patch1: %{name}-panasonic-acpi-suse.diff -Patch2: %{name}-allow_uid_for_ntfs.diff -Patch3: %{name}-fix-storage-policy-fixed-drives.diff -# SUSE specific temporary patches -Patch10: hal-revert-git-multisession.diff -Patch11: hal-add-standby-support.diff -# -# submitted (or planed to do in next time) upstream patches -Patch100: hal-fix-util_compute_time_remaining_warning_highTime.diff -Patch101: hal-fix-power-privileges.diff -Patch102: hal-pci.diff -Patch103: hal-add-IBMHotkey_Support_v2_incl_TabletPC.diff -Patch104: hal-fix-compiler_warning_dell-addon.diff -Patch105: hal-fix-compiler_warning_storage-cleanup-mountpoint.diff -Patch106: hal-fix-compiler_warning_libhal.diff -Patch107: hal-fix-compiler_warning_create_cache.diff -Patch108: hal-fix-compiler_warning_UID_data_type.diff -Patch109: hal-fix-libhal_validate_parameter_fd.o_bug10133_v2.diff -Patch110: hal-usb_speed_and_version_in_double.diff -# -# need to backport -Patch400: hal-performance_pci.ids_v5.diff # Sources: Source0: %{name}-%{version}.tar.bz2 -Source1: hal-info-20070305.tar.bz2 +Source1: hal-info-20070314.tar.bz2 Source2: rc.hal Source3: 90-hal.rules Prereq: /usr/sbin/groupadd /usr/sbin/useradd /etc/init.d/boot.localfs @@ -75,6 +51,25 @@ Requires: %{name} >= %{version}, dbus-1-python >= %{dbus_version}-%{dbus_release}, python-gtk, python-gnome Autoreqprov: on Group: System/GUI/GNOME +# SUSE specific patches +Patch0: %{name}-add-tabletPC_support_v2.diff +Patch1: %{name}-panasonic-acpi-suse.diff +Patch2: %{name}-allow_uid_for_ntfs.diff +Patch3: %{name}-fix-storage-policy-fixed-drives.diff +# SUSE specific temporary patches +Patch10: hal-revert-git-multisession.diff +Patch11: hal-add-standby-support.diff +# +# submitted (or planed to do in next time) upstream patches +Patch100: hal-fix-util_compute_time_remaining_warning_highTime.diff +Patch101: hal-fix-power-privileges.diff +Patch102: hal-pci.diff +Patch103: hal-add-IBMHotkey_Support_v2_incl_TabletPC.diff +Patch104: hal-usb_speed_and_version_in_double.diff +Patch105: hal-add-cdrom_capabilities.diff +# +# need to backport +Patch400: hal-performance_pci.ids_v5.diff %description HAL is a hardware abstraction layer and aims to provide a live list of @@ -155,11 +150,6 @@ %patch103 -p1 %patch104 -p1 %patch105 -p1 -%patch106 -p1 -%patch107 -p1 -%patch108 -p1 -%patch109 -p1 -%patch110 -p1 popd #%patch400 -p1 @@ -188,7 +178,7 @@ --enable-sysfs-carrier \ --enable-acpi-acpid \ --disable-acpi-proc \ - --disable-gtk-doc \ + --enable-gtk-doc \ --enable-parted \ --enable-policy-kit \ --enable-docbook-docs \ @@ -253,8 +243,6 @@ %dir %{_sysconfdir}/udev %dir %{_sysconfdir}/udev/rules.d %dir %{_datadir}/doc/packages/hal -%dir %{_datadir}/doc/packages/hal/conf -%dir %{_datadir}/doc/packages/hal/spec %dir %{_datadir}/hal %dir %{_datadir}/hal/fdi %dir %{_libdir}/hal @@ -278,13 +266,13 @@ %files -n hal-devel %defattr(-, root, root) -%dir %{_datadir}/gtk-doc/html/hal +%dir %{_datadir}/gtk-doc/html %{_includedir}/* %{_libdir}/lib*.a %{_libdir}/lib*.la %{_libdir}/lib*.so %{_libdir}/pkgconfig/* -%{_datadir}/gtk-doc/html/hal/* +%{_datadir}/gtk-doc/html/* %files -n hal-gnome %defattr(-, root, root) @@ -293,6 +281,20 @@ %{_bindir}/hal-device-manager %changelog +* Wed Mar 14 2007 - dkukawka@suse.de +- updated to actual HAL and hal-info git master: + - this package include now fixes for there b.n.c bugs: #205669 + and #145416 +- removed upstream gone patches: + - hal-fix-compiler_warning_dell-addon.diff + - hal-fix-compiler_warning_storage-cleanup-mountpoint.diff + - hal-fix-compiler_warning_libhal.diff + - hal-fix-compiler_warning_create_cache.diff + - hal-fix-compiler_warning_UID_data_type.diff + - hal-fix-libhal_validate_parameter_fd.o_bug10133_v2.diff +- added new patch: + - hal-add-cdrom_capabilities.diff: add more information about + cdrom devices and capabilities * Sun Mar 11 2007 - ro@suse.de - added Requires: e2fsprogs-devel to hal-devel (for libuuid used in libhal-storage) ++++++ hal-0.5.8_git20070305.tar.bz2 -> hal-0.5.8_git20070314.tar.bz2 ++++++ ++++ 53009 lines of diff (skipped) ++++++ hal-info-20070305.tar.bz2 -> hal-info-20070314.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20070305/ChangeLog new/hal-info-20070314/ChangeLog --- old/hal-info-20070305/ChangeLog 2007-03-05 14:28:34.000000000 +0100 +++ new/hal-info-20070314/ChangeLog 2007-03-14 19:29:23.000000000 +0100 @@ -1,3 +1,118 @@ +commit 828c748d4c920a40e1a591d8a9061bfa15d5cb9b +Merge: f49e80c... 98b3497... +Author: David Zeuthen <davidz@redhat.com> +Date: Tue Mar 13 17:43:48 2007 -0400 + + Merge branch 'master' of ssh://david@git.freedesktop.org/git/hal-info + +commit f49e80ca43d6230bff7c6b103758144285d56eb6 +Author: David Zeuthen <davidz@redhat.com> +Date: Tue Mar 13 17:43:34 2007 -0400 + + update version to 20070313 + + configure.in | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +commit 98b34973933fc6db1735ae94053ed369826226f7 +Author: Elias Probst <elias.probst@gmx.de> +Date: Wed Mar 7 15:21:15 2007 +0100 + + added iRiver T20 to USB musicplayers + + Added iRiver T20 to USB musicplayers list. + + .../10freedesktop/10-usb-music-players.fdi | 8 ++++++++ + 1 files changed, 8 insertions(+), 0 deletions(-) + +commit a949ee5340b3037d1e480718ff3336c8b439930b +Author: Richard Hughes <richard@hughsie.com> +Date: Tue Mar 6 17:57:51 2007 +0000 + + fix up vbestate_restore for display resuming + + We were using the old names in hal-info, which got changed + on the HAL list after review. The spec uses the new names, + as does the hal-spec so we should switch hal-info to use them. + Patch from Frederic Crozat <fcrozat@mandriva.com> + + .../10freedesktop/20-video-quirk-pm-acer.fdi | 20 ++-- + .../10freedesktop/20-video-quirk-pm-apple.fdi | 2 +- + .../10freedesktop/20-video-quirk-pm-asus.fdi | 6 +- + .../10freedesktop/20-video-quirk-pm-dell.fdi | 62 +++++----- + .../10freedesktop/20-video-quirk-pm-fujitsu.fdi | 12 +- + .../10freedesktop/20-video-quirk-pm-hp.fdi | 32 +++--- + .../10freedesktop/20-video-quirk-pm-ibm.fdi | 126 + ++++++++++---------- + .../10freedesktop/20-video-quirk-pm-misc.fdi | 10 +- + .../10freedesktop/20-video-quirk-pm-sony.fdi | 2 +- + .../10freedesktop/20-video-quirk-pm-toshiba.fdi | 24 ++-- + 10 files changed, 148 insertions(+), 148 deletions(-) + +commit b932b43fd0cf7fcc56523bf8801ddc42bdb66af1 +Merge: ea02892... aee9db6... +Author: Richard Hughes <richard@hughsie.com> +Date: Mon Mar 5 20:33:01 2007 +0000 + + Merge branch 'master' of + git+ssh://hughsient@git.freedesktop.org/git/hal-info + +commit aee9db6892551a86c1da0f31ba2a1c776dd8419a +Author: Danny Kukawka <danny.kukawka@web.de> +Date: Mon Mar 5 21:17:31 2007 +0100 + + moved Nokia devices into existing structure/logic + + Moved the NOkia N770 and N800 entries for USB music players into the + existing structure to avoid unneeded entries. + + .../10freedesktop/10-usb-music-players.fdi | 47 + ++++++++----------- + 1 files changed, 20 insertions(+), 27 deletions(-) + +commit e3699bad5e8da3a986a585c7ff448fdfc90403b9 +Author: William Jon McCann <mccann@jhu.edu> +Date: Mon Mar 5 14:37:03 2007 -0500 + + add portable_audio_player support for Nokia N770 and N800 + + .../10freedesktop/10-usb-music-players.fdi | 28 + +++++++++++++++++++- + 1 files changed, 27 insertions(+), 1 deletions(-) + +commit 51210cb35a1bda02db982e6abc3ab60419c89050 +Author: David Zeuthen <davidz@redhat.com> +Date: Sun Mar 4 21:30:02 2007 -0500 + + update version to 20070304 + + configure.in | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +commit ea0289241e74d9216134e984001d1e4b2065c651 +Merge: aaba085... 302840e... +Author: Richard Hughes <richard@hughsie.com> +Date: Sun Mar 4 15:43:23 2007 +0000 + + Merge branch 'master' of + git+ssh://hughsient@git.freedesktop.org/git/hal-info + +commit aaba08582dad15bb0325b9a596655586c93e8be0 +Author: Richard Hughes <richard@hughsie.com> +Date: Thu Mar 1 23:35:46 2007 +0000 + + add lenovo battery recall data + + Today Lenovo recalled 208,000 batteries. Add them to hal-info so we + can try to + find at least a few. + Many thanks to Steven Garrity for the quick response for data. + + .../10freedesktop/10-recall-battery-lenovo.fdi | 20 + ++++++++++++++++++++ + fdi/information/10freedesktop/Makefile.am | 1 + + 2 files changed, 21 insertions(+), 0 deletions(-) + commit 302840ec67441f55ba07cae9991538e6c91f7fdc Author: David Zeuthen <davidz@redhat.com> Date: Wed Feb 28 21:56:34 2007 -0500 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20070305/configure new/hal-info-20070314/configure --- old/hal-info-20070305/configure 2007-03-05 14:27:45.000000000 +0100 +++ new/hal-info-20070314/configure 2007-03-14 19:28:57.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for hal-info 20070305. +# Generated by GNU Autoconf 2.59 for hal-info 20070314. # # Report bugs to <dkukawka@suse.de>. # @@ -269,8 +269,8 @@ # Identity of this package. PACKAGE_NAME='hal-info' PACKAGE_TARNAME='hal-info' -PACKAGE_VERSION='20070305' -PACKAGE_STRING='hal-info 20070305' +PACKAGE_VERSION='20070314' +PACKAGE_STRING='hal-info 20070314' PACKAGE_BUGREPORT='dkukawka@suse.de' ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE LN_S BUILD_RECALL_TRUE BUILD_RECALL_FALSE BUILD_RECALL BUILD_VIDEO_TRUE BUILD_VIDEO_FALSE BUILD_VIDEO SYSCONFDIR DATADIR LIBOBJS LTLIBOBJS' @@ -738,7 +738,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -`configure' configures hal-info 20070305 to adapt to many kinds of systems. +`configure' configures hal-info 20070314 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -800,7 +800,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of hal-info 20070305:";; + short | recursive ) echo "Configuration of hal-info 20070314:";; esac cat <<_ACEOF @@ -919,7 +919,7 @@ test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<_ACEOF -hal-info configure 20070305 +hal-info configure 20070314 generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. @@ -933,7 +933,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by hal-info $as_me 20070305, which was +It was created by hal-info $as_me 20070314, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -1576,7 +1576,7 @@ # Define the identity of the package. PACKAGE=hal-info - VERSION=20070305 + VERSION=20070314 cat >>confdefs.h <<_ACEOF @@ -3313,7 +3313,7 @@ } >&5 cat >&5 <<_CSEOF -This file was extended by hal-info $as_me 20070305, which was +This file was extended by hal-info $as_me 20070314, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3376,7 +3376,7 @@ cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\ -hal-info config.status 20070305 +hal-info config.status 20070314 configured by $0, generated by GNU Autoconf 2.59, with options \"`echo "$ac_configure_args" | sed 's/[\""`$]/\\&/g'`\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20070305/configure.in new/hal-info-20070314/configure.in --- old/hal-info-20070305/configure.in 2007-03-05 14:27:33.000000000 +0100 +++ new/hal-info-20070314/configure.in 2007-03-14 19:28:33.000000000 +0100 @@ -1,6 +1,6 @@ AC_PREREQ(2.57) -AC_INIT(hal-info, 20070305, dkukawka@suse.de) +AC_INIT(hal-info, 20070314, dkukawka@suse.de) AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION) AM_CONFIG_HEADER(config.h) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20070305/fdi/information/10freedesktop/10-recall-battery-lenovo.fdi new/hal-info-20070314/fdi/information/10freedesktop/10-recall-battery-lenovo.fdi --- old/hal-info-20070305/fdi/information/10freedesktop/10-recall-battery-lenovo.fdi 1970-01-01 01:00:00.000000000 +0100 +++ new/hal-info-20070314/fdi/information/10freedesktop/10-recall-battery-lenovo.fdi 2007-03-14 19:27:40.000000000 +0100 @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="UTF-8"?> +<deviceinfo version="0.2"> + <device> + + <match key="battery.vendor" string="SANYO"> + + <match key="battery.model" string="92P1131"> + <merge key="info.is_recalled" type="bool">true</merge> + </match> + + <!-- only matching on specific model and vendor SANYO --> + <match key="info.is_recalled" bool="true"> + <merge key="info.recall.vendor" type="string">LENOVO</merge> + <merge key="info.recall.website_url" type="string">http://www.lenovo.com/batteryprogram</merge> + </match> + + </match> + + </device> +</deviceinfo> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20070305/fdi/information/10freedesktop/10-usb-music-players.fdi new/hal-info-20070314/fdi/information/10freedesktop/10-usb-music-players.fdi --- old/hal-info-20070305/fdi/information/10freedesktop/10-usb-music-players.fdi 2007-03-05 13:55:38.000000000 +0100 +++ new/hal-info-20070314/fdi/information/10freedesktop/10-usb-music-players.fdi 2007-03-14 19:27:40.000000000 +0100 @@ -88,6 +88,25 @@ </match> </match> + <match key="@storage.originating_device:usb.vendor_id" int="0x421"> + <!-- Nokia 770 --> + <match key="@storage.originating_device:usb.product_id" int="0x431"> + <merge key="portable_audio_player.access_method" type="string">storage</merge> + <merge key="portable_audio_player.type" type="string">generic</merge> + <append key="portable_audio_player.output_formats" type="strlist">audio/aac</append> + <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append> + <append key="portable_audio_player.output_formats" type="strlist">audio/x-wav</append> + </match> + <!-- Nokia N800 --> + <match key="@storage.originating_device:usb.product_id" int="0x4c3"> + <merge key="portable_audio_player.access_method" type="string">storage</merge> + <merge key="portable_audio_player.type" type="string">generic</merge> + <append key="portable_audio_player.output_formats" type="strlist">audio/aac</append> + <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append> + <append key="portable_audio_player.output_formats" type="strlist">audio/x-wav</append> + </match> + </match> + <!-- SONICblue --> <match key="@storage.originating_device:usb.vendor_id" int="0x045a"> <!-- Rio Forge --> @@ -231,7 +250,7 @@ <append key="portable_audio_player.input_formats" type="strlist">audio/x-wav</append> </match> <!-- MSCNMMC MP3 Player / Tevion MD80946 --> - <match key="@storage.physical_device:usb.product_id" int="0x8004"> + <match key="@storage.originating_device:usb.product_id" int="0x8004"> <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-wav</append> @@ -654,6 +673,14 @@ <!-- iRiver --> <match key="@storage.originating_device:usb.vendor_id" int="0x4102"> + <!-- T20 UMS --> + <match key="@storage.originating_device:usb.product_id" int="0x1014"> + <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/mpeg</append> + </match> <!-- T30 UMS --> <match key="@storage.originating_device:usb.product_id" int="0x1018"> <merge key="portable_audio_player.type" type="string">generic</merge> @@ -904,6 +931,6 @@ </match> </match> </match> - + </device> </deviceinfo> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20070305/fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi new/hal-info-20070314/fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi --- old/hal-info-20070305/fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi 2007-03-05 13:55:38.000000000 +0100 +++ new/hal-info-20070314/fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi 2007-03-14 19:27:40.000000000 +0100 @@ -4,7 +4,7 @@ <match key="system.hardware.vendor" prefix="Acer"> <match key="system.hardware.product" prefix="TravelMate"> <match key="system.hardware.product" contains="C300"> - <merge key="power_management.quirk.vbe_save" type="bool">true</merge> + <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> </match> <match key="system.hardware.product" contains="3220"> <merge key="power_management.quirk.s3_bios" type="bool">true</merge> @@ -16,37 +16,37 @@ </match> <match key="system.hardware.product" contains="290"> <merge key="power_management.quirk.vbe_post" type="bool">true</merge> - <merge key="power_management.quirk.vbe_save" type="bool">true</merge> + <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> </match> <match key="system.hardware.product" contains="660"> <merge key="power_management.quirk.vbe_post" type="bool">true</merge> - <merge key="power_management.quirk.vbe_save" type="bool">true</merge> + <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> </match> <match key="system.hardware.product" contains="650"> <merge key="power_management.quirk.vbe_post" type="bool">true</merge> - <merge key="power_management.quirk.vbe_save" type="bool">true</merge> + <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> </match> <match key="system.hardware.product" contains="3000"> <merge key="power_management.quirk.vbe_post" type="bool">true</merge> - <merge key="power_management.quirk.vbe_save" type="bool">true</merge> + <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> </match> <match key="system.hardware.product" contains="8100"> <merge key="power_management.quirk.vbe_post" type="bool">true</merge> - <merge key="power_management.quirk.vbe_save" type="bool">true</merge> + <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> </match> </match> <match key="system.hardware.product" prefix="Aspire"> <match key="system.hardware.product" contains="2000"> <merge key="power_management.quirk.vbe_post" type="bool">true</merge> - <merge key="power_management.quirk.vbe_save" type="bool">true</merge> + <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> </match> <match key="system.hardware.product" contains="3000"> <merge key="power_management.quirk.vbe_post" type="bool">true</merge> - <merge key="power_management.quirk.vbe_save" type="bool">true</merge> + <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> </match> <match key="system.hardware.product" contains="1690"> <merge key="power_management.quirk.vbe_post" type="bool">true</merge> - <merge key="power_management.quirk.vbe_save" type="bool">true</merge> + <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> <merge key="power_management.quirk.no_fb" type="bool">true</merge> </match> </match> @@ -56,7 +56,7 @@ </match> <match key="system.hardware.product" string="Ferrari 4000"> <merge key="power_management.quirk.vbe_post" type="bool">true</merge> - <merge key="power_management.quirk.vbe_save" type="bool">true</merge> + <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> <merge key="power_management.quirk.no_fb" type="bool">true</merge> </match> </match> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20070305/fdi/information/10freedesktop/20-video-quirk-pm-apple.fdi new/hal-info-20070314/fdi/information/10freedesktop/20-video-quirk-pm-apple.fdi --- old/hal-info-20070305/fdi/information/10freedesktop/20-video-quirk-pm-apple.fdi 2007-03-05 13:55:38.000000000 +0100 +++ new/hal-info-20070314/fdi/information/10freedesktop/20-video-quirk-pm-apple.fdi 2007-03-14 19:27:40.000000000 +0100 @@ -3,7 +3,7 @@ <device> <match key="system.hardware.vendor" prefix="Apple"> <match key="system.hardware.product" string="MacBook1,1"> - <merge key="power_management.quirk.vbe_save" type="bool">true</merge> + <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> </match> <match key="system.hardware.product" string="MacBookPro2,2"> <merge key="power_management.quirk.s3_bios" type="bool">true</merge> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20070305/fdi/information/10freedesktop/20-video-quirk-pm-asus.fdi new/hal-info-20070314/fdi/information/10freedesktop/20-video-quirk-pm-asus.fdi --- old/hal-info-20070305/fdi/information/10freedesktop/20-video-quirk-pm-asus.fdi 2007-03-05 13:55:38.000000000 +0100 +++ new/hal-info-20070314/fdi/information/10freedesktop/20-video-quirk-pm-asus.fdi 2007-03-14 19:27:40.000000000 +0100 @@ -7,11 +7,11 @@ </match> <match key="system.hardware.product" string="L3000D"> <merge key="power_management.quirk.vbe_post" type="bool">true</merge> - <merge key="power_management.quirk.vbe_save" type="bool">true</merge> + <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> </match> <match key="system.hardware.product" string="L7000G"> <merge key="power_management.quirk.vbe_post" type="bool">true</merge> - <merge key="power_management.quirk.vbe_save" type="bool">true</merge> + <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> </match> <match key="system.hardware.product" prefix="M6Ne"> <merge key="power_management.quirk.s3_mode" type="bool">true</merge> @@ -22,7 +22,7 @@ </match> <match key="system.hardware.product" prefix="W5A"> <merge key="power_management.quirk.vbe_post" type="bool">true</merge> - <merge key="power_management.quirk.vbe_save" type="bool">true</merge> + <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> </match> <match key="system.hardware.product" string="V6V"> <merge key="power_management.quirk.s3_mode" type="bool">true</merge> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20070305/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi new/hal-info-20070314/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi --- old/hal-info-20070305/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi 2007-03-05 13:55:38.000000000 +0100 +++ new/hal-info-20070314/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi 2007-03-14 19:27:40.000000000 +0100 @@ -5,135 +5,135 @@ <match key="system.hardware.product" prefix="Latitude"> <match key="system.hardware.product" contains="D410"> <merge key="power_management.quirk.vbe_post" type="bool">true</merge> - <merge key="power_management.quirk.vbe_save" type="bool">true</merge> + <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> </match> <match key="system.hardware.product" contains="D610"> <merge key="power_management.quirk.vbe_post" type="bool">true</merge> - <merge key="power_management.quirk.vbe_save" type="bool">true</merge> + <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> <merge key="power_management.quirk.no_fb" type="bool">true</merge> </match> <match key="system.hardware.product" contains="110L"> <merge key="power_management.quirk.vbe_post" type="bool">true</merge> - <merge key="power_management.quirk.vbe_save" type="bool">true</merge> + <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> </match> <match key="system.hardware.product" contains="D510"> <merge key="power_management.quirk.vbe_post" type="bool">true</merge> - <merge key="power_management.quirk.vbe_save" type="bool">true</merge> + <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> </match> <match key="system.hardware.product" contains="D810"> <merge key="power_management.quirk.vbe_post" type="bool">true</merge> - <merge key="power_management.quirk.vbe_save" type="bool">true</merge> + <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> </match> <match key="system.hardware.product" contains="X1"> <merge key="power_management.quirk.vbe_post" type="bool">true</merge> - <merge key="power_management.quirk.vbe_save" type="bool">true</merge> + <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> </match> <match key="system.hardware.product" contains="X300"> <merge key="power_management.quirk.vbe_post" type="bool">true</merge> - <merge key="power_management.quirk.vbe_save" type="bool">true</merge> + <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> </match> <match key="system.hardware.product" contains="110L"> <merge key="power_management.quirk.vbe_post" type="bool">true</merge> - <merge key="power_management.quirk.vbe_save" type="bool">true</merge> + <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> </match> <match key="system.hardware.product" contains="D410"> <merge key="power_management.quirk.vbe_post" type="bool">true</merge> - <merge key="power_management.quirk.vbe_save" type="bool">true</merge> + <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> </match> <match key="system.hardware.product" contains="D510"> <merge key="power_management.quirk.vbe_post" type="bool">true</merge> - <merge key="power_management.quirk.vbe_save" type="bool">true</merge> + <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> </match> <match key="system.hardware.product" contains="D810"> <merge key="power_management.quirk.vbe_post" type="bool">true</merge> - <merge key="power_management.quirk.vbe_save" type="bool">true</merge> + <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> </match> <match key="system.hardware.product" contains="X300"> <merge key="power_management.quirk.vbe_post" type="bool">true</merge> - <merge key="power_management.quirk.vbe_save" type="bool">true</merge> + <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> </match> <match key="system.hardware.product" contains="D800"> <merge key="power_management.quirk.vbe_post" type="bool">true</merge> - <merge key="power_management.quirk.vbe_save" type="bool">true</merge> + <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> </match> <match key="system.hardware.product" contains="C600"> <merge key="power_management.quirk.radeon_off" type="bool">true</merge> </match> <match key="system.hardware.product" contains="D600"> <merge key="power_management.quirk.vbe_post" type="bool">true</merge> - <merge key="power_management.quirk.vbe_save" type="bool">true</merge> + <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> <merge key="power_management.quirk.no_fb" type="bool">true</merge> </match> </match> <match key="system.hardware.product" prefix="Inspiron"> <match key="system.hardware.product" contains="700m"> <merge key="power_management.quirk.vbe_post" type="bool">true</merge> - <merge key="power_management.quirk.vbe_save" type="bool">true</merge> + <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> </match> <match key="system.hardware.product" contains="1200"> <merge key="power_management.quirk.vbe_post" type="bool">true</merge> - <merge key="power_management.quirk.vbe_save" type="bool">true</merge> + <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> </match> <match key="system.hardware.product" contains="6000"> <merge key="power_management.quirk.vbe_post" type="bool">true</merge> - <merge key="power_management.quirk.vbe_save" type="bool">true</merge> + <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> </match> <match key="system.hardware.product" contains="8100"> <merge key="power_management.quirk.vbe_post" type="bool">true</merge> - <merge key="power_management.quirk.vbe_save" type="bool">true</merge> + <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> </match> <match key="system.hardware.product" contains="8200"> <merge key="power_management.quirk.vbe_post" type="bool">true</merge> - <merge key="power_management.quirk.vbe_save" type="bool">true</merge> + <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> </match> <match key="system.hardware.product" contains="8600"> <merge key="power_management.quirk.vbe_post" type="bool">true</merge> - <merge key="power_management.quirk.vbe_save" type="bool">true</merge> + <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> </match> <match key="system.hardware.product" contains="9300"> <merge key="power_management.quirk.vbe_post" type="bool">true</merge> - <merge key="power_management.quirk.vbe_save" type="bool">true</merge> + <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> </match> <match key="system.hardware.product" contains="700m"> <merge key="power_management.quirk.vbe_post" type="bool">true</merge> - <merge key="power_management.quirk.vbe_save" type="bool">true</merge> + <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> </match> <match key="system.hardware.product" contains="1200"> <merge key="power_management.quirk.vbe_post" type="bool">true</merge> - <merge key="power_management.quirk.vbe_save" type="bool">true</merge> + <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> </match> <match key="system.hardware.product" contains="6000"> <merge key="power_management.quirk.vbe_post" type="bool">true</merge> - <merge key="power_management.quirk.vbe_save" type="bool">true</merge> + <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> </match> <match key="system.hardware.product" contains="8100"> <merge key="power_management.quirk.vbe_post" type="bool">true</merge> - <merge key="power_management.quirk.vbe_save" type="bool">true</merge> + <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> </match> <match key="system.hardware.product" contains="8200"> <merge key="power_management.quirk.vbe_post" type="bool">true</merge> - <merge key="power_management.quirk.vbe_save" type="bool">true</merge> + <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> </match> <match key="system.hardware.product" contains="8600"> <merge key="power_management.quirk.vbe_post" type="bool">true</merge> - <merge key="power_management.quirk.vbe_save" type="bool">true</merge> + <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> </match> <match key="system.hardware.product" contains="9300"> <merge key="power_management.quirk.vbe_post" type="bool">true</merge> - <merge key="power_management.quirk.vbe_save" type="bool">true</merge> + <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> </match> <match key="system.hardware.product" contains="5150"> <merge key="power_management.quirk.vbe_post" type="bool">true</merge> - <merge key="power_management.quirk.vbe_save" type="bool">true</merge> + <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> </match> <match key="system.hardware.product" contains="8000"> <merge key="power_management.quirk.vbe_post" type="bool">true</merge> - <merge key="power_management.quirk.vbe_save" type="bool">true</merge> + <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> </match> </match> <match key="system.hardware.product" contains="Precision M20"> <merge key="power_management.quirk.vbe_post" type="bool">true</merge> - <merge key="power_management.quirk.vbe_save" type="bool">true</merge> + <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> </match> </match> </device> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20070305/fdi/information/10freedesktop/20-video-quirk-pm-fujitsu.fdi new/hal-info-20070314/fdi/information/10freedesktop/20-video-quirk-pm-fujitsu.fdi --- old/hal-info-20070305/fdi/information/10freedesktop/20-video-quirk-pm-fujitsu.fdi 2007-03-05 13:55:38.000000000 +0100 +++ new/hal-info-20070314/fdi/information/10freedesktop/20-video-quirk-pm-fujitsu.fdi 2007-03-14 19:27:40.000000000 +0100 @@ -4,24 +4,24 @@ <match key="system.hardware.vendor" prefix="FUJITSU"> <match key="system.hardware.product" prefix="Amilo M"> <merge key="power_management.quirk.vbe_post" type="bool">true</merge> - <merge key="power_management.quirk.vbe_save" type="bool">true</merge> + <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> </match> <match key="system.hardware.product" prefix="Amilo A7640"> <merge key="power_management.quirk.vbe_post" type="bool">true</merge> - <merge key="power_management.quirk.vbe_save" type="bool">true</merge> + <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> <merge key="power_management.quirk.s3_bios" type="bool">true</merge> </match> <match key="system.hardware.product" string="LifeBook S Series"> <merge key="power_management.quirk.vbe_post" type="bool">true</merge> - <merge key="power_management.quirk.vbe_save" type="bool">true</merge> + <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> </match> <match key="system.hardware.product" string="LIFEBOOK S6120"> <merge key="power_management.quirk.vbe_post" type="bool">true</merge> - <merge key="power_management.quirk.vbe_save" type="bool">true</merge> + <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> </match> <match key="system.hardware.product" string="LIFEBOOK P7010"> <merge key="power_management.quirk.vbe_post" type="bool">true</merge> - <merge key="power_management.quirk.vbe_save" type="bool">true</merge> + <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> </match> <match key="system.hardware.product" string="Stylistic ST5000"> <merge key="power_management.quirk.s3_bios" type="bool">true</merge> @@ -29,7 +29,7 @@ </match> <match key="system.hardware.product" string="SCENIC W300/W600"> <merge key="power_management.quirk.vbe_post" type="bool">true</merge> - <merge key="power_management.quirk.vbe_save" type="bool">true</merge> + <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> </match> </match> </device> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20070305/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi new/hal-info-20070314/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi --- old/hal-info-20070305/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi 2007-03-05 13:55:38.000000000 +0100 +++ new/hal-info-20070314/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi 2007-03-14 19:27:40.000000000 +0100 @@ -4,7 +4,7 @@ <match key="system.hardware.vendor" string="Hewlett Packard"> <match key="system.hardware.version" prefix="HP OmniBook XE3 GF"> <merge key="power_management.quirk.vbe_post" type="bool">true</merge> - <merge key="power_management.quirk.vbe_save" type="bool">true</merge> + <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> </match> </match> </device> @@ -13,13 +13,13 @@ <match key="system.hardware.product" contains="nx5000"> <match key="system.firmware.version" prefix="68BCU"> <merge key="power_management.quirk.vbe_post" type="bool">true</merge> - <merge key="power_management.quirk.vbe_save" type="bool">true</merge> + <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> </match> </match> <match key="system.hardware.product" contains="nx5000"> <match key="system.firmware.version" prefix="68BCU"> <merge key="power_management.quirk.vbe_post" type="bool">true</merge> - <merge key="power_management.quirk.vbe_save" type="bool">true</merge> + <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> </match> </match> <match key="system.hardware.product" contains="nc6000"> @@ -29,56 +29,56 @@ </match> </match> <match key="system.hardware.product" contains="nx6125"> - <merge key="power_management.quirk.vbe_save" type="bool">true</merge> + <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> <merge key="power_management.quirk.no_fb" type="bool">true</merge> </match> <match key="system.hardware.product" contains="nc6230"> - <merge key="power_management.quirk.vbe_save" type="bool">true</merge> + <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> <merge key="power_management.quirk.no_fb" type="bool">true</merge> </match> <match key="system.hardware.product" contains="nx8220"> - <merge key="power_management.quirk.vbe_save" type="bool">true</merge> + <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> <merge key="power_management.quirk.no_fb" type="bool">true</merge> </match> <match key="system.hardware.product" contains="nc4200"> <merge key="power_management.quirk.vbe_post" type="bool">true</merge> - <merge key="power_management.quirk.vbe_save" type="bool">true</merge> + <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> </match> <match key="system.hardware.product" contains="nx6110"> <merge key="power_management.quirk.vbe_post" type="bool">true</merge> - <merge key="power_management.quirk.vbe_save" type="bool">true</merge> + <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> </match> <match key="system.hardware.product" contains="nc6120"> <merge key="power_management.quirk.vbe_post" type="bool">true</merge> - <merge key="power_management.quirk.vbe_save" type="bool">true</merge> + <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> </match> <match key="system.hardware.product" contains="nc6220"> <merge key="power_management.quirk.vbe_post" type="bool">true</merge> - <merge key="power_management.quirk.vbe_save" type="bool">true</merge> + <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> </match> <match key="system.hardware.product" contains="nc8230"> <merge key="power_management.quirk.vbe_post" type="bool">true</merge> - <merge key="power_management.quirk.vbe_save" type="bool">true</merge> + <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> </match> <match key="system.hardware.product" contains="dv1000"> <merge key="power_management.quirk.vbe_post" type="bool">true</merge> - <merge key="power_management.quirk.vbe_save" type="bool">true</merge> + <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> </match> <match key="system.hardware.product" contains="zt3000"> <merge key="power_management.quirk.vbe_post" type="bool">true</merge> - <merge key="power_management.quirk.vbe_save" type="bool">true</merge> + <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> </match> <match key="system.hardware.product" contains="zd7000"> <merge key="power_management.quirk.vbe_post" type="bool">true</merge> - <merge key="power_management.quirk.vbe_save" type="bool">true</merge> + <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> </match> <match key="system.hardware.product" contains="Tx1100"> <merge key="power_management.quirk.vbe_post" type="bool">true</merge> - <merge key="power_management.quirk.vbe_save" type="bool">true</merge> + <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> </match> <match key="system.hardware.product" contains="TR1105"> <merge key="power_management.quirk.vbe_post" type="bool">true</merge> - <merge key="power_management.quirk.vbe_save" type="bool">true</merge> + <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> </match> <match key="system.hardware.product" contains="R4100"> <merge key="power_management.quirk.s3_bios" type="bool">true</merge> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20070305/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi new/hal-info-20070314/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi --- old/hal-info-20070305/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi 2007-03-05 13:55:38.000000000 +0100 +++ new/hal-info-20070314/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi 2007-03-14 19:27:40.000000000 +0100 @@ -46,7 +46,7 @@ </match> </match> <match key="system.hardware.product" prefix="2388"> - <merge key="power_management.quirk.vbe_save" type="bool">true</merge> + <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> </match> <!-- Z60m --> <match key="system.hardware.product" prefix="2529"> @@ -55,267 +55,267 @@ </match> <match key="system.hardware.product" prefix="2682"> <merge key="power_management.quirk.vbe_post" type="bool">true</merge> - <merge key="power_management.quirk.vbe_save" type="bool">true</merge> + <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> </match> <match key="system.hardware.product" prefix="2683"> <merge key="power_management.quirk.vbe_post" type="bool">true</merge> - <merge key="power_management.quirk.vbe_save" type="bool">true</merge> + <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> </match> <match key="system.hardware.product" prefix="2692"> <merge key="power_management.quirk.vbe_post" type="bool">true</merge> - <merge key="power_management.quirk.vbe_save" type="bool">true</merge> + <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> </match> <match key="system.hardware.product" prefix="2693"> <merge key="power_management.quirk.vbe_post" type="bool">true</merge> - <merge key="power_management.quirk.vbe_save" type="bool">true</merge> + <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> </match> <match key="system.hardware.product" prefix="2696"> <merge key="power_management.quirk.vbe_post" type="bool">true</merge> - <merge key="power_management.quirk.vbe_save" type="bool">true</merge> + <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> </match> <match key="system.hardware.product" prefix="2698"> <merge key="power_management.quirk.vbe_post" type="bool">true</merge> - <merge key="power_management.quirk.vbe_save" type="bool">true</merge> + <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> </match> <match key="system.hardware.product" prefix="2699"> <merge key="power_management.quirk.vbe_post" type="bool">true</merge> - <merge key="power_management.quirk.vbe_save" type="bool">true</merge> + <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> </match> <match key="system.hardware.product" prefix="2723"> <merge key="power_management.quirk.vbe_post" type="bool">true</merge> - <merge key="power_management.quirk.vbe_save" type="bool">true</merge> + <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> </match> <match key="system.hardware.product" prefix="2724"> <merge key="power_management.quirk.vbe_post" type="bool">true</merge> - <merge key="power_management.quirk.vbe_save" type="bool">true</merge> + <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> </match> <!-- R50/p --> <match key="system.hardware.product" prefix="2897"> <merge key="power_management.quirk.vbe_post" type="bool">true</merge> - <merge key="power_management.quirk.vbe_save" type="bool">true</merge> + <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> </match> <match key="system.hardware.product" prefix="1829"> <merge key="power_management.quirk.vbe_post" type="bool">true</merge> - <merge key="power_management.quirk.vbe_save" type="bool">true</merge> + <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> </match> <match key="system.hardware.product" prefix="1830"> <merge key="power_management.quirk.vbe_post" type="bool">true</merge> - <merge key="power_management.quirk.vbe_save" type="bool">true</merge> + <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> </match> <match key="system.hardware.product" prefix="1831"> <merge key="power_management.quirk.vbe_post" type="bool">true</merge> - <merge key="power_management.quirk.vbe_save" type="bool">true</merge> + <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> </match> <match key="system.hardware.product" prefix="1832"> <merge key="power_management.quirk.vbe_post" type="bool">true</merge> - <merge key="power_management.quirk.vbe_save" type="bool">true</merge> + <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> </match> <match key="system.hardware.product" prefix="1833"> <merge key="power_management.quirk.vbe_post" type="bool">true</merge> - <merge key="power_management.quirk.vbe_save" type="bool">true</merge> + <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> </match> <match key="system.hardware.product" prefix="1836"> <merge key="power_management.quirk.vbe_post" type="bool">true</merge> - <merge key="power_management.quirk.vbe_save" type="bool">true</merge> + <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> </match> <match key="system.hardware.product" prefix="1840"> <merge key="power_management.quirk.vbe_post" type="bool">true</merge> - <merge key="power_management.quirk.vbe_save" type="bool">true</merge> + <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> </match> <!-- R50e needs not yet implemented save_video_pci_state --> <match key="system.hardware.product" prefix="1841"> <merge key="power_management.quirk.vbe_post" type="bool">true</merge> - <merge key="power_management.quirk.vbe_save" type="bool">true</merge> + <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> </match> <match key="system.hardware.product" prefix="1846"> <merge key="power_management.quirk.vbe_post" type="bool">true</merge> - <merge key="power_management.quirk.vbe_save" type="bool">true</merge> + <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> </match> <match key="system.hardware.product" prefix="1847"> <merge key="power_management.quirk.vbe_post" type="bool">true</merge> - <merge key="power_management.quirk.vbe_save" type="bool">true</merge> + <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> </match> <match key="system.hardware.product" prefix="1848"> <merge key="power_management.quirk.vbe_post" type="bool">true</merge> - <merge key="power_management.quirk.vbe_save" type="bool">true</merge> + <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> </match> <match key="system.hardware.product" prefix="1849"> <merge key="power_management.quirk.vbe_post" type="bool">true</merge> - <merge key="power_management.quirk.vbe_save" type="bool">true</merge> + <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> </match> <match key="system.hardware.product" prefix="1850"> <merge key="power_management.quirk.vbe_post" type="bool">true</merge> - <merge key="power_management.quirk.vbe_save" type="bool">true</merge> + <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> </match> <!-- T21 --> <match key="system.hardware.product" prefix="1870"> <merge key="power_management.quirk.vbe_post" type="bool">true</merge> - <merge key="power_management.quirk.vbe_save" type="bool">true</merge> + <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> </match> <match key="system.hardware.product" prefix="2647"> <merge key="power_management.quirk.vbe_post" type="bool">true</merge> - <merge key="power_management.quirk.vbe_save" type="bool">true</merge> + <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> </match> <!-- T23 --> <match key="system.hardware.product" prefix="2648"> <merge key="power_management.quirk.vbe_post" type="bool">true</merge> - <merge key="power_management.quirk.vbe_save" type="bool">true</merge> + <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> </match> <!-- T40/T41/T42/p --> <match key="system.hardware.product" prefix="475S"> <merge key="power_management.quirk.vbe_post" type="bool">true</merge> - <merge key="power_management.quirk.vbe_save" type="bool">true</merge> + <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> </match> <match key="system.hardware.product" prefix="2375"> <merge key="power_management.quirk.vbe_post" type="bool">true</merge> - <merge key="power_management.quirk.vbe_save" type="bool">true</merge> + <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> </match> <match key="system.hardware.product" prefix="2376"> <merge key="power_management.quirk.vbe_post" type="bool">true</merge> - <merge key="power_management.quirk.vbe_save" type="bool">true</merge> + <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> </match> <match key="system.hardware.product" prefix="2378"> <merge key="power_management.quirk.vbe_post" type="bool">true</merge> - <merge key="power_management.quirk.vbe_save" type="bool">true</merge> + <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> </match> <!-- T43 --> <match key="system.hardware.product" prefix="2379"> <merge key="power_management.quirk.vbe_post" type="bool">true</merge> - <merge key="power_management.quirk.vbe_save" type="bool">true</merge> + <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> </match> <match key="system.hardware.product" prefix="1871"> <merge key="power_management.quirk.vbe_post" type="bool">true</merge> - <merge key="power_management.quirk.vbe_save" type="bool">true</merge> + <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> </match> <match key="system.hardware.product" prefix="1872"> <merge key="power_management.quirk.vbe_post" type="bool">true</merge> - <merge key="power_management.quirk.vbe_save" type="bool">true</merge> + <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> </match> <match key="system.hardware.product" prefix="1873"> <merge key="power_management.quirk.vbe_post" type="bool">true</merge> - <merge key="power_management.quirk.vbe_save" type="bool">true</merge> + <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> </match> <match key="system.hardware.product" prefix="1874"> <merge key="power_management.quirk.vbe_post" type="bool">true</merge> - <merge key="power_management.quirk.vbe_save" type="bool">true</merge> + <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> </match> <match key="system.hardware.product" prefix="1875"> <merge key="power_management.quirk.vbe_post" type="bool">true</merge> - <merge key="power_management.quirk.vbe_save" type="bool">true</merge> + <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> </match> <!-- T43/p --> <match key="system.hardware.product" prefix="1876"> <merge key="power_management.quirk.vbe_post" type="bool">true</merge> - <merge key="power_management.quirk.vbe_save" type="bool">true</merge> + <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> </match> <match key="system.hardware.product" prefix="2668"> <merge key="power_management.quirk.vbe_post" type="bool">true</merge> - <merge key="power_management.quirk.vbe_save" type="bool">true</merge> + <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> </match> <match key="system.hardware.product" prefix="2669"> <merge key="power_management.quirk.vbe_post" type="bool">true</merge> - <merge key="power_management.quirk.vbe_save" type="bool">true</merge> + <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> </match> <match key="system.hardware.product" prefix="2678"> <merge key="power_management.quirk.vbe_post" type="bool">true</merge> - <merge key="power_management.quirk.vbe_save" type="bool">true</merge> + <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> </match> <match key="system.hardware.product" prefix="2679"> <merge key="power_management.quirk.vbe_post" type="bool">true</merge> - <merge key="power_management.quirk.vbe_save" type="bool">true</merge> + <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> </match> <match key="system.hardware.product" prefix="2686"> <merge key="power_management.quirk.vbe_post" type="bool">true</merge> - <merge key="power_management.quirk.vbe_save" type="bool">true</merge> + <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> </match> <!-- X30 --> <match key="system.hardware.product" prefix="2687"> <merge key="power_management.quirk.vbe_post" type="bool">true</merge> - <merge key="power_management.quirk.vbe_save" type="bool">true</merge> + <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> </match> <match key="system.hardware.product" prefix="2673"> <merge key="power_management.quirk.vbe_post" type="bool">true</merge> - <merge key="power_management.quirk.vbe_save" type="bool">true</merge> + <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> <merge key="power_management.quirk.radeon_off" type="bool">true</merge> </match> <match key="system.hardware.product" prefix="2884"> <merge key="power_management.quirk.vbe_post" type="bool">true</merge> - <merge key="power_management.quirk.vbe_save" type="bool">true</merge> + <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> <merge key="power_management.quirk.radeon_off" type="bool">true</merge> </match> <match key="system.hardware.product" prefix="2885"> <merge key="power_management.quirk.vbe_post" type="bool">true</merge> - <merge key="power_management.quirk.vbe_save" type="bool">true</merge> + <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> <merge key="power_management.quirk.radeon_off" type="bool">true</merge> </match> <match key="system.hardware.product" prefix="2890"> <merge key="power_management.quirk.vbe_post" type="bool">true</merge> - <merge key="power_management.quirk.vbe_save" type="bool">true</merge> + <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> <merge key="power_management.quirk.radeon_off" type="bool">true</merge> </match> <!-- X40 --> <match key="system.hardware.product" prefix="2891"> <merge key="power_management.quirk.vbe_post" type="bool">true</merge> - <merge key="power_management.quirk.vbe_save" type="bool">true</merge> + <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> <merge key="power_management.quirk.radeon_off" type="bool">true</merge> </match> <match key="system.hardware.product" prefix="2369"> <merge key="power_management.quirk.vbe_post" type="bool">true</merge> - <merge key="power_management.quirk.vbe_save" type="bool">true</merge> + <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> </match> <match key="system.hardware.product" prefix="2370"> <merge key="power_management.quirk.vbe_post" type="bool">true</merge> - <merge key="power_management.quirk.vbe_save" type="bool">true</merge> + <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> </match> <match key="system.hardware.product" prefix="2372"> <merge key="power_management.quirk.vbe_post" type="bool">true</merge> - <merge key="power_management.quirk.vbe_save" type="bool">true</merge> + <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> </match> <match key="system.hardware.product" prefix="2382"> <merge key="power_management.quirk.vbe_post" type="bool">true</merge> - <merge key="power_management.quirk.vbe_save" type="bool">true</merge> + <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> </match> <!-- X41 --> <match key="system.hardware.product" prefix="2386"> <merge key="power_management.quirk.vbe_post" type="bool">true</merge> - <merge key="power_management.quirk.vbe_save" type="bool">true</merge> + <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> </match> <match key="system.hardware.product" prefix="1864"> <merge key="power_management.quirk.vbe_post" type="bool">true</merge> - <merge key="power_management.quirk.vbe_save" type="bool">true</merge> + <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> </match> <match key="system.hardware.product" prefix="1865"> <merge key="power_management.quirk.vbe_post" type="bool">true</merge> - <merge key="power_management.quirk.vbe_save" type="bool">true</merge> + <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> </match> <match key="system.hardware.product" prefix="2525"> <merge key="power_management.quirk.vbe_post" type="bool">true</merge> - <merge key="power_management.quirk.vbe_save" type="bool">true</merge> + <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> </match> <match key="system.hardware.product" prefix="2526"> <merge key="power_management.quirk.vbe_post" type="bool">true</merge> - <merge key="power_management.quirk.vbe_save" type="bool">true</merge> + <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> </match> <match key="system.hardware.product" prefix="2527"> <merge key="power_management.quirk.vbe_post" type="bool">true</merge> - <merge key="power_management.quirk.vbe_save" type="bool">true</merge> + <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> </match> <!-- X41 Tablet --> <match key="system.hardware.product" prefix="2528"> <merge key="power_management.quirk.vbe_post" type="bool">true</merge> - <merge key="power_management.quirk.vbe_save" type="bool">true</merge> + <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> </match> <match key="system.hardware.product" prefix="1866"> <merge key="power_management.quirk.vbe_post" type="bool">true</merge> - <merge key="power_management.quirk.vbe_save" type="bool">true</merge> + <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> </match> <match key="system.hardware.product" prefix="1867"> <merge key="power_management.quirk.vbe_post" type="bool">true</merge> - <merge key="power_management.quirk.vbe_save" type="bool">true</merge> + <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> </match> <match key="system.hardware.product" prefix="1869"> <merge key="power_management.quirk.vbe_post" type="bool">true</merge> - <merge key="power_management.quirk.vbe_save" type="bool">true</merge> + <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> </match> </match> </device> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20070305/fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi new/hal-info-20070314/fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi --- old/hal-info-20070305/fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi 2007-03-05 13:55:38.000000000 +0100 +++ new/hal-info-20070314/fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi 2007-03-14 19:27:40.000000000 +0100 @@ -28,7 +28,7 @@ <match key="system.hardware.vendor" contains="Matsushita"> <match key="system.hardware.product" contains="CF-51E"> <merge key="power_management.quirk.vbe_post" type="bool">true</merge> - <merge key="power_management.quirk.vbe_save" type="bool">true</merge> + <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> </match> </match> </device> @@ -36,7 +36,7 @@ <match key="system.hardware.vendor" string="Samsung"> <match key="system.hardware.product" string="SQ10"> <merge key="power_management.quirk.vbe_post" type="bool">true</merge> - <merge key="power_management.quirk.vbe_save" type="bool">true</merge> + <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> </match> </match> </device> @@ -52,7 +52,7 @@ <match key="system.hardware.vendor" string="ECS"> <match key="system.hardware.product" contains="G556 Centrino"> <merge key="power_management.quirk.vbe_post" type="bool">true</merge> - <merge key="power_management.quirk.vbe_save" type="bool">true</merge> + <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> </match> </match> </device> @@ -60,7 +60,7 @@ <match key="system.hardware.vendor" prefix="Samsung"> <match key="system.hardware.product" contains="NX05S"> <merge key="power_management.quirk.vbe_post" type="bool">true</merge> - <merge key="power_management.quirk.vbe_save" type="bool">true</merge> + <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> </match> <match key="system.hardware.product" string="SX20S"> <merge key="power_management.quirk.s3_bios" type="bool">true</merge> @@ -72,7 +72,7 @@ <match key="system.hardware.vendor" prefix="SHARP"> <match key="system.hardware.product" contains="PC-MM20 Series"> <merge key="power_management.quirk.vbe_post" type="bool">true</merge> - <merge key="power_management.quirk.vbe_save" type="bool">true</merge> + <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> </match> </match> </device> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20070305/fdi/information/10freedesktop/20-video-quirk-pm-sony.fdi new/hal-info-20070314/fdi/information/10freedesktop/20-video-quirk-pm-sony.fdi --- old/hal-info-20070305/fdi/information/10freedesktop/20-video-quirk-pm-sony.fdi 2007-03-05 13:55:38.000000000 +0100 +++ new/hal-info-20070314/fdi/information/10freedesktop/20-video-quirk-pm-sony.fdi 2007-03-14 19:27:40.000000000 +0100 @@ -11,7 +11,7 @@ </match> <match key="system.hardware.product" prefix="PCG-U101"> <merge key="power_management.quirk.vbe_post" type="bool">true</merge> - <merge key="power_management.quirk.vbe_save" type="bool">true</merge> + <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> </match> </match> </device> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20070305/fdi/information/10freedesktop/20-video-quirk-pm-toshiba.fdi new/hal-info-20070314/fdi/information/10freedesktop/20-video-quirk-pm-toshiba.fdi --- old/hal-info-20070305/fdi/information/10freedesktop/20-video-quirk-pm-toshiba.fdi 2007-03-05 13:55:38.000000000 +0100 +++ new/hal-info-20070314/fdi/information/10freedesktop/20-video-quirk-pm-toshiba.fdi 2007-03-14 19:27:40.000000000 +0100 @@ -11,51 +11,51 @@ </match> </match> <match key="system.hardware.product" string="Satellite A30"> - <merge key="power_management.quirk.vbe_save" type="bool">true</merge> + <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> </match> <match key="system.hardware.product" string="Satellite L10"> <merge key="power_management.quirk.vbe_post" type="bool">true</merge> - <merge key="power_management.quirk.vbe_save" type="bool">true</merge> + <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> </match> <match key="system.hardware.product" prefix="Satellite 1900"> <merge key="power_management.quirk.vbe_post" type="bool">true</merge> - <merge key="power_management.quirk.vbe_save" type="bool">true</merge> + <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> </match> <match key="system.hardware.product" prefix="libretto U100"> <merge key="power_management.quirk.vbe_post" type="bool">true</merge> - <merge key="power_management.quirk.vbe_save" type="bool">true</merge> + <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> </match> <match key="system.hardware.product" prefix="P4000"> <merge key="power_management.quirk.vbe_post" type="bool">true</merge> - <merge key="power_management.quirk.vbe_save" type="bool">true</merge> + <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> </match> <match key="system.hardware.product" prefix="PORTEGE A100"> <merge key="power_management.quirk.vbe_post" type="bool">true</merge> - <merge key="power_management.quirk.vbe_save" type="bool">true</merge> + <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> </match> <match key="system.hardware.product" prefix="PORTEGE A200"> <merge key="power_management.quirk.vbe_post" type="bool">true</merge> - <merge key="power_management.quirk.vbe_save" type="bool">true</merge> + <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> </match> <match key="system.hardware.product" prefix="PORTEGE M200"> <merge key="power_management.quirk.vbe_post" type="bool">true</merge> - <merge key="power_management.quirk.vbe_save" type="bool">true</merge> + <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> </match> <match key="system.hardware.product" prefix="PORTEGE R200"> <merge key="power_management.quirk.vbe_post" type="bool">true</merge> - <merge key="power_management.quirk.vbe_save" type="bool">true</merge> + <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> </match> <match key="system.hardware.product" prefix="TECRA A2"> <merge key="power_management.quirk.vbe_post" type="bool">true</merge> - <merge key="power_management.quirk.vbe_save" type="bool">true</merge> + <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> </match> <match key="system.hardware.product" prefix="TECRA A5"> <merge key="power_management.quirk.vbe_post" type="bool">true</merge> - <merge key="power_management.quirk.vbe_save" type="bool">true</merge> + <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> </match> <match key="system.hardware.product" prefix="TECRA M2"> <merge key="power_management.quirk.vbe_post" type="bool">true</merge> - <merge key="power_management.quirk.vbe_save" type="bool">true</merge> + <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> </match> </match> </device> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20070305/fdi/information/10freedesktop/Makefile.am new/hal-info-20070314/fdi/information/10freedesktop/Makefile.am --- old/hal-info-20070305/fdi/information/10freedesktop/Makefile.am 2007-03-05 13:55:38.000000000 +0100 +++ new/hal-info-20070314/fdi/information/10freedesktop/Makefile.am 2007-03-14 19:27:40.000000000 +0100 @@ -14,6 +14,7 @@ dist_fdi_DATA += \ 10-recall-battery-dell.fdi \ 10-recall-battery-ibm.fdi \ + 10-recall-battery-lenovo.fdi \ 10-recall-battery-fujitsu.fdi \ 10-recall-battery-gateway.fdi \ 10-recall-battery-toshiba.fdi diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20070305/fdi/information/10freedesktop/Makefile.in new/hal-info-20070314/fdi/information/10freedesktop/Makefile.in --- old/hal-info-20070305/fdi/information/10freedesktop/Makefile.in 2007-03-05 14:28:21.000000000 +0100 +++ new/hal-info-20070314/fdi/information/10freedesktop/Makefile.in 2007-03-14 19:28:56.000000000 +0100 @@ -37,6 +37,7 @@ @BUILD_RECALL_TRUE@am__append_1 = \ @BUILD_RECALL_TRUE@ 10-recall-battery-dell.fdi \ @BUILD_RECALL_TRUE@ 10-recall-battery-ibm.fdi \ +@BUILD_RECALL_TRUE@ 10-recall-battery-lenovo.fdi \ @BUILD_RECALL_TRUE@ 10-recall-battery-fujitsu.fdi \ @BUILD_RECALL_TRUE@ 10-recall-battery-gateway.fdi \ @BUILD_RECALL_TRUE@ 10-recall-battery-toshiba.fdi @@ -72,13 +73,14 @@ 10-camera-ptp.fdi 10-usb-pda.fdi 10-usbcsr-mice.fdi \ 10-laptop-panel-hardware.fdi 10-cd-dvd-burner.fdi \ 10-recall-battery-dell.fdi 10-recall-battery-ibm.fdi \ - 10-recall-battery-fujitsu.fdi 10-recall-battery-gateway.fdi \ - 10-recall-battery-toshiba.fdi 20-video-quirk-pm-acer.fdi \ - 20-video-quirk-pm-apple.fdi 20-video-quirk-pm-asus.fdi \ - 20-video-quirk-pm-dell.fdi 20-video-quirk-pm-fujitsu.fdi \ - 20-video-quirk-pm-hp.fdi 20-video-quirk-pm-ibm.fdi \ - 20-video-quirk-pm-lenovo.fdi 20-video-quirk-pm-misc.fdi \ - 20-video-quirk-pm-sony.fdi 20-video-quirk-pm-toshiba.fdi + 10-recall-battery-lenovo.fdi 10-recall-battery-fujitsu.fdi \ + 10-recall-battery-gateway.fdi 10-recall-battery-toshiba.fdi \ + 20-video-quirk-pm-acer.fdi 20-video-quirk-pm-apple.fdi \ + 20-video-quirk-pm-asus.fdi 20-video-quirk-pm-dell.fdi \ + 20-video-quirk-pm-fujitsu.fdi 20-video-quirk-pm-hp.fdi \ + 20-video-quirk-pm-ibm.fdi 20-video-quirk-pm-lenovo.fdi \ + 20-video-quirk-pm-misc.fdi 20-video-quirk-pm-sony.fdi \ + 20-video-quirk-pm-toshiba.fdi am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org