rpms/xkeyboard-config/OLPC-2 olpc-xkeyboard-config-evdev-keycode-211.patch, NONE, 1.1 xkeyboard-config.spec, 1.13, 1.14

[Bernardo Innocenti (bernie)]

Author: bernie

Update of /cvs/pkgs/rpms/xkeyboard-config/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23270

Modified Files:
	xkeyboard-config.spec 
Added Files:
	olpc-xkeyboard-config-evdev-keycode-211.patch 
Log Message:
* Fri Dec 22 2007 Bernardo Innocenti <bernie at codewiz.org> 1.1-7.20071130cvs
- Add olpc-xkeyboard-config-evdev-keycode-211.patch


olpc-xkeyboard-config-evdev-keycode-211.patch:

--- NEW FILE olpc-xkeyboard-config-evdev-keycode-211.patch ---
Kill off the I211 key in evdev, as it conflicts with I211 and makes
xkbcomp generate warnings.

I decided to let AB11 outlive I211 because it was more widely
used in the symbols files.

Index: keycodes/evdev
===================================================================
RCS file: /cvs/xlibs/xkbdesc/xkeyboard-config/keycodes/evdev,v
retrieving revision 1.10
diff -u -p -r1.10 evdev
--- keycodes/evdev	14 Nov 2007 21:40:51 -0000	1.10
+++ keycodes/evdev	22 Dec 2007 06:11:42 -0000
@@ -235,7 +235,7 @@ default xkb_keycodes "evdev" {
 	<I208> = 208;	// #define KEY_PLAYCD              200
 	<I209> = 209;	// #define KEY_PAUSECD             201
 	<I210> = 210;	// #define KEY_PROG3               202
-	<I211> = 211;	// #define KEY_PROG4               203
+	//<I211> = 211;	// #define KEY_PROG4               203 conflicts with AB11
 	<I213> = 213;	// #define KEY_SUSPEND             205
 	<I214> = 214;	// #define KEY_CLOSE               206
 	<I215> = 215;	// #define KEY_PLAY                207
Index: symbols/inet
===================================================================
RCS file: /cvs/xlibs/xkbdesc/xkeyboard-config/symbols/inet,v
retrieving revision 1.76
diff -u -p -r1.76 inet
--- symbols/inet	10 Dec 2007 22:42:07 -0000	1.76
+++ symbols/inet	22 Dec 2007 06:11:43 -0000
@@ -126,7 +126,7 @@ xkb_symbols "evdev" {
     key <I208>   {      [ XF86AudioPlay         ]       };
     key <I209>   {      [ XF86AudioPause        ]       };
     key <I210>   {      [ XF86Launch3           ]       };
-    key <I211>   {      [ XF86Launch4           ]       };
+    key <AB11>   {      [ XF86Launch4           ]       };
     key <I213>   {      [ XF86Standby           ]       };
     key <I214>   {      [ XF86Close             ]       };
     key <I215>   {      [ XF86AudioPlay         ]       };


Index: xkeyboard-config.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xkeyboard-config/OLPC-2/xkeyboard-config.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- xkeyboard-config.spec	1 Dec 2007 04:04:45 -0000	1.13
+++ xkeyboard-config.spec	22 Dec 2007 06:41:08 -0000	1.14
@@ -5,7 +5,7 @@
 Summary: xkeyboard-config alternative xkb data files
 Name: xkeyboard-config
 Version: 1.1
-Release: 6.%{cvsdate}%{?dist}
+Release: 7.%{cvsdate}%{?dist}
 License: MIT
 Group: User Interface/X
 URL: http://www.x.org
@@ -14,6 +14,7 @@
 #Source0: http://xlibs.freedesktop.org/xkbdesc/%{name}-%{version}.tar.bz2
 Source0: %{name}-%{version}-%{cvsdate}.tar.bz2
 Patch0: olpc-xkeyboard-config-us-accents.patch
+Patch1: olpc-xkeyboard-config-evdev-keycode-211.patch
 
 BuildArch: noarch
 
@@ -43,6 +44,7 @@
 %prep
 %setup -q
 %patch0 -p0 -b .usacc
+%patch1 -p0 -b .i211
 
 %build
 %configure \
@@ -82,6 +84,9 @@
 %{_datadir}/X11/xkb/rules/xorg.xml
 
 %changelog
+* Fri Dec 22 2007 Bernardo Innocenti <bernie at codewiz.org> 1.1-7.20071130cvs
+- Add olpc-xkeyboard-config-evdev-keycode-211.patch
+
 * Fri Nov 30 2007 Bernardo Innocenti <bernie at codewiz.org> 1.1-6.20071130cvs
 - Add olpc-xkeyboard-config-us-accents.patch
 - Upgrade xkeyboard-config snapshot to cvs20071130