xkeyboard-config fontconfig libX11 libXft libxcb mesa git update 12 Mar 2012

25 files changed, 0 insertions, 908 deletions

diff --git a/xorg-server/xkeyboard-config/keymap/sgi_vndr/Makefile.am b/xorg-server/xkeyboard-config/keymap/sgi_vndr/Makefile.am
deleted file mode 100644
index 234a336db..000000000
--- a/xorg-server/xkeyboard-config/keymap/sgi_vndr/Makefile.am
+++ /dev/null
@@ -1,12 +0,0 @@
-keymapdir = $(xkb_base)/keymap/sgi_vndr
-
-dist_keymap_DATA = \
-be bg ca \
-ch cz de \
-dk dvorak \
-es fi \
-fr gb \
-hu it jp \
-no pl pt \
-ru se sk \
-th us
diff --git a/xorg-server/xkeyboard-config/keymap/sgi_vndr/be b/xorg-server/xkeyboard-config/keymap/sgi_vndr/be
deleted file mode 100644
index 1301e5596..000000000
--- a/xorg-server/xkeyboard-config/keymap/sgi_vndr/be
+++ /dev/null
@@ -1,32 +0,0 @@
-default xkb_keymap "indy" {

-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};

-    xkb_types		{ include "default"			};

-    xkb_compatibility	{ include "default"			};

-    xkb_symbols 	{ include "en_US(pc_universal)+be"	};

-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};

-};

-xkb_keymap "indy_nodeadkeys" {

-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols 	{ 

-	include "en_US(pc_universal_nodeadkeys)+be(nodeadkeys)"

-    };

-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"	};

-};

-xkb_keymap "indigo" {

-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols 	{ include "en_US(pc102)+be"	};

-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};

-};

-xkb_keymap "indigo_nodeadkeys" {

-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols 	{ 

-	include "en_US(pc102_nodeadkeys)+be(nodeadkeys)"

-    };

-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};

-};

diff --git a/xorg-server/xkeyboard-config/keymap/sgi_vndr/bg b/xorg-server/xkeyboard-config/keymap/sgi_vndr/bg
deleted file mode 100644
index 556f1146b..000000000
--- a/xorg-server/xkeyboard-config/keymap/sgi_vndr/bg
+++ /dev/null
@@ -1,18 +0,0 @@
-default xkb_keymap "indy" {

-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols  { 

-	include "us(pc_universal)+bg+group(shifts_toggle)"

-    };

-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"	};

-};

-xkb_keymap "indigo" {

-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols { 

-	include "us(pc102)+bg+group(shifts_toggle)"

-    };

-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};

-};

diff --git a/xorg-server/xkeyboard-config/keymap/sgi_vndr/ca b/xorg-server/xkeyboard-config/keymap/sgi_vndr/ca
deleted file mode 100644
index 528b0642a..000000000
--- a/xorg-server/xkeyboard-config/keymap/sgi_vndr/ca
+++ /dev/null
@@ -1,32 +0,0 @@
-default xkb_keymap "indy" {

-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};

-    xkb_types		{ include "default"			};

-    xkb_compatibility	{ include "default"			};

-    xkb_symbols 	{ include "en_US(pc_universal)+ca"	};

-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};

-};

-xkb_keymap "indy_nodeadkeys" {

-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols 	{ 

-	include "en_US(pc_universal_nodeadkeys)+ca(nodeadkeys)"

-    };

-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"	};

-};

-xkb_keymap "indigo" {

-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols 	{ include "en_US(pc102)+ca"	};

-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};

-};

-xkb_keymap "indigo_nodeadkeys" {

-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols 	{

-	include "en_US(pc102_nodeadkeys)+ca(nodeadkeys)"

-    };

-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};

-};

diff --git a/xorg-server/xkeyboard-config/keymap/sgi_vndr/ch b/xorg-server/xkeyboard-config/keymap/sgi_vndr/ch
deleted file mode 100644
index ca35be7d9..000000000
--- a/xorg-server/xkeyboard-config/keymap/sgi_vndr/ch
+++ /dev/null
@@ -1,65 +0,0 @@
-default xkb_keymap "de_indy" {

-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};

-    xkb_types		{ include "default"			};

-    xkb_compatibility	{ include "default"			};

-    xkb_symbols 	{ include "en_US(pc_universal)+ch(de)"	};

-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};

-};

