? rules/base.olpc
Index: rules/base.lists.part
===================================================================
RCS file: /cvs/xlibs/xkbdesc/xkeyboard-config/rules/base.lists.part,v
retrieving revision 1.37
diff -u -p -r1.37 base.lists.part
--- rules/base.lists.part	23 Apr 2007 22:09:07 -0000	1.37
+++ rules/base.lists.part	11 Jun 2007 22:56:52 -0000
@@ -6,7 +6,7 @@
 //              ru scc sy syr tel th tj tam ua uz
 
 // PC models
-! $pcmodels = pc101 pc102 pc104 pc105
+! $pcmodels = pc101 pc102 pc104 pc105 olpc
 
 // Microsoft models (using MS geometry)
 ! $msmodels = microsoft microsoftpro microsoftprousb microsoftprose
Index: rules/base.m_k.part
===================================================================
RCS file: /cvs/xlibs/xkbdesc/xkeyboard-config/rules/base.m_k.part,v
retrieving revision 1.10
diff -u -p -r1.10 base.m_k.part
--- rules/base.m_k.part	16 Oct 2006 19:04:52 -0000	1.10
+++ rules/base.m_k.part	11 Jun 2007 22:56:52 -0000
@@ -6,6 +6,7 @@
   abnt2		=	xfree86(abnt2)
   jp106		=	xfree86(jp106)
   evdev		=	evdev
+  olpc		=	evdev(olpc)
   macintosh_old	=	macintosh(old)
  $macbooks	=	macintosh+macintosh(badmap)
  $macs   	=	macintosh
Index: rules/base.ml_s.part
===================================================================
RCS file: /cvs/xlibs/xkbdesc/xkeyboard-config/rules/base.ml_s.part,v
retrieving revision 1.15
diff -u -p -r1.15 base.ml_s.part
--- rules/base.ml_s.part	20 Nov 2006 23:20:57 -0000	1.15
+++ rules/base.ml_s.part	11 Jun 2007 22:56:52 -0000
@@ -14,5 +14,6 @@
   macintosh_old	*			=	macintosh_vndr/us(oldmac)+%l%(v)
  $macs		en_US			=	pc+macintosh_vndr/us(extended)
  $macs		$macvendorlayouts	=	pc+macintosh_vndr/%l%(v)
-  *	   	$nonlatin		=	pc+us+%l%(v):2
+  olpc		*			=	pc(olpc)+%l%(v)
+  *		$nonlatin		=	pc+us+%l%(v):2
   *		*			=	pc+%l%(v)
Index: rules/base.xml.in
===================================================================
RCS file: /cvs/xlibs/xkbdesc/xkeyboard-config/rules/base.xml.in,v
retrieving revision 1.185
diff -u -p -r1.185 base.xml.in
--- rules/base.xml.in	7 Jun 2007 22:35:38 -0000	1.185
+++ rules/base.xml.in	11 Jun 2007 22:56:53 -0000
@@ -924,6 +924,13 @@
     </model>
     <model>
       <configItem>
+	<name>olpc</name>
+	<_description>OLPC keyboard</_description>
+	<vendor>OLPC</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
 	<name>benqx730</name>
 	<_description>BenQ X-Touch 730</_description>
 	<vendor>BenQ</vendor>
Index: rules/merge.sh
===================================================================
RCS file: /cvs/xlibs/xkbdesc/xkeyboard-config/rules/merge.sh,v
retrieving revision 1.4
diff -u -p -r1.4 merge.sh
--- rules/merge.sh	17 Sep 2006 20:03:34 -0000	1.4
+++ rules/merge.sh	11 Jun 2007 22:56:53 -0000
@@ -7,7 +7,8 @@ if [ -z "$HDR" ]; then
     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