debian/changelog | 29 +++++++++++++++++++++++++++++
debian/patches/109_fr_oss_space_char.patch | 22 ++++++++++++++++++++++
debian/patches/110_dead_hook_horn.patch | 21 +++++++++++++++++++++
debian/patches/111_cz_ssharp.patch | 21 +++++++++++++++++++++
debian/patches/112_dk_dvorak_tilde.patch | 18 ++++++++++++++++++
debian/patches/series | 4 ++++
6 files changed, 115 insertions(+)
New commits:
commit b855eb7a0debe8fa140628f7c91f96d8a0fbcf06
Author: Bryce Harrington <br...@canonical.com>
Date: Mon Jun 4 18:32:08 2012 -0700
cl
diff --git a/debian/changelog b/debian/changelog
index 4b928f9..1cba3d0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xkeyboard-config (2.5-1ubuntu4) quantal; urgency=low
+
+ * Actually apply patch 112
+
+ -- Bryce Harrington <br...@ubuntu.com> Mon, 04 Jun 2012 18:30:47 -0700
+
xkeyboard-config (2.5-1ubuntu3) quantal; urgency=low
* Add 111_cz_ssharp.patch: Fix mapping of 4th level of the AC11 key to
commit 12a54fd6ac94493dda2d24928296721f7e827fd2
Author: Bryce Harrington <br...@canonical.com>
Date: Mon Jun 4 18:30:11 2012 -0700
Add patch 112
diff --git a/debian/changelog b/debian/changelog
index 65c2327..4b928f9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,9 @@ xkeyboard-config (2.5-1ubuntu3) quantal; urgency=low
ssharp rather than quotedbl for the Czech layout. Cherrypick of
patch from upstream.
(LP: #953477)
+ * Add 112_dk_dvorak_tilde.patch: Fix tilde key in the Danish Dvorak
+ layout. It's not the same as Norwegian as has been assumed previously.
+ (LP: #989626)
-- Bryce Harrington <br...@ubuntu.com> Mon, 04 Jun 2012 18:11:53 -0700
diff --git a/debian/patches/112_dk_dvorak_tilde.patch
b/debian/patches/112_dk_dvorak_tilde.patch
new file mode 100644
index 0000000..e43ebf9
--- /dev/null
+++ b/debian/patches/112_dk_dvorak_tilde.patch
@@ -0,0 +1,18 @@
+commit a76516530698afb567230f367c04b804ebda044b
+Author: Sergey V. Udaltsov <s...@gnome.org>
+Date: Tue May 1 00:37:26 2012 +0100
+
+ Added missing tilde to dk(dvorak)
+
+ https://bugs.freedesktop.org/show_bug.cgi?id=49312
+
+diff --git a/symbols/dk b/symbols/dk
+index 1187a99..1deea28 100644
+--- a/symbols/dk
++++ b/symbols/dk
+@@ -69,4 +69,5 @@ xkb_symbols "dvorak" {
+ include "no(dvorak)"
+
+ name[Group1]= "Danish (Dvorak)";
++ key <AD12> { [ asciitilde, asciicircum, dead_diaeresis, dead_tilde ] };
+ };
diff --git a/debian/patches/series b/debian/patches/series
index 3141a5b..d4fe280 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@ revert-goodmap-badmap-for-apple.diff
109_fr_oss_space_char.patch
110_dead_hook_horn.patch
111_cz_ssharp.patch
+112_dk_dvorak_tilde.patch
commit d56160dfe062bc2ae7560b52a1ac48b826491150
Author: Bryce Harrington <br...@canonical.com>
Date: Mon Jun 4 18:21:07 2012 -0700
Add patch 111
diff --git a/debian/changelog b/debian/changelog
index 825a88e..65c2327 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+xkeyboard-config (2.5-1ubuntu3) quantal; urgency=low
+
+ * Add 111_cz_ssharp.patch: Fix mapping of 4th level of the AC11 key to
+ ssharp rather than quotedbl for the Czech layout. Cherrypick of
+ patch from upstream.
+ (LP: #953477)
+
+ -- Bryce Harrington <br...@ubuntu.com> Mon, 04 Jun 2012 18:11:53 -0700
+
xkeyboard-config (2.5-1ubuntu2) quantal; urgency=low
* Add 109_fr_oss_space_char.patch: Fix problems using space bar in various
diff --git a/debian/patches/111_cz_ssharp.patch
b/debian/patches/111_cz_ssharp.patch
new file mode 100644
index 0000000..77cfa7b
--- /dev/null
+++ b/debian/patches/111_cz_ssharp.patch
@@ -0,0 +1,21 @@
+commit 8640e24c91e80675016458d50d7a1ad8546e32ff
+Author: Sergey V. Udaltsov <s...@gnome.org>
+Date: Sun Apr 8 05:41:11 2012 +0100
+
+ Czech (qwerty) layout has " instead of ß in the 4th level
+
+ https://bugs.freedesktop.org/show_bug.cgi?id=48252
+
+diff --git a/symbols/cz b/symbols/cz
+index 25fd54a..db3dd48 100644
+--- a/symbols/cz
++++ b/symbols/cz
+@@ -90,7 +90,7 @@ xkb_symbols "qwerty" {
+
+ key <AB01> { [ z, Z, degree,
NoSymbol ] };
+ key <AC10> { [ uring, quotedbl, semicolon,
colon ] };
+- key <AC11> { [ section, exclam, apostrophe,
quotedbl ] };
++ key <AC11> { [ section, exclam, apostrophe,
ssharp ] };
+ key <AD06> { [ y, Y, NoSymbol,
NoSymbol ] };
+ key <AD11> { [ uacute, slash, bracketleft,
braceleft ] };
+ key <AD12> { [parenright, parenleft, bracketright,
braceright ] };
diff --git a/debian/patches/series b/debian/patches/series
index fa86d66..3141a5b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@ revert-goodmap-badmap-for-apple.diff
108_fix_intltool_make_check.diff
109_fr_oss_space_char.patch
110_dead_hook_horn.patch
+111_cz_ssharp.patch
commit a438418a4aedebdbb0d2c03d5fa2b240b86cfe88
Author: Bryce Harrington <br...@canonical.com>
Date: Wed May 16 18:53:17 2012 -0700
Add patches 109 and 110
diff --git a/debian/changelog b/debian/changelog
index 3ced153..825a88e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+xkeyboard-config (2.5-1ubuntu2) quantal; urgency=low
+
+ * Add 109_fr_oss_space_char.patch: Fix problems using space bar in various
+ applications when using the fr(oss) keymap.
+ (LP: #221112)
+ * Add 110_dead_hook_horn.patch: Add two deadkeys on level 3 and 4 of the
+ j key for the latin keymap.
+ (LP: #825624)
+
+ -- Bryce Harrington <br...@ubuntu.com> Wed, 16 May 2012 18:46:24 -0700
+
xkeyboard-config (2.5-1ubuntu1) precise; urgency=low
* Merge from Debian experimental. Remaining Ubuntu changes:
diff --git a/debian/patches/109_fr_oss_space_char.patch
b/debian/patches/109_fr_oss_space_char.patch
new file mode 100644
index 0000000..a6b1c37
--- /dev/null
+++ b/debian/patches/109_fr_oss_space_char.patch
@@ -0,0 +1,22 @@
+commit 518c769df2e9ce70cb721769a08b81504f243b2a
+Author: Sergey V. Udaltsov <s...@gnome.org>
+Date: Sat Mar 24 22:16:47 2012 +0000
+
+ For fr(oss), some application can't handle space caracter properly
+
+ https://bugs.freedesktop.org/show_bug.cgi?id=15804
+
+diff --git a/symbols/fr b/symbols/fr
+index c58eb0d..0bf0be2 100644
+--- a/symbols/fr
++++ b/symbols/fr
+@@ -125,7 +125,8 @@ xkb_symbols "oss" {
+
+ include "latin"
+ include "level3(ralt_switch)"
+- include "nbsp(level4nl)"
++ include "nbsp(level4n)"
++ include "level5(rctrl_switch)"
+ include "keypad(oss)"
+
+ name[Group1]="French (alternative)";
diff --git a/debian/patches/110_dead_hook_horn.patch
b/debian/patches/110_dead_hook_horn.patch
new file mode 100644
index 0000000..0d66c35
--- /dev/null
+++ b/debian/patches/110_dead_hook_horn.patch
@@ -0,0 +1,21 @@
+commit 0e88f0216f6410ba037fb40f5c4c375f3e82c042
+Author: Bryce Harrington <br...@canonical.com>
+Date: Mon Apr 30 14:18:49 2012 -0700
+
+ latin: Add dead_hook and dead_horn to J key level 3, 4
+
+ Signed-off-by: Bryce Harrington <br...@canonical.com>
+
+diff --git a/symbols/latin b/symbols/latin
+index 77b99d4..424768e 100644
+--- a/symbols/latin
++++ b/symbols/latin
+@@ -35,7 +35,7 @@ xkb_symbols "basic" {
+ key <AC04> { [ f, F, dstroke, ordfeminine ]
};
+ key <AC05> { [ g, G, eng, ENG ]
};
+ key <AC06> { [ h, H, hstroke, Hstroke ]
};
+- key <AC07> { [ j, J, j, J ]
};
++ key <AC07> { [ j, J, dead_hook, dead_horn ]
};
+ key <AC08> { [ k, K, kra, ampersand ]
};
+ key <AC09> { [ l, L, lstroke, Lstroke ]
};
+ key <AC10> { [ semicolon, colon, dead_acute, dead_doubleacute ]
};
diff --git a/debian/patches/series b/debian/patches/series
index 1029554..fa86d66 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,5 @@ docs.diff
revert-goodmap-badmap-for-apple.diff
105_intelligent_keyboard.patch
108_fix_intltool_make_check.diff
+109_fr_oss_space_char.patch
+110_dead_hook_horn.patch
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1sfrce-0003ed...@vasks.debian.org
