From 74e21f951a8a1c11445cab7accce2ace6c1acef5 Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Sun, 31 Jan 2010 12:30:46 +0000
Subject: Updated to xkeyboard-config-1.8

---
 xorg-server/xkbdata.src/symbols/macintosh_vndr/Makefile.am | 2 +-
 xorg-server/xkbdata.src/symbols/macintosh_vndr/Makefile.in | 7 ++++---
 xorg-server/xkbdata.src/symbols/macintosh_vndr/es          | 6 ------
 3 files changed, 5 insertions(+), 10 deletions(-)
 delete mode 100644 xorg-server/xkbdata.src/symbols/macintosh_vndr/es

(limited to 'xorg-server/xkbdata.src/symbols/macintosh_vndr')

diff --git a/xorg-server/xkbdata.src/symbols/macintosh_vndr/Makefile.am b/xorg-server/xkbdata.src/symbols/macintosh_vndr/Makefile.am
index d409eff93..8a4ca9fc4 100644
--- a/xorg-server/xkbdata.src/symbols/macintosh_vndr/Makefile.am
+++ b/xorg-server/xkbdata.src/symbols/macintosh_vndr/Makefile.am
@@ -2,7 +2,7 @@ symbolsdir = $(xkb_base)/symbols/macintosh_vndr
 
 dist_symbols_DATA = \
 apple ch de dk \
-es fi fr \
+fi fr \
 gb is it \
 latam nl no pt \
 se us
diff --git a/xorg-server/xkbdata.src/symbols/macintosh_vndr/Makefile.in b/xorg-server/xkbdata.src/symbols/macintosh_vndr/Makefile.in
index 801f8ab0d..e4e5eb4e2 100644
--- a/xorg-server/xkbdata.src/symbols/macintosh_vndr/Makefile.in
+++ b/xorg-server/xkbdata.src/symbols/macintosh_vndr/Makefile.in
@@ -106,6 +106,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 POFILES = @POFILES@
@@ -166,7 +167,7 @@ xkb_rules_symlink = @xkb_rules_symlink@
 symbolsdir = $(xkb_base)/symbols/macintosh_vndr
 dist_symbols_DATA = \
 apple ch de dk \
-es fi fr \
+fi fr \
 gb is it \
 latam nl no pt \
 se us
@@ -183,9 +184,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  symbols/macintosh_vndr/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  symbols/macintosh_vndr/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  symbols/macintosh_vndr/Makefile
+	  $(AUTOMAKE) --foreign  symbols/macintosh_vndr/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/xorg-server/xkbdata.src/symbols/macintosh_vndr/es b/xorg-server/xkbdata.src/symbols/macintosh_vndr/es
deleted file mode 100644
index 61f12498f..000000000
--- a/xorg-server/xkbdata.src/symbols/macintosh_vndr/es
+++ /dev/null
@@ -1,6 +0,0 @@
-
-partial default alphanumeric_keys 
-xkb_symbols "basic" {
-    include "es"
-    name[Group1]= "Spain - Mac";
-};
-- 
cgit v1.2.3