hal: Branch 'master' - 3 commits

[Danny Kukawka]

 fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi |    4 ++--
 tools/Makefile.am                                          |    3 ++-
 tools/hal-setup-keymap-keys.txt                            |    4 ++++
 3 files changed, 8 insertions(+), 3 deletions(-)

New commits:
commit 2fa885bebd6b621cb8c3beca240686438498ea10
Author: Lubomir Kundrak <lkundrak at redhat.com>
Date:   Fri Jan 25 15:09:32 2008 +0100

    added another Lenovo R61i
    
    Added another Lenovo R61i suspend quirk:
    
      system.hardware.primary_video.product = 10754  (0x2a02)  (int)
      system.hardware.primary_video.vendor = 32902  (0x8086)  (int)
      system.hardware.product = '8932AEG'  (string)
      system.hardware.vendor = 'LENOVO'  (string)
      system.hardware.version = 'ThinkPad R61'  (string)
    
    on the above system, the following worked well (tested in 64bit mode):

diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi
index 5b24d17..8501b0e 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi
@@ -9,8 +9,8 @@
         <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
         <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
       </match>
-      <!-- X61* Tablet, R61i (7732) -->
-      <match key="system.hardware.product" prefix_outof="7669;7764;7673;7675;7732">
+      <!-- X61* Tablet, R61i (7732,8932) -->
+      <match key="system.hardware.product" prefix_outof="7669;7764;7673;7675;7732;8932">
         <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
       </match>
       <match key="system.hardware.product" prefix="63664DU">
commit bb1a76d089a650405984ab0f75ea0f4a5198e9ff
Author: Lubomir Kundrak <lkundrak at redhat.com>
Date:   Fri Jan 25 15:07:31 2008 +0100

    fix typo in R61i support
    
    Use a semicolon instead of a comma.

diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi
index efe6c5d..5b24d17 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi
@@ -10,7 +10,7 @@
         <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
       </match>
       <!-- X61* Tablet, R61i (7732) -->
-      <match key="system.hardware.product" prefix_outof="7669;7764;7673;7675,7732">
+      <match key="system.hardware.product" prefix_outof="7669;7764;7673;7675;7732">
         <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
       </match>
       <match key="system.hardware.product" prefix="63664DU">
commit 09804c209808e64344ca1d37bde7f5e59ab1bd95
Author: Frederic Crozat <fcrozat at mandriva.com>
Date:   Fri Jan 25 15:05:18 2008 +0100

    add keymap database to tarball and add some missing keycodes
    
    The keymap database (tools/hal-setup-keymap-keys.txt) is missing in the
    tarball (preventing to run make check).
    
    Moreover, this database is missing some keycode.
    
    Attached patch fixes both issues.

diff --git a/tools/Makefile.am b/tools/Makefile.am
index 1c3861f..9f0d822 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -5,5 +5,6 @@ clean-local :
 	rm -f *~
 
 EXTRA_DIST =						\
-	keymap-check.sh
+	keymap-check.sh					\
+	hal-setup-keymap-keys.txt
 
diff --git a/tools/hal-setup-keymap-keys.txt b/tools/hal-setup-keymap-keys.txt
index 172f8dc..c99ba88 100644
--- a/tools/hal-setup-keymap-keys.txt
+++ b/tools/hal-setup-keymap-keys.txt
@@ -346,3 +346,7 @@ BRL_DOT6
 BRL_DOT7
 BRL_DOT8
 MIN_INTERESTING
+EURO
+DOLLAR
+LOCK
+SYNC