symbols: remove from vendor files variants that are gone from main files

And adjust the name in the include for the one variant that was renamed.

(This should have been done in the commits that removed or renamed the
variants in the main symbol files.)

This addresses the first part of issue #418.

Reported-by: Daniel Kochmański

Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>

5 files changed, 1 insertions, 41 deletions

diff --git a/symbols/sun_vndr/ara b/symbols/sun_vndr/ara
index 54a242d5..2c905956 100644
--- a/symbols/sun_vndr/ara
+++ b/symbols/sun_vndr/ara
@@ -96,11 +96,6 @@ partial alphanumeric_keys
 };
 
 partial alphanumeric_keys
-	xkb_symbols "qwerty" {
-	include "ara(qwerty)"
-};
-
-partial alphanumeric_keys
 	xkb_symbols "azerty" {
 	include "ara(azerty)"
 };
@@ -111,11 +106,6 @@ partial alphanumeric_keys
 };
 
 partial alphanumeric_keys
-	xkb_symbols "qwerty_digits" {
-	include "ara(qwerty_digits)"
-};
-
-partial alphanumeric_keys
 	xkb_symbols "azerty_digits" {
 	include "ara(azerty_digits)"
 };
diff --git a/symbols/sun_vndr/de b/symbols/sun_vndr/de
index 5ed3734e..171a0e44 100644
--- a/symbols/sun_vndr/de
+++ b/symbols/sun_vndr/de
@@ -72,7 +72,7 @@ partial alphanumeric_keys
 
 partial alphanumeric_keys
 	xkb_symbols "legacy" {
-	include "de(legacy)"
+	include "de(deadtilde)"
 };
 
 partial alphanumeric_keys
diff --git a/symbols/sun_vndr/es b/symbols/sun_vndr/es
index d1be776d..a4916716 100644
--- a/symbols/sun_vndr/es
+++ b/symbols/sun_vndr/es
@@ -97,11 +97,6 @@ partial alphanumeric_keys
 };
 
 partial alphanumeric_keys
-	xkb_symbols "mac" {
-	include "es(mac)"
-};
-
-partial alphanumeric_keys
 	xkb_symbols "olpc" {
 	include "es(olpc)"
 };
diff --git a/symbols/sun_vndr/tr b/symbols/sun_vndr/tr
index 191307f5..21afa025 100644
--- a/symbols/sun_vndr/tr
+++ b/symbols/sun_vndr/tr
@@ -114,18 +114,3 @@ partial alphanumeric_keys
 	xkb_symbols "olpc" {
 	include "tr(olpc)"
 };
-
-partial alphanumeric_keys
-	xkb_symbols "crh" {
-	include "tr(crh)"
-};
-
-partial alphanumeric_keys
-	xkb_symbols "crh_f" {
-	include "tr(crh_f)"
-};
-
-partial alphanumeric_keys
-	xkb_symbols "crh_alt" {
-	include "tr(crh_alt)"
-};
diff --git a/symbols/sun_vndr/ua b/symbols/sun_vndr/ua
index e40eb9e8..2fbbe656 100644
--- a/symbols/sun_vndr/ua
+++ b/symbols/sun_vndr/ua
@@ -120,16 +120,6 @@ partial alphanumeric_keys
 };
 
 partial alphanumeric_keys
-	xkb_symbols "rstu" {
-	include "ua(rstu)"
-};
-
-partial alphanumeric_keys
-	xkb_symbols "rstu_ru" {
-	include "ua(rstu_ru)"
-};
-
-partial alphanumeric_keys
 	xkb_symbols "homophonic" {
 	include "ua(homophonic)"
 };