debian/changelog | 6 ++++-- debian/control | 1 + debian/local/64-xorg-xkb.rules | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-)
New commits: commit dfa2e7cd4eaa078067d26cd07f613fd838be9f06 Author: Robert Hooker <robert.hoo...@canonical.com> Date: Wed Jan 5 11:50:39 2011 -0500 64-xorg-xkb.rules: Re-add broken model handling diff --git a/debian/local/64-xorg-xkb.rules b/debian/local/64-xorg-xkb.rules index 5a3c5b8..df727a0 100644 --- a/debian/local/64-xorg-xkb.rules +++ b/debian/local/64-xorg-xkb.rules @@ -5,4 +5,9 @@ KERNEL!="event*", GOTO="xorg_xkb_end" # import keyboard layout from /etc/default/keyboard ENV{ID_INPUT_KEY}=="?*", IMPORT{file}="/etc/default/keyboard" +# ignore "SKIP" keyboard model, which is a magic value from console-setup's debconf +ENV{XKBMODEL}=="SKIP", ENV{XKBMODEL}="" +# Similarly, ignore this broken default variant, which breaks keyboard entirely +ENV{XKBVARIANT}=="U.S. English", ENV{XKBVARIANT}="" + LABEL="xorg_xkb_end" commit 7f294f4a718ccb23506d529207e950e72a5fda75 Author: Robert Hooker <robert.hoo...@canonical.com> Date: Wed Jan 5 11:43:01 2011 -0500 Switch to using keyboard-config for keyboard layouts. diff --git a/debian/changelog b/debian/changelog index fb99463..0fde10f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xorg-server (2:1.9.0.902-1ubuntu2) UNRELEASED; urgency=low +xorg-server (2:1.9.0.902-1ubuntu2) natty; urgency=low [ Christopher James Halse Rogers ] * Cherry-pick 3effb61e from server-1.9 branch. Fixes a typo in Xinerama @@ -8,8 +8,10 @@ xorg-server (2:1.9.0.902-1ubuntu2) UNRELEASED; urgency=low [ Robert Hooker ] * Add 105_nvidia_fglrx_autodetect.patch, enables fglrx and nvidia to work without an xorg.conf. + * debian/local/64-xorg-xkb.rules, control: Use keyboard-configuration + information for keymaps (/etc/default/keyboard) - -- Robert Hooker <sarv...@ubuntu.com> Thu, 23 Dec 2010 11:47:44 -0500 + -- Robert Hooker <sarv...@ubuntu.com> Wed, 05 Jan 2011 11:29:17 -0500 xorg-server (2:1.9.0.902-1ubuntu1) natty; urgency=low diff --git a/debian/control b/debian/control index 01b2565..0df90b9 100644 --- a/debian/control +++ b/debian/control @@ -87,6 +87,7 @@ Architecture: any Depends: xserver-common (>= ${source:Version}), xserver-xorg, + keyboard-configuration [linux-any kfreebsd-any], udev (>= 149) [linux-any], ${shlibs:Depends}, ${misc:Depends}, diff --git a/debian/local/64-xorg-xkb.rules b/debian/local/64-xorg-xkb.rules index 25d42b6..5a3c5b8 100644 --- a/debian/local/64-xorg-xkb.rules +++ b/debian/local/64-xorg-xkb.rules @@ -3,11 +3,6 @@ SUBSYSTEM!="input", GOTO="xorg_xkb_end" KERNEL!="event*", GOTO="xorg_xkb_end" # import keyboard layout from /etc/default/keyboard -ENV{ID_INPUT_KEY}=="?*", IMPORT{program}="/bin/grep ^XKB /etc/default/console-setup" - -# ignore "SKIP" keyboard model, which is a magic value from console-setup's debconf -ENV{XKBMODEL}=="SKIP", ENV{XKBMODEL}="" -# Similarly, ignore this broken default variant, which breaks keyboard entirely -ENV{XKBVARIANT}=="U.S. English", ENV{XKBVARIANT}="" +ENV{ID_INPUT_KEY}=="?*", IMPORT{file}="/etc/default/keyboard" LABEL="xorg_xkb_end" -- 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/e1pawcb-0007uq...@alioth.debian.org