xorg: Changes to 'ubuntu'
debian/changelog | 2 ++
debian/control | 3 ++-
debian/local/debian-setup-keyboard | 2 +-
3 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit fb99fdb167e1437332b6bc6aa50ed884510db6ed
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date: Thu Dec 3 13:48:37 2009 +0200
control, local/debian-setup-keyboard: Use console-setup, until the new version is merged.
diff --git a/debian/changelog b/debian/changelog
index 90c7a19..ec349f4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -37,6 +37,8 @@ xorg (1:7.5~3ubuntu1) UNRELEASED; urgency=low
- xserver-xorg.postinst.in: Migrate psb users to vesa.
* control: Drop Breaks on gdm, since it was only needed during karmic.
Likewise for Conflicts/Replaces hal.
+ * control, local/debian-setup-keyboard: Use console-setup, until the
+ new version is merged.
-- Timo Aaltonen <tjaalton@ubuntu.com> Thu, 03 Dec 2009 11:03:17 +0200
diff --git a/debian/control b/debian/control
index 1824ede..9e90c4a 100644
--- a/debian/control
+++ b/debian/control
@@ -93,7 +93,8 @@ Depends:
${shlibs:Depends},
${misc:Depends},
xkb-data (>= 1.4),
- x11-xkb-utils
+ x11-xkb-utils,
+ console-setup
Recommends:
libgl1-mesa-dri,
Description: the X.Org X server
diff --git a/debian/local/debian-setup-keyboard b/debian/local/debian-setup-keyboard
index 9693e44..b0603ca 100755
--- a/debian/local/debian-setup-keyboard
+++ b/debian/local/debian-setup-keyboard
@@ -5,7 +5,7 @@
[ -x /usr/bin/hal-set-property ] || exit 0
-. /etc/default/keyboard >/dev/null 2>&1 || exit 0
+. /etc/default/console-setup >/dev/null 2>&1 || exit 0
hal_set () {
if [ -n "$2" ]; then
Reply to: