debian/changelog | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)
New commits: commit cf236364c44621890b5e5e132b7411dccdc1242e Author: Timo Aaltonen <tjaal...@ubuntu.com> Date: Tue Jan 24 00:36:34 2012 +0200 release to precise diff --git a/debian/changelog b/debian/changelog index 7b79e3b..3ced153 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xkeyboard-config (2.5-1ubuntu1) UNRELEASED; urgency=low +xkeyboard-config (2.5-1ubuntu1) precise; urgency=low * Merge from Debian experimental. Remaining Ubuntu changes: + rules, xkb-data-i18n.install, xkb-data.install: Split out @@ -13,7 +13,7 @@ xkeyboard-config (2.5-1ubuntu1) UNRELEASED; urgency=low * xkb-data.install: Add missing directories (man, pkgconfig). * xkb-data.postinst: Remove the xkb cache to make sure it gets regenerated. - -- Timo Aaltonen <tjaal...@ubuntu.com> Mon, 23 Jan 2012 11:14:58 +0200 + -- Timo Aaltonen <tjaal...@ubuntu.com> Tue, 24 Jan 2012 00:35:43 +0200 xkeyboard-config (2.5-1) unstable; urgency=low commit 5d20de72281f3a171e4cc370dca446efe674f157 Author: Timo Aaltonen <tjaal...@ubuntu.com> Date: Tue Jan 24 00:32:33 2012 +0200 add the changelog entry for 2.3-1ubuntu3 diff --git a/debian/changelog b/debian/changelog index a4a8476..7b79e3b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -38,6 +38,14 @@ xkeyboard-config (2.3-2) unstable; urgency=low -- Cyril Brulebois <k...@debian.org> Wed, 21 Dec 2011 10:52:00 +0100 +xkeyboard-config (2.3-1ubuntu3) precise; urgency=low + + * debian/patches/101_disable_ungrab_keys_by_default.diff: + - Cherry pick from upstream. Don't bind the ClearGrab/CloseGrab keys by + default - these allow bypassing of screensavers' screenlocks. + + -- Christopher James Halse Rogers <r...@ubuntu.com> Fri, 20 Jan 2012 12:57:14 +1100 + xkeyboard-config (2.3-1ubuntu2) oneiric; urgency=low * rules: Bring back the pot file build, very much needed still. -- 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/e1rpsxa-0005pk...@vasks.debian.org