-xkb_keymap "de_indy_nodeadkeys" {

-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols 	{ 

-	include "en_US(pc_universal_nodeadkeys)+ch(de_nodeadkeys)"

-    };

-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"	};

-};

-xkb_keymap "de_indigo" {

-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols 	{ include "en_US(pc102)+ch(de)"	};

-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};

-};

-xkb_keymap "de_indigo_nodeadkeys" {

-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols 	{ 

-	include "en_US(pc102_nodeadkeys)+ch(dr_nodeadkeys)"

-    };

-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};

-};

-

-default xkb_keymap "fr_indy" {

-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};

-    xkb_types		{ include "default"			};

-    xkb_compatibility	{ include "default"			};

-    xkb_symbols 	{ include "en_US(pc_universal)+ch(fr)"	};

-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};

-};

-xkb_keymap "fr_indy_nodeadkeys" {

-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols 	{ 

-	include "en_US(pc_universal_nodeadkeys)+ch(fr_nodeadkeys)"

-    };

-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"	};

-};

-xkb_keymap "fr_indigo" {

-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols 	{ include "en_US(pc102)+ch(fr)"	};

-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};

-};

-xkb_keymap "fr_indigo_nodeadkeys" {

-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols 	{ 

-	include "en_US(pc102_nodeadkeys)+ch(fr_nodeadkeys)"

-    };

-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};

-};

diff --git a/xorg-server/xkeyboard-config/keymap/sgi_vndr/cz b/xorg-server/xkeyboard-config/keymap/sgi_vndr/cz
deleted file mode 100644
index 8e4a0a79c..000000000
--- a/xorg-server/xkeyboard-config/keymap/sgi_vndr/cz
+++ /dev/null
@@ -1,29 +0,0 @@
-default xkb_keymap "indy" {

-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};

-    xkb_types		{ include "default"			};

-    xkb_compatibility	{ include "default"			};

-    xkb_symbols 	{ include "us(pc_universal)+cz"		};

-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};

-};

-xkb_keymap "indigo" {

-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};

-    xkb_types		{ include "default"			};

-    xkb_compatibility	{ include "default"			};

-    xkb_symbols 	{ include "us(pc102)+cz"		};

-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};

-};

-

-default xkb_keymap "indy_qwerty" {

-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};

-    xkb_types		{ include "default"			};

-    xkb_compatibility	{ include "default"			};

-    xkb_symbols 	{ include "us(pc_universal)+cz(qwerty)"  };

-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};

-};

-xkb_keymap "indigo_qwerty" {

-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};

-    xkb_types		{ include "default"			};

-    xkb_compatibility	{ include "default"			};

-    xkb_symbols 	{ include "us(pc102)+cz(qwerty)"		};

-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};

-};

diff --git a/xorg-server/xkeyboard-config/keymap/sgi_vndr/de b/xorg-server/xkeyboard-config/keymap/sgi_vndr/de
deleted file mode 100644
index c63caf9b0..000000000
--- a/xorg-server/xkeyboard-config/keymap/sgi_vndr/de
+++ /dev/null
@@ -1,32 +0,0 @@
-default xkb_keymap "indy" {

-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"			};

-    xkb_types		{ include "default"				};

-    xkb_compatibility	{ include "default"				};

-    xkb_symbols 	{ include "en_US(pc_universal)+de"		};

-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"			};

-};

-xkb_keymap "indy_nodeadkeys" {

-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};

-    xkb_types		{ include "default"			};

-    xkb_compatibility	{ include "default"			};

-    xkb_symbols 	{ 

-	include "en_US(pc_universal_nodeadkeys)+de(nodeadkeys)"

-    };

-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};

-};

-xkb_keymap "indigo" {

-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};

-    xkb_types		{ include "default"			};

-    xkb_compatibility	{ include "default"			};

-    xkb_symbols 	{ include "en_US(pc102)+de"		};

-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};

-};

-xkb_keymap "indigo_nodeadkeys" {

-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};

-    xkb_types		{ include "default"			};

-    xkb_compatibility	{ include "default"			};

-    xkb_symbols {

-	include "en_US(pc102_nodeadkeys)+de(nodeadkeys)"

-    };

-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};

-};

diff --git a/xorg-server/xkeyboard-config/keymap/sgi_vndr/dk b/xorg-server/xkeyboard-config/keymap/sgi_vndr/dk
deleted file mode 100644
index 017443d56..000000000
--- a/xorg-server/xkeyboard-config/keymap/sgi_vndr/dk
+++ /dev/null
@@ -1,32 +0,0 @@
-default xkb_keymap "indy" {

-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"			};

-    xkb_types		{ include "default"				};

-    xkb_compatibility	{ include "default"				};

-    xkb_symbols 	{ include "en_US(pc_universal)+dk"		};

-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"			};

-};

-xkb_keymap "indy_nodeadkeys" {

-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};

-    xkb_types		{ include "default"			};

-    xkb_compatibility	{ include "default"			};

-    xkb_symbols 	{ 

-	include "en_US(pc_universal_nodeadkeys)+dk(nodeadkeys)"

-    };

-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};

-};

-xkb_keymap "indigo" {

-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};

-    xkb_types		{ include "default"			};

-    xkb_compatibility	{ include "default"			};

-    xkb_symbols 	{ include "en_US(pc102)+dk"		};

-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};

-};

-xkb_keymap "indigo_nodeadkeys" {

-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};

-    xkb_types		{ include "default"			};

-    xkb_compatibility	{ include "default"			};

-    xkb_symbols 	{ 

-	include "en_US(pc102_nodeadkeys)+dk(nodeadkeys)"

-    };

-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};

-};

diff --git a/xorg-server/xkeyboard-config/keymap/sgi_vndr/dvorak b/xorg-server/xkeyboard-config/keymap/sgi_vndr/dvorak
deleted file mode 100644
index b84bc5659..000000000
--- a/xorg-server/xkeyboard-config/keymap/sgi_vndr/dvorak
+++ /dev/null
@@ -1,14 +0,0 @@
-default xkb_keymap "indy" {

-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};

-    xkb_types		{ include "default"			};

-    xkb_compatibility	{ include "default"			};

-    xkb_symbols 	{ include "us(pc_universal)+dvorak"	};

-    xkb_geometry	{ include "sgi_vndr/indy(pc101)"		};

-};

-xkb_keymap "indigo" {

-    xkb_keycodes	{ include "sgi_vndr/indigo"		};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols 	{ include "us(pc101)+dvorak"	};

-    xkb_geometry	{ include "sgi_vndr/indigo(pc101)"	};

-};

diff --git a/xorg-server/xkeyboard-config/keymap/sgi_vndr/en_US b/xorg-server/xkeyboard-config/keymap/sgi_vndr/en_US
deleted file mode 100644
index 184d4b896..000000000
--- a/xorg-server/xkeyboard-config/keymap/sgi_vndr/en_US
+++ /dev/null
@@ -1,56 +0,0 @@
-default xkb_keymap "indy" {

-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols 	{ include "en_US(pc_universal)"	};

-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"	};

-};

-xkb_keymap "indy_nodeadkeys" {

-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"			};

-    xkb_types		{ include "default"				};

-    xkb_compatibility	{ include "default"				};

-    xkb_symbols 	{ include "en_US(pc_universal_nodeadkeys)"	};

-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"			};

-};

-xkb_keymap "indy101" {

-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols 	{ include "en_US(pc_universal)"	};

-    xkb_geometry	{ include "sgi_vndr/indy(pc101)"	};

-};

-xkb_keymap "indy101_nodeadkeys" {

-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"			};

-    xkb_types		{ include "default"				};

-    xkb_compatibility	{ include "default"				};

-    xkb_symbols 	{ include "en_US(pc_universal_nodeadkeys)"	};

-    xkb_geometry	{ include "sgi_vndr/indy(pc101)"			};

-};

-xkb_keymap "indy104" {

-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols 	{ include "en_US(pc_universal)"	};

-    xkb_geometry	{ include "microsoft(natural)"	};

-};

-xkb_keymap "indy104_nodeadkeys" {

-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"			};

-    xkb_types		{ include "default"				};

-    xkb_compatibility	{ include "default"				};

-    xkb_symbols 	{ include "en_US(pc_universal_nodeadkeys)"	};

-    xkb_geometry	{ include "microsoft(natural)"			};

-};

-xkb_keymap "indigo" {

-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols 	{ include "en_US(pc102)"	};

-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};

-};

-xkb_keymap "indigo_nodeadkeys" {

-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};

-    xkb_types		{ include "default"			};

-    xkb_compatibility	{ include "default"			};

-    xkb_symbols 	{ include "en_US(pc102_nodeadkeys)"	};

-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};

-};

diff --git a/xorg-server/xkeyboard-config/keymap/sgi_vndr/es b/xorg-server/xkeyboard-config/keymap/sgi_vndr/es
deleted file mode 100644
index 96898c6e3..000000000
--- a/xorg-server/xkeyboard-config/keymap/sgi_vndr/es
+++ /dev/null
@@ -1,32 +0,0 @@
-default xkb_keymap "indy" {

-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};

-    xkb_types		{ include "default"			};

-    xkb_compatibility	{ include "default"			};

-    xkb_symbols 	{ include "en_US(pc_universal)+es"	};

-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};

-};

-xkb_keymap "indy_nodeadkeys" {

-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols 	{

-	include "en_US(pc_universal_nodeadkeys)+es(nodeadkeys)"

-    };

-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"	};

-};

-xkb_keymap "indigo" {

-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols 	{ include "en_US(pc102)+es"	};

-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};

-};

-xkb_keymap "indigo_nodeadkeys" {

-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols 	{

-	include "en_US(pc102_nodeadkeys)+es(nodeadkeys)"

-    };

-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};

-};

diff --git a/xorg-server/xkeyboard-config/keymap/sgi_vndr/fi b/xorg-server/xkeyboard-config/keymap/sgi_vndr/fi
deleted file mode 100644
index ca99af149..000000000
--- a/xorg-server/xkeyboard-config/keymap/sgi_vndr/fi
+++ /dev/null
@@ -1,32 +0,0 @@
-default xkb_keymap "indy" {

-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};

-    xkb_types		{ include "default"			};

-    xkb_compatibility	{ include "default"			};

-    xkb_symbols 	{ include "en_US(pc_universal)+fi"	};

-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};

-};

-xkb_keymap "indy_nodeadkeys" {

-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols 	{

-	include "en_US(pc_universal_nodeadkeys)+fi(nodeadkeys)"

-    };

-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"	};

-};

-xkb_keymap "indigo" {

-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols 	{ include "en_US(pc102)+fi"	};

-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};

-};

-xkb_keymap "indigo_nodeadkeys" {

-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols 	{

-	include "en_US(pc102_nodeadkeys)+fi(nodeadkeys)"

-    };

-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};

-};

diff --git a/xorg-server/xkeyboard-config/keymap/sgi_vndr/fr b/xorg-server/xkeyboard-config/keymap/sgi_vndr/fr
deleted file mode 100644
index fa84b65a7..000000000
--- a/xorg-server/xkeyboard-config/keymap/sgi_vndr/fr
+++ /dev/null
@@ -1,32 +0,0 @@
-default xkb_keymap "indy" {

-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};

-    xkb_types		{ include "default"			};

-    xkb_compatibility	{ include "default"			};

-    xkb_symbols 	{ include "en_US(pc_universal)+fr"	};

-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};

-};

-xkb_keymap "indy_nodeadkeys" {

-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols  { 

-	include "en_US(pc_universal_nodeadkeys)+fr(nodeadkeys)"

-    };

-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"	};

-};

-xkb_keymap "indigo" {

-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols 	{ include "en_US(pc102)+fr"	};

-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};

-};

-xkb_keymap "indigo_nodeadkeys" {

-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols 	{ 

-	include "en_US(pc102_nodeadkeys)+fr(nodeadkeys)"

-    };

-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};

-};

diff --git a/xorg-server/xkeyboard-config/keymap/sgi_vndr/gb b/xorg-server/xkeyboard-config/keymap/sgi_vndr/gb
deleted file mode 100644
index 90f79c194..000000000
--- a/xorg-server/xkeyboard-config/keymap/sgi_vndr/gb
+++ /dev/null
@@ -1,32 +0,0 @@
-default xkb_keymap "indy" {

-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};

-    xkb_types		{ include "default"			};

-    xkb_compatibility	{ include "default"			};

-    xkb_symbols 	{ include "en_US(pc_universal)+gb"	};

-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};

-};

-xkb_keymap "indy_nodeadkeys" {

-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols 	{

-	include "en_US(pc_universal_nodeadkeys)+gb(nodeadkeys)"

-    };

-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"	};

-};

-xkb_keymap "indigo" {

-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols 	{ include "en_US(pc102)+gb"	};

-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};

-};

-xkb_keymap "indigo_nodeadkeys" {

-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols 	{

-	include "en_US(pc102_nodeadkeys)+gb(nodeadkeys)"

-    };

-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};

-};

diff --git a/xorg-server/xkeyboard-config/keymap/sgi_vndr/hu b/xorg-server/xkeyboard-config/keymap/sgi_vndr/hu
deleted file mode 100644
index 653236f2f..000000000
--- a/xorg-server/xkeyboard-config/keymap/sgi_vndr/hu
+++ /dev/null
@@ -1,104 +0,0 @@
-default xkb_keymap "indy" {

-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"			};

-    xkb_types		{ include "default"				};

-    xkb_compatibility	{ include "default"				};

-    xkb_symbols 	{ include "en_US(pc_universal)+hu(basic)"	};

-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"			};

-};

-xkb_keymap "indy_toggle" {

-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};

-    xkb_types		{ include "default"			};

-    xkb_compatibility	{ include "default"			};

-    xkb_symbols { 

-	include "en_US(pc_universal)+hu(basic)+group(toggle)" 

-    };

-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};

-};

-xkb_keymap "indy_shift_toggle" {

-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};

-    xkb_types		{ include "default"			};

-    xkb_compatibility	{ include "default"			};

-    xkb_symbols { 

-	include "en_US(pc_universal)+hu(basic)+group(shifts_toggle)" 

-    };

-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};

-};

-xkb_keymap "indy_ctrl_shift_toggle" {

-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};

-    xkb_types		{ include "default"			};

-    xkb_compatibility	{ include "default"			};

-    xkb_symbols { 

-	include "en_US(pc_universal)+hu(basic)+group(ctrl_shift_toggle)" 

-    };

-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};

-};

-xkb_keymap "indy_ctrl_alt_toggle" {

-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};

-    xkb_types		{ include "default"			};

-    xkb_compatibility	{ include "default"			};

-    xkb_symbols { 

-	include "en_US(pc_universal)+hu(basic)+group(ctrl_alt_toggle)" 

-    };

-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};

-};

-xkb_keymap "indy_caps_toggle" {

-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};

-    xkb_types		{ include "default"			};

-    xkb_compatibility	{ include "default"			};

-    xkb_symbols { 

-	include "en_US(pc_universal)+hu(basic)+group(caps_toggle)" 

-    };

-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};

-};

-xkb_keymap "indigo" {

-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};

-    xkb_types		{ include "default"			};

-    xkb_compatibility	{ include "default"			};

-    xkb_symbols 	{ include "en_US(pc102)+hu(basic)"	};

-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};

-};

-xkb_keymap "indigo_toggle" {

-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};

-    xkb_types		{ include "default"			};

-    xkb_compatibility	{ include "default"			};

-    xkb_symbols { 

-	include "en_US(pc102)+hu(basic)+group(toggle)" 

-    };

-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};

-};

-xkb_keymap "indigo_shift_toggle" {

-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};

-    xkb_types		{ include "default"			};

-    xkb_compatibility	{ include "default"			};

-    xkb_symbols { 

-	include "en_US(pc102)+hu(basic)+group(shifts_toggle)" 

-    };

-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};

-};

-xkb_keymap "indigo_ctrl_shift_toggle" {

-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};

-    xkb_types		{ include "default"			};

-    xkb_compatibility	{ include "default"			};

-    xkb_symbols { 

-	include "en_US(pc102)+hu(basic)+group(ctrl_shift_toggle)" 

-    };

-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};

-};

-xkb_keymap "indigo_ctrl_alt_toggle" {

-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};

-    xkb_types		{ include "default"			};

-    xkb_compatibility	{ include "default"			};

-    xkb_symbols { 

-	include "en_US(pc102)+hu(basic)+group(ctrl_alt_toggle)" 

-    };

-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};

-};

-xkb_keymap "indigo_caps_toggle" {

-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};

-    xkb_types		{ include "default"			};

-    xkb_compatibility	{ include "default"			};

-    xkb_symbols { 

-	include "en_US(pc102)+hu(basic)+group(caps_toggle)" 

-    };

-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};

-};

diff --git a/xorg-server/xkeyboard-config/keymap/sgi_vndr/it b/xorg-server/xkeyboard-config/keymap/sgi_vndr/it
deleted file mode 100644
index 64a413d4d..000000000
--- a/xorg-server/xkeyboard-config/keymap/sgi_vndr/it
+++ /dev/null
@@ -1,32 +0,0 @@
-default xkb_keymap "indy" {

-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};

-    xkb_types		{ include "default"			};

-    xkb_compatibility	{ include "default"			};

-    xkb_symbols 	{ include "en_US(pc_universal)+it"	};

-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};

-};

