debian/changelog | 7 +++++++
debian/control | 7 +++++++
debian/rules | 2 ++
3 files changed, 16 insertions(+)
New commits:
commit 808a1056809a6eb2b3650db5c866531768c08613
Author: Julien Cristau <jcris...@debian.org>
Date: Tue Aug 24 14:53:22 2010 +0200
Set default xkb rules to evdev on linux
Works around a wrong default in configure.ac and an Xorg issue where it
reverts to the default on reset. Thanks to Bastian Blank for the report.
(cherry-picked from commit 6674d622ca189405ca4a74d0c6ff8ecdb63bc8c4)
diff --git a/debian/changelog b/debian/changelog
index af9b67a..40a8797 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,9 @@ xorg-server (2:1.10.2.902-1) unstable; urgency=low
+ Add Breaks on drivers abandoned between lenny and squeeze. This helps
apt decide to remove them instead of removing all of X. Thanks, David
Kalnischkies!
+ + Set default xkb rules to evdev on linux, to work around a wrong default
in
+ configure.ac and an Xorg issue where it reverts to the default on reset.
+ Thanks to Bastian Blank for the report.
-- Cyril Brulebois <k...@debian.org> Sat, 02 Jul 2011 11:58:58 +0200
diff --git a/debian/rules b/debian/rules
index 7d1c012..b8ce77e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -54,6 +54,7 @@ endif
ifeq ($(DEB_HOST_ARCH_OS), linux)
build_xfbdev = --enable-xfbdev
selinux = --enable-xselinux
+ xkbrules = --with-default-xkb-rules=evdev
else
build_xfbdev = --disable-xfbdev
selinux = --disable-xselinux
@@ -103,6 +104,7 @@ confflags += \
--with-builderstring="$(SOURCE_NAME) $(SOURCE_VERSION)
($(BUILDER))" \
--with-xkb-path=/usr/share/X11/xkb \
--with-xkb-output=/var/lib/xkb \
+ $(xkbrules) \
--disable-builddocs \
--disable-install-libxf86config \
--enable-mitshm \
commit 1d27c7d37c2eebd66fd44be810b3e17ad61e6a83
Author: Julien Cristau <jcris...@debian.org>
Date: Sat Jul 3 11:58:46 2010 +0100
Add Breaks on drivers abandoned between lenny and squeeze.
This helps apt decide to remove them instead of removing all of X.
Thanks, David Kalnischkies!
(cherry-picked from commit 9c8080d06c457932d3bfec021c69ac000aa60120)
diff --git a/debian/changelog b/debian/changelog
index b1ff9c2..af9b67a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,10 @@ xorg-server (2:1.10.2.902-1) unstable; urgency=low
- DIX: Set backgroundState correctly for root window (Closes: #632134).
* Drop 20-workaround-36986.diff, fixed upstream.
* Bump Standards-Version to 3.9.2 (no changes).
+ * Merge packaging changes lost from the 1.7 (squeeze) branch:
+ + Add Breaks on drivers abandoned between lenny and squeeze. This helps
+ apt decide to remove them instead of removing all of X. Thanks, David
+ Kalnischkies!
-- Cyril Brulebois <k...@debian.org> Sat, 02 Jul 2011 11:58:58 +0200
diff --git a/debian/control b/debian/control
index 1e162a6..60b4805 100644
--- a/debian/control
+++ b/debian/control
@@ -111,6 +111,13 @@ Breaks:
xserver-xorg-input-tslib (<= 0.0.6-3),
xserver-xorg-input-vmmouse (<= 1:12.6.5-4),
xserver-xorg-input-wacom (<= 0.10.5+20100415-1),
+ xserver-xorg-video-cyrix (<= 1:1.1.0-8),
+ xserver-xorg-video-i810 (<< 2:2.4),
+ xserver-xorg-video-imstt (<= 1:1.1.0-7),
+ xserver-xorg-video-nsc (<= 1:2.8.3-4),
+ xserver-xorg-video-sunbw2 (<= 1:1.1.0-5),
+ xserver-xorg-video-v4l (<< 1:0.2.0),
+ xserver-xorg-video-vga (<= 1:4.1.0-8),
libgl1-mesa-dri (<< 7.10.2-4),
libgl1-mesa-dri-experimental (<< 7.10.2-4),
Provides:
--
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/e1qlmmr-0008qg...@vasks.debian.org
