From 8e93cfc32720349054868adcc9426145c476fc96 Mon Sep 17 00:00:00 2001
From: unknown author <cooker@mandrivalinux.org>
Date: Thu, 26 Feb 2009 14:53:25 +0000
Subject: [PATCH 1/4] fixkbd

---
 symbols/az |    2 +-
 symbols/fr |    1 +
 symbols/il |    3 +++
 symbols/mt |    2 +-
 symbols/pt |    1 +
 symbols/ro |    5 +++++
 symbols/us |    2 +-
 7 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/symbols/az b/symbols/az
index 254cf7f..82457b6 100644
--- a/symbols/az
+++ b/symbols/az
@@ -20,7 +20,7 @@ xkb_symbols "latin" {
   key <AE08> { [ 8,          asterisk,   asciicircum, dead_circumflex ] };
   key <AE11> { [ minus,      underscore, hyphen,      emdash          ] };
 
-  key <AD02> { [ udiaeresis, Udiaeresis  ] };
+  key <AD02> { [ udiaeresis, Udiaeresis, w, W  ] };
   key <AD04> { [ r,          R,          registered   ] };
   key <AD08> { [ i,          Iabovedot   ] };
   key <AD11> { [ odiaeresis, Odiaeresis, bracketleft, braceleft       ] };
diff --git a/symbols/fr b/symbols/fr
index 721f1bd..c6634db 100644
--- a/symbols/fr
+++ b/symbols/fr
@@ -27,6 +27,7 @@ xkb_symbols "basic" {
     key <AD01>	{ [         a,          A,           ae,           AE ]	};
     key <AD02>	{ [         z,          Z, guillemotleft,        less ]	};
     key <AD03>	{ [         e,          E,     EuroSign,         cent ]	};
+    key <AD09>	{ [         o,          O,           oe,           OE ]	};
     key <AD11>	{ [dead_circumflex, dead_diaeresis, dead_diaeresis, dead_abovering ] };
     key <AD12>	{ [    dollar,   sterling,     currency,  dead_macron ]	};
 
diff --git a/symbols/il b/symbols/il
index 1d49bc8..db0325f 100644
--- a/symbols/il
+++ b/symbols/il
@@ -130,6 +130,9 @@ xkb_symbols "lyx" {
     key <AD12> { [ bracketleft,	braceleft	]       };
     key <AE09> { [ 9         ,	parenright	]       };
     key <AE10> { [ 0         ,	parenleft	]       };
+
+    // Mirrored until "us" doesn't set EuroSign, cf mdbz#39418
+    key <AE05> { [     5, percent       ]};
     
     key <AE11> { [     minus,	0x10005be	]	}; // H. Hiphen
 };
diff --git a/symbols/mt b/symbols/mt
index 5069aa4..e896283 100644
--- a/symbols/mt
+++ b/symbols/mt
@@ -8,7 +8,7 @@
 partial default alphanumeric_keys
 xkb_symbols "basic" {
 
-    include "latin"
+    include "gb"
 
     name[Group1]="Malta";
 
diff --git a/symbols/pt b/symbols/pt
index ba141b3..3a9667a 100644
--- a/symbols/pt
+++ b/symbols/pt
@@ -25,6 +25,7 @@ xkb_symbols "basic" {
     key <TLDE>	{ [ backslash,        bar,      notsign,      notsign ]	};
 
     key <BKSL>	{ [dead_tilde, dead_circumflex, dead_grave, dead_breve]	};
+    key <LSGT>	{ [ less, greater ]	};
 
     include "level3(ralt_switch)"
 };
diff --git a/symbols/ro b/symbols/ro
index e4ed705..bc96ab3 100644
--- a/symbols/ro
+++ b/symbols/ro
@@ -19,6 +19,11 @@
 
 
 partial default alphanumeric_keys
+xkb_symbols "qwertz" {
+   include "ro(std_cedilla)"
+};
+
+partial alphanumeric_keys
 xkb_symbols "basic" {
 // This RO_US/Programmers layout, although the secondary layout in the 
 // Romanian standard, has always been the "de facto" standard in the 
diff --git a/symbols/us b/symbols/us
index 20a1b57..209fe53 100644
--- a/symbols/us
+++ b/symbols/us
@@ -16,7 +16,7 @@ xkb_symbols "basic" {
     key <AE02> {	[	  2,	at		]	};
     key <AE03> {	[	  3,	numbersign	]	};
     key <AE04> {	[	  4,	dollar		]	};
-    key <AE05> {	[	  5,	percent		]	};
+    key <AE05> {	[	  5,	percent, EuroSign ]	}; // EuroSign should be removed post mdv2008.1 (cf mdvbz#39418)
     key <AE06> {	[	  6,	asciicircum	]	};
     key <AE07> {	[	  7,	ampersand	]	};
     key <AE08> {	[	  8,	asterisk	]	};
-- 
1.6.1.3