packages: xkeyboard-config/xkeyboard-config.spec, xkeyboard-config/xkeyboar...

[draenog]

Author: draenog                      Date: Fri Jan 20 00:41:29 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fix Shift+Bksp

---- Files affected:
packages/xkeyboard-config:
   xkeyboard-config.spec (1.40 -> 1.41) , xkeyboard-config-backspace.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/xkeyboard-config/xkeyboard-config.spec
diff -u packages/xkeyboard-config/xkeyboard-config.spec:1.40 packages/xkeyboard-config/xkeyboard-config.spec:1.41
--- packages/xkeyboard-config/xkeyboard-config.spec:1.40	Fri Jan 20 01:34:58 2012
+++ packages/xkeyboard-config/xkeyboard-config.spec	Fri Jan 20 01:41:24 2012
@@ -3,13 +3,14 @@
 Summary(pl.UTF-8):	Baza danych konfiguracji klawiatury pod X
 Name:		xkeyboard-config
 Version:	2.4.1
-Release:	3
+Release:	4
 License:	MIT
 Group:		X11/Development/Libraries
 Source0:	http://xorg.freedesktop.org/archive/individual/data/%{name}-%{version}.tar.bz2
 # Source0-md5:	9f6d7a37fd192264a3ca07ede5d183c3
 Patch0:		%{name}-CVE-2012-0064.patch
 Patch1:		%{name}-function-keys.patch
+Patch2:		%{name}-backspace.patch
 URL:		http://www.freedesktop.org/wiki/Software/XKeyboardConfig
 BuildRequires:	autoconf >= 2.57
 BuildRequires:	automake
@@ -47,6 +48,7 @@
 
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %{__aclocal}
@@ -100,6 +102,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.41  2012/01/20 00:41:24  draenog
+- fix Shift+Bksp
+
 Revision 1.40  2012/01/20 00:34:58  draenog
 - fix Shift+Fn
 

================================================================
Index: packages/xkeyboard-config/xkeyboard-config-backspace.patch
diff -u /dev/null packages/xkeyboard-config/xkeyboard-config-backspace.patch:1.1
--- /dev/null	Fri Jan 20 01:41:29 2012
+++ packages/xkeyboard-config/xkeyboard-config-backspace.patch	Fri Jan 20 01:41:24 2012
@@ -0,0 +1,34 @@
+commit 81fc86a911b55481b9597bb9284b3beca460104c
+Author: Sergey V. Udaltsov <svu at gnome.org>
+Date:   Sun Nov 20 20:03:26 2011 +0000
+
+    Extend BackSpace to the 2nd group
+    
+    https://bugs.freedesktop.org/show_bug.cgi?id=43098
+
+diff --git a/symbols/pc b/symbols/pc
+index e1965ce..7e13ecb 100644
+--- a/symbols/pc
++++ b/symbols/pc
+@@ -14,7 +14,7 @@ xkb_symbols "pc105" {
+     include "pc(editing)"
+     include "keypad(x11)"
+ 
+-    key <BKSP> {	[ BackSpace	]	};
++    key <BKSP> {	[ BackSpace, BackSpace	]	};
+ 
+     key  <TAB> {	[ Tab,	ISO_Left_Tab	]	};
+     key <RTRN> {	[ Return	]	};
+diff --git a/symbols/us b/symbols/us
+index 1d8bdd0..7c3ee24 100644
+--- a/symbols/us
++++ b/symbols/us
+@@ -573,7 +573,7 @@ xkb_symbols "dvp" {
+     key <AE10> { [ bracketright,    6                                           ], type[Group1] = "FOUR_LEVEL_ALPHABETIC" };
+     key <AE11> { [ exclam,          8,              exclamdown                  ], type[Group1] = "FOUR_LEVEL_ALPHABETIC" };
+     key <AE12> { [ numbersign,      grave,          dead_grave                  ] };
+-    key <BKSP> { [ BackSpace                                                    ] };
++    key <BKSP> { [ BackSpace,       BackSpace                                   ] };
+ 
+     // upper row, left side
+     key <AD01> { [ semicolon,       colon,          dead_diaeresis              ] };
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xkeyboard-config/xkeyboard-config.spec?r1=1.40&r2=1.41&f=u