Yahoo! Models test pased ok!

7 files changed, 29 insertions, 29 deletions

diff --git a/keycodes/digital_vndr/Makefile.am b/keycodes/digital_vndr/Makefile.am
index 29dad84..471f8bb 100644
--- a/keycodes/digital_vndr/Makefile.am
+++ b/keycodes/digital_vndr/Makefile.am
@@ -3,4 +3,4 @@ lk pc
                                                                                           
 EXTRA_DIST= $(kc_DATA)
                                                                                           
-kcdir = $(xkb_base)/keycodes/digital.vndr
+kcdir = $(xkb_base)/keycodes/digital_vndr
diff --git a/keycodes/digital_vndr/lk b/keycodes/digital_vndr/lk
index d9fbcba..8523b95 100644
--- a/keycodes/digital_vndr/lk
+++ b/keycodes/digital_vndr/lk
@@ -151,7 +151,7 @@ xkb_keycodes "lk_common" {
 };
 
 xkb_keycodes "lkx01" {
-    include "digital.vndr/lk(lk_common)"
+    include "digital_vndr/lk(lk_common)"
     <AB00>	= 201;
     <FK13>	= 115;
     <FK14>	= 116;
@@ -178,7 +178,7 @@ xkb_keycodes "lkx01" {
 };
 
 xkb_keycodes "lk201" {
-    include "digital.vndr/lk(lkx01)"
+    include "digital_vndr/lk(lkx01)"
     indicator 4 = "Scroll Lock";
     indicator 3 = "Caps Lock";
     indicator 2 = "Compose";
@@ -186,20 +186,20 @@ xkb_keycodes "lk201" {
 };
 
 xkb_keycodes "lk421" {
-    include	"digital.vndr/lk(lkx01)"
+    include	"digital_vndr/lk(lkx01)"
     <LALT>	= 172;
     <RALT>	= 178;
     <RCMP>	= 173;
 };
 
 xkb_keycodes "lk401" {
-    include	"digital.vndr/lk(lk421)"
+    include	"digital_vndr/lk(lk421)"
     indicator 4 = "Scroll Lock";
     indicator 3 = "Caps Lock";
 };
 
 xkb_keycodes "lk44x" {
-    include "digital.vndr/lk(lk_common)"
+    include "digital_vndr/lk(lk_common)"
     <ESC>	= 85;
     <PRSC>	= 115;
     <SCLK>	= 116;
@@ -221,7 +221,7 @@ xkb_keycodes "lk44x" {
 };
 
 xkb_keycodes "lk443" {
-    include "digital.vndr/lk(lk44x)"
+    include "digital_vndr/lk(lk44x)"
     <BKSL>	= 247;
     indicator 3 = "Caps Lock";
     indicator 4 = "Scroll Lock";
@@ -229,7 +229,7 @@ xkb_keycodes "lk443" {
 };
 
 xkb_keycodes "lk444" {
-    include "digital.vndr/lk(lk44x)"
+    include "digital_vndr/lk(lk44x)"
     <BKSL>	= 201;
     <AC12>	= 247;
     indicator 3 = "Caps Lock";
@@ -247,25 +247,25 @@ xkb_keycodes "lk444" {
 // LK441-LT = lk443
 
 xkb_keycodes "lk421aj" {
-    include "digital.vndr/lk(lk421)"
+    include "digital_vndr/lk(lk421)"
     <AB11>  = 252;
 };
 
 xkb_keycodes "lk421jj" {
-    include "digital.vndr/lk(lk421aj)"
+    include "digital_vndr/lk(lk421aj)"
     <MUHE>  = 94;
     <KANJ>  = 95;
     <HIRA>  = 97;
 };
 
 xkb_keycodes "lk401bj" {
-    include "digital.vndr/lk(lk401)"
+    include "digital_vndr/lk(lk401)"
     <MUHE>  = 94;
     <KANJ>  = 95;
     <HIRA>  = 97;
 };
 
 xkb_keycodes "lk401jj" {
-    include "digital.vndr/lk(lk401bj)"
+    include "digital_vndr/lk(lk401bj)"
     <AB11>  = 252;
 };
diff --git a/keycodes/digital_vndr/pc b/keycodes/digital_vndr/pc
index d37053a..5117156 100644
--- a/keycodes/digital_vndr/pc
+++ b/keycodes/digital_vndr/pc
@@ -160,7 +160,7 @@ xkb_keycodes "pc_common" {
 };
 
 xkb_keycodes "pc10x" {
-    include "digital.vndr/pc(pc_common)"
+    include "digital_vndr/pc(pc_common)"
     <ESC>	= 8;
     <AE00>	= 14;
     <PRSC>	= 87;
@@ -186,28 +186,28 @@ xkb_keycodes "pc10x" {
 };
 
 xkb_keycodes "pc101" {
-    include "digital.vndr/pc(pc10x)"
+    include "digital_vndr/pc(pc10x)"
     <BKSL>  = 92;
     indicator 5 = "Num Lock";
 };
 
 
 xkb_keycodes "pc102" {
-    include "digital.vndr/pc(pc10x)"
+    include "digital_vndr/pc(pc10x)"
     <BKSL>  = 19;
     <AC12>  = 83;
     indicator 5 = "Num Lock";
 };
 
 xkb_keycodes "pc104" {
-    include "digital.vndr/pc(pc101)"
+    include "digital_vndr/pc(pc101)"
     <LWIN>  = 139;
     <RWIN>  = 140;
     <MENU>  = 141;
 };
 
 xkb_keycodes "lk411_common" {
-    include "digital.vndr/pc(pc_common)"
+    include "digital_vndr/pc(pc_common)"
     <AE00>      = 8;
     <AB00>      = 14;
     <FK13>	= 24;
@@ -240,12 +240,12 @@ xkb_keycodes "lk411_common" {
 };
 
 xkb_keycodes "lk411" {
-    include "digital.vndr/pc(lk411_common)"
+    include "digital_vndr/pc(lk411_common)"
     <BKSL>	= 92;
 };
 
 xkb_keycodes "lk450" {
-    include	"digital.vndr/pc(lk411)"
+    include	"digital_vndr/pc(lk411)"
     indicator 2 = "Compose";
     indicator 1 = "Wait";
 };
@@ -258,7 +258,7 @@ xkb_keycodes "lk450" {
 // LK411-LT = lk411
 
 xkb_keycodes "pcxajaa" {
-    include "digital.vndr/pc(pc10x)"
+    include "digital_vndr/pc(pc10x)"
     <BKSL>  = 93;
     <AC12>  = 83;
     <AB11>  = 81;
@@ -269,7 +269,7 @@ xkb_keycodes "pcxajaa" {
 };
 
 xkb_keycodes "lk411jj" {
-    include "digital.vndr/pc(lk411_common)"
+    include "digital_vndr/pc(lk411_common)"
     <AB11>  = 81;
     <BKSL>  = 83;
     <MUHE>  = 133;
diff --git a/keycodes/sgi_vndr/Makefile.am b/keycodes/sgi_vndr/Makefile.am
index 25a3f58..9cf7804 100644
--- a/keycodes/sgi_vndr/Makefile.am
+++ b/keycodes/sgi_vndr/Makefile.am
@@ -3,4 +3,4 @@ indigo indy iris
                                                                                           
 EXTRA_DIST= $(kc_DATA)
                                                                                           
-kcdir = $(xkb_base)/keycodes/sgi.vndr
+kcdir = $(xkb_base)/keycodes/sgi_vndr
diff --git a/keycodes/sgi_vndr/indigo b/keycodes/sgi_vndr/indigo
index 35aef87..fd87e57 100644
--- a/keycodes/sgi_vndr/indigo
+++ b/keycodes/sgi_vndr/indigo
@@ -135,6 +135,6 @@ default xkb_keycodes "pc101" {
     indicator 7 = "Scroll Lock";
 };
 xkb_keycodes "pc102" {
-    include "sgi.vndr/indigo(pc101)"
+    include "sgi_vndr/indigo(pc101)"
     <LSGT> = 118;
 };
diff --git a/keycodes/sgi_vndr/indy b/keycodes/sgi_vndr/indy
index cd24267..a777c37 100644
--- a/keycodes/sgi_vndr/indy
+++ b/keycodes/sgi_vndr/indy
@@ -2,7 +2,7 @@
 default xkb_keycodes "universal" {
     minimum= 15;
     maximum= 149;
-    include "sgi.vndr/indy(pc105)"
+    include "sgi_vndr/indy(pc105)"
     alternate <BKSL> = 91;
     alternate <BKSL> = 100;
     alternate <BKSL> = 101;
@@ -146,12 +146,12 @@ xkb_keycodes "pc101" {
 xkb_keycodes "pc102" {
     <BKSL> = 91;
     <LSGT> = 27;
-    augment "sgi.vndr/indy(pc101)"
+    augment "sgi_vndr/indy(pc101)"
     maximum= 149;
     minimum= 15;
 };
 xkb_keycodes "pc104" {
-    include "sgi.vndr/indy(pc101)"
+    include "sgi_vndr/indy(pc101)"
     minimum= 15;
     maximum= 149;
 
@@ -163,7 +163,7 @@ xkb_keycodes "pc104" {
 };
 xkb_keycodes "pc105" {
     <LSGT> = 27;
-    augment "sgi.vndr/indy(pc104)"
+    augment "sgi_vndr/indy(pc104)"
     minimum= 15;
     maximum= 149;
 };
@@ -177,7 +177,7 @@ xkb_keycodes "jp106" {
     alias <TLDE> = <HZTG>;
     alias <AE00> = <HZTG>;
     alias <AE13> = <BKSL>;
-    augment "sgi.vndr/indy(pc101)"
+    augment "sgi_vndr/indy(pc101)"
     minimum= 15;
     maximum= 149;
 };
diff --git a/keycodes/sgi_vndr/iris b/keycodes/sgi_vndr/iris
index 70cf9be..a4118a6 100644
--- a/keycodes/sgi_vndr/iris
+++ b/keycodes/sgi_vndr/iris
@@ -1,6 +1,6 @@
 // $Xorg: iris,v 1.3 2000/08/17 19:54:39 cpqbld Exp $
 default xkb_keycodes "iris" {
-    include "sgi.vndr/indigo(pc101)"
+    include "sgi_vndr/indigo(pc101)"
     indicator 1 = "L1";
     indicator 2 = "L2";
     indicator 3 = "L3";