-xkb_keymap "indy_nodeadkeys" {

-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols 	{

-	include "en_US(pc_universal_nodeadkeys)+it(nodeadkeys)"

-    };

-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"	};

-};

-xkb_keymap "indigo" {

-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols 	{ include "en_US(pc102)+it"	};

-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};

-};

-xkb_keymap "indigo_nodeadkeys" {

-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols 	{

-	include "en_US(pc102_nodeadkeys)+it(nodeadkeys)"

-    };

-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};

-};

diff --git a/xorg-server/xkeyboard-config/keymap/sgi_vndr/jp b/xorg-server/xkeyboard-config/keymap/sgi_vndr/jp
deleted file mode 100644
index 96280c105..000000000
--- a/xorg-server/xkeyboard-config/keymap/sgi_vndr/jp
+++ /dev/null
@@ -1,7 +0,0 @@
-default xkb_keymap "indy" {

-    xkb_keycodes	{ include "sgi_vndr/indy(jp106)"			};

-    xkb_types		{ include "default"				};

-    xkb_compatibility	{ include "default"				};

-    xkb_symbols 	{ include "us(pc101)+sgi_vndr/jp"			};

-    xkb_geometry	{ include "sgi_vndr/indy(jp106)"			};

-};

diff --git a/xorg-server/xkeyboard-config/keymap/sgi_vndr/no b/xorg-server/xkeyboard-config/keymap/sgi_vndr/no
deleted file mode 100644
index 8fc326abe..000000000
--- a/xorg-server/xkeyboard-config/keymap/sgi_vndr/no
+++ /dev/null
@@ -1,32 +0,0 @@
-default xkb_keymap "indy" {

-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};

-    xkb_types		{ include "default"			};

-    xkb_compatibility	{ include "default"			};

-    xkb_symbols 	{ include "en_US(pc_universal)+no"	};

-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};

-};

-xkb_keymap "indy_nodeadkeys" {

-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols 	{

-	include "en_US(pc_universal_nodeadkeys)+no(nodeadkeys)"

-    };

-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"	};

-};

-xkb_keymap "indigo" {

-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols 	{ include "en_US(pc102)+no"	};

-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};

-};

-xkb_keymap "indigo_nodeadkeys" {

-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols 	{

-	include "en_US(pc102_nodeadkeys)+no(nodeadkeys)"

-    };

-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};

-};

diff --git a/xorg-server/xkeyboard-config/keymap/sgi_vndr/pl b/xorg-server/xkeyboard-config/keymap/sgi_vndr/pl
deleted file mode 100644
index 623e06f8f..000000000
--- a/xorg-server/xkeyboard-config/keymap/sgi_vndr/pl
+++ /dev/null
@@ -1,28 +0,0 @@
-default xkb_keymap "indy" {

-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols 	{ include "us(pc_universal)+pl"	};

-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"	};

-};

-xkb_keymap "indy_nodeadkeys" {

-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"			};

-    xkb_types		{ include "default"				};

-    xkb_compatibility	{ include "default"				};

-    xkb_symbols 	{ include "us(pc_universal)+pl(nodeadkeys)" 	};

-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"			};

-};

-xkb_keymap "indigo" {

-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols 	{ include "us(pc102)+pl"	};

-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};

-};

-xkb_keymap "indigo_nodeadkeys" {

-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols 	{ include "us(pc102)+pl(nodeadkeys)" };

-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};

-};

diff --git a/xorg-server/xkeyboard-config/keymap/sgi_vndr/pt b/xorg-server/xkeyboard-config/keymap/sgi_vndr/pt
deleted file mode 100644
index 6be76ddb9..000000000
--- a/xorg-server/xkeyboard-config/keymap/sgi_vndr/pt
+++ /dev/null
@@ -1,32 +0,0 @@
-default xkb_keymap "indy" {

-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};

-    xkb_types		{ include "default"			};

-    xkb_compatibility	{ include "default"			};

-    xkb_symbols 	{ include "en_US(pc_universal)+pt"	};

-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};

-};

-xkb_keymap "indy_nodeadkeys" {

-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols 	{

-	include "en_US(pc_universal_nodeadkeys)+pt(nodeadkeys)"

-    };

-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"	};

-};

-xkb_keymap "indigo" {

-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols 	{ include "en_US(pc102)+pt"	};

-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};

-};

-xkb_keymap "indigo_nodeadkeys" {

-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols 	{

-	include "en_US(pc102_nodeadkeys)+pt(nodeadkeys)"

-    };

-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};

-};

diff --git a/xorg-server/xkeyboard-config/keymap/sgi_vndr/ru b/xorg-server/xkeyboard-config/keymap/sgi_vndr/ru
deleted file mode 100644
index 45ebdf76f..000000000
--- a/xorg-server/xkeyboard-config/keymap/sgi_vndr/ru
+++ /dev/null
@@ -1,104 +0,0 @@
-default xkb_keymap "indy" {

-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"			};

-    xkb_types		{ include "default"				};

-    xkb_compatibility	{ include "default"				};

-    xkb_symbols 	{ include "en_US(pc_universal)+ru(basic)"	};

-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"			};

-};

-xkb_keymap "indy_toggle" {

-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};

-    xkb_types		{ include "default"			};

-    xkb_compatibility	{ include "default"			};

-    xkb_symbols { 

-	include "en_US(pc_universal)+ru(basic)+group(toggle)" 

-    };

-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};

-};

-xkb_keymap "indy_shift_toggle" {

-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};

-    xkb_types		{ include "default"			};

-    xkb_compatibility	{ include "default"			};

-    xkb_symbols { 

-	include "en_US(pc_universal)+ru(basic)+group(shifts_toggle)" 

-    };

-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};

-};

-xkb_keymap "indy_ctrl_shift_toggle" {

-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};

-    xkb_types		{ include "default"			};

-    xkb_compatibility	{ include "default"			};

-    xkb_symbols { 

-	include "en_US(pc_universal)+ru(basic)+group(ctrl_shift_toggle)" 

-    };

-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};

-};

-xkb_keymap "indy_ctrl_alt_toggle" {

-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};

-    xkb_types		{ include "default"			};

-    xkb_compatibility	{ include "default"			};

-    xkb_symbols { 

-	include "en_US(pc_universal)+ru(basic)+group(ctrl_alt_toggle)" 

-    };

-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};

-};

-xkb_keymap "indy_caps_toggle" {

-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};

-    xkb_types		{ include "default"			};

-    xkb_compatibility	{ include "default"			};

-    xkb_symbols { 

-	include "en_US(pc_universal)+ru(basic)+group(caps_toggle)" 

-    };

-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};

-};

-xkb_keymap "indigo" {

-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};

-    xkb_types		{ include "default"			};

-    xkb_compatibility	{ include "default"			};

-    xkb_symbols 	{ include "en_US(pc102)+ru(basic)"	};

-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};

-};

-xkb_keymap "indigo_toggle" {

-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};

-    xkb_types		{ include "default"			};

-    xkb_compatibility	{ include "default"			};

-    xkb_symbols { 

-	include "en_US(pc102)+ru(basic)+group(toggle)" 

-    };

-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};

-};

-xkb_keymap "indigo_shift_toggle" {

-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};

-    xkb_types		{ include "default"			};

-    xkb_compatibility	{ include "default"			};

-    xkb_symbols { 

-	include "en_US(pc102)+ru(basic)+group(shifts_toggle)" 

-    };

-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};

-};

-xkb_keymap "indigo_ctrl_shift_toggle" {

-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};

-    xkb_types		{ include "default"			};

-    xkb_compatibility	{ include "default"			};

-    xkb_symbols { 

-	include "en_US(pc102)+ru(basic)+group(ctrl_shift_toggle)" 

-    };

-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};

-};

-xkb_keymap "indigo_ctrl_alt_toggle" {

-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};

-    xkb_types		{ include "default"			};

-    xkb_compatibility	{ include "default"			};

-    xkb_symbols { 

-	include "en_US(pc102)+ru(basic)+group(ctrl_alt_toggle)" 

-    };

-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};

-};

-xkb_keymap "indigo_caps_toggle" {

-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};

-    xkb_types		{ include "default"			};

-    xkb_compatibility	{ include "default"			};

-    xkb_symbols { 

-	include "en_US(pc102)+ru(basic)+group(caps_toggle)" 

-    };

-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};

-};

diff --git a/xorg-server/xkeyboard-config/keymap/sgi_vndr/se b/xorg-server/xkeyboard-config/keymap/sgi_vndr/se
deleted file mode 100644
index 7ac2fbc6b..000000000
--- a/xorg-server/xkeyboard-config/keymap/sgi_vndr/se
+++ /dev/null
@@ -1,32 +0,0 @@
-default xkb_keymap "indy" {

-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};

-    xkb_types		{ include "default"			};

-    xkb_compatibility	{ include "default"			};

