Merge remote-tracking branch 'origin/released'

2 files changed, 35 insertions, 1 deletions

diff --git a/xorg-server/xkeyboard-config/rules/base.xml.in b/xorg-server/xkeyboard-config/rules/base.xml.in
index e0c1b4e58..49a2aeddf 100644
--- a/xorg-server/xkeyboard-config/rules/base.xml.in
+++ b/xorg-server/xkeyboard-config/rules/base.xml.in
@@ -3877,6 +3877,12 @@
             <_description>Norwegian (Macintosh, eliminate dead keys)</_description>
           </configItem>
         </variant>
+	<variant>
+          <configItem>
+            <name>colemak</name>
+            <_description>Norwegian (Colemak)</_description>
+          </configItem>
+        </variant>
       </variantList>
     </layout>
     <layout>
diff --git a/xorg-server/xkeyboard-config/symbols/no b/xorg-server/xkeyboard-config/symbols/no
index 53c83da62..8012570d5 100644
--- a/xorg-server/xkeyboard-config/symbols/no
+++ b/xorg-server/xkeyboard-config/symbols/no
@@ -212,7 +212,6 @@ xkb_symbols "mac" {
     key <BKSL>	{ [        at,   asterisk     ]	};
 };
 
-
 partial alphanumeric_keys 
 xkb_symbols "mac_nodeadkeys" {
 
@@ -223,3 +222,32 @@ xkb_symbols "mac_nodeadkeys" {
     key <AE12>	{ [      grave,     acute,        acute,       ogonek ]	};
     key <AD12>	{ [  diaeresis, asciicircum, asciitilde,       macron ]	};
 };
+
+partial alphanumeric_keys 
+xkb_symbols "colemak" {
+
+    // Colemak layout - http://colemak.com/
+    // Q W F P G   J L U Y Ø Å ¨
+    // A R S T D   H N E I O Æ '
+    // < Z X C V   B K M , . -
+    include "no(basic)"
+    name[Group1]= "Norwegian (Colemak)";
+
+    key <AB06>	{ [         k,          K,          kra,    ampersand ] };
+    key <AC02>	{ [         r,          R,   registered,    trademark ] };
+    key <AC03>	{ [         s,          S,       ssharp,      section ] };
+    key <AC04>	{ [         t,          T,        thorn,        THORN ] };
+    key <AC05>	{ [         d,          D,          eth,          ETH ] };
+    key <AC07>	{ [         n,          N ] };
+    key <AC08>	{ [         e,          E,     EuroSign,         cent ] };
+    key <AC09>	{ [         i,          I,   rightarrow,     idotless ] };
+    key <AC10>	{ [         o,          O,           oe,           OE ] };
+    key <AD03>	{ [         f,          F,      dstroke,  ordfeminine ] };
+    key <AD04>	{ [         p,          P,     Greek_pi,     Greek_PI ] };
+    key <AD05>	{ [         g,          G,          eng,          ENG ] };
+    key <AD06>	{ [         j,          J ] };
+    key <AD07>	{ [         l,          L,      lstroke,      Lstroke ] };
+    key <AD08>	{ [         u,          U,    downarrow,      uparrow ] };
+    key <AD09>	{ [         y,          Y,    leftarrow,          yen ] };
+    key <AD10>	{ [    oslash,   Ooblique,   dead_acute, dead_doubleacute ] };
+};