Removed htcdream support

Too old to be supported

12 files changed, 2 insertions, 193 deletions

diff --git a/rules/base.lists.base.part b/rules/base.lists.base.part
index 63519b60..75059447 100644
--- a/rules/base.lists.base.part
+++ b/rules/base.lists.base.part
@@ -15,7 +15,7 @@
               genius geniuscomfy2 \
               gyration honeywell_euroboard \
               hp250x hp5xx hp500fa hpdv5 \
-              hpi6 hpxe3gc hpxe3gf hpxe4xxx hpxt1000 hpzt11xx htcdream \
+              hpi6 hpxe3gc hpxe3gf hpxe4xxx hpxt1000 hpzt11xx \
               ibm_spacesaver ipaq inspiron intel \
               logiaccess logicda logicink \
               logiex110 logiclx300 \
diff --git a/rules/base.lists.part b/rules/base.lists.part
index 6badcd0f..6f7433d2 100644
--- a/rules/base.lists.part
+++ b/rules/base.lists.part
@@ -78,4 +78,3 @@
 
 ! $sun_compat = sun_type6 sun_type6_suncompat sun_type7_suncompat suncompat
 
-! $htcdreamlayouts = us it de
diff --git a/rules/base.ml_s.part b/rules/base.ml_s.part
index 7bf3d516..7708f4c3 100644
--- a/rules/base.ml_s.part
+++ b/rules/base.ml_s.part
@@ -35,6 +35,5 @@
   ws007sh	*			=	pc+sharp_vndr/ws007sh(basic)
   ws011sh	*			=	pc+sharp_vndr/ws011sh(basic)
   ws020sh	*			=	pc+sharp_vndr/ws020sh(basic)
-  htcdream	$htcdreamlayouts	=	%l(htcdream)
   *	   	$nonlatin		=	pc+us+%l%(v):2
   *		*			=	pc+%l%(v)
diff --git a/rules/base.xml b/rules/base.xml
index b848a1cc..37a17633 100644
--- a/rules/base.xml
+++ b/rules/base.xml
@@ -449,13 +449,6 @@
     </model>
     <model>
       <configItem>
-        <name>htcdream</name>
-        <description>HTC Dream</description>
-        <vendor>HTC</vendor>
-      </configItem>
-    </model>
-    <model>
-      <configItem>
         <name>kinesis</name>
         <description>Kinesis</description>
         <vendor>Kinesis</vendor>
@@ -1297,13 +1290,6 @@
     </model>
     <model>
       <configItem>
-       <name>htcdream</name>
-       <description>Htc Dream phone</description>
-       <vendor>htc</vendor>
-     </configItem>
-    </model>
-    <model>
-      <configItem>
        <name>teck227</name>
        <description>Truly Ergonomic 227</description>
        <vendor>Truly Ergonomic</vendor>
diff --git a/symbols/de b/symbols/de
index a96671bd..1a03a2a5 100644
--- a/symbols/de
+++ b/symbols/de
@@ -764,51 +764,6 @@ xkb_symbols "pl" {
 };
 
 partial alphanumeric_keys
-xkb_symbols "htcdream" {
-        include "inet(htcdream)"
-
-        name[Group1]= "German";
-
-        //second row
-        key <AD01> { [ q, Q, Tab, Tab ] };
-        key <AD02> { [ w, W, grave, grave ] };
-        key <AD03> { [ e, E, EuroSign, EuroSign ] };
-        key <AD04> { [ r, R, underscore, underscore ] };
-        key <AD05> { [ t, T, sterling, sterling] };
-        key <AD06> { [ z, Z, division, division ] };
-        key <AD07> { [ u, U, udiaeresis, udiaeresis ] };
-        key <AD08> { [ i, I, minus, minus ] };
-        key <AD09> { [ o, O, odiaeresis, odiaeresis ] };
-        key <AD10> { [ p, P, equal, equal ] };
-
-        //third row
-        key <AC01> { [ a, A, adiaeresis, adiaeresis ] };
-        key <AC02> { [ s, S, ssharp, U1E9E ] };
-        key <AC03> { [ d ,D, backslash, backslash ] };
-        key <AC04> { [ f, F, braceleft, braceleft ] };
-        key <AC05> { [ g, G, braceright, braceright ] };
-        key <AC06> { [ h, H, multiply, multiply ] };
-        key <AC07> { [ j, J, colon, colon ] };
-        key <AC08> { [ k, K, plus, plus ] };
-        key <AC09> { [ l, L, apostrophe, apostrophe ] };
-
-        //forth row
-        key <AB01> { [ y, Y, bar, bar ] };
-        key <AB02> { [ x, X, bracketleft, bracketleft ] };
-        key <AB03> { [ c, C, bracketright, bracketright ] };
-        key <AB04> { [ v, V, less, less ] };
-        key <AB05> { [ b, B, greater, greater ] };
-        key <AB06> { [ n, N, semicolon, semicolon ] };
-        key <AB07> { [ m, M, quotedbl, quotedbl ] };
-        key <AB08> { [ comma, comma, question, question ] };
-
-        //fifth row
-        key <FK15> { [ at, at, asciitilde, asciitilde ] };
-
-        include "level3(alt_switch)"
-};
-
-partial alphanumeric_keys
 xkb_symbols "tr" {
 
     // add turkish-specific letters to the basic German layout.
diff --git a/symbols/inet b/symbols/inet
index 8375d114..049ac185 100644
--- a/symbols/inet
+++ b/symbols/inet
@@ -1865,32 +1865,6 @@ xkb_symbols "pc105" {
     include "inet(media_nav_acpi_common)"
 };
 
-
-// HTC Dream
-partial alphanumeric_keys
-xkb_symbols "htcdream" {
-	key <BKSP> { [ BackSpace ] };
-	key <RTRN> { [ Return ] };
-
-        key <AE01> { [ 1, 1, exclam, exclam ] };
-        key <AE02> { [ 2, 2, at, at ] };
-        key <AE03> { [ 3, 3, numbersign, numbersign ] };
-        key <AE04> { [ 4, 4, dollar, dollar ] };
-        key <AE05> { [ 5, 5, percent, percent ] };
-        key <AE06> { [ 6, 6, dead_circumflex, dead_circumflex ] };
-        key <AE07> { [ 7, 7, ampersand, ampersand ] };
-        key <AE08> { [ 8, 8, asterisk, asterisk ] };
-        key <AE09> { [ 9, 9, parenleft, parenleft ] };
-        key <AE10> { [ 0, 0, parenright, parenright ] };
-
-	key <LFSH> { [ Shift_L ] };
-	key <SPCE> { [ space ] };
-	key <AB09> { [ period, period, slash, slash ] };
-	key <RTSH> { [ Shift_R ] };
-
-	modifier_map Shift { <LFSH>, <RTSH> };
-};
-
 partial alphanumeric_keys
 xkb_symbols "chromebook" {
 	include "level3(ralt_switch)"
diff --git a/symbols/it b/symbols/it
index f087df3d..eceec6fa 100644
--- a/symbols/it
+++ b/symbols/it
@@ -220,50 +220,6 @@ xkb_symbols "us" {
 };
 
 partial alphanumeric_keys
-xkb_symbols "htcdream" {
-        include "inet(htcdream)"
-        name[Group1]= "Italian";
-
-        //second row
-        key <AD01> { [ q, Q, Tab, Tab ] };
-        key <AD02> { [ w, W, grave, grave ] };
-        key <AD03> { [ e, E, egrave, egrave] };
-        key <AD04> { [ r, R, eacute, eacute ] };
-        key <AD05> { [ t, T, quotedbl, quotedbl ] };
-        key <AD06> { [ y, Y, apostrophe, apostrophe ] };
-        key <AD07> { [ u, U, ugrave, ugrave ] };
-        key <AD08> { [ i, I, igrave, igrave ] };
-        key <AD09> { [ o, O, ograve, ograve ] };
-        key <AD10> { [ p, P, NoSymbol, NoSymbol ] };
-
-        //third row
-        key <AC01> { [ a, A, agrave, agrave ] };
-        key <AC02> { [ s, S, bar, bar ] };
-        key <AC03> { [ d ,D, EuroSign, EuroSign ] };
-        key <AC04> { [ f, F, sterling, sterling ] };
-        key <AC05> { [ g, G, division, division ] };
-        key <AC06> { [ h, H, multiply, multiply ] };
-        key <AC07> { [ j, J, minus, minus ] };
-        key <AC08> { [ k, K, plus, plus ] };
-        key <AC09> { [ l, L, equal, equal ] };
-
-        //forth row
-        key <AB01> { [ z, Z, underscore, underscore ] };
-        key <AB02> { [ x, X, asciitilde, asciitilde ] };
-        key <AB03> { [ c, C, less, less ] };
-        key <AB04> { [ v, V, greater, greater ] };
-        key <AB05> { [ b, B,  backslash, backslash ] };
-        key <AB06> { [ n, N, colon, colon ] };
-        key <AB07> { [ m, M, semicolon, semicolon ] };
-        key <AB08> { [ comma, comma, question, question ] };
-
-        //fifth row
-        key <FK15> { [ at, at, NoSymbol, NoSymbol ] };
-
-        include "level3(alt_switch)"
-};
-
-partial alphanumeric_keys
 xkb_symbols "ibm" {
 
     // Modifies the basic italian layout to match IBM 142 variant
diff --git a/symbols/sun_vndr/de b/symbols/sun_vndr/de
index d95b0795..3f2e9cf4 100644
--- a/symbols/sun_vndr/de
+++ b/symbols/sun_vndr/de
@@ -166,11 +166,6 @@ partial alphanumeric_keys
 };
 
 partial alphanumeric_keys
-	xkb_symbols "htcdream" {
-	include "de(htcdream)"
-};
-
-partial alphanumeric_keys
 	xkb_symbols "us" {
 	include "de(us)"
 };
diff --git a/symbols/sun_vndr/it b/symbols/sun_vndr/it
index d73ef6e6..593a0d3b 100644
--- a/symbols/sun_vndr/it
+++ b/symbols/sun_vndr/it
@@ -89,11 +89,6 @@ partial alphanumeric_keys
 };
 
 partial alphanumeric_keys
-	xkb_symbols "htcdream" {
-	include "it(htcdream)"
-};
-
-partial alphanumeric_keys
 	xkb_symbols "ibm" {
 	include "it(ibm)"
 };
diff --git a/symbols/sun_vndr/us b/symbols/sun_vndr/us
index 25328523..06a090f1 100644
--- a/symbols/sun_vndr/us
+++ b/symbols/sun_vndr/us
@@ -175,11 +175,6 @@ partial alphanumeric_keys
 };
 
 partial alphanumeric_keys
-	xkb_symbols "htcdream" {
-	include "us(htcdream)"
-};
-
-partial alphanumeric_keys
 	xkb_symbols "workman" {
 	include "us(workman)"
 };
diff --git a/symbols/us b/symbols/us
index 0e2bf441..798926f3 100644
--- a/symbols/us
+++ b/symbols/us
@@ -1203,51 +1203,6 @@ xkb_symbols "hbs" {
   include "level3(ralt_switch)"
 };
 
-//based on http://upload.wikimedia.org/wikipedia/commons/1/18/T-Mobile_G1_launch_event_2.jpg
-partial alphanumeric_keys
-xkb_symbols "htcdream" {
-        include "inet(htcdream)"
-        name[Group1]= "English (US)";
-
-        //second row
-        key <AD01> { [ q, Q, Tab, Tab ] };
-        key <AD02> { [ w, W, grave, grave ] };
-        key <AD03> { [ e, E, underscore, underscore ] };
-        key <AD04> { [ r, R, sterling, sterling ] };
-        key <AD05> { [ t, T, EuroSign, EuroSign ] };
-        key <AD06> { [ y, Y, division, division ] };
-        key <AD07> { [ u, U, multiply, multiply ] };
-        key <AD08> { [ i, I, minus, minus ] };
-        key <AD09> { [ o, O, plus, plus ] };
-        key <AD10> { [ p, P, equal, equal ] };
-
-        //third row
-        key <AC01> { [ a, A, NoSymbol, NoSymbol ] };
-        key <AC02> { [ s, S, bar, bar ] };
-        key <AC03> { [ d ,D, backslash, backslash ] };
-        key <AC04> { [ f, F, braceleft, braceleft ] };
-        key <AC05> { [ g, G, braceright, braceright ] };
-        key <AC06> { [ h, H, colon, colon ] };
-        key <AC07> { [ j, J, semicolon, semicolon ] };
-        key <AC08> { [ k, K, quotedbl, quotedbl ] };
-        key <AC09> { [ l, L, apostrophe, apostrophe ] };
-
-        //forth row
-        key <AB01> { [ z, Z, NoSymbol, NoSymbol ] };
-        key <AB02> { [ x, X, NoSymbol, NoSymbol ] };
-        key <AB03> { [ c, C, NoSymbol, NoSymbol ] };
-        key <AB04> { [ v, V, bracketleft, bracketleft ] };
-        key <AB05> { [ b, B, bracketright, bracketright ] };
-        key <AB06> { [ n, N, less, less ] };
-        key <AB07> { [ m, M, greater, greater ] };
-        key <AB08> { [ comma, comma, question, question ] };
-
-        //fifth row
-        key <FK15> { [ at, at, asciitilde, asciitilde ] };
-
-        include "level3(alt_switch)"
-};
-
 // Workman Keyboard Layout symbols for xkb on X.Org Server 7.x
 // 09-06-2010 OJ Bucao. http://www.workmanlayout.com
 
diff --git a/tests/genLists4Comparizon.sh b/tests/genLists4Comparizon.sh
index 5dac14ef..7b1330d5 100755
--- a/tests/genLists4Comparizon.sh
+++ b/tests/genLists4Comparizon.sh
@@ -44,7 +44,7 @@ for i in $ROOT/symbols/*; do
   } else
   {
     name=$2;
-    if (variant == "olpc" || variant == "htcdream" || variant == "olpcm" || variant == "classmate")
+    if (variant == "olpc" || variant == "olpcm" || variant == "classmate")
       printf "%s:\"%s\"\n", id, name;
     else
       printf "%s(%s):\"%s\"\n", id, variant, name;