[systemd/f18] https://bugzilla.redhat.com/show_bug.cgi?id=889562
Lennart Poettering
lennart at fedoraproject.org
Thu Jan 3 22:41:19 UTC 2013
commit 9d8d62c94d61e5598e7a2b74f0a6aef1ba43fd45
Author: Lennart Poettering <lennart at poettering.net>
Date: Thu Jan 3 23:41:02 2013 +0100
https://bugzilla.redhat.com/show_bug.cgi?id=889562
...-add-Belarussian-mapping-simple-by-and-by.patch | 21 ++++++++++++++++
...dian-xlayout-is-just-ca-not-ca-fr-any-mor.patch | 26 ++++++++++++++++++++
0003-add-Hebrew-Israel-simple-il-il.patch | 21 ++++++++++++++++
0004-add-Kazakh-keyboard-mapping-kazakh-kz.patch | 21 ++++++++++++++++
0005-add-Lithuanian-keyboard-mapping-lt-lt.patch | 21 ++++++++++++++++
...edonian-keyboard-mapping-X-layout-is-mk-n.patch | 26 ++++++++++++++++++++
systemd.spec | 12 ++++++++-
7 files changed, 147 insertions(+), 1 deletions(-)
---
diff --git a/0001-add-Belarussian-mapping-simple-by-and-by.patch b/0001-add-Belarussian-mapping-simple-by-and-by.patch
new file mode 100644
index 0000000..1f6284f
--- /dev/null
+++ b/0001-add-Belarussian-mapping-simple-by-and-by.patch
@@ -0,0 +1,21 @@
+From 40b5bbb91e1077ff0b7d88d7cbcff0228e282616 Mon Sep 17 00:00:00 2001
+From: Adam Williamson <awilliam at redhat.com>
+Date: Thu, 3 Jan 2013 12:57:58 -0800
+Subject: [PATCH 1/6] add Belarussian mapping: simple, 'by' and 'by'
+
+---
+ src/locale/kbd-model-map | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/locale/kbd-model-map b/src/locale/kbd-model-map
+index a895880..a0d7d19 100644
+--- a/src/locale/kbd-model-map
++++ b/src/locale/kbd-model-map
+@@ -70,3 +70,4 @@ cf ca(fr) pc105 - terminate:ctrl_alt_bksp
+ sv-latin1 se pc105 - terminate:ctrl_alt_bksp
+ sr-cy rs pc105 - terminate:ctrl_alt_bksp
+ gr gr,us pc105 - terminate:ctrl_alt_bksp,grp:shifts_toggle,grp_led:scroll
++by by,us pc105 - terminate:ctrl_alt_bksp,grp:shifts_toggle,grp_led:scroll
+--
+1.8.0.2
+
diff --git a/0002-French-Canadian-xlayout-is-just-ca-not-ca-fr-any-mor.patch b/0002-French-Canadian-xlayout-is-just-ca-not-ca-fr-any-mor.patch
new file mode 100644
index 0000000..984e880
--- /dev/null
+++ b/0002-French-Canadian-xlayout-is-just-ca-not-ca-fr-any-mor.patch
@@ -0,0 +1,26 @@
+From fa593cfd8783374ec1382f32ea02f4a137a6de16 Mon Sep 17 00:00:00 2001
+From: Adam Williamson <awilliam at redhat.com>
+Date: Thu, 3 Jan 2013 12:43:09 -0800
+Subject: [PATCH 2/6] French Canadian xlayout is just "ca", not "ca(fr)" any
+ more
+
+---
+ src/locale/kbd-model-map | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/locale/kbd-model-map b/src/locale/kbd-model-map
+index a0d7d19..e05322d 100644
+--- a/src/locale/kbd-model-map
++++ b/src/locale/kbd-model-map
+@@ -66,7 +66,7 @@ sk-qwerty sk pc105 - terminate:ctrl_alt_bksp,qwerty
+ dev dev,us pc105 - terminate:ctrl_alt_bksp,grp:shifts_toggle,grp_led:scroll
+ fr-latin9 fr pc105 latin9 terminate:ctrl_alt_bksp
+ fr_CH-latin1 ch pc105 fr terminate:ctrl_alt_bksp
+-cf ca(fr) pc105 - terminate:ctrl_alt_bksp
++cf ca pc105 - terminate:ctrl_alt_bksp
+ sv-latin1 se pc105 - terminate:ctrl_alt_bksp
+ sr-cy rs pc105 - terminate:ctrl_alt_bksp
+ gr gr,us pc105 - terminate:ctrl_alt_bksp,grp:shifts_toggle,grp_led:scroll
+--
+1.8.0.2
+
diff --git a/0003-add-Hebrew-Israel-simple-il-il.patch b/0003-add-Hebrew-Israel-simple-il-il.patch
new file mode 100644
index 0000000..69f5898
--- /dev/null
+++ b/0003-add-Hebrew-Israel-simple-il-il.patch
@@ -0,0 +1,21 @@
+From 2eaaf10fe053f1e2f1668319d5cd13328500be7d Mon Sep 17 00:00:00 2001
+From: Adam Williamson <awilliam at redhat.com>
+Date: Thu, 3 Jan 2013 13:20:08 -0800
+Subject: [PATCH 3/6] add Hebrew (Israel) - simple, il/il
+
+---
+ src/locale/kbd-model-map | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/locale/kbd-model-map b/src/locale/kbd-model-map
+index e05322d..ee8f9c1 100644
+--- a/src/locale/kbd-model-map
++++ b/src/locale/kbd-model-map
+@@ -71,3 +71,4 @@ sv-latin1 se pc105 - terminate:ctrl_alt_bksp
+ sr-cy rs pc105 - terminate:ctrl_alt_bksp
+ gr gr,us pc105 - terminate:ctrl_alt_bksp,grp:shifts_toggle,grp_led:scroll
+ by by,us pc105 - terminate:ctrl_alt_bksp,grp:shifts_toggle,grp_led:scroll
++il il pc105 - terminate:ctrl_alt_bksp
+--
+1.8.0.2
+
diff --git a/0004-add-Kazakh-keyboard-mapping-kazakh-kz.patch b/0004-add-Kazakh-keyboard-mapping-kazakh-kz.patch
new file mode 100644
index 0000000..d9d9cdc
--- /dev/null
+++ b/0004-add-Kazakh-keyboard-mapping-kazakh-kz.patch
@@ -0,0 +1,21 @@
+From 177c11eddfb89066e31c6bcec28815e37b8c838b Mon Sep 17 00:00:00 2001
+From: Adam Williamson <awilliam at redhat.com>
+Date: Thu, 3 Jan 2013 13:25:36 -0800
+Subject: [PATCH 4/6] add Kazakh keyboard mapping (kazakh/kz)
+
+---
+ src/locale/kbd-model-map | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/locale/kbd-model-map b/src/locale/kbd-model-map
+index ee8f9c1..500b688 100644
+--- a/src/locale/kbd-model-map
++++ b/src/locale/kbd-model-map
+@@ -72,3 +72,4 @@ sr-cy rs pc105 - terminate:ctrl_alt_bksp
+ gr gr,us pc105 - terminate:ctrl_alt_bksp,grp:shifts_toggle,grp_led:scroll
+ by by,us pc105 - terminate:ctrl_alt_bksp,grp:shifts_toggle,grp_led:scroll
+ il il pc105 - terminate:ctrl_alt_bksp
++kazakh kz,us pc105 - terminate:ctrl_alt_bksp,grp:shifts_toggle,grp_led:scroll
+--
+1.8.0.2
+
diff --git a/0005-add-Lithuanian-keyboard-mapping-lt-lt.patch b/0005-add-Lithuanian-keyboard-mapping-lt-lt.patch
new file mode 100644
index 0000000..27544ef
--- /dev/null
+++ b/0005-add-Lithuanian-keyboard-mapping-lt-lt.patch
@@ -0,0 +1,21 @@
+From 12939e721759aeeb24830ac0904ed8a701c07e24 Mon Sep 17 00:00:00 2001
+From: Adam Williamson <awilliam at redhat.com>
+Date: Thu, 3 Jan 2013 13:28:41 -0800
+Subject: [PATCH 5/6] add Lithuanian keyboard mapping (lt/lt)
+
+---
+ src/locale/kbd-model-map | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/locale/kbd-model-map b/src/locale/kbd-model-map
+index 500b688..1688373 100644
+--- a/src/locale/kbd-model-map
++++ b/src/locale/kbd-model-map
+@@ -73,3 +73,4 @@ gr gr,us pc105 - terminate:ctrl_alt_bksp,grp:shifts_toggle,grp_led:scroll
+ by by,us pc105 - terminate:ctrl_alt_bksp,grp:shifts_toggle,grp_led:scroll
+ il il pc105 - terminate:ctrl_alt_bksp
+ kazakh kz,us pc105 - terminate:ctrl_alt_bksp,grp:shifts_toggle,grp_led:scroll
++lt lt pc105 - terminate:ctrl_alt_bksp
+--
+1.8.0.2
+
diff --git a/0006-correct-Macedonian-keyboard-mapping-X-layout-is-mk-n.patch b/0006-correct-Macedonian-keyboard-mapping-X-layout-is-mk-n.patch
new file mode 100644
index 0000000..92f2150
--- /dev/null
+++ b/0006-correct-Macedonian-keyboard-mapping-X-layout-is-mk-n.patch
@@ -0,0 +1,26 @@
+From 768aa358713d3e28864d35ee1bb53355ecc894d7 Mon Sep 17 00:00:00 2001
+From: Adam Williamson <awilliam at redhat.com>
+Date: Thu, 3 Jan 2013 13:37:08 -0800
+Subject: [PATCH 6/6] correct Macedonian keyboard mapping (X layout is 'mk',
+ not 'mkd')
+
+---
+ src/locale/kbd-model-map | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/locale/kbd-model-map b/src/locale/kbd-model-map
+index 1688373..b0860ab 100644
+--- a/src/locale/kbd-model-map
++++ b/src/locale/kbd-model-map
+@@ -2,7 +2,7 @@
+ # consolelayout xlayout xmodel xvariant xoptions
+ sg ch pc105 de_nodeadkeys terminate:ctrl_alt_bksp
+ nl nl pc105 - terminate:ctrl_alt_bksp
+-mk-utf mkd,us pc105 - terminate:ctrl_alt_bksp,grp:shifts_toggle,grp_led:scroll
++mk-utf mk,us pc105 - terminate:ctrl_alt_bksp,grp:shifts_toggle,grp_led:scroll
+ trq tr pc105 - terminate:ctrl_alt_bksp
+ guj in,us pc105 guj terminate:ctrl_alt_bksp,grp:shifts_toggle,grp_led:scroll
+ uk gb pc105 - terminate:ctrl_alt_bksp
+--
+1.8.0.2
+
diff --git a/systemd.spec b/systemd.spec
index 0993f68..179206b 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -14,7 +14,7 @@ Name: systemd
Url: http://www.freedesktop.org/wiki/Software/systemd
Version: 195
-Release: 14%{?gitcommit:.git%{gitcommit}}%{?dist}
+Release: 15%{?gitcommit:.git%{gitcommit}}%{?dist}
# For a breakdown of the licensing, see README
License: LGPLv2+ and MIT and GPLv2+
Summary: A System and Service Manager
@@ -101,6 +101,13 @@ Patch0019: 0019-journal-send-always-send-SYSLOG_IDENTIFIER-if-we-hav.patch
Patch0020: 0020-revert-udev-killing.patch
# F18 NTH https://bugzilla.redhat.com/show_bug.cgi?id=882212
Patch0021: 0021-localectl-fix-dbus-call-arguments-in-set_x11_keymap.patch
+# F18: https://bugs.freedesktop.org/show_bug.cgi?id=59000 https://bugzilla.redhat.com/show_bug.cgi?id=889562
+Patch0022: 0001-add-Belarussian-mapping-simple-by-and-by.patch
+Patch0023: 0002-French-Canadian-xlayout-is-just-ca-not-ca-fr-any-mor.patch
+Patch0024: 0003-add-Hebrew-Israel-simple-il-il.patch
+Patch0025: 0004-add-Kazakh-keyboard-mapping-kazakh-kz.patch
+Patch0026: 0005-add-Lithuanian-keyboard-mapping-lt-lt.patch
+Patch0027: 0006-correct-Macedonian-keyboard-mapping-X-layout-is-mk-n.patch
Obsoletes: SysVinit < 2.86-24, sysvinit < 2.86-24
Provides: SysVinit = 2.86-24, sysvinit = 2.86-24
@@ -734,6 +741,9 @@ fi
%{_libdir}/pkgconfig/gudev-1.0*
%changelog
+* Thu Jan 3 2013 Lennart Poettering <lpoetter at redhat.com> - 195-15
+- https://bugs.freedesktop.org/show_bug.cgi?id=59000
+
* Thu Jan 3 2013 Lennart Poettering <lpoetter at redhat.com> - 195-14
- Migrate old s-s-k X11 keyboard configuration file
- https://bugzilla.redhat.com/show_bug.cgi?id=889699
More information about the scm-commits
mailing list