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

X Strike Force X.Org X11 SVN commit: r1005 - in trunk/debian: . patches patches/general



Author: dnusinow
Date: 2006-01-04 17:27:33 -0500 (Wed, 04 Jan 2006)
New Revision: 1005

Added:
   trunk/debian/patches/general/016_czech_include_location.diff
Modified:
   trunk/debian/changelog
   trunk/debian/patches/series
Log:
* Add general/016_czech_include_location.diff which is a fix the path to the
  czech symbol rules. This Fd.o bug #5077. Thanks Matej Cepl. 
  (closes: #345893)


Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2006-01-04 22:19:52 UTC (rev 1004)
+++ trunk/debian/changelog	2006-01-04 22:27:33 UTC (rev 1005)
@@ -20,6 +20,9 @@
       upgrade errors
   * Remove general/097_mouse_zaxis_mapping_pushes_up_buttons.diff which is now
     obsolete. Thanks Christopher Martin. (closes: #343728)
+  * Add general/016_czech_include_location.diff which is a fix the path to the
+    czech symbol rules. This Fd.o bug #5077. Thanks Matej Cepl. 
+    (closes: #345893)
 
   [ David Martínez Moreno ]
   * Added -n in order to avoid newline in xdm script (closes: #310000).
@@ -28,7 +31,7 @@
     Perrier (closes: #345609).  While at it, added whitespace that made all
     the translations gain 1 fuzzy string.
 
- -- David Nusinow <dnusinow@debian.org>  Wed,  4 Jan 2006 17:17:26 -0500
+ -- David Nusinow <dnusinow@debian.org>  Wed,  4 Jan 2006 17:25:53 -0500
 
 xorg-x11 (6.9.0.dfsg.1-1) unstable; urgency=low
 

Added: trunk/debian/patches/general/016_czech_include_location.diff
===================================================================
--- trunk/debian/patches/general/016_czech_include_location.diff	2006-01-04 22:19:52 UTC (rev 1004)
+++ trunk/debian/patches/general/016_czech_include_location.diff	2006-01-04 22:27:33 UTC (rev 1005)
@@ -0,0 +1,34 @@
+Fix the path to the czech symbol rules. This is for Debian bug #345893 and
+Fd.o bug #5077. Patch by Oldrich Jedlicka.
+
+Index: trunk/xc/programs/xkbcomp/symbols/pc/cz
+===================================================================
+--- trunk.orig/xc/programs/xkbcomp/symbols/pc/cz	2005-12-27 02:38:43.000000000 -0500
++++ trunk/xc/programs/xkbcomp/symbols/pc/cz	2006-01-04 17:23:34.000000000 -0500
+@@ -78,7 +78,7 @@
+ 
+ // Use <BKSL> instead of <LSGT> (useful for keyboard without <LSGT> key)
+ xkb_symbols "bksl" {
+-    include "cz(basic)"
++    include "pc/cz(basic)"
+     name[Group1]= "Czechia - With <\|> key";
+ 
+     key <BKSL>	{ [ backslash,        bar,        slash,     NoSymbol ]	};
+@@ -91,7 +91,7 @@
+     // of 'Z' and 'Y' keys, which are in the qwerty style (ie. swapped).
+     // 2001 by Kamil Toman <ktoman@email.cz>
+     
+-    include "cz(basic)"
++    include "pc/cz(basic)"
+     name[Group1]= "Czechia - qwerty";
+ 
+     key <AB01>	{ [         z,          Z,       degree,     NoSymbol ]	};
+@@ -100,7 +100,7 @@
+ 
+ // Use <BKSL> instead of <LSGT> (useful for keyboard without <LSGT> key)
+ xkb_symbols "qwerty_bksl" {
+-    include "cz(qwerty)"
++    include "pc/cz(qwerty)"
+ 
+     name[Group1]= "Czechia - qwerty, extended Backslash";
+ 

Modified: trunk/debian/patches/series
===================================================================
--- trunk/debian/patches/series	2006-01-04 22:19:52 UTC (rev 1004)
+++ trunk/debian/patches/series	2006-01-04 22:27:33 UTC (rev 1005)
@@ -15,6 +15,7 @@
 general/013a_xkb_symbols_euro_support.diff -p0
 general/014_startx_hostname_fix.diff -p0
 general/015_startx_dummy_fix.diff
+general/016_czech_include_location.diff
 general/017_fix_Xlib_depend_target.diff -p0
 general/019_iso8859-15_Compose_fix.diff -p0
 general/022_disable_xmh.diff



Reply to: