xkb-data: Changes to 'debian-unstable'
debian/changelog | 19 +++++++++++++++++++
debian/patches/preserve-shift.diff | 37 +++++++++++++++++++++++++++++++++++++
debian/patches/series | 1 +
symbols/gr | 6 ++++--
symbols/is | 4 ++--
symbols/keypad | 11 +++++------
6 files changed, 68 insertions(+), 10 deletions(-)
New commits:
commit 28fee2be186cfabad8a9236f47c6a279fd88aa0e
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Dec 25 12:37:03 2012 +0100
Upload to unstable
diff --git a/debian/changelog b/debian/changelog
index 51a025a..9af7276 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xkeyboard-config (2.5.1-3) UNRELEASED; urgency=low
+xkeyboard-config (2.5.1-3) unstable; urgency=low
* Cherry-picks from upstream:
- A couple of missing chars in gr(polytonic), added on levels 3, 4
@@ -7,7 +7,7 @@ xkeyboard-config (2.5.1-3) UNRELEASED; urgency=low
- symbols: ossmath is CTRL+ALT, not FOUR_LEVEL (closes: #657440)
- symbols/gr: fix comment (closes: #696125)
- -- Julien Cristau <jcristau@debian.org> Tue, 25 Dec 2012 12:28:27 +0100
+ -- Julien Cristau <jcristau@debian.org> Tue, 25 Dec 2012 12:37:00 +0100
xkeyboard-config (2.5.1-2.1) unstable; urgency=low
commit 95ee3ac56ae03750e0f8ebeb859a5958db32a4f7
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Dec 25 12:30:09 2012 +0100
Add changelog entry
diff --git a/debian/changelog b/debian/changelog
index e61c376..51a025a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+xkeyboard-config (2.5.1-3) UNRELEASED; urgency=low
+
+ * Cherry-picks from upstream:
+ - A couple of missing chars in gr(polytonic), added on levels 3, 4
+ (closes: #696126)
+ - Reverting broken fix for is keyboard
+ - symbols: ossmath is CTRL+ALT, not FOUR_LEVEL (closes: #657440)
+ - symbols/gr: fix comment (closes: #696125)
+
+ -- Julien Cristau <jcristau@debian.org> Tue, 25 Dec 2012 12:28:27 +0100
+
xkeyboard-config (2.5.1-2.1) unstable; urgency=low
* Non-maintainer upload.
commit d441bdd6b22c399c3a236e8134e64107f8ade709
Author: Sergey V. Udaltsov <svu@gnome.org>
Date: Thu Dec 20 23:17:25 2012 +0000
fixed comment
https://bugs.freedesktop.org/show_bug.cgi?id=58546
(cherry picked from commit 5bffacbf168a45992e36b621625bb9e821ecd836)
diff --git a/symbols/gr b/symbols/gr
index d470904..d7d1260 100644
--- a/symbols/gr
+++ b/symbols/gr
@@ -73,7 +73,7 @@ xkb_symbols "simple" {
key <AE12> { [ equal, plus ] }; // = +
key <AD11> { [ bracketleft, braceleft ] }; // [ {
- key <AD12> { [ bracketright, braceright ] }; // [ {
+ key <AD12> { [ bracketright, braceright ] }; // ] }
key <AC11> { [ apostrophe, quotedbl ] }; // ' "
commit 395847f8146a48423e5d7b4d3a5cceba7614f63a
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Jun 21 10:16:31 2012 +1000
symbols: ossmath is CTRL+ALT, not FOUR_LEVEL (#43541)
having KPMU defined as FOUR_LEVEL, with 4 symbols only, triggers an xkb
error when the keypad stuff picks up the CTRL+ALT (from x11) and waits for 5
symbols instead.
X.Org Bug 43541 <http://bugs.freedesktop.org/show_bug.cgi?id=43541>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
(cherry picked from commit 49ed96928f6036bf07c8daa5aa886485fc3635e4)
diff --git a/symbols/keypad b/symbols/keypad
index 1bab391..b362ebc 100644
--- a/symbols/keypad
+++ b/symbols/keypad
@@ -267,13 +267,12 @@ xkb_symbols "legacymath" {
partial keypad_keys
xkb_symbols "ossmath" {
- key.type[Group1]="FOUR_LEVEL_X" ;
-
- key <KPDV> { [ KP_Divide, 0x1002215, 0x10000F7, XF86_Ungrab ] }; // / ∕ ÷ <XF86_Ungrab>
- key <KPMU> { [ KP_Multiply, 0x10022C5, 0x10000D7, XF86_ClearGrab ] }; // * ⋅ × <XF86_ClearGrab>
- key <KPSU> { [ KP_Subtract, 0x1002212, 0x1002212, XF86_Prev_VMode ] }; // - − − <XF86_Prev_VMode>
+ key.type[Group1]="CTRL+ALT" ;
- key <KPAD> { [ KP_Add, 0x100002B, 0x100002B, XF86_Next_VMode ] }; // + + + <XF86_Next_VMode>
+ key <KPDV> { [ KP_Divide, 0x1002215, 0x10000F7, VoidSymbol, XF86_Ungrab ] }; // / ∕ ÷ <XF86_Ungrab>
+ key <KPMU> { [ KP_Multiply, 0x10022C5, 0x10000D7, VoidSymbol, XF86_ClearGrab ] }; // * ⋅ × <XF86_ClearGrab>
+ key <KPSU> { [ KP_Subtract, 0x1002212, 0x1002212, VoidSymbol, XF86_Prev_VMode ] }; // - − − <XF86_Prev_VMode>
+ key <KPAD> { [ KP_Add, 0x100002B, 0x100002B, VoidSymbol, XF86_Next_VMode ] }; // + + + <XF86_Next_VMode>
};
commit 0eb9e4b01309650f10e9166ff365385da68505a9
Author: Sergey V. Udaltsov <svu@gnome.org>
Date: Fri Jun 1 22:20:01 2012 +0100
Reverting broken fix for is keyboard
https://bugs.freedesktop.org/show_bug.cgi?id=43173
(cherry picked from commit cd657ccb4223f34feffd635c3299206f96a5e216)
diff --git a/symbols/is b/symbols/is
index f8e0ce1..e5f5d82 100644
--- a/symbols/is
+++ b/symbols/is
@@ -21,14 +21,14 @@ xkb_symbols "basic" {
key <AE12> { [ minus, underscore, dead_cedilla, dead_ogonek ] };
key <AD11> { [ eth, ETH, dead_diaeresis, dead_abovering ] };
- key <AD12> { [apostrophe, question, dead_tilde, dead_macron ] };
+ key <AD12> { [apostrophe, question, asciitilde, dead_macron ] };
key <AC10> { [ ae, AE, asciicircum, dead_doubleacute ] };
key <AC11> { [dead_acute, dead_acute, dead_circumflex, dead_caron ] };
key <TLDE> { [dead_abovering, dead_diaeresis, notsign, hyphen ] };
// <AC12> = <BKSL>
- key <BKSL> { [ plus, asterisk, dead_grave, dead_breve ] };
+ key <BKSL> { [ plus, asterisk, grave, dead_breve ] };
// <AB00> = <LSGT>, is in file "pc": pc105
key <AB10> { [ thorn, THORN, dead_belowdot, dead_abovedot ] };
commit 96d2ed765ba1b4799daba6e4b4089a4ffbadecac
Author: Sergey V. Udaltsov <svu@gnome.org>
Date: Wed Dec 19 22:11:33 2012 +0000
A couple of missing chars in gr(polytonic), added on levels 3, 4
https://bugs.freedesktop.org/show_bug.cgi?id=58441
(cherry picked from commit 322480cc58f99cb05918376528432e1cd58d8ab5)
diff --git a/symbols/gr b/symbols/gr
index f4364cf..d470904 100644
--- a/symbols/gr
+++ b/symbols/gr
@@ -180,7 +180,9 @@ xkb_symbols "polytonic" {
key <AD12> { [ dead_iota, VoidSymbol, dead_breve ] }; // ͺ ˘
key <AC10> { [ dead_acute, dead_psili ] }; // ´ ̓
- key <AC11> { [ dead_grave, dead_dasia ] }; // ` ̔
+ key <AC11> { type[Group1]="FOUR_LEVEL",
+ [ dead_grave, dead_dasia, apostrophe, quotedbl ] };
+ // ` ̔ ' "
};
partial alphanumeric_keys alternate_group
commit 3f3b450c8c134c282afa81ee2b14cdc15ef50823
Author: Michael Biebl <biebl@debian.org>
Date: Tue Dec 25 12:33:50 2012 +0100
Preserve Shift modifier so GTK3 apps can properly differentiate between F10 and Shift+F10
diff --git a/debian/changelog b/debian/changelog
index 1647b8f..e61c376 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xkeyboard-config (2.5.1-2.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Preserve Shift modifier so GTK3 apps can properly differentiate between
+ F10 and Shift+F10 (Closes: #656685).
+
+ -- Michael Biebl <biebl@debian.org> Fri, 21 Sep 2012 18:12:52 +0200
+
xkeyboard-config (2.5.1-2) unstable; urgency=low
[ Ansgar Burchardt ]
diff --git a/debian/patches/preserve-shift.diff b/debian/patches/preserve-shift.diff
new file mode 100644
index 0000000..4b4960a
--- /dev/null
+++ b/debian/patches/preserve-shift.diff
@@ -0,0 +1,37 @@
+From a4f62448819764f6f27ebcb86115734d0d57ea8d Mon Sep 17 00:00:00 2001
+From: Sergey V. Udaltsov <svu@gnome.org>
+Date: Sun, 02 Sep 2012 07:57:52 +0000
+Subject: Fixed Shift-F10 behaviour
+
+Preserving shift is essential for many applications
+https://bugs.freedesktop.org/show_bug.cgi?id=45008
+---
+diff --git a/types/pc b/types/pc
+index 01a5634..daebe74 100644
+--- a/types/pc
++++ b/types/pc
+@@ -59,17 +59,19 @@ partial default xkb_types "default" {
+ };
+
+ type "CTRL+ALT" {
+- modifiers = Control+Alt+Shift+LevelThree;
++ modifiers = Control+Alt+Shift+LevelThree;
+ map[None] = Level1;
+ map[Shift] = Level2;
+ map[LevelThree] = Level3;
+ map[Shift+LevelThree] = Level4;
+- map[Control+Alt] = Level5;
++ map[Control+Alt] = Level5;
++ preserve[Shift] = Shift;
++ preserve[Shift+LevelThree] = Shift;
+ level_name[Level1] = "Base";
+ level_name[Level2] = "Shift";
+ level_name[Level3] = "Alt Base";
+ level_name[Level4] = "Shift Alt";
+- level_name[Level5] = "Ctrl+Alt";
++ level_name[Level5] = "Ctrl+Alt";
+ };
+
+ // Local eight level
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/debian/patches/series b/debian/patches/series
index 85f937c..ed7ada3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
docs.diff
revert-goodmap-badmap-for-apple.diff
+preserve-shift.diff
Reply to: