rpms/xkeyboard-config/F-10 xkeyboard-config-1.4-jp-tilde.patch, NONE, 1.1 xkeyboard-config.spec, 1.25, 1.26

[Peter Hutterer]

Author: whot

Update of /cvs/pkgs/rpms/xkeyboard-config/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11688

Modified Files:
	xkeyboard-config.spec 
Added Files:
	xkeyboard-config-1.4-jp-tilde.patch 
Log Message:
* Tue Nov 13 2008 Peter Hutterer  <peter.hutterer at redhat.com> - 1.4-5
- xkeyboard-config-1.4-jp-tilde.patch: TLDE in jp is Zenkaku/Hankaku, and BKSL
  should be bracket right/brace right (#469537).



xkeyboard-config-1.4-jp-tilde.patch:

--- NEW FILE xkeyboard-config-1.4-jp-tilde.patch ---
diff -up xkeyboard-config-1.4/symbols/jp.orig xkeyboard-config-1.4/symbols/jp
--- xkeyboard-config-1.4/symbols/jp.orig	2008-11-11 11:19:41.000000000 +1000
+++ xkeyboard-config-1.4/symbols/jp	2008-11-11 11:37:53.000000000 +1000
@@ -24,6 +24,13 @@ xkb_symbols "common" {
 	symbols[Group1]= [ Zenkaku_Hankaku, Kanji ]
     };
 
+    key <TLDE> {
+	type[Group1]="PC_ALT_LEVEL2",
+	symbols[Group1]= [ Zenkaku_Hankaku, Kanji ]
+    };
+
+    key <BKSL> { [ bracketright, braceright ] };
+
     key <AE01> { [ 1, exclam		] };
     key <AE02> { [ 2, quotedbl		] };
     key <AE03> { [ 3, numbersign	] };


Index: xkeyboard-config.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xkeyboard-config/F-10/xkeyboard-config.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- xkeyboard-config.spec	24 Oct 2008 04:28:23 -0000	1.25
+++ xkeyboard-config.spec	12 Nov 2008 23:33:43 -0000	1.26
@@ -4,7 +4,7 @@
 Summary: xkeyboard-config alternative xkb data files
 Name: xkeyboard-config
 Version: 1.4
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: MIT
 Group: User Interface/X
 URL: http://www.x.org
@@ -17,6 +17,8 @@
 Patch3: xkeyboard-config-1.4-tj-variant.patch
 # Sent to svu, not committed yet (he's waiting for libX11 release)
 Patch4: xkeyboard-config-1.4-battery.patch
+# Sent to svu
+Patch5: xkeyboard-config-1.4-jp-tilde.patch
 
 BuildArch: noarch
 
@@ -50,6 +52,7 @@
 %patch2 -p1 -b .usinet
 %patch3 -p1 -b .tj-variants
 %patch4 -p1 -b .battery
+%patch5 -p1 -b .jp-tilde
 
 %build
 %configure \
@@ -89,6 +92,10 @@
 %{_datadir}/X11/xkb/rules/xorg.xml
 
 %changelog
+* Tue Nov 13 2008 Peter Hutterer  <peter.hutterer at redhat.com> - 1.4-5
+- xkeyboard-config-1.4-jp-tilde.patch: TLDE in jp is Zenkaku/Hankaku, and BKSL
+  should be bracket right/brace right (#469537).
+
 * Fri Oct 24 2008 Peter Hutterer  <peter.hutterer at redhat.com> - 1.4-4
 - xkeyboard-config-1.4-battery.patch: add XF86 syms for Battery, Bluetooth,
   Wlan and UWB to usinet.