-    xkb_symbols 	{ include "en_US(pc_universal)+se"	};

-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};

-};

-xkb_keymap "indy_nodeadkeys" {

-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols 	{

-	include "en_US(pc_universal_nodeadkeys)+se(nodeadkeys)"

-    };

-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"	};

-};

-xkb_keymap "indigo" {

-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols 	{ include "en_US(pc102)+se"	};

-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};

-};

-xkb_keymap "indigo_nodeadkeys" {

-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols 	{ 

-	include "en_US(pc102_nodeadkeys)+se(nodeadkeys)"

-    };

-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};

-};

diff --git a/xorg-server/xkeyboard-config/keymap/sgi_vndr/sk b/xorg-server/xkeyboard-config/keymap/sgi_vndr/sk
deleted file mode 100644
index 53c5ebd84..000000000
--- a/xorg-server/xkeyboard-config/keymap/sgi_vndr/sk
+++ /dev/null
@@ -1,29 +0,0 @@
-default xkb_keymap "indy" {

-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};

-    xkb_types		{ include "default"			};

-    xkb_compatibility	{ include "default"			};

-    xkb_symbols 	{ include "us(pc_universal)+sk"		};

-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};

-};

-xkb_keymap "indigo" {

-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};

-    xkb_types		{ include "default"			};

-    xkb_compatibility	{ include "default"			};

-    xkb_symbols 	{ include "us(pc102)+sk"		};

-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};

-};

-

-default xkb_keymap "indy_qwerty" {

-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};

-    xkb_types		{ include "default"			};

-    xkb_compatibility	{ include "default"			};

-    xkb_symbols 	{ include "us(pc_universal)+sk(qwerty)"	};

-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};

-};

-xkb_keymap "indigo_qwerty" {

-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};

-    xkb_types		{ include "default"			};

-    xkb_compatibility	{ include "default"			};

-    xkb_symbols 	{ include "us(pc102)+sk(qwerty)"		};

-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};

-};

diff --git a/xorg-server/xkeyboard-config/keymap/sgi_vndr/th b/xorg-server/xkeyboard-config/keymap/sgi_vndr/th
deleted file mode 100644
index a1fb26601..000000000
--- a/xorg-server/xkeyboard-config/keymap/sgi_vndr/th
+++ /dev/null
@@ -1,16 +0,0 @@
-default xkb_keymap "indy" {

-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols 	{

-	include "en_US(pc_universal)+th+group(shifts_toggle)"

-    };

-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"	};

-};

-xkb_keymap "indigo" {

-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols 	{ include "en_US(pc102)+th+group(shifts_toggle)"	};

-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};

-};

diff --git a/xorg-server/xkeyboard-config/keymap/sgi_vndr/us b/xorg-server/xkeyboard-config/keymap/sgi_vndr/us
deleted file mode 100644
index 156e3684d..000000000
--- a/xorg-server/xkeyboard-config/keymap/sgi_vndr/us
+++ /dev/null
@@ -1,42 +0,0 @@
-default xkb_keymap "indy" {

-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};

-    xkb_types		{ include "default"			};

-    xkb_compatibility	{ include "default"			};

-    xkb_symbols 	{ include "us(pc_universal)"		};

-    xkb_geometry	{ include "sgi_vndr/indy(pc101)"		};

-};

-xkb_keymap "indy101_euro" {

-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols 	{ include "us(pc_universal)"	};

-    xkb_geometry	{ include "sgi_vndr/indy(pc101)"	};

-};

-xkb_keymap "indy_compose" {

-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols 	{ include "us(pc_universal)"	};

-    xkb_geometry	{ include "sgi_vndr/indy(pc101)"	};

-};

-xkb_keymap "indigo" {

-    xkb_keycodes	{ include "sgi_vndr/indigo(pc101)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols 	{ include "us(pc101)"		};

-    xkb_geometry	{ include "sgi_vndr/indigo(pc101)"	};

-};

-xkb_keymap "indigo_compose" {

-    xkb_keycodes	{ include "sgi_vndr/indigo(pc101)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols 	{ include "us(pc101compose)"	};

-    xkb_geometry	{ include "sgi_vndr/indigo(pc101)"	};

-};

-xkb_keymap "indigo101_compose" {

-    xkb_keycodes	{ include "sgi_vndr/indigo(pc101)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols 	{ include "us(pc101euro)"	};

-    xkb_geometry	{ include "sgi_vndr/indigo(pc101)"	};

-};