debian/changelog | 2 ++
debian/control | 1 -
debian/local/64-xorg-xkb.rules | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
New commits:
commit 76e2d32dc4e67783b90b5b6fdac35b547e005a64
Author: Timo Aaltonen <tjaal...@cc.hut.fi>
Date: Thu Dec 3 13:53:33 2009 +0200
control, local/64-xorg-xkb.rules: Don't depend on keyboard-configuration
until we have it.
diff --git a/debian/changelog b/debian/changelog
index e3db8d6..7abeda7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -63,6 +63,8 @@ xorg-server (2:1.7.2-2ubuntu1) UNRELEASED; urgency=low
- 188_default_primary_to_first_busid.patch
- 190_cache-xkbcomp_output_for_fast_start_up.patch
* 189_xserver_1.5.0_bg_none_root.patch: Fetched a new version.
+ * control, local/64-xorg-xkb.rules: Don't depend on keyboard-configuration
+ until we have it.
-- Timo Aaltonen <tjaal...@ubuntu.com> Wed, 02 Dec 2009 20:40:21 +0200
diff --git a/debian/control b/debian/control
index 1714464..06a32db 100644
--- a/debian/control
+++ b/debian/control
@@ -85,7 +85,6 @@ Architecture: any
Depends:
xserver-common (>= ${source:Version}),
xserver-xorg,
- keyboard-configuration [linux-any kfreebsd-any],
${shlibs:Depends},
${misc:Depends},
Recommends: libgl1-mesa-dri (>= 7.1~rc1)
diff --git a/debian/local/64-xorg-xkb.rules b/debian/local/64-xorg-xkb.rules
index 311d49b..d42bfb6 100644
--- a/debian/local/64-xorg-xkb.rules
+++ b/debian/local/64-xorg-xkb.rules
@@ -6,6 +6,6 @@ KERNEL!="event*", GOTO="xorg_xkb_end"
ENV{ID_INPUT}=="", IMPORT{program}="/lib/xorg/input_id %p"
# import keyboard layout from /etc/default/keyboard
-ENV{ID_INPUT_KEY}=="?*", IMPORT{file}="/etc/default/keyboard"
+ENV{ID_INPUT_KEY}=="?*", IMPORT{file}="/etc/default/console-setup"
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
