xkeyboard-config/rules base.lists.part, 1.44, 1.45 base.m_k.part, 1.11, 1.12 base.ml_c.part, 1.6, 1.7 base.ml_s.part, 1.17, 1.18 base.xml.in, 1.208, 1.209 merge.sh, 1.4, 1.5

Committed by: svu

Update of /cvs/xkeyboard-config/xkeyboard-config/rules
In directory kemper:/tmp/cvs-serv16344/rules

Modified Files:
	base.lists.part base.m_k.part base.ml_c.part base.ml_s.part 
	base.xml.in merge.sh 
Log Message:
massive patch from OLPC

Index: base.lists.part
===================================================================
RCS file: /cvs/xkeyboard-config/xkeyboard-config/rules/base.lists.part,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- base.lists.part	5 Sep 2007 23:00:41 -0000	1.44
+++ base.lists.part	26 Sep 2007 11:43:49 -0000	1.45
@@ -14,6 +14,9 @@
 // PC geometries - they have special geometry but symbols are mostly pc105
 ! $pcgeometries = abnt2 latitude jp106 kr106
 
+// Layouts that provide further specializations for the OLPC
+! $olpclayouts = ara br es ru th tr us
+
 ! $macbooks = macbook78 macbook79
 ! $maclaptop = ibook powerbook macbook78 macbook79
 ! $macs = macintosh macintosh_old ibook powerbook macbook78 macbook79

Index: base.m_k.part
===================================================================
RCS file: /cvs/xkeyboard-config/xkeyboard-config/rules/base.m_k.part,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- base.m_k.part	29 Aug 2007 22:19:38 -0000	1.11
+++ base.m_k.part	26 Sep 2007 11:43:50 -0000	1.12
@@ -6,6 +6,7 @@
   abnt2		=	xfree86(abnt2)
   jp106		=	xfree86(jp106)
   evdev		=	evdev
+  olpc		=	evdev
   macintosh_hhk	=	macintosh(hhk)
   macintosh_old	=	macintosh(old)
  $macbooks	=	macintosh+macintosh(badmap)

Index: base.ml_c.part
===================================================================
RCS file: /cvs/xkeyboard-config/xkeyboard-config/rules/base.ml_c.part,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- base.ml_c.part	28 May 2006 19:54:04 -0000	1.6
+++ base.ml_c.part	26 Sep 2007 11:43:50 -0000	1.7
@@ -1,3 +1,4 @@
   pc98		nec_vndr/jp	=	pc98(basic)
   *		jp		=	complete+japan
+  olpc         *               =       olpc
   *		*		=	complete

Index: base.ml_s.part
===================================================================
RCS file: /cvs/xkeyboard-config/xkeyboard-config/rules/base.ml_s.part,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- base.ml_s.part	18 Aug 2007 00:32:01 -0000	1.17
+++ base.ml_s.part	26 Sep 2007 11:43:50 -0000	1.18
@@ -16,6 +16,8 @@
   macintosh_old	*			=	macintosh_vndr/us(oldmac)+%l%(v)
  $macs		en_US			=	pc+macintosh_vndr/us(extended)
  $macs		$macvendorlayouts	=	pc+macintosh_vndr/%l%(v)
+  olpc		$olpclayouts		=	olpc+%l%(m)
+  olpc		*			=	olpc+%l
   thinkpad   	br			=	pc+br(thinkpad)
   *	   	$nonlatin		=	pc+us+%l%(v):2
   *		*			=	pc+%l%(v)

Index: base.xml.in
===================================================================
RCS file: /cvs/xkeyboard-config/xkeyboard-config/rules/base.xml.in,v
retrieving revision 1.208
retrieving revision 1.209
diff -u -d -r1.208 -r1.209
--- base.xml.in	5 Sep 2007 23:00:42 -0000	1.208
+++ base.xml.in	26 Sep 2007 11:43:50 -0000	1.209
@@ -935,6 +935,13 @@
 	<vendor>Intel</vendor>
       </configItem>
     </model>
+    <model>
+      <configItem>
+	<name>olpc</name>
+	<_description>OLPC</_description>
+	<vendor>OLPC</vendor>
+      </configItem>
+    </model>
   </modelList>
   <layoutList>
     <layout>
@@ -1010,6 +1017,12 @@
             <_description>International (AltGr dead keys)</_description>
           </configItem>
         </variant>
+        <variant>
+          <configItem>
+            <name>olpc2</name>
+            <_description>OLPC with mode toggle on multiply/divide key</_description>
+          </configItem>
+        </variant>
       </variantList>
     </layout>
     <layout>

Index: merge.sh
===================================================================
RCS file: /cvs/xkeyboard-config/xkeyboard-config/rules/merge.sh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- merge.sh	17 Sep 2006 20:03:34 -0000	1.4
+++ merge.sh	26 Sep 2007 11:43:50 -0000	1.5
@@ -7,7 +7,8 @@
     HDR="HDR"
 fi
 
-> $DEST
+basename=`basename $0`
+echo "// DO NOT EDIT THIS FILE - IT WAS AUTOGENERATED BY $basename FROM rules/*.part" >$DEST
 
 for i in $*; do
   if [ "$i" == "$HDR" ] || [ "$i" == "HDR" ]; then