[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

xkb-data: Changes to 'debian-unstable'



 ChangeLog        |    9 ++++++++-
 debian/changelog |    7 +++++++
 keycodes/evdev   |   14 +++++++-------
 symbols/inet     |   10 +++++-----
 4 files changed, 27 insertions(+), 13 deletions(-)

New commits:
commit b05ab0f8f781856e93d66e05bde2a2d9d9228332
Author: Mohammed Adnene Trojette <adn@uracile.localdomain>
Date:   Tue Sep 18 16:32:19 2007 +0200

    releasing version 1.0~cvs.20070916-1

diff --git a/ChangeLog b/ChangeLog
index 9e8c5c4..3383f6d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-09-14  Sergey Udaltsov
+
+	* symbols/inet: small fixes in cymotionlinux,
+	https://bugs.freedesktop.org/show_bug.cgi?id=7983
+	* keycodes/evdev: fixed fake keycodes,
+	https://bugs.freedesktop.org/show_bug.cgi?id=12202
+
 2007-09-05  Sergey Udaltsov
 
 	* symbols/inet, geometry/dell, rules/base.m_g.part,
@@ -1675,7 +1682,7 @@
 
 2004-09-13 22:39  svu
 
-	* symbols/tj: new local cvs keyword seems to be ok - no more $Id: ChangeLog,v 1.329 2007-09-05 23:10:13 svu Exp $
+	* symbols/tj: new local cvs keyword seems to be ok - no more $Id: ChangeLog,v 1.331 2007-09-14 22:12:47 svu Exp $
 
 2004-09-13 22:38  svu
 
diff --git a/debian/changelog b/debian/changelog
index d2ed552..8ed8a36 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xkeyboard-config (1.0~cvs.20070916-1) unstable; urgency=low
+
+  * New upstream CVS snapshot from September 16th 2007:
+     + fix evdev layout. (Closes: #442479)
+
+ -- Mohammed Adnène Trojette <adn+deb@diwi.org>  Sun, 16 Sep 2007 18:51:30 +0200
+
 xkeyboard-config (1.0~cvs.20070914-1) unstable; urgency=low
 
   * New upstream CVS snapshot from September 14th 2007:
diff --git a/keycodes/evdev b/keycodes/evdev
index 1c246d4..13b19f9 100644
--- a/keycodes/evdev
+++ b/keycodes/evdev
@@ -1,7 +1,7 @@
 // translation from evdev scancodes to something resembling xfree86 keycodes.
 
 default xkb_keycodes "evdev" {
-	minimum = 1;
+	minimum = 8;
 	maximum = 255;
 
         # Added for pc105 compatibility
@@ -279,12 +279,12 @@ default xkb_keycodes "evdev" {
 	<I253> = 253;	// #define KEY_DISPLAY_OFF         245
 
 	// Fake keycodes for virtual keys
-	<MDSW> =   1;
-	<LVL3> =   2;
-	<ALT>  =   3;
-	<META> =   4;
-	<SUPR> =   5;
-	<HYPR> =   6;
+	<LVL3> =   92;
+	<MDSW> =   203;
+	<ALT>  =   204;
+	<META> =   205;
+	<SUPR> =   206;
+	<HYPR> =   207;
 
 	indicator 1  = "Caps Lock";
 	indicator 2  = "Num Lock";
diff --git a/symbols/inet b/symbols/inet
index bcb783a..c065d17 100644
--- a/symbols/inet
+++ b/symbols/inet
@@ -1,4 +1,4 @@
-// $XKeyboardConfig: xkeyboard-config/symbols/inet,v 1.63 2007-09-05 23:00:41 svu Exp $
+// $XKeyboardConfig: xkeyboard-config/symbols/inet,v 1.64 2007-09-14 21:23:23 svu Exp $
 
 // $XFree86: xc/programs/xkbcomp/symbols/inet,v 1.38 2004/01/17 14:59:37 pascal Exp $
 
@@ -2040,12 +2040,10 @@ partial xkb_symbols "apple" {
 partial alphanumeric_keys
 xkb_symbols "cymotionlinux" {
     include "inet(media_common)"
-    key	<RWIN>	{	[	at		]	};
-    key	<I68>	{	[	XF86Stop		]	};
     key <FK17>	{	[	XF86Search		]	};
     key <I02>	{	[	XF86WWW			]	};
+    key <I05>	{	[	Redo			]	};
     key <I07>	{	[	Undo			]	};
-    key <I0A>	{	[	Redo			]	};
     key <I0F>	{	[	XF86ScrollDown		]	};
     key <I17>	{	[	XF86Launch2		]	};
     key <I1F>	{	[	XF86Launch1		]	};
@@ -2053,9 +2051,10 @@ xkb_symbols "cymotionlinux" {
     key <I28>	{	[	XF86MenuKB		]	};
     key <I2B>	{	[	XF86Launch3		]	};
     key <I3C>	{	[	XF86Cut			]	};
+    key <I47>	{	[	XF86PowerOff		]	};
     key <I63>   {	[	XF86Standby		]	};
     key <I67>	{	[	XF86Reload		]	};
-    key <I68>	{	[	XF86PowerOff		]	};
+    key	<I68>	{	[	XF86Stop		]	};
     key <I69>	{	[	XF86Forward		]	};
     key <I6A>	{	[	XF86Back		]	};
     key <I6C>	{	[	XF86Mail		]	};
@@ -2063,6 +2062,7 @@ xkb_symbols "cymotionlinux" {
     key <K65>	{	[	XF86Paste		]	};
     key <K6C>	{	[	XF86Eject		]	};
     key <K75>	{	[	XF86ScrollUp		]	};
+    key	<RWIN>	{	[	at		]	};
     key <XFER>	{	[	XF86AudioMedia		]	};
 };
 



Reply to: