ChangeLog | 10 ++++++++++
debian/changelog | 9 +++++++++
rules/base.xml.in | 10 +++++++++-
symbols/ca | 7 +++++++
4 files changed, 35 insertions(+), 1 deletion(-)
New commits:
commit 6ea8b014ad1db7878b62bf16e5d0665266f482f5
Author: Julien Cristau <jcris...@debian.org>
Date: Sun Feb 1 16:47:15 2009 +0100
Prepare changelog for upload
diff --git a/debian/changelog b/debian/changelog
index 0a91dd4..efb0ad7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+xkeyboard-config (1.5-2) unstable; urgency=low
+
+ * Cherry-picked from upstream git:
+ + added ca(eng), b.fd.o#19707
+ + fixed meta for fi(smi), b.fd.o#19841
+ Requested by Samuel Thibault.
+
+ -- Julien Cristau <jcris...@debian.org> Sun, 01 Feb 2009 16:46:55 +0100
+
xkeyboard-config (1.5-1) unstable; urgency=low
* New upstream release.
commit 0f5a5a6930c463868cca5f1b311cc9bdb486fe16
Author: Sergey V. Udaltsov <s...@gnome.org>
Date: Sun Feb 1 15:29:55 2009 +0000
fixed meta for fi(smi), b.fd.o#19841
diff --git a/ChangeLog b/ChangeLog
index 6d62ab5..18e6445 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-02-01 Reşat SABIQ
+
+ * rules/base.xml.in: fixed metainfo for fi(smi),
+ http://bugs.freedesktop.org/show_bug.cgi?id=19841
+
2009-01-28 Sergey Udaltsov
* rules/base.xml.in, symbols/ca: added ca(eng) for convenience,
diff --git a/rules/base.xml.in b/rules/base.xml.in
index 98d3e34..773fe69 100644
--- a/rules/base.xml.in
+++ b/rules/base.xml.in
@@ -2223,7 +2223,8 @@
<configItem>
<name>smi</name>
<_description>Northern Saami</_description>
- <languageList><iso639Id>smi</iso639Id></languageList>
+ <languageList><iso639Id>smi</iso639Id>
+ <iso639Id>sme</iso639Id></languageList>
</configItem>
</variant>
<variant>
commit 00db32da904dbf1e1a5476f52d5814dc68bc0301
Author: Sergey V. Udaltsov <s...@linnie-the-pooh.(none)>
Date: Wed Jan 28 23:55:52 2009 +0000
added ca(eng), b.fd.o#19707
diff --git a/ChangeLog b/ChangeLog
index 13a29fb..6d62ab5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-01-28 Sergey Udaltsov
+
+ * rules/base.xml.in, symbols/ca: added ca(eng) for convenience,
+ http://bugs.freedesktop.org/show_bug.cgi?id=19707
+
2009-01-27 Sergey Udaltsov
* symbols/typo: fixed text selection,
diff --git a/rules/base.xml.in b/rules/base.xml.in
index b8d8491..98d3e34 100644
--- a/rules/base.xml.in
+++ b/rules/base.xml.in
@@ -1886,6 +1886,13 @@
<_description>Ktunaxa</_description>
</configItem>
</variant>
+ <variant>
+ <configItem>
+ <name>eng</name>
+ <_description>English</_description>
+ <languageList><iso639Id>eng</iso639Id></languageList>
+ </configItem>
+ </variant>
</variantList>
</layout>
<layout>
diff --git a/symbols/ca b/symbols/ca
index 66b9f2d..818a8ff 100644
--- a/symbols/ca
+++ b/symbols/ca
@@ -516,3 +516,10 @@ xkb_symbols "kut" {
//MODIFIER LETTER RIGHT HALF RING
key <AC10> { [ semicolon, colon,U02BE,U02BE ] };
};
+
+partial alphanumeric_keys
+xkb_symbols "eng" {
+ name[Group1] = "Canada - English";
+ include "us(basic)"
+};
+
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
