keymap-locales:

- Fix o-umlaut on VT and X and remove warning message during loadkeys
- Add c7x0 -DE keymap, testing courtesy of _law_
mt: ----------------------------------------------------------------------

diff --git a/packages/keymap-locales/files/akita/keymap-extension-2.6-de.map b/packages/keymap-locales/files/akita/keymap-extension-2.6-de.map
index d139bde..d33d4de 100644 (file)
--- a/packages/keymap-locales/files/akita/keymap-extension-2.6-de.map
+++ b/packages/keymap-locales/files/akita/keymap-extension-2.6-de.map
@@ -1,9 +1,10 @@
 # German keymapping
-altgr keycode 24 = +odiaresis
-altgr keycode 30 = +adiaresis
-altgr keycode 22 = +udiaresis
-shift altgr keycode 24 = +Odiaresis
-shift altgr keycode 30 = +Adiaresis
-altgr shift keycode 22 = +Udiaresis
+charset "iso-8859-1"
+altgr keycode 24 = +odiaeresis
+altgr keycode 30 = +adiaeresis
+altgr keycode 22 = +udiaeresis
+shift altgr keycode 24 = +Odiaeresis
+shift altgr keycode 30 = +Adiaeresis
+altgr shift keycode 22 = +Udiaeresis
 altgr keycode 31 = ssharp
 

diff --git a/packages/keymap-locales/files/borzoi/keymap-extension-2.6-de.map b/packages/keymap-locales/files/borzoi/keymap-extension-2.6-de.map
index d139bde..d33d4de 100644 (file)
--- a/packages/keymap-locales/files/borzoi/keymap-extension-2.6-de.map
+++ b/packages/keymap-locales/files/borzoi/keymap-extension-2.6-de.map
@@ -1,9 +1,10 @@
 # German keymapping
-altgr keycode 24 = +odiaresis
-altgr keycode 30 = +adiaresis
-altgr keycode 22 = +udiaresis
-shift altgr keycode 24 = +Odiaresis
-shift altgr keycode 30 = +Adiaresis
-altgr shift keycode 22 = +Udiaresis
+charset "iso-8859-1"
+altgr keycode 24 = +odiaeresis
+altgr keycode 30 = +adiaeresis
+altgr keycode 22 = +udiaeresis
+shift altgr keycode 24 = +Odiaeresis
+shift altgr keycode 30 = +Adiaeresis
+altgr shift keycode 22 = +Udiaeresis
 altgr keycode 31 = ssharp
 

diff --git a/packages/keymap-locales/files/c7x0/.mtn2git_empty b/packages/keymap-locales/files/c7x0/.mtn2git_empty
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/packages/keymap-locales/files/c7x0/keymap-extension-2.6-de.map b/packages/keymap-locales/files/c7x0/keymap-extension-2.6-de.map
new file mode 100644 (file)
index 0000000..d33d4de
--- /dev/null
+++ b/packages/keymap-locales/files/c7x0/keymap-extension-2.6-de.map
@@ -0,0 +1,10 @@
+# German keymapping
+charset "iso-8859-1"
+altgr keycode 24 = +odiaeresis
+altgr keycode 30 = +adiaeresis
+altgr keycode 22 = +udiaeresis
+shift altgr keycode 24 = +Odiaeresis
+shift altgr keycode 30 = +Adiaeresis
+altgr shift keycode 22 = +Udiaeresis
+altgr keycode 31 = ssharp
+

diff --git a/packages/keymap-locales/files/spitz/keymap-extension-2.6-de.map b/packages/keymap-locales/files/spitz/keymap-extension-2.6-de.map
index d139bde..d33d4de 100644 (file)
--- a/packages/keymap-locales/files/spitz/keymap-extension-2.6-de.map
+++ b/packages/keymap-locales/files/spitz/keymap-extension-2.6-de.map
@@ -1,9 +1,10 @@
 # German keymapping
-altgr keycode 24 = +odiaresis
-altgr keycode 30 = +adiaresis
-altgr keycode 22 = +udiaresis
-shift altgr keycode 24 = +Odiaresis
-shift altgr keycode 30 = +Adiaresis
-altgr shift keycode 22 = +Udiaresis
+charset "iso-8859-1"
+altgr keycode 24 = +odiaeresis
+altgr keycode 30 = +adiaeresis
+altgr keycode 22 = +udiaeresis
+shift altgr keycode 24 = +Odiaeresis
+shift altgr keycode 30 = +Adiaeresis
+altgr shift keycode 22 = +Udiaeresis
 altgr keycode 31 = ssharp
 

diff --git a/packages/keymap-locales/keymap-locales.bb b/packages/keymap-locales/keymap-locales.bb
index a490656..5ba84e6 100644 (file)
--- a/packages/keymap-locales/keymap-locales.bb
+++ b/packages/keymap-locales/keymap-locales.bb
@@ -4,7 +4,7 @@ PRIORITY = "optional"
 MAINTAINER = "Matthias 'CoreDump' Hentges  <oe@hentges.net>"
 LICENSE = "GPL"
 
-PR = "r3"
+PR = "r4"
 
 SRC_URI = "file://*.map"