xkb-data: Changes to 'debian-unstable'
ChangeLog | 7 ++++++-
debian/changelog | 1 +
debian/xkb-data.postinst | 4 ++--
symbols/us | 6 +++---
4 files changed, 12 insertions(+), 6 deletions(-)
New commits:
commit d876da4cad1ed9b0544d1c8f25454af8cbd6779b
Author: Mohammed Adnene Trojette <adn@uracile.diwi.org>
Date: Sat Jan 5 02:11:04 2008 +0100
--no-run-if-empty
diff --git a/debian/xkb-data.postinst b/debian/xkb-data.postinst
index 5a5bded..3f1ccfe 100644
--- a/debian/xkb-data.postinst
+++ b/debian/xkb-data.postinst
@@ -6,11 +6,9 @@ set -e
case "$1" in
configure)
- if [ -d /etc/X11/xkb/ \
- -a `find /etc/X11/xkb/ | grep -v '/etc/X11/xkb/base.xml' | wc -l` -ne 1 \
- -a `find /etc/X11/xkb/ | grep '/etc/X11/xkb/base.xml' | wc -l` -ne 1 ]
+ if [ -d /etc/X11/xkb/ -a `find /etc/X11/xkb/ | wc -l` -ne 1 ]
then
- find /etc/X11/xkb/* | grep -v '/etc/X11/xkb/base.xml' | xargs rm
+ find /etc/X11/xkb/* | grep -v '/etc/X11/xkb/base.xml' | xargs --no-run-if-empty rm
fi
;;
commit 871785a6a13a218eaa1479d748a5dbcae7bf72ae
Author: Mohammed Adnene Trojette <adn@uracile.diwi.org>
Date: Sat Jan 5 01:46:21 2008 +0100
+ added English quotation marks to intl keymaps. (Closes: #453675)
diff --git a/ChangeLog b/ChangeLog
index e431e98..0913882 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-01-05 Sergey Udaltsov
+
+ * symbols/us: add (left,right)singlequotemark to us(-altgr)-intl
+ keymap, https://bugs.freedesktop.org/show_bug.cgi?id=13935
+
2008-01-04 Sergey Udaltsov
* symbols/inet, rules/base.lists.part, rules/base.xml.in: adding BTC
@@ -1906,7 +1911,7 @@
2004-09-13 22:39 svu
- * symbols/tj: new local cvs keyword seems to be ok - no more $Id: ChangeLog,v 1.388 2008-01-04 22:34:04 svu Exp $
+ * symbols/tj: new local cvs keyword seems to be ok - no more $Id: ChangeLog,v 1.389 2008-01-05 00:40:38 svu Exp $
2004-09-13 22:38 svu
diff --git a/debian/changelog b/debian/changelog
index 34b22c8..7b4b8f6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ xkeyboard-config (1.1~cvs.20080104.1-1) UNRELEASED; urgency=low
+ splitted Serbia and Montenegro. (Closes: #451622)
+ added fr(nodeadkeys) to mac. (Closes: #456942)
+ fixed mapping for shift+backslash in "il" keyboard. (Closes: #457927)
+ + added English quotation marks to intl keymaps. (Closes: #453675)
* Refreshed resync_rules_base.diff. (Closes: #442942)
* Documented the creation of a custom layout in README.Debian and
make /usr/share/X11/xkb/rules/base.xml a symlink to
diff --git a/symbols/us b/symbols/us
index 401211c..ea15c5b 100644
--- a/symbols/us
+++ b/symbols/us
@@ -1,4 +1,4 @@
-// $XKeyboardConfig: xkeyboard-config/symbols/us,v 1.41 2007-11-30 22:01:17 svu Exp $
+// $XKeyboardConfig: xkeyboard-config/symbols/us,v 1.42 2008-01-05 00:40:38 svu Exp $
//
// $XdotOrg: xc/programs/xkbcomp/symbols/us,v 1.1.4.3 2004/03/05 13:41:33 eich Exp $
@@ -111,8 +111,8 @@ xkb_symbols "intl" {
key <AD08> { [ i, I, iacute, Iacute ] };
key <AD09> { [ o, O, oacute, Oacute ] };
key <AD10> { [ p, P, odiaeresis, Odiaeresis ] };
- key <AD11> { [ bracketleft, braceleft, guillemotleft, guillemotleft ] };
- key <AD12> { [bracketright, braceright, guillemotright,guillemotright ] };
+ key <AD11> { [ bracketleft, braceleft, guillemotleft, leftdoublequotemark ] };
+ key <AD12> { [bracketright, braceright, guillemotright, rightdoublequotemark ] };
key <AC01> { [ a, A, aacute, Aacute ] };
key <AC02> { [ s, S, ssharp, section ] };
commit 8a9e71072261870ade33a699b1bf9116857997b8
Author: Mohammed Adnene Trojette <adn@uracile.diwi.org>
Date: Sat Jan 5 01:40:24 2008 +0100
and make it silent
diff --git a/debian/xkb-data.postinst b/debian/xkb-data.postinst
index 5486c85..5a5bded 100644
--- a/debian/xkb-data.postinst
+++ b/debian/xkb-data.postinst
@@ -2,7 +2,7 @@
# postinst script for xkb-data
#
-set -ex
+set -e
case "$1" in
configure)
commit 0a32eade0696478c44f17e0c87ef20dac8d74901
Author: Mohammed Adnene Trojette <adn@uracile.diwi.org>
Date: Sat Jan 5 01:39:59 2008 +0100
Don't make rm miss an operand...
diff --git a/debian/xkb-data.postinst b/debian/xkb-data.postinst
index 0d9f17c..5486c85 100644
--- a/debian/xkb-data.postinst
+++ b/debian/xkb-data.postinst
@@ -2,11 +2,13 @@
# postinst script for xkb-data
#
-set -e
+set -ex
case "$1" in
configure)
- if [ -d /etc/X11/xkb/ -a `find /etc/X11/xkb/|wc -l` -ne 1 ]
+ if [ -d /etc/X11/xkb/ \
+ -a `find /etc/X11/xkb/ | grep -v '/etc/X11/xkb/base.xml' | wc -l` -ne 1 \
+ -a `find /etc/X11/xkb/ | grep '/etc/X11/xkb/base.xml' | wc -l` -ne 1 ]
then
find /etc/X11/xkb/* | grep -v '/etc/X11/xkb/base.xml' | xargs rm
fi
Reply to: