X Strike Force X.Org X11 SVN commit: r2485 - in trunk/data/xkb-data/debian: . patches
Author: barbier
Date: 2006-07-21 17:36:07 -0400 (Fri, 21 Jul 2006)
New Revision: 2485
Added:
trunk/data/xkb-data/debian/patches/macintosh-gb.diff
trunk/data/xkb-data/debian/patches/macintosh.diff
Modified:
trunk/data/xkb-data/debian/changelog
trunk/data/xkb-data/debian/patches/series
Log:
* debian/patches/macintosh-gb.diff: New patch to fix <LSGT> and <TLDE> keys.
Closes: #379148 Thanks Roger Leigh
* debian/patches/macintosh.diff: New patch to include 'latin' layout.
Closes: #366615, #363525
Modified: trunk/data/xkb-data/debian/changelog
===================================================================
--- trunk/data/xkb-data/debian/changelog 2006-07-21 21:15:48 UTC (rev 2484)
+++ trunk/data/xkb-data/debian/changelog 2006-07-21 21:36:07 UTC (rev 2485)
@@ -1,3 +1,13 @@
+xkeyboard-config (0.8-7) UNRELEASED; urgency=low
+
+ * debian/patches/macintosh-gb.diff: New patch to fix <LSGT> and <TLDE> keys.
+ Closes: #379148 Thanks Roger Leigh
+
+ * debian/patches/macintosh.diff: New patch to include 'latin' layout.
+ Closes: #366615, #363525
+
+ -- Denis Barbier <barbier@debian.org> Fri, 21 Jul 2006 22:50:11 +0200
+
xkeyboard-config (0.8-6) unstable; urgency=low
* debian/control: Move debhelper from Build-Depends-Indep to Build-Depends.
Added: trunk/data/xkb-data/debian/patches/macintosh-gb.diff
===================================================================
--- trunk/data/xkb-data/debian/patches/macintosh-gb.diff 2006-07-21 21:15:48 UTC (rev 2484)
+++ trunk/data/xkb-data/debian/patches/macintosh-gb.diff 2006-07-21 21:36:07 UTC (rev 2485)
@@ -0,0 +1,18 @@
+Index: xkb-data/symbols/macintosh_vndr/gb
+===================================================================
+--- xkb-data.orig/symbols/macintosh_vndr/gb
++++ xkb-data/symbols/macintosh_vndr/gb
+@@ -6,11 +6,12 @@
+ // Describes the differences between a very simple en_US
+ // keyboard and a very simple U.K. keyboard layout
+
+-
+ name[Group1]= "Great Britain";
+
+ key <AE03> { [ 3, sterling ],
+ [ numbersign ] };
++ key <LSGT> { [ quoteleft, asciitilde ] };
++ key <TLDE> { [ section, plusminus ] };
+
+ // End alphanumeric section
+
Added: trunk/data/xkb-data/debian/patches/macintosh.diff
===================================================================
--- trunk/data/xkb-data/debian/patches/macintosh.diff 2006-07-21 21:15:48 UTC (rev 2484)
+++ trunk/data/xkb-data/debian/patches/macintosh.diff 2006-07-21 21:36:07 UTC (rev 2485)
@@ -0,0 +1,104 @@
+Index: xkb-data/symbols/macintosh_vndr/de
+===================================================================
+--- xkb-data.orig/symbols/macintosh_vndr/de
++++ xkb-data/symbols/macintosh_vndr/de
+@@ -9,6 +9,8 @@
+ // Describes the differences between a very simple US/ASCII
+ // keyboard and a very simple German keybaord
+
++ include "latin"
++
+ // Alphanumeric section
+ name[Group1]= "German";
+ key <TLDE> { [ dead_circumflex, degree ],
+Index: xkb-data/symbols/macintosh_vndr/dk
+===================================================================
+--- xkb-data.orig/symbols/macintosh_vndr/dk
++++ xkb-data/symbols/macintosh_vndr/dk
+@@ -7,6 +7,8 @@
+ // keyboard and a Danish keyboard with dead key support
+ // and all of ISO-8859-1 characters available.
+
++ include "latin"
++
+ name[Group1]= "Danish";
+
+ key <TLDE> { [ onehalf, section ],
+Index: xkb-data/symbols/macintosh_vndr/es
+===================================================================
+--- xkb-data.orig/symbols/macintosh_vndr/es
++++ xkb-data/symbols/macintosh_vndr/es
+@@ -5,6 +5,8 @@
+ // Describes the differences between a very simple mac_US
+ // keyboard and a very simple Spanish keybaord
+
++ include "latin"
++
+ name[Group1]= "Spanish";
+
+ key <TLDE> { [ bracketleft, bracketright ],
+Index: xkb-data/symbols/macintosh_vndr/gb
+===================================================================
+--- xkb-data.orig/symbols/macintosh_vndr/gb
++++ xkb-data/symbols/macintosh_vndr/gb
+@@ -6,6 +6,8 @@
+ // Describes the differences between a very simple en_US
+ // keyboard and a very simple U.K. keyboard layout
+
++ include "latin"
++
+ name[Group1]= "Great Britain";
+
+ key <AE03> { [ 3, sterling ],
+Index: xkb-data/symbols/macintosh_vndr/nl
+===================================================================
+--- xkb-data.orig/symbols/macintosh_vndr/nl
++++ xkb-data/symbols/macintosh_vndr/nl
+@@ -5,6 +5,8 @@
+ // Describes the differences between a very simple mac_US
+ // keyboard and a very simple netherland keybaord
+
++ include "latin"
++
+ name[Group1]= "Netherland";
+
+ // do just nothing
+Index: xkb-data/symbols/macintosh_vndr/no
+===================================================================
+--- xkb-data.orig/symbols/macintosh_vndr/no
++++ xkb-data/symbols/macintosh_vndr/no
+@@ -6,6 +6,8 @@
+ // Describes the differences between a very simple en_US
+ // keyboard and a very simple Norwegian keybaord
+
++ include "latin"
++
+ name[Group1]= "Norwegian";
+
+ key <TLDE> { [ bar, section ] };
+Index: xkb-data/symbols/macintosh_vndr/pt
+===================================================================
+--- xkb-data.orig/symbols/macintosh_vndr/pt
++++ xkb-data/symbols/macintosh_vndr/pt
+@@ -8,6 +8,8 @@
+ // Describes the differences between a very simple en_US
+ // keyboard and a very simple Portuguese keybaord
+
++ include "latin"
++
+ name[Group1]= "Portuguese";
+
+ key <LSGT> { [ less, greater ],
+Index: xkb-data/symbols/macintosh_vndr/se
+===================================================================
+--- xkb-data.orig/symbols/macintosh_vndr/se
++++ xkb-data/symbols/macintosh_vndr/se
+@@ -6,6 +6,8 @@
+ // Describes the differences between a very simple en_US
+ // keyboard and a very simple Swedish(Sweden) keybaord
+
++ include "latin"
++
+ name[Group1]= "Swedish";
+
+ key <TLDE> { [ section, degree ] };
Modified: trunk/data/xkb-data/debian/patches/series
===================================================================
--- trunk/data/xkb-data/debian/patches/series 2006-07-21 21:15:48 UTC (rev 2484)
+++ trunk/data/xkb-data/debian/patches/series 2006-07-21 21:36:07 UTC (rev 2485)
@@ -1,3 +1,5 @@
cvs.diff
docs.diff
sclk_toggle.diff
+macintosh-gb.diff
+macintosh.diff
Reply to: