From d90e8f7a1566899079124a8fe9e160a832d8b7f6 Mon Sep 17 00:00:00 2001
From: "Sergey V. Udaltsov" <svu@gnome.org>
Date: Sun, 30 Nov 2008 16:25:22 +0000
Subject: [PATCH] optimizing HP SK-210x kbds

---
 rules/base.lists.part |  2 +-
 rules/base.xml.in     | 11 ++---------
 symbols/inet          | 15 +++------------
 3 files changed, 6 insertions(+), 22 deletions(-)

diff --git a/rules/base.lists.part b/rules/base.lists.part
index 6742f2e..b40bd62 100644
--- a/rules/base.lists.part
+++ b/rules/base.lists.part
@@ -41,7 +41,7 @@
               emachines ennyah_dkb1008 evdev fscaa1667g \
               genius geniuscomfy geniuscomfy2 geniuskb19e \
               gyration honeywell_euroboard \
-              hp2501 hp2505 hp5xx hp500fa hpdv5 \
+              hp250x hp5xx hp500fa hpdv5 \
               hpi6 hpxe3gc hpxe3gf hpxe4xxx hpxt1000 hpzt11xx \
               ibm_spacesaver ipaq inspiron intel latitude \
               logiaccess logicda logicink \
diff --git a/rules/base.xml.in b/rules/base.xml.in
index 7ae4418..0a45dfb 100644
--- a/rules/base.xml.in
+++ b/rules/base.xml.in
@@ -464,15 +464,8 @@
     </model>
     <model>
       <configItem>
-        <name>hp2501</name>
-        <_description>Hewlett-Packard SK-2501 Multimedia Keyboard</_description>
-        <vendor>Hewlett-Packard</vendor>
-      </configItem>
-    </model>
-    <model>
-      <configItem>
-        <name>hp2505</name>
-        <_description>Hewlett-Packard SK-2505 Internet Keyboard</_description>
+        <name>hp250x</name>
+        <_description>Hewlett-Packard SK-250x Multimedia Keyboard</_description>
         <vendor>Hewlett-Packard</vendor>
       </configItem>
     </model>
diff --git a/symbols/inet b/symbols/inet
index 0a4e7c1..5a05c98 100644
--- a/symbols/inet
+++ b/symbols/inet
@@ -1002,11 +1002,12 @@ xkb_symbols "hpi6" {
     key <I75>   {       [ Help                  ]       };
 };
 
-// Hewlett-Packard SK-2501 Multimedia Keyboard
+// Hewlett-Packard SK-2501, SK-2505 Multimedia Keyboard
 partial alphanumeric_keys
-xkb_symbols "hp2501" {
+xkb_symbols "hp250x" {
     key <I12>	{	[ XF86Tools		]	};
     key <I17>	{	[ XF86Search		]	};
+    key <I18>	{	[ XF86Eject		]	};
     key <I1E>	{	[ XF86Mail		]	};
     key <I20>	{	[ XF86AudioMute		]	};
     key <I21>	{	[ XF86Launch5		]	};
@@ -1020,16 +1021,6 @@ xkb_symbols "hp2501" {
     key <I32>	{	[ XF86WWW		]	};
 };
 
-// Hewlett-Packard SK-2505 Internet Keyboard
-partial alphanumeric_keys
-xkb_symbols "hp2505" {
-    include "inet(media_common)"
-    key <I18>	{	[ XF86Eject		]	};
-    key <I1E>	{	[ XF86Mail		]	};
-    key <I25>	{	[ XF86Standby		]	};
-    key <I32>	{	[ XF86WWW		]	};
-};
-
 // Hewlett-Packard Omnibook XE3 GC, GD, GE and Pavilion N5xxx
 partial alphanumeric_keys
 xkb_symbols "hpxe3gc" {
-- 
2.7.4