xkbdesc/rules base.m_t.part, 1.3, 1.4 base.ml1_s.part, 1.7, 1.8 base.ml_s.part, 1.10, 1.11 base.o_t.part, 1.3, 1.4 base.xml.in, 1.148, 1.149 merge.sh, 1.3, 1.4

[Sergey V. Oudaltsov]

Committed by: svu

Update of /cvs/xlibs/xkbdesc/rules
In directory kemper:/tmp/cvs-serv18470/rules

Modified Files:
	base.m_t.part base.ml1_s.part base.ml_s.part base.o_t.part 
	base.xml.in merge.sh 
Log Message:
b.fd.o#8280,b.fd.o#8312

Index: base.m_t.part
===================================================================
RCS file: /cvs/xlibs/xkbdesc/rules/base.m_t.part,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- base.m_t.part	20 Jul 2004 01:29:47 -0000	1.3
+++ base.m_t.part	17 Sep 2006 20:03:34 -0000	1.4
@@ -1 +1,2 @@
+  $macs		=	complete+numpad(mac)
   *		=	complete

Index: base.ml1_s.part
===================================================================
RCS file: /cvs/xlibs/xkbdesc/rules/base.ml1_s.part,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- base.ml1_s.part	5 Sep 2006 19:04:20 -0000	1.7
+++ base.ml1_s.part	17 Sep 2006 20:03:34 -0000	1.8
@@ -2,9 +2,9 @@
   amiga		*			=	xfree68_vndr/amiga(usa1)+%l[1]%(v[1])
   sun4		*			=	latin+sun_vndr/us(sun4)+%l[1]%(v[1])
   sun5		*			=	latin+sun_vndr/us(sun5)+%l[1]%(v[1])
-  macintosh_old	us			=	macintosh_vndr/us(extended)
-  macintosh_old	$macvendorlayouts	=	macintosh_vndr/us(extended)+macintosh_vndr/%l[1]%(v[1])
-  macintosh_old	*			=	macintosh_vndr/us(extended)+%l[1]%(v[1])
+  macintosh_old	us			=	macintosh_vndr/us(oldmac)
+  macintosh_old	$macvendorlayouts	=	macintosh_vndr/us(oldmac)+macintosh_vndr/%l[1]%(v[1])
+  macintosh_old	*			=	macintosh_vndr/us(oldmac)+%l[1]%(v[1])
  $macs		$macvendorlayouts	=	pc(pc105)+macintosh_vndr/%l[1]%(v[1])
  $pcmodels	*			=	pc(%m)+%l[1]%(v[1])
   *		*			=	pc(pc105)+%l[1]%(v[1])

Index: base.ml_s.part
===================================================================
RCS file: /cvs/xlibs/xkbdesc/rules/base.ml_s.part,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- base.ml_s.part	5 Sep 2006 19:04:20 -0000	1.10
+++ base.ml_s.part	17 Sep 2006 20:03:34 -0000	1.11
@@ -8,11 +8,11 @@
   sun5		*			=	latin+sun_vndr/us(sun5)+%l%(v)
   pc98		nec_vndr/jp		=	nec_vndr/jp(pc98)
   abnt2		br			=	pc(pc104)+br
-  macintosh_old	us			=	macintosh_vndr/us(extended)
-  macintosh_old	en_US			=	macintosh_vndr/us(extended)
-  macintosh_old	$macvendorlayouts	=	macintosh_vndr/us(extended)+macintosh_vndr/%l%(v)
-  macintosh_old	$nonlatin		=	macintosh_vndr/us(extended)+%l%(v):2
-  macintosh_old	*			=	macintosh_vndr/us(extended)+%l%(v)
+  macintosh_old	us			=	macintosh_vndr/us(oldmac)
+  macintosh_old	en_US			=	macintosh_vndr/us(oldmac)
+  macintosh_old	$macvendorlayouts	=	macintosh_vndr/us(oldmac)+macintosh_vndr/%l%(v)
+  macintosh_old	$nonlatin		=	macintosh_vndr/us(oldmac)+%l%(v):2
+  macintosh_old	*			=	macintosh_vndr/us(oldmac)+%l%(v)
  $macbooks	*			=	pc(pc105)+%l%(v)
  $macs		en_US			=	pc(pc105)+macintosh_vndr/us(extended)
  $macs		$macvendorlayouts	=	pc(pc105)+macintosh_vndr/%l%(v)

Index: base.o_t.part
===================================================================
RCS file: /cvs/xlibs/xkbdesc/rules/base.o_t.part,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- base.o_t.part	20 Jul 2004 01:29:47 -0000	1.3
+++ base.o_t.part	17 Sep 2006 20:03:34 -0000	1.4
@@ -2,4 +2,6 @@
   caps:internal_nocancel	=	+caps(internal_nocancel)
   caps:shift			=	+caps(shift)
   caps:shift_nocancel		=	+caps(shift_nocancel)
+  numpad:pc			=	+numpad(pc)
+  numpad:mac			=	+numpad(mac)
   numpad:microsoft		=	+numpad(microsoft)

Index: base.xml.in
===================================================================
RCS file: /cvs/xlibs/xkbdesc/rules/base.xml.in,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -d -r1.148 -r1.149
--- base.xml.in	10 Sep 2006 12:27:51 -0000	1.148
+++ base.xml.in	17 Sep 2006 20:03:34 -0000	1.149
@@ -3150,6 +3150,18 @@
       </configItem>
       <option>
         <configItem>
+          <name>numpad:pc</name>
+          <_description>Default numpad keys.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>numpad:mac</name>
+          <_description>Numpad keys work as with Mac.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
           <name>numpad:microsoft</name>
           <_description>Shift with numpad keys works as in MS Windows.</_description>
         </configItem>

Index: merge.sh
===================================================================
RCS file: /cvs/xlibs/xkbdesc/rules/merge.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- merge.sh	22 Sep 2005 22:19:58 -0000	1.3
+++ merge.sh	17 Sep 2006 20:03:34 -0000	1.4
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 DEST=$1
 shift