Switch to xkeyboard-config is done. Remove old xkbdata and unifdef it.

ok shadchin@

13 files changed, 0 insertions, 785 deletions

diff --git a/data/xkbdata/types/Makefile.am b/data/xkbdata/types/Makefile.am
deleted file mode 100644
index 3de54aecf..000000000
--- a/data/xkbdata/types/Makefile.am
+++ /dev/null
@@ -1,18 +0,0 @@
-xkbdata_typesdir = $(datadir)/X11/xkb/types
-dist_xkbdata_types_DATA = \
-	basic \
-	cancel \
-	caps \
-	complete \
-	default \
-	extra \
-	iso9995 \
-	mousekeys \
-	numpad \
-	pc \
-	README 
-
-xkbdatadir = $(datadir)/X11/xkb
-xkbdata_DATA = types.dir
-
-include $(top_srcdir)/xkbrules.am
diff --git a/data/xkbdata/types/Makefile.in b/data/xkbdata/types/Makefile.in
deleted file mode 100644
index a00bb5666..000000000
--- a/data/xkbdata/types/Makefile.in
+++ /dev/null
@@ -1,337 +0,0 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-# Common rules for building *.dir files in all xkb subdirectories
-# Replaces Imake's MakeXkbDir() rule
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-DIST_COMMON = README $(dist_xkbdata_types_DATA) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in $(top_srcdir)/xkbrules.am
-subdir = types
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-SOURCES =
-DIST_SOURCES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-am__installdirs = "$(DESTDIR)$(xkbdata_typesdir)" \
-	"$(DESTDIR)$(xkbdatadir)"
-dist_xkbdata_typesDATA_INSTALL = $(INSTALL_DATA)
-xkbdataDATA_INSTALL = $(INSTALL_DATA)
-DATA = $(dist_xkbdata_types_DATA) $(xkbdata_DATA)
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-AMTAR = @AMTAR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
-MAKEINFO = @MAKEINFO@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-VERSION = @VERSION@
-XKBCOMP = @XKBCOMP@
-ac_ct_STRIP = @ac_ct_STRIP@
-am__leading_dot = @am__leading_dot@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build_alias = @build_alias@
-datadir = @datadir@
-exec_prefix = @exec_prefix@
-host_alias = @host_alias@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-xkbdata_typesdir = $(datadir)/X11/xkb/types
-dist_xkbdata_types_DATA = \
-	basic \
-	cancel \
-	caps \
-	complete \
-	default \
-	extra \
-	iso9995 \
-	mousekeys \
-	numpad \
-	pc \
-	README 
-
-xkbdatadir = $(datadir)/X11/xkb
-xkbdata_DATA = types.dir
-MOSTLYCLEANFILES = $(subdir).dir
-all: all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/xkbrules.am $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  types/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  types/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-uninstall-info-am:
-install-dist_xkbdata_typesDATA: $(dist_xkbdata_types_DATA)
-	@$(NORMAL_INSTALL)
-	test -z "$(xkbdata_typesdir)" || $(mkdir_p) "$(DESTDIR)$(xkbdata_typesdir)"
-	@list='$(dist_xkbdata_types_DATA)'; for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(dist_xkbdata_typesDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(xkbdata_typesdir)/$$f'"; \
-	  $(dist_xkbdata_typesDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(xkbdata_typesdir)/$$f"; \
-	done
-
-uninstall-dist_xkbdata_typesDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(dist_xkbdata_types_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(xkbdata_typesdir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(xkbdata_typesdir)/$$f"; \
-	done
-install-xkbdataDATA: $(xkbdata_DATA)
-	@$(NORMAL_INSTALL)
-	test -z "$(xkbdatadir)" || $(mkdir_p) "$(DESTDIR)$(xkbdatadir)"
-	@list='$(xkbdata_DATA)'; for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(xkbdataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(xkbdatadir)/$$f'"; \
-	  $(xkbdataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(xkbdatadir)/$$f"; \
-	done
-
-uninstall-xkbdataDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(xkbdata_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(xkbdatadir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(xkbdatadir)/$$f"; \
-	done
-tags: TAGS
-TAGS:
-
-ctags: CTAGS
-CTAGS:
-
-
-distdir: $(DISTFILES)
-	$(mkdir_p) $(distdir)/..
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
-	  if test -d $$d/$$file; then \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(DATA)
-installdirs:
-	for dir in "$(DESTDIR)$(xkbdata_typesdir)" "$(DESTDIR)$(xkbdatadir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
-	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-	-test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic mostlyclean-am
-
-distclean: distclean-am
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-info: info-am
-
-info-am:
-
-install-data-am: install-dist_xkbdata_typesDATA install-xkbdataDATA
-
-install-exec-am:
-
-install-info: install-info-am
-
-install-man:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-dist_xkbdata_typesDATA uninstall-info-am \
-	uninstall-xkbdataDATA
-
-.PHONY: all all-am check check-am clean clean-generic distclean \
-	distclean-generic distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am \
-	install-dist_xkbdata_typesDATA install-exec install-exec-am \
-	install-info install-info-am install-man install-strip \
-	install-xkbdataDATA installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am \
-	uninstall-dist_xkbdata_typesDATA uninstall-info-am \
-	uninstall-xkbdataDATA
-
-
-$(subdir).dir:
-	-rm -f $@
-	$(XKBCOMP) -lfhlpR -o $@ '*'
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/data/xkbdata/types/README b/data/xkbdata/types/README
deleted file mode 100644
index 039d8f424..000000000
--- a/data/xkbdata/types/README
+++ /dev/null
@@ -1,8 +0,0 @@
-The types component of a keyboard mapping specifies the key types that can be
-associated with the various keyboard keys. The types component can also
-optionally contain real modifiers binding and symbolic names for one
-or more virtual modifiers.
-
-
-
-/* $XFree86$ */
diff --git a/data/xkbdata/types/basic b/data/xkbdata/types/basic
deleted file mode 100644
index 735fe03db..000000000
--- a/data/xkbdata/types/basic
+++ /dev/null
@@ -1,40 +0,0 @@
-// $Xorg: basic,v 1.3 2000/08/17 19:54:48 cpqbld Exp $
-// $XFree86$
-default xkb_types "basic" {
-
-    // Fairly standard definitions for
-    // the four required key types
-
-    virtual_modifiers NumLock;
-
-    type "ONE_LEVEL" {
-	modifiers = None;
-	map[None] = Level1;
-	level_name[Level1]= "Any";
-    };
-
-    type "TWO_LEVEL" {
-	modifiers = Shift;
-	map[Shift] = Level2;
-	level_name[Level1] = "Base";
-	level_name[Level2] = "Shift";
-    };
-
-    type "ALPHABETIC" {
-        modifiers = Shift+Lock;
-        map[Shift] = Level2;
-        map[Lock] = Level2;
-        level_name[Level1] = "Base";
-        level_name[Level2] = "Caps";
-    };
-
-    type "KEYPAD" {
-	modifiers = Shift+NumLock;
-	map[None] = Level1;
-	map[Shift] = Level2;
-	map[NumLock] = Level2;
-	map[Shift+NumLock] = Level1;
-	level_name[Level1] = "Base";
-	level_name[Level2] = "Number";
-    };
-};
diff --git a/data/xkbdata/types/cancel b/data/xkbdata/types/cancel
deleted file mode 100644
index 478c99c4b..000000000
--- a/data/xkbdata/types/cancel
+++ /dev/null
@@ -1,12 +0,0 @@
-// $Xorg: cancel,v 1.3 2000/08/17 19:54:48 cpqbld Exp $
-partial default xkb_types "Shift_Cancels_Caps" {
-
-override type "TWO_LEVEL" {
-    modifiers = Shift+Lock;
-    map[Shift] = Level2;
-    preserve[Lock]= Lock;
-    level_name[Level1] = "Base";
-    level_name[Level2] = "Shift";
-};
-
-};
diff --git a/data/xkbdata/types/caps b/data/xkbdata/types/caps
deleted file mode 100644
index efcae864b..000000000
--- a/data/xkbdata/types/caps
+++ /dev/null
@@ -1,170 +0,0 @@
-// $XFree86: xc/programs/xkbcomp/types/caps,v 1.3 2002/11/26 02:14:02 dawes Exp $
-
-// CapsLock uses internal capitalization rules
-// Shift cancels CapsLock
-partial xkb_types "internal" {
-    type "ALPHABETIC" {
-	modifiers = Shift+Lock;
-	map[Shift] = Level2;
-	preserve[Lock] = Lock;
-	level_name[Level1] = "Base";
-	level_name[Level2] = "Caps";
-    };
-
-    type "FOUR_LEVEL_ALPHABETIC" {
-	modifiers = Shift+Lock+LevelThree;
-	map[None] = Level1;
-	map[Shift] = Level2;
-	preserve[Lock] = Lock;
-	map[LevelThree] = Level3;
-	map[Shift+LevelThree] = Level4;
-	map[Lock+LevelThree] =  Level3;
-        map[Lock+Shift+LevelThree] = Level3;
-	preserve[Lock+LevelThree] = Lock;
-	level_name[Level1] = "Base";
-	level_name[Level2] = "Shift";
-	level_name[Level3] = "Alt Base";
-	level_name[Level4] = "Shift Alt";
-    };
-
-    type "FOUR_LEVEL_SEMIALPHABETIC" {
-	modifiers = Shift+Lock+LevelThree;
-	map[None] = Level1;
-	map[Shift] = Level2;
-	preserve[Lock] = Lock;
-	map[LevelThree] = Level3;
-	map[Shift+LevelThree] = Level4;
-	map[Lock+LevelThree] =  Level3;
-        map[Lock+Shift+LevelThree] = Level4;
-	preserve[Lock+LevelThree] = Lock;
-	preserve[Lock+Shift+LevelThree] = Lock;
-	level_name[Level1] = "Base";
-	level_name[Level2] = "Shift";
-	level_name[Level3] = "Alt Base";
-	level_name[Level4] = "Shift Alt";
-    };
-};
-// CapsLock uses internal capitalization rules
-// Shift doesn't cancel CapsLock
-partial xkb_types "internal_nocancel" {
-    type "ALPHABETIC" {
-	modifiers = Shift;
-	map[Shift] = Level2;
-	level_name[Level1] = "Base";
-	level_name[Level2] = "Caps";
-    };
-
-    type "FOUR_LEVEL_ALPHABETIC" {
-	modifiers = Shift+LevelThree;
-	map[None] = Level1;
-	map[Shift] = Level2;
-	map[LevelThree] = Level3;
-	map[Shift+LevelThree] = Level4;
-	level_name[Level1] = "Base";
-	level_name[Level2] = "Shift";
-	level_name[Level3] = "Alt Base";
-	level_name[Level4] = "Shift Alt";
-    };
-
-    type "FOUR_LEVEL_SEMIALPHABETIC" {
-        // the same as FOUR_LEVEL_ALPHABETIC
-	modifiers = Shift+LevelThree;
-	map[None] = Level1;
-	map[Shift] = Level2;
-	map[LevelThree] = Level3;
-	map[Shift+LevelThree] = Level4;
-	level_name[Level1] = "Base";
-	level_name[Level2] = "Shift";
-	level_name[Level3] = "Alt Base";
-	level_name[Level4] = "Shift Alt";
-    };
-};
-// CapsLock acts as Shift with locking
-// Shift cancels CapsLock
-partial xkb_types "shift" {
-    type "ALPHABETIC" {
-	modifiers = Shift+Lock;
-	map[Shift] = Level2;
-	map[Lock] = Level2;
-	level_name[Level1] = "Base";
-	level_name[Level2] = "Caps";
-    };
-
-    type "FOUR_LEVEL_ALPHABETIC" {
-	modifiers = Shift+Lock+LevelThree;
-	map[None] = Level1;
-	map[Shift] = Level2;
-	map[Lock]  = Level2;
-	map[LevelThree] = Level3;
-	map[Shift+LevelThree] = Level4;
-	map[Lock+LevelThree] =  Level4;
-	map[Shift+Lock+LevelThree] =  Level3;
-	level_name[Level1] = "Base";
-	level_name[Level2] = "Shift";
-	level_name[Level3] = "Alt Base";
-	level_name[Level4] = "Shift Alt";
-    };
-
-    type "FOUR_LEVEL_SEMIALPHABETIC" {
-	modifiers = Shift+Lock+LevelThree;
-	map[None] = Level1;
-	map[Shift] = Level2;
-	map[Lock]  = Level2;
-	map[LevelThree] = Level3;
-	map[Shift+LevelThree] = Level4;
-	map[Lock+LevelThree] =  Level3;
-        map[Lock+Shift+LevelThree] = Level4;
-	preserve[Lock+LevelThree] = Lock;
-	preserve[Lock+Shift+LevelThree] = Lock;
-	level_name[Level1] = "Base";
-	level_name[Level2] = "Shift";
-	level_name[Level3] = "Alt Base";
-	level_name[Level4] = "Shift Alt";
-    };
-};
-// CapsLock acts as Shift with locking
-// Shift doesn't cancel CapsLock
-partial xkb_types "shift_nocancel" {
-    type "ALPHABETIC" {
-	modifiers = Shift+Lock;
-	map[Shift] = Level2;
-	map[Lock] = Level2;
-	map[Shift+Lock] = Level2;
-	level_name[Level1] = "Base";
-	level_name[Level2] = "Caps";
-    };
-
-    type "FOUR_LEVEL_ALPHABETIC" {
-	modifiers = Shift+Lock+LevelThree;
-	map[None] =  Level1;
-	map[Shift] = Level2;
-	map[Lock] =  Level2;
-	map[Shift+Lock] = Level2;
-	map[LevelThree] = Level3;
-	map[Shift+LevelThree] = Level4;
-	map[Lock+LevelThree] =  Level4;
-	map[Shift+Lock+LevelThree] = Level4;
-	level_name[Level1] = "Base";
-	level_name[Level2] = "Shift";
-	level_name[Level3] = "Alt Base";
-	level_name[Level4] = "Shift Alt";
-    };
-
-    type "FOUR_LEVEL_SEMIALPHABETIC" {
-	modifiers = Shift+Lock+LevelThree;
-	map[None] =  Level1;
-	map[Shift] = Level2;
-	map[Lock] =  Level2;
-	map[Shift+Lock] = Level2;
-	map[LevelThree] = Level3;
-	map[Shift+LevelThree] = Level4;
-	map[Lock+LevelThree] =  Level3;
-        map[Lock+Shift+LevelThree] = Level4;
-	preserve[Lock+LevelThree] = Lock;
-	preserve[Lock+Shift+LevelThree] = Lock;
-	level_name[Level1] = "Base";
-	level_name[Level2] = "Shift";
-	level_name[Level3] = "Alt Base";
-	level_name[Level4] = "Shift Alt";
-    };
-};
diff --git a/data/xkbdata/types/complete b/data/xkbdata/types/complete
deleted file mode 100644
index ecf6ec132..000000000
--- a/data/xkbdata/types/complete
+++ /dev/null
@@ -1,14 +0,0 @@
-// $Xorg: complete,v 1.3 2000/08/17 19:54:48 cpqbld Exp $
-//
-//
-//
-//
-// $XFree86: xc/programs/xkbcomp/types/complete,v 1.2 2001/05/18 23:35:35 dawes Exp $
-
-default xkb_types "complete" {
-    include "basic"
-    include "mousekeys"
-    include "pc"
-    include "iso9995"
-    include "extra"
-};
diff --git a/data/xkbdata/types/default b/data/xkbdata/types/default
deleted file mode 100644
index 5d6ba744e..000000000
--- a/data/xkbdata/types/default
+++ /dev/null
@@ -1,14 +0,0 @@
-// $Xorg: default,v 1.3 2000/08/17 19:54:48 cpqbld Exp $
-//
-//
-//
-//
-// $XFree86$
-
-default xkb_types "default" {
-    include "basic"
-    include "pc"
-    include "iso9995"
-    include "extra"
-    include "mousekeys"
-};
diff --git a/data/xkbdata/types/extra b/data/xkbdata/types/extra
deleted file mode 100644
index 6f2d850a4..000000000
--- a/data/xkbdata/types/extra
+++ /dev/null
@@ -1,93 +0,0 @@
-// $XFree86: xc/programs/xkbcomp/types/extra,v 1.3 2002/11/26 02:14:02 dawes Exp $
-
-partial default xkb_types "default" {
-    // Definition for a key type used for the czech keymap, for instance.
-    // Defines style a with four level shift. It is similar to three_level
-    // type used for iso9995 but it lets the shift key behave "normally".
-
-    virtual_modifiers LevelThree;
-
-    type "FOUR_LEVEL" {
-        modifiers = Shift+LevelThree;
-	map[None] = Level1;
-	map[Shift] = Level2;
-	map[LevelThree] = Level3;
-	map[Shift+LevelThree] = Level4;
-	level_name[Level1] = "Base";
-	level_name[Level2] = "Shift";
-	level_name[Level3] = "Alt Base";  
-	level_name[Level4] = "Shift Alt";  
-    };
-
-    type "FOUR_LEVEL_ALPHABETIC" {
-	modifiers = Shift+Lock+LevelThree;
-	map[None] = Level1;
-	map[Shift] = Level2;
-	map[Lock]  = Level2;
-	map[LevelThree] = Level3;
-	map[Shift+LevelThree] = Level4;
-	map[Lock+LevelThree] =  Level4;
-	map[Shift+Lock+LevelThree] =  Level3;
-	level_name[Level1] = "Base";
-	level_name[Level2] = "Shift";
-	level_name[Level3] = "Alt Base";
-	level_name[Level4] = "Shift Alt";
-    };
-
-    type "FOUR_LEVEL_SEMIALPHABETIC" {
-	modifiers = Shift+Lock+LevelThree;
-	map[None] = Level1;
-	map[Shift] = Level2;
-	map[Lock]  = Level2;
-	map[LevelThree] = Level3;
-	map[Shift+LevelThree] = Level4;
-	map[Lock+LevelThree] =  Level3;
-        map[Lock+Shift+LevelThree] = Level4;
-	preserve[Lock+LevelThree] = Lock;
-	preserve[Lock+Shift+LevelThree] = Lock;
-	level_name[Level1] = "Base";
-	level_name[Level2] = "Shift";
-	level_name[Level3] = "Alt Base";
-	level_name[Level4] = "Shift Alt";
-    };
-
-    // This enables the four level shifting also for the keypad.
-    type "FOUR_LEVEL_KEYPAD" {
-	modifiers = Shift+NumLock+LevelThree;
-	map[None] = Level1;
-	map[Shift] = Level2;
-	map[NumLock] = Level2;
-	map[Shift+NumLock] = Level1;
-	map[LevelThree] = Level3;
-	map[Shift+LevelThree] = Level4;
-	map[NumLock+LevelThree] = Level4;
-	map[Shift+NumLock+LevelThree] = Level3;
-	level_name[Level1] = "Base";
-	level_name[Level2] = "Number";
-	level_name[Level3] = "Alt Base";
-	level_name[Level4] = "Alt Number";
-    };       
-
-// Special type for keys used in Serbian Latin Unicode map
-// It makes it possible to use all three forms of latin letters 
-// present in Unicode that are made up of two separate letters 
-// (forms like LJ, Lj, and lj; NJ, Nj, and nj; etc)
-
-    type "SEPARATE_CAPS_AND_SHIFT_ALPHABETIC" {
-        modifiers = Shift+Lock+LevelThree;
-        map[None] = Level1;
-        map[Shift] = Level2;
-        map[Lock] = Level4;
-        map[LevelThree] = Level3;
-        map[Shift+LevelThree] = Level4;
-        map[Lock+LevelThree] =  Level3;
-        map[Lock+Shift+LevelThree] = Level3;
-        preserve[Lock]= Lock;
-        preserve[Lock+LevelThree]= Lock;
-        level_name[Level1] = "Base";
-        level_name[Level2] = "Shift";
-        level_name[Level3] = "AltGr Base";
-        level_name[Level4] = "Shift AltGr";
-    };
-};
-
diff --git a/data/xkbdata/types/iso9995 b/data/xkbdata/types/iso9995
deleted file mode 100644
index 80f3ee5cf..000000000
--- a/data/xkbdata/types/iso9995
+++ /dev/null
@@ -1,20 +0,0 @@
-// $Xorg: iso9995,v 1.3 2000/08/17 19:54:48 cpqbld Exp $
-partial default xkb_types "default" {
-
-    // Definition for a key type which 
-    // can be used to implement ISO9995
-    // style level three shift
-    virtual_modifiers LevelThree;
-
-    type "THREE_LEVEL" {
-	modifiers = Shift+LevelThree;
-	map[None] = Level1;
-	map[Shift] = Level2;
-	map[LevelThree] = Level3;
-	map[Shift+LevelThree] = Level3;
-	level_name[Level1] = "Base";
-	level_name[Level2] = "Shift";
-	level_name[Level3] = "Level3";
-    };
-};
-
diff --git a/data/xkbdata/types/mousekeys b/data/xkbdata/types/mousekeys
deleted file mode 100644
index 85440ca7f..000000000
--- a/data/xkbdata/types/mousekeys
+++ /dev/null
@@ -1,13 +0,0 @@
-// $Xorg: mousekeys,v 1.3 2000/08/17 19:54:48 cpqbld Exp $
-// 
-partial default xkb_types "default" {
-    virtual_modifiers Alt;
-
-    type "SHIFT+ALT" {
-   	modifiers = Shift+Alt;
-    	map[Shift+Alt] = Level2;
-    	level_name[Level1] = "Base";
-	level_name[Level2] = "Shift+Alt";
-    };
-};
-
diff --git a/data/xkbdata/types/numpad b/data/xkbdata/types/numpad
deleted file mode 100644
index 46b6822c0..000000000
--- a/data/xkbdata/types/numpad
+++ /dev/null
@@ -1,13 +0,0 @@
-// $XFree86$
-
-xkb_types "microsoft" {
-
-    type "KEYPAD" {
-        modifiers = Shift+NumLock;
-        map[None] = Level1;
-        preserve[Shift] = Shift;
-        map[NumLock] = Level2;
-        level_name[Level1] = "Base";
-        level_name[Level2] = "Number";
-    };
-};
diff --git a/data/xkbdata/types/pc b/data/xkbdata/types/pc
deleted file mode 100644
index 5671f426b..000000000
--- a/data/xkbdata/types/pc
+++ /dev/null
@@ -1,33 +0,0 @@
-// $Xorg: pc,v 1.3 2000/08/17 19:54:48 cpqbld Exp $
-// 
-
-partial default xkb_types "default" {
-
-    // Some types that are necessary
-    // for a full implementation of
-    // a PC compatible keyboard.
-    virtual_modifiers Alt;
-
-    type "PC_BREAK" {
-	modifiers = Control;
-	map[None] = Level1;
-	map[Control] = Level2;
-	level_name[Level1] = "Base";
-	level_name[Level2] = "Control";
-    };
-
-    type "PC_SYSRQ" {
-	modifiers = Alt;
-	map[None] = Level1;
-	map[Alt] = Level2;
-	level_name[Level1] = "Base";
-	level_name[Level2] = "Alt";
-    };
-
-    type "CTRL+ALT" {
-	modifiers = Control+Alt;
-	map[Control+Alt] = Level2;
-	level_name[Level1] = "Base";
-	level_name[Level2] = "Ctrl+Alt";
-    };
-};