xorg: Changes to 'debian-unstable'
debian/changelog | 2 ++
debian/control | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
New commits:
commit 8604077efb923a2cc669bd06b7aa6ed7905ede48
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date: Wed Jul 8 15:00:59 2009 +0300
control: Move xserver-xorg dependency on evdev after -input-all. Otherwise only evdev is installed by default.
Conflicts:
debian/changelog
diff --git a/debian/changelog b/debian/changelog
index 621d276..735b9d6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ xorg (1:7.4+4) UNRELEASED; urgency=low
* debian-x11-keymap.fdi: Check for input.keys from info.capabilities.
(closes: #535291)
+ * control: Move xserver-xorg dependency on evdev after -input-all.
+ Otherwise only evdev is installed by default.
-- Timo Aaltonen <tjaalton@ubuntu.com> Thu, 02 Jul 2009 17:23:57 +0300
diff --git a/debian/control b/debian/control
index a80473b..7c3d3e4 100644
--- a/debian/control
+++ b/debian/control
@@ -84,9 +84,9 @@ Conflicts: xserver-xfree86 (<< 6.8.2.dfsg.1-1), xserver-common (<< 7), x11-commo
Replaces: xserver-common (<< 7), x11-common (<< 1:7.3+11)
Depends:
xserver-xorg-core (>= 2:1.5.99.901),
- xserver-xorg-input-evdev [alpha amd64 arm armeb armel hppa i386 ia64 lpia m32r m68k mips mipsel powerpc sparc],
xserver-xorg-video-all | xserver-xorg-video-5,
xserver-xorg-input-all | xserver-xorg-input-4,
+ xserver-xorg-input-evdev [alpha amd64 arm armeb armel hppa i386 ia64 lpia m32r m68k mips mipsel powerpc sparc],
hal (>= 0.5.12~git20090406),
console-setup (>= 1.29) | console-setup-mini (>= 1.29),
${shlibs:Depends},
Reply to: