.gitignore | 2
ChangeLog | 496 ++++
Makefile.am | 4
NEWS | 4
compat/xfree86 | 18
configure.in | 13
debian/changelog | 16
debian/control | 2
debian/rules | 3
debian/watch | 2
man/Makefile.am | 17
man/man.xsl | 137 +
po/bg.po | 2330 ++++++++++-----------
po/ca.po | 1784 ++++++++--------
po/da.po | 2157 ++++++++++---------
po/de.po | 2274 ++++++++++----------
po/eo.po | 2914 ++++++++++++++------------
po/es.po | 2664 ++++++++++++------------
po/fr.po | 1790 ++++++++--------
po/hu.po | 2719 +++++++++++++-----------
po/ja.po | 2457 +++++++++++-----------
po/ko.po | 1761 ++++++++--------
po/lt.po | 4280 +++++++++++++++++++++++++--------------
po/nl.po | 1800 ++++++++--------
po/pl.po | 2107 ++++++++++---------
po/ru.po | 2165 ++++++++++---------
po/sl.po | 4101 +++++++++++++++++++++++--------------
po/uk.po | 2156 ++++++++++---------
po/xkeyboard-config.pot | 2087 ++++++++++---------
po/zh_CN.po | 2654 +++++++++++++-----------
rules/base.extras.xml.in | 85
rules/base.o_c.part | 1
rules/base.o_s.part | 27
rules/base.xml.in | 407 ++-
rules/compat/variantsMapping.lst | 2
rules/xkb.dtd | 5
symbols/apl | 752 ++++--
symbols/cd | 2
symbols/cm | 34
symbols/ctrl | 16
symbols/cz | 17
symbols/de | 63
symbols/ee | 1
symbols/gb | 2
symbols/group | 212 +
symbols/in | 307 ++
symbols/is | 20
symbols/jp | 8
symbols/keypad | 24
symbols/la | 8
symbols/lk | 5
symbols/lv | 14
symbols/ma | 18
symbols/macintosh_vndr/apple | 2
symbols/no | 2
symbols/pc | 56
symbols/ru | 6
symbols/srvr_ctrl | 32
symbols/sun_vndr/us | 2
symbols/terminate | 2
symbols/tw | 1
symbols/us | 2
types/extra | 22
types/numpad | 10
types/pc | 15
xkeyboard-config.spec.in | 45
66 files changed, 26437 insertions(+), 20704 deletions(-)
New commits:
commit 06527818c820838368647e507281a2aea4cc4d09
Author: Cyril Brulebois <k...@debian.org>
Date: Fri Jan 20 18:21:05 2012 +0100
Upload to unstable.
diff --git a/debian/changelog b/debian/changelog
index 944d885..43e4267 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xkeyboard-config (2.5-1) UNRELEASED; urgency=low
+xkeyboard-config (2.5-1) unstable; urgency=low
* New upstream release, including:
- Hide ClearGrab/CloseGrabs actions behind an option.
@@ -12,7 +12,7 @@ xkeyboard-config (2.5-1) UNRELEASED; urgency=low
* Add xsltproc, xutils-dev build-deps.
* Keep /usr/share/man out of the udeb, due to a newly-added manpage.
- -- Cyril Brulebois <k...@debian.org> Fri, 20 Jan 2012 17:07:47 +0100
+ -- Cyril Brulebois <k...@debian.org> Fri, 20 Jan 2012 18:21:03 +0100
xkeyboard-config (2.3-2) unstable; urgency=low
commit bf003fda90b22fde46db0dcb70b3131c0462f22e
Author: Cyril Brulebois <k...@debian.org>
Date: Fri Jan 20 18:21:00 2012 +0100
Fix option name.
diff --git a/debian/changelog b/debian/changelog
index 5ddbe23..944d885 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,7 +2,7 @@ xkeyboard-config (2.5-1) UNRELEASED; urgency=low
* New upstream release, including:
- Hide ClearGrab/CloseGrabs actions behind an option.
- * To get those actions back, use the grab:break_action option. At
+ * To get those actions back, use the grab:break_actions option. At
the moment, the corresponding actionve has been disabled on the
server side as a hot fix for CVE-2012-0064 (Closes: #656500).
* Since there's a workaround on the server side already, do not use
commit 5334d62477c78abf510e195771dc9ef9dc512a9b
Author: Cyril Brulebois <k...@debian.org>
Date: Fri Jan 20 17:46:00 2012 +0100
Keep /usr/share/man out of the udeb, due to a newly-added manpage.
diff --git a/debian/changelog b/debian/changelog
index 2688a09..5ddbe23 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ xkeyboard-config (2.5-1) UNRELEASED; urgency=low
changes can be tested for a while in unstable.
* Update URL in watch file.
* Add xsltproc, xutils-dev build-deps.
+ * Keep /usr/share/man out of the udeb, due to a newly-added manpage.
-- Cyril Brulebois <k...@debian.org> Fri, 20 Jan 2012 17:07:47 +0100
diff --git a/debian/rules b/debian/rules
index 4e1850d..0324b55 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,9 +15,10 @@ override_dh_auto_install:
# Regular deb:
$(MAKE) -C build install DESTDIR=$(CURDIR)/debian/xkb-data
- # Treat the udeb as an exact copy, but remove messages/pkg-config:
+ # Treat the udeb as an exact copy, but remove
messages/pkg-config/man-pages:
cp -r $(CURDIR)/debian/xkb-data/* $(CURDIR)/debian/xkb-data-udeb
rm -rf $(CURDIR)/debian/xkb-data-udeb/usr/share/locale
+ rm -rf $(CURDIR)/debian/xkb-data-udeb/usr/share/man
rm -rf $(CURDIR)/debian/xkb-data-udeb/usr/share/pkgconfig
# Now try and save some space, by getting rid of comments (in
commit 88da273e42f96f207915949168625d777462bd72
Author: Cyril Brulebois <k...@debian.org>
Date: Fri Jan 20 17:21:35 2012 +0100
Add xsltproc, xutils-dev build-deps.
diff --git a/debian/changelog b/debian/changelog
index 3502ec9..2688a09 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ xkeyboard-config (2.5-1) UNRELEASED; urgency=low
a high urgency, so that this new upstream release and its various
changes can be tested for a while in unstable.
* Update URL in watch file.
+ * Add xsltproc, xutils-dev build-deps.
-- Cyril Brulebois <k...@debian.org> Fri, 20 Jan 2012 17:07:47 +0100
diff --git a/debian/control b/debian/control
index 8bd3b95..f54d1cd 100644
--- a/debian/control
+++ b/debian/control
@@ -12,6 +12,8 @@ Build-Depends-Indep:
x11-xkb-utils,
libglib2.0-dev,
intltool,
+ xsltproc,
+ xutils-dev (>= 1:7.6+2),
Standards-Version: 3.9.1
Vcs-Git: git://git.debian.org/git/pkg-xorg/data/xkb-data
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/data/xkb-data.git
commit 4d891cb0eb510a0897f63de4d2454f322353c353
Author: Cyril Brulebois <k...@debian.org>
Date: Fri Jan 20 17:16:20 2012 +0100
Update URL in watch file.
diff --git a/debian/changelog b/debian/changelog
index 51aaf37..3502ec9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ xkeyboard-config (2.5-1) UNRELEASED; urgency=low
* Since there's a workaround on the server side already, do not use
a high urgency, so that this new upstream release and its various
changes can be tested for a while in unstable.
+ * Update URL in watch file.
-- Cyril Brulebois <k...@debian.org> Fri, 20 Jan 2012 17:07:47 +0100
diff --git a/debian/watch b/debian/watch
index 7a647e3..3dac745 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,3 @@
#git=git://anongit.freedesktop.org/xkeyboard-config
version=3
-http://www.x.org/releases/individual/data/xkeyboard-config/xkeyboard-config-(.*)\.tar\.gz
+http://xorg.freedesktop.org/releases/individual/data/xkeyboard-config-(.*)\.tar\.gz
commit bcaa9046327480fdc17682a86b2febec5e847d35
Author: Cyril Brulebois <k...@debian.org>
Date: Fri Jan 20 17:13:42 2012 +0100
Bump changelogs, closing CVE-2012-0064/#656500.
diff --git a/ChangeLog b/ChangeLog
index c44a3b5..4b9c196 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,499 @@
+commit f2426383a22ac3ee7bc4a03c51edba0345871664
+Author: Sergey V. Udaltsov <s...@gnome.org>
+Date: Thu Jan 19 23:30:35 2012 +0000
+
+ Preparing 2.5
+
+commit 16b645db6909fd6a715742580e35aaf186ec4be6
+Author: Sergey V. Udaltsov <s...@gnome.org>
+Date: Thu Jan 19 23:27:39 2012 +0000
+
+ Pre-release PO sync
+
+commit dc55259e52ef034e568a50beb43a80b3595e49e4
+Author: Daniel Stone <dan...@fooishbar.org>
+Date: Thu Jan 19 16:36:16 2012 +1100
+
+ Hide ClearGrab/CloseGrabs actions behind an option
+
+ Similar to how we put the Terminate mapping behind an option rather than
+ enabling it by default, put the ClearGrab/CloseGrab action handlers
+ behind an option too, so we don't ship 'break my screensaver'. Oops.
+
+ Signed-off-by: Daniel Stone <dan...@fooishbar.org>
+
+commit 9c1c2e3db0db7ffde3668aacaf81919fd829adeb
+Author: Sergey V. Udaltsov <s...@gnome.org>
+Date: Thu Jan 19 23:21:41 2012 +0000
+
+ Fixed no(dvorak), AD12
+
+ https://bugs.freedesktop.org/show_bug.cgi?id=44866
+
+commit ee03c309aebce674efb98a548cfaa6174498b2fa
+Author: Sergey V. Udaltsov <s...@gnome.org>
+Date: Sat Jan 7 23:49:06 2012 +0000
+
+ Updated metainfo for apl layout
+
+ https://bugs.freedesktop.org/show_bug.cgi?id=44057
+
+commit 77e38cbe4b11b1cbd760f337ddca97965bb35cef
+Author: Sergey V. Udaltsov <s...@gnome.org>
+Date: Wed Dec 28 02:15:12 2011 +0000
+
+ Making consistent CTRL+SHIFT toggle
+
+ The default switchers are changed to switch to next group.
+ The old behavior is kept in _bidir options
+
+ https://bugs.freedesktop.org/show_bug.cgi?id=42931
+
+commit 75093402d75403b6bd8de4a5d4be7e4ad36673f2
+Author: Sergey V. Udaltsov <s...@gnome.org>
+Date: Wed Dec 28 01:46:39 2011 +0000
+
+ Making consistent CTRL+ALT toggle
+
+ The default switchers are changed to switch to next group.
+ The old behavior is kept in _bidir options
+
+ https://bugs.freedesktop.org/show_bug.cgi?id=42931
+
+commit 86f2a0226feac7bd8297a164746a24d8165faf4d
+Merge: de45ece 3e3bae1
+Author: Sergey V. Udaltsov <s...@gnome.org>
+Date: Mon Dec 26 12:30:23 2011 +0000
+
+ Merge branch 'master' of git+ssh://git.freedesktop.org/git/xkeyboard-config
+
+commit de45ece5ab09ab218998d35db3a9d0cb4686b546
+Author: Sergey V. Udaltsov <s...@gnome.org>
+Date: Mon Dec 26 12:26:35 2011 +0000
+
+ Separating lalt_lshift_toggle option
+
+ https://bugs.freedesktop.org/show_bug.cgi?id=43922
+ Now, alt_shift_toggle is composed of "right" and "left" blocks. Also, it
is one-direction ("Next") only. For people who need both directions, the
"bidir" option is introduced but not advertised in xml - because GUI tools
usually belong to DEs that perform one-way circular layout switching.
+
+commit 3e3bae15e3268b963ee9f81cea716ea7732be4dd
+Author: Sergey V. Udaltsov <s...@gnome.org>
+Date: Sat Dec 24 20:26:55 2011 +0000
+
+ updated apl layout
+
+ https://bugs.freedesktop.org/show_bug.cgi?id=44057
+
+commit e92c4f65b6fb74eeb1772cc40ff89c5a1ff2c4ec
+Author: Sergey V. Udaltsov <s...@gnome.org>
+Date: Thu Dec 22 00:50:22 2011 +0000
+
+ Removed overriding LFSH and RTSH
+
+ https://bugs.freedesktop.org/show_bug.cgi?id=44035
+
+commit a3beae55c7f596c946109ca74f6411cd9cb0185c
+Author: Peter Hutterer <peter.hutte...@who-t.net>
+Date: Thu Dec 15 15:53:55 2011 +1000
+
+ rules: Serbian keyboards are cyrillic by default, say so
+
+ https://bugzilla.redhat.com/show_bug.cgi?id=755609
+ https://bugs.freedesktop.org/show_bug.cgi?id=43850
+
+ Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+
+commit 24b69ffb87dae21a9794dadce13812900248ec2d
+Author: Sergey V. Udaltsov <s...@gnome.org>
+Date: Sun Dec 4 22:31:14 2011 +0000
+
+ Fixed Congo-Kinshasa
+
+ https://bugs.freedesktop.org/show_bug.cgi?id=43423
+
+commit ed3115f02a528ca597a6794427cea714e4d1a449
+Author: Sergey V. Udaltsov <s...@gnome.org>
+Date: Wed Nov 30 00:30:25 2011 +0000
+
+ Removed unneeded .spec
+
+ It is not properly maintained anyway - and distros are doing it themselves
+
+commit 1ce4ea6da2b998a1ed1b1c75aa3bd215ee9c4963
+Author: Sergey V. Udaltsov <s...@gnome.org>
+Date: Tue Nov 29 23:43:50 2011 +0000
+
+ Small fixes to Icelandic
+
+ https://bugs.freedesktop.org/show_bug.cgi?id=43173
+
+commit 3b06e46488f0a34183bc15aad0985ab6e4c1b8ce
+Author: Sergey V. Udaltsov <s...@gnome.org>
+Date: Mon Nov 21 23:59:51 2011 +0000
+
+ Unneeded language removed from tw default variant
+
+ https://bugs.freedesktop.org/show_bug.cgi?id=42820
+
+commit 81fc86a911b55481b9597bb9284b3beca460104c
+Author: Sergey V. Udaltsov <s...@gnome.org>
+Date: Sun Nov 20 20:03:26 2011 +0000
+
+ Extend BackSpace to the 2nd group
+
+ https://bugs.freedesktop.org/show_bug.cgi?id=43098
+
+commit a0e5adf1745a16e8b6a99cd5de82fccc22446e39
+Author: Daiki Ueno <u...@unixuser.org>
+Date: Wed Nov 9 17:19:52 2011 +0900
+
+ Add an option to map Zenkaku_Hankaku to Escape.
+
+commit f9bd9af7dad0aa6cb2419e88038ca5b15b08fde3
+Author: Sergey V. Udaltsov <s...@gnome.org>
+Date: Thu Nov 17 19:40:23 2011 +0000
+
+ A couple of symbols added to tw layout for Paiwan
+
+ https://bugs.freedesktop.org/show_bug.cgi?id=42820
+
+commit 569dd72bd4b26abd7a4d641c0417ebf50f1f48bd
+Author: Sergey V. Udaltsov <s...@gnome.org>
+Date: Mon Oct 17 21:01:46 2011 +0100
+
+ Commented out broken level5 options
+
+ Since lvl5:*cancel options are not working anyway - no need to show them.
+ https://bugs.freedesktop.org/show_bug.cgi?id=41621
+
+commit b918406daab7a70d12f69ee2fa2c964b32fd3bbd
+Author: Sergey V. Udaltsov <s...@gnome.org>
+Date: Sun Oct 16 23:16:19 2011 +0100
+
+ Fixed uk(mac)
+
+ https://bugs.freedesktop.org/show_bug.cgi?id=41813
+
+commit 680bd9ce893b665cb3cb2955b80d49c05d0221e1
+Author: Sergey V. Udaltsov <s...@gnome.org>
+Date: Sun Oct 16 21:48:18 2011 +0100
+
+ Improved description
+
+commit 566b887f8ecfda0719d445298ea8499bf53b4442
+Author: Sergey V. Udaltsov <s...@gnome.org>
+Date: Sun Oct 16 21:36:48 2011 +0100
+
+ Fix "mac style" numpad
+
+ https://bugs.freedesktop.org/show_bug.cgi?id=41607
+
+commit d7a239e3a0a2af299b746bc478653e573d172699
+Author: Sergey V. Udaltsov <s...@gnome.org>
+Date: Sun Oct 9 22:57:28 2011 +0100
+
+ Small fix for cz layout
+
+ https://bugs.freedesktop.org/show_bug.cgi?id=38017
+
+commit 5c8a983c99fcb641fe0d6bc3a2e0107cf631b36d
+Author: Sergey V. Udaltsov <s...@gnome.org>
+Date: Sun Oct 9 22:48:00 2011 +0100
+
+ Improved descriptions for level3, level5 latches
+
+ https://bugs.freedesktop.org/show_bug.cgi?id=41621
+
+commit 8b7ea2db10cf3ddb8bfc561d2b909739e48ba5f8
+Author: Sergey V. Udaltsov <s...@gnome.org>
+Date: Sun Oct 9 16:52:52 2011 +0100
+
+ Belarussian description: be->by
+
+commit f804659c882d00fc96e344a90d60dfde94e9a788
+Author: Sergey V. Udaltsov <s...@gnome.org>
+Date: Sun Oct 9 16:49:29 2011 +0100
+
+ Adding some l10n comments
+
+ https://bugs.freedesktop.org/show_bug.cgi?id=41617
+
+commit 1d1338afa6aa555c5f6c83d07fceec43a4d87f0d
+Author: Sergey V. Udaltsov <s...@gnome.org>
+Date: Wed Oct 5 22:26:26 2011 +0100
+
+ Levels 2-4 for CTRL+ALT are propagated from level 1
+
+commit f08995249158713eca9c200d85dbbed75a9ac6bc
+Author: Sergey V. Udaltsov <s...@gnome.org>
+Date: Tue Oct 4 23:19:54 2011 +0100
+
+ preparing emergency 2.4.1
+
+commit df82ed7d78316202b7ca66a8df9a7a6111cfedc7
+Author: Sergey V. Udaltsov <s...@gnome.org>
+Date: Sat Oct 1 20:46:57 2011 +0100
+
+ Fixing keys using CTRL+ALT type
+
+ https://bugs.freedesktop.org/show_bug.cgi?id=41297
+ A number of keys used 2nd level for CTRL+ALT action,
+ now they are using level 5
+
+commit 3964cfa4acb0ee5c48e5479e313b9f9b6799d38d
+Author: Sergey V. Udaltsov <s...@gnome.org>
+Date: Fri Sep 30 00:54:24 2011 +0100
+
+ Synced description
+
+commit feb645f9572cc859af23523df978f1f9679f7837
+Author: Peter Hutterer <peter.hutte...@who-t.net>
+Date: Wed Sep 28 10:27:33 2011 +1000
+
+ rules: rename Bengali variants for 'in' to Bengali (India)
+
+ This lines up the Bengali variants on the 'in' layout with other so that
the
+ use of the 'Bengali' description is unique to the 'bd' layout.
+
+ Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+
+commit e1d469fac6868df31d115f3c14a54febfd3c5193
+Author: Sergey V. Udaltsov <s...@gnome.org>
+Date: Tue Sep 27 22:36:06 2011 +0100
+
+ fixed version number
+
+commit 0a674932ec07fc66fb331e4954172b36827df354
+Author: Sergey V. Udaltsov <s...@gnome.org>
+Date: Tue Sep 27 22:23:04 2011 +0100
+
+ preparing 2.4.0
+
+commit ca89d8a34827cb08de1be09a733ada74c3bc7fe4
+Author: Sergey V. Udaltsov <s...@gnome.org>
+Date: Tue Sep 27 22:20:49 2011 +0100
+
+ syncing translations
+
+commit 80ace8a3ad189e76cc9e95faf2b183e35476d53a
+Author: Sergey V. Udaltsov <s...@gnome.org>
+Date: Thu Sep 15 21:42:33 2011 +0100
+
+ Updated Cameroon layout
+
+ https://bugs.freedesktop.org/show_bug.cgi?id=40795
+
+commit 305f4e2307d1dc2aa7cb5a6fa800f79d389b9291
+Author: Sergey V. Udaltsov <s...@gnome.org>
+Date: Wed Aug 10 21:41:50 2011 +0100
+
+ There should not be dead keys in de(nodeadkeys)
+
+ https://bugs.freedesktop.org/show_bug.cgi?id=38468
+
+commit 6b47b2e5e95b5f53bd58e0e78bf324a260d789fa
+Author: Sergey V. Udaltsov <s...@gnome.org>
+Date: Sat Aug 6 21:47:53 2011 +0100
+
+ Small reorganization in ctrl:* option names
+
+ There was no convention for the option names.
+ Now, where it is possible, the convention is <keycode>_<keysym>
+ (when <keycode> is mapped to <keysym>)
+
+commit f0c4c16bf0fdb38494875dba117e38b363e99614
+Author: Sergey V. Udaltsov <s...@gnome.org>
+Date: Sat Aug 6 21:35:23 2011 +0100
+
+ Added option to use RAlt as RCtrl
+
+ https://bugs.freedesktop.org/show_bug.cgi?id=38493
+
+commit 0d61a4fa52899df44ec92dc46f827b568425baf9
+Author: Aldis Berjoza <al...@bsdroot.lv>
+Date: Sat Jul 30 12:22:22 2011 +0300
+
+ Updated Latvian Modern layout to lastest stable version
+
+commit be303743e59981ac055b72994894b91b2a046ba0
+Author: Sergey V. Udaltsov <s...@gnome.org>
+Date: Mon Jul 25 22:11:52 2011 +0100
+
+ Added missing mapping to Estonian
+
+ https://bugs.freedesktop.org/show_bug.cgi?id=39350
+
+commit ea08c776d2850f6345c4665d36d492416d540fed
+Author: Daniel Stone <dan...@fooishbar.org>
+Date: Tue Jun 21 18:01:42 2011 +0100
+
+ Compat: Add grab/window logging actions
+
+ XF86LogWindowTree and XF86LogGrabInfo, included in very recent x11proto,
+ are new symbols to trigger the PrGrbs and PrWins actions, respectively.
+ These are new debugging actions which print useful information to the X
+ log.
+
+ See http://lists.x.org/archives/xorg-devel/2011-June/023314.html for
+ more information. (Note that there is a slight mismatch with some of
+ the action names there, which was fixed in a later revision of the
+ patch.)
+
+ This should probably only be included in a new major release though, due
+ to http://cgit.freedesktop.org/xorg/app/xkbcomp/commit/?id=2a473b which
+ meant that using any unknown keysyms in an interp definition meant that
+ it turned into an Any+AnyOfOrNone(All) definition, so all your
+ non-action keys just dumped the window tree to the X log and did nothing
+ else.
+
+ Signed-off-by: Daniel Stone <dan...@fooishbar.org>
+
+commit e0e41912718edb40d0f4296c61c0d4b8be0ce731
+Author: Daniel Stone <dan...@fooishbar.org>
+Date: Tue Jun 21 18:01:41 2011 +0100
+
+ symbols/ma: Replace NoAction with NoSymbol
+
+ I assume this is what they intended, and is a lot more sensible.
+
+ Signed-off-by: Daniel Stone <dan...@fooishbar.org>
+
+commit 062b5bfcc59f9f6e4e11ba394bbe459af2a07b7e
+Author: Sergey V. Udaltsov <s...@gnome.org>
+Date: Wed Jun 15 21:40:11 2011 +0100
+
+ Move switch VT mapping to 5th level, amending CTRL+ALT
+
+ The idea is to allow functional keys to have mappings on 2-4 levels (with
Shift and RAlt)
+ https://bugs.freedesktop.org/show_bug.cgi?id=11822
+
+commit 7ba36852440d38273ea895372a34f95edfcf63ea
+Author: Peter Hutterer <peter.hutte...@who-t.net>
+Date: Wed Mar 2 10:53:34 2011 +1000
+
+ symbols: remove pc(function), srvr_ctrl(fkey2vt) does the same
+
+ Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+
+commit 5a69aa8ed8611aae2d0c140083a9b8af1f1cc6c5
+Author: Sergey V. Udaltsov <s...@gnome.org>
+Date: Tue Jun 14 00:13:04 2011 +0100
+
+ temporary man pages should not annoy me
+
+commit c17f8b08740aed26687fd65c84e654a6cdc163a2
+Author: Peter Hutterer <peter.hutte...@who-t.net>
+Date: Mon Jun 13 23:39:30 2011 +0100
+
+ Use XSL to generate man page from the rules XML
+
+ Generate a man-page from the evdev.xml through the xslt/man.xsl stylesheet.
+
+ Adds a requirement on the xorg util-macros and xsltproc.
+
+ Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+ Reviewed-by: Dan Nicholson <dbn.li...@gmail.com>
+ Reviewed-by: Gaetan Nadon <mems...@videotron.ca>
+
+commit b213892256576e43c569a965add7eae93f5be690
+Author: Kristof Szabo <kris@x.(none)>
+Date: Sat Jun 11 23:21:50 2011 +0200
+
+ German layout with Hungarian letters added
+
+ https://bugs.freedesktop.org/show_bug.cgi?id=38192
+
+commit bff391686c43db90ff4560230338f99922bb5bf3
+Author: Sergey V. Udaltsov <s...@gnome.org>
+Date: Thu Jun 9 22:15:39 2011 +0100
+
+ Revert "Use XSL to generate man page from the rules XML"
+
+ This reverts commit 35dc61af79dba32653ec97bd455b428b9cdb681d.
+
+commit 35dc61af79dba32653ec97bd455b428b9cdb681d
+Author: Peter Hutterer <peter.hutte...@who-t.net>
+Date: Wed Jun 8 12:50:49 2011 +1000
+
+ Use XSL to generate man page from the rules XML
+
+ Take evdev.xml and convert it into a man page, install it as
+ xkeyoard-config.7 man page to list all option that xkeyboard-config
+ provides.
+
+ man.xsl is badly indented because I couldn't figure out how to make xsl
+ ignore whitespaces properly.
+
+ Adds a requirement on the xorg util-macros.
+
+ Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+
+commit a9fc72984ee796049a49ea7f4a415fab579c5093
+Author: Promathesh Mandal <promathesh812...@gmail.com>
+Date: Wed Jun 8 14:35:35 2011 +0530
+
+ Added four new Bengali Keyboard Layout
+
+commit eaa6a2638661723de69bd93b624ce7d2c2996daa
+Author: Sergey V. Udaltsov <s...@gnome.org>
+Date: Wed Jun 8 20:27:09 2011 +0100
+
+ Fixed cz(qwerty)
+
+ https://bugs.freedesktop.org/show_bug.cgi?id=38017
+
+commit fd830658afb205d998fde9bf1a760347476884af
+Author: Sergey V. Udaltsov <s...@gnome.org>
+Date: Sun Jun 5 01:29:43 2011 +0100
+
+ Got rid of de(qwerty)
+
+ Permitted by Matej Kosik (the author), in favor of de(us)
+
+commit 84901d99bf00ff37765cf7c549c81afa930c907f
+Author: Sergey V. Udaltsov <s...@gnome.org>
+Date: Fri Jun 3 18:21:55 2011 +0100
+
+ First bit of hw information in the database
+
+commit 5c9920f653ae647d185918d0402f084ff0b21a1c
+Author: Sergey V. Udaltsov <s...@gnome.org>
+Date: Thu Jun 2 00:06:45 2011 +0100
+
+ Bump the version
+
+commit 32fac7642ebdd6d8a37fd7e569629c64f8a30d35
+Author: Sergey V. Udaltsov <s...@gnome.org>
+Date: Wed Jun 1 21:31:33 2011 +0100
+
+ fixed descriptions for cm variants
+
+ https://bugs.freedesktop.org/show_bug.cgi?id=37202
+
+commit f1f0ae9f2edf383b6dc08144cb87ae2525a7ca71
+Author: Vasyĺ V. Vercynśkyj <fuc...@ukr.net>
+Date: Fri May 20 23:00:41 2011 +0300
+
+ slight improvements of ru(ruu) layout
+
+commit 162170bf3096dec7541b56763507add4bcbe8fa0
+Author: Sergey V. Udaltsov <s...@gnome.org>
+Date: Wed Jun 1 21:24:05 2011 +0100
+
+ Added de(us)
+
+ https://bugs.freedesktop.org/show_bug.cgi?id=37237
+
+commit 81851539ded1bce1e54915939940cac0bc9b068f
+Author: Harshula Jayasuriya <harsh...@gmail.com>
+Date: Thu May 26 16:12:20 2011 +1000
+
+ lk: Change "Sinhala" to "Sinhala (phonetic)"
+
+ Change "Sinhala" to "Sinhala (phonetic)" so that it is clear that
+ the layout is not the official Wijesekera layout. The Wijesekera
+ layout is too complex to be implmented in XKB.
+
commit 0012006e23556fcc565a6ce2d7d265c28d876bff
Author: Sergey V. Udaltsov <s...@gnome.org>
Date: Tue May 31 20:15:03 2011 +0100
diff --git a/debian/changelog b/debian/changelog
index fc0e838..51aaf37 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+xkeyboard-config (2.5-1) UNRELEASED; urgency=low
+
+ * New upstream release, including:
+ - Hide ClearGrab/CloseGrabs actions behind an option.
+ * To get those actions back, use the grab:break_action option. At
+ the moment, the corresponding actionve has been disabled on the
+ server side as a hot fix for CVE-2012-0064 (Closes: #656500).
+ * Since there's a workaround on the server side already, do not use
+ a high urgency, so that this new upstream release and its various
+ changes can be tested for a while in unstable.
+
+ -- Cyril Brulebois <k...@debian.org> Fri, 20 Jan 2012 17:07:47 +0100
+
xkeyboard-config (2.3-2) unstable; urgency=low
* Upload to unstable, for GNOME3 (Closes: #652871).
commit f2426383a22ac3ee7bc4a03c51edba0345871664
Author: Sergey V. Udaltsov <s...@gnome.org>
Date: Thu Jan 19 23:30:35 2012 +0000
Preparing 2.5
diff --git a/NEWS b/NEWS
index 00ae0db..4522d22 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,5 @@
+2.5 Critical security bug fixed: Grabs and screensavers
+ 15 bugs fixed, a number of translations updated
2.4.1 Critical bug fixed: many Ctl+Alt combinations broken
2.4 9 bugs fixed, a number of translations updated
2.3 First scheduled (and reasonably polished) release since GNOME3.
diff --git a/configure.in b/configure.in
index 82b1e1d..52deb44 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-AC_INIT(xkeyboard-config, 2.4.1)
+AC_INIT(xkeyboard-config, 2.5)
AC_CONFIG_SRCDIR(rules/base.xml.in)
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
commit 16b645db6909fd6a715742580e35aaf186ec4be6
Author: Sergey V. Udaltsov <s...@gnome.org>
Date: Thu Jan 19 23:27:39 2012 +0000
Pre-release PO sync
diff --git a/po/bg.po b/po/bg.po
index 698e7fd..2e5c9cd 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -1,8 +1,8 @@
# Bulgarian translation of xkeyboard-config.
# Copyright (C) 2002, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
-# Copyright (C) 2009, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
# This file is distributed under the same license as the xkeyboard-config
package.
-# Alexander Shopov <a...@kambanaria.org>, 2002, 2005, 2006, 2007, 2008, 2009,
2010, 2011.
+# Alexander Shopov <a...@kambanaria.org>, 2002, 2005, 2006, 2007, 2008, 2009,
2010, 2011, 2012.
# Damyan Ivanov <dam+gn...@ktnx.net>, 2010.
#
#
@@ -48,10 +48,10 @@
# Предпочита се дълго тире „—“ пред скоби „()“.
msgid ""
msgstr ""
-"Project-Id-Version: xkeyboard-config-2.3.99\n"
+"Project-Id-Version: xkeyboard-config-2.4.99\n"
"Report-Msgid-Bugs-To: s...@users.sourceforge.net\n"
-"POT-Creation-Date: 2011-09-15 21:25+0100\n"
-"PO-Revision-Date: 2011-09-18 12:09+0300\n"
+"POT-Creation-Date: 2012-01-17 20:46+0000\n"
+"PO-Revision-Date: 2012-01-18 22:33+0200\n"
"Last-Translator: Alexander Shopov <a...@kambanaria.org>\n"
"Language-Team: Bulgarian <d...@fsa-bg.org>\n"
"Language: bg\n"
@@ -65,376 +65,376 @@ msgid "<Less/Greater>"
msgstr "„<>“"
#: ../rules/base.xml.in.h:2
-msgid "<Less/Greater> (chooses 3rd level, latches when pressed together
with another 3rd-level-chooser)"
-msgstr "„<>“ избира третото ниво и го заключва заедно с друг клавиш за
трето ниво"
+msgid "<Less/Greater> chooses 3rd level, acts as onetime lock when
pressed together with another 3rd-level-chooser"
+msgstr "„<>“ избира третото ниво и еднократно го заключва заедно с друг
клавиш за трето ниво"
#: ../rules/base.xml.in.h:3
-msgid "<Less/Greater> chooses 5th level and activates level5-Lock when
pressed together with another 5th-level-chooser, one press releases the lock"
-msgstr "„<>“ избира петото ниво, заключва го заедно с друг клавиш за
пето ниво и го отключва при единично натискане"
-
-#: ../rules/base.xml.in.h:4
msgid "<Less/Greater> chooses 5th level, locks when pressed together
with another 5th-level-chooser"
msgstr "„<>“ избира петото ниво и го заключва заедно с друг клавиш за
пето ниво"
-#: ../rules/base.xml.in.h:5
-msgid "<Less/Greater> chooses 5th level, locks when pressed together
with another 5th-level-chooser, one press releases the lock"
-msgstr "„<>“ избира петото ниво, заключва го заедно с друг клавиш за
пето ниво и го отключва при единично натискане"
-
-#: ../rules/base.xml.in.h:6
+#: ../rules/base.xml.in.h:4
msgid "A4Tech KB-21"
msgstr "A4Tech KB-21"
-#: ../rules/base.xml.in.h:7
+#: ../rules/base.xml.in.h:5
msgid "A4Tech KBS-8"
msgstr "A4Tech KBS-8"
-#: ../rules/base.xml.in.h:8
+#: ../rules/base.xml.in.h:6
msgid "A4Tech Wireless Desktop RFKB-23"
msgstr "A4Tech Wireless Desktop RFKB-23 — безжична"
-#: ../rules/base.xml.in.h:9
+#: ../rules/base.xml.in.h:7
msgid "ATM/phone-style"
msgstr "Като банкомат/телефон"
-#: ../rules/base.xml.in.h:10
+#: ../rules/base.xml.in.h:8
msgid "Acer AirKey V"
msgstr "Acer AirKey V"
-#: ../rules/base.xml.in.h:11
+#: ../rules/base.xml.in.h:9
msgid "Acer C300"
msgstr "Acer C300"
-#: ../rules/base.xml.in.h:12
+#: ../rules/base.xml.in.h:10
msgid "Acer Ferrari 4000"
msgstr "Acer Ferrari 4000"
-#: ../rules/base.xml.in.h:13
+#: ../rules/base.xml.in.h:11
msgid "Acer Laptop"
msgstr "Acer, за мобилен компютър"
-#: ../rules/base.xml.in.h:14
+#: ../rules/base.xml.in.h:12
msgid "Add the standard behavior to Menu key"
msgstr "Добавяне на стандартното поведение на Menu"
-#: ../rules/base.xml.in.h:15
+#: ../rules/base.xml.in.h:13
msgid "Adding Esperanto circumflexes (supersigno)"
msgstr "Добавяне на двойните ударения на Esperanto"
-#: ../rules/base.xml.in.h:16
+#: ../rules/base.xml.in.h:14
msgid "Adding currency signs to certain keys"
msgstr "Добавяне на знак за валута към някои клавиши"
-#: ../rules/base.xml.in.h:17
+#: ../rules/base.xml.in.h:15
msgid "Advance Scorpius KI"
msgstr "Advance Scorpius KI"
-#: ../rules/base.xml.in.h:18
+#: ../rules/base.xml.in.h:16
msgid "Afghani"
msgstr "афганистанска"
-#: ../rules/base.xml.in.h:19
+#: ../rules/base.xml.in.h:17
msgid "Akan"
msgstr "аканска"
-#: ../rules/base.xml.in.h:20
+#: ../rules/base.xml.in.h:18
msgid "Albanian"
msgstr "албанска"
-#: ../rules/base.xml.in.h:21
+#: ../rules/base.xml.in.h:19
msgid "Alt and Meta are on Alt keys"
msgstr "Alt-овете отговарят на Meta и на Alt"
-#: ../rules/base.xml.in.h:22
+#: ../rules/base.xml.in.h:20
msgid "Alt is mapped to Right Win, Super to Menu"
msgstr "Десният Win е Alt, а Menu — Super"
-#: ../rules/base.xml.in.h:23
+#: ../rules/base.xml.in.h:21
msgid "Alt+Caps Lock"
msgstr "Alt+Caps Lock"
-#: ../rules/base.xml.in.h:24
+#: ../rules/base.xml.in.h:22
msgid "Alt+Ctrl"
msgstr "Alt+Ctrl"
-#: ../rules/base.xml.in.h:25
+#: ../rules/base.xml.in.h:23
msgid "Alt+Shift"
msgstr "Alt+Shift"
-#: ../rules/base.xml.in.h:26
+#: ../rules/base.xml.in.h:24
msgid "Alt+Space"
msgstr "Alt+Space"
-#: ../rules/base.xml.in.h:27
+#: ../rules/base.xml.in.h:25
msgid "Alt/Win key behavior"
msgstr "Поведение на Alt/Win"
-#: ../rules/base.xml.in.h:28
+#: ../rules/base.xml.in.h:26
msgid "Amharic"
msgstr "амхарска"
-#: ../rules/base.xml.in.h:29
+#: ../rules/base.xml.in.h:27
msgid "Any Alt key"
msgstr "Всеки Alt"
-#: ../rules/base.xml.in.h:30
+#: ../rules/base.xml.in.h:28
msgid "Any Win key"
msgstr "Всеки Win"
-#: ../rules/base.xml.in.h:31
+#: ../rules/base.xml.in.h:29
msgid "Any Win key (while pressed)"
msgstr "Всеки Win (докато е натиснат)"
-#: ../rules/base.xml.in.h:32
+#: ../rules/base.xml.in.h:30
msgid "Apple"
msgstr "Apple"
-#: ../rules/base.xml.in.h:33
+#: ../rules/base.xml.in.h:31
msgid "Apple Aluminium Keyboard (ANSI)"
msgstr "Apple Aluminium Keyboard — стандарт ANSI"
-#: ../rules/base.xml.in.h:34
+#: ../rules/base.xml.in.h:32
msgid "Apple Aluminium Keyboard (ISO)"
msgstr "Apple Aluminium Keyboard — стандарт ISO"
-#: ../rules/base.xml.in.h:35
+#: ../rules/base.xml.in.h:33
msgid "Apple Aluminium Keyboard (JIS)"
msgstr "Apple Aluminium Keyboard — стандарт JIS"
-#: ../rules/base.xml.in.h:36
+#: ../rules/base.xml.in.h:34
msgid "Apple Aluminium Keyboard: emulate PC keys (Print, Scroll Lock, Pause,
Num Lock)"
msgstr "Apple Aluminium Keyboard — симулиране на клавиши за PC (Print, Scroll
Lock, Pause, Num Lock)"
-#: ../rules/base.xml.in.h:37
+#: ../rules/base.xml.in.h:35
msgid "Apple Laptop"
msgstr "Apple, за мобилен компютър"
-#: ../rules/base.xml.in.h:38
+#: ../rules/base.xml.in.h:36
msgid "Arabic"
msgstr "арабска"
-#: ../rules/base.xml.in.h:39
+#: ../rules/base.xml.in.h:37
msgid "Arabic (Buckwalter)"
msgstr "арабска — транслитерация по Бъкуолтър"
-#: ../rules/base.xml.in.h:40
+#: ../rules/base.xml.in.h:38
msgid "Arabic (Morocco)"
msgstr "арабска — мароканска"
--
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/e1roirj-0002hk...@vasks.debian.org
