xorg-server: Changes to 'debian-unstable'
debian/changelog | 7 ++
debian/control | 6 +
debian/patches/15-keep-udev-x11-driver.diff | 19 -----
debian/patches/18-Add-10-evdev.conf.diff | 97 ++++++++++++++++++++++++++++
debian/patches/series | 2
debian/serverminver | 2
debian/xserver-xorg-core-udeb.install | 1
debian/xserver-xorg-core.install | 1
8 files changed, 114 insertions(+), 21 deletions(-)
New commits:
commit 8b7db378eb36cfa451a334b21f6cd3b93bfc6d02
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Apr 16 21:56:29 2010 +0200
Drop Breaks on evdev
We're shipping 10-evdev.conf with the server, so this should just work.
diff --git a/debian/control b/debian/control
index eb92b70..cf5ff4e 100644
--- a/debian/control
+++ b/debian/control
@@ -108,7 +108,6 @@ Conflicts:
xserver-xorg-input-4,
xserver-xorg-input-wacom (<< 0.7.8),
Breaks:
- xserver-xorg-input-evdev (<= 1:2.3.2-5),
xserver-xorg-input-joystick (<= 1:1.5.0-3),
xserver-xorg-input-synaptics (<= 1.2.2-1),
xserver-xorg-input-tslib (<= 0.0.6-3),
commit ce8f6741751d27465ad5133d77751c37bbef4c79
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Apr 16 21:39:56 2010 +0200
Install 10-evdev.conf in /usr/share/X11/xorg.conf.d
From upstream, patch 18-Add-10-evdev.conf.diff.
diff --git a/debian/changelog b/debian/changelog
index 02ebe50..bb31f06 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -32,6 +32,8 @@ xorg-server (2:1.7.6.901-1) UNRELEASED; urgency=low
since we're changing the path.
* Stop looking for x11_driver property in udev, since we're migrating the
drivers over to xorg.conf.d anyway.
+ * Install 10-evdev.conf in /usr/share/X11/xorg.conf.d (from upstream, patch
+ 18-Add-10-evdev.conf.diff).
[ Timo Aaltonen ]
* Add 17-xfree86-saner-conf-search-paths.diff. Allows using another
diff --git a/debian/patches/18-Add-10-evdev.conf.diff b/debian/patches/18-Add-10-evdev.conf.diff
new file mode 100644
index 0000000..d2a5cb5
--- /dev/null
+++ b/debian/patches/18-Add-10-evdev.conf.diff
@@ -0,0 +1,97 @@
+From 6d0f5735216847a9b8ea96b874bd68bc97992e4f Mon Sep 17 00:00:00 2001
+From: Julien Cristau <jcristau@debian.org>
+Date: Fri, 16 Apr 2010 21:34:33 +0200
+Subject: [PATCH] Add 10-evdev.conf
+
+Cherry-picked from upstream commits:
+24952b7 Install 10-evdev.conf in $(prefix)/etc/X11/xorg.conf.d under udev
+c8a608c config: only match sane devices in 10-evdev.conf
+d4dd3d0 Move 10-evdev.conf to system config dir $datadir/X11/xorg.conf.d
+---
+ config/10-evdev.conf | 40 ++++++++++++++++++++++++++++++++++++++++
+ config/Makefile.am | 5 ++++-
+ configure.ac | 1 +
+ 3 files changed, 45 insertions(+), 1 deletions(-)
+ create mode 100644 config/10-evdev.conf
+
+diff --git a/config/10-evdev.conf b/config/10-evdev.conf
+new file mode 100644
+index 0000000..cc83ab2
+--- /dev/null
++++ b/config/10-evdev.conf
+@@ -0,0 +1,40 @@
++#
++# Catch-all evdev loader for udev-based systems
++# We don't simply match on any device since that also adds accelerometers
++# and other devices that we don't really want to use. The list below
++# matches everything but joysticks.
++
++Section "InputClass"
++ Identifier "evdev pointer catchall"
++ MatchIsPointer "on"
++ MatchDevicePath "/dev/input/event*"
++ Driver "evdev"
++EndSection
++
++Section "InputClass"
++ Identifier "evdev keyboard catchall"
++ MatchIsKeyboard "on"
++ MatchDevicePath "/dev/input/event*"
++ Driver "evdev"
++EndSection
++
++Section "InputClass"
++ Identifier "evdev touchpad catchall"
++ MatchIsTouchpad "on"
++ MatchDevicePath "/dev/input/event*"
++ Driver "evdev"
++EndSection
++
++Section "InputClass"
++ Identifier "evdev tablet catchall"
++ MatchIsTablet "on"
++ MatchDevicePath "/dev/input/event*"
++ Driver "evdev"
++EndSection
++
++Section "InputClass"
++ Identifier "evdev touchscreen catchall"
++ MatchIsTouchscreen "on"
++ MatchDevicePath "/dev/input/event*"
++ Driver "evdev"
++EndSection
+diff --git a/config/Makefile.am b/config/Makefile.am
+index 27f251b..675a3b2 100644
+--- a/config/Makefile.am
++++ b/config/Makefile.am
+@@ -9,6 +9,9 @@ AM_CFLAGS += $(UDEV_CFLAGS)
+ libconfig_la_SOURCES += udev.c
+ libconfig_la_LIBADD = $(UDEV_LIBS)
+
++xorgconfddir = $(datadir)/X11/$(XF86CONFIGDIR)
++xorgconfd_DATA = 10-evdev.conf
++
+ else
+
+ if CONFIG_NEED_DBUS
+@@ -33,4 +36,4 @@ endif # CONFIG_NEED_DBUS
+
+ endif # !CONFIG_UDEV
+
+-EXTRA_DIST = xorg-server.conf x11-input.fdi
++EXTRA_DIST = xorg-server.conf x11-input.fdi 10-evdev.conf
+diff --git a/configure.ac b/configure.ac
+index 574d9f0..9a10d8b 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1717,6 +1717,7 @@ if test "x$XORG" = xyes; then
+ dnl these only go in xorg-config.h
+ XF86CONFIGFILE="xorg.conf"
+ XF86CONFIGDIR="xorg.conf.d"
++ AC_SUBST(XF86CONFIGDIR)
+ CONFIGFILE="$sysconfdir/$XF86CONFIGFILE"
+ LOGPREFIX="$logdir/Xorg."
+ AC_DEFINE(XORG_SERVER, 1, [Building Xorg server])
+--
+1.7.0.4
+
diff --git a/debian/patches/series b/debian/patches/series
index a4d7e4f..96158a3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -18,3 +18,4 @@
14-tone-down-nidr-errors.diff
16-xaa-fbcomposite-fix-negative-size.diff
17-xfree86-saner-conf-search-paths.diff
+18-Add-10-evdev.conf.diff
diff --git a/debian/xserver-xorg-core-udeb.install b/debian/xserver-xorg-core-udeb.install
index 92130ee..8092696 100644
--- a/debian/xserver-xorg-core-udeb.install
+++ b/debian/xserver-xorg-core-udeb.install
@@ -4,3 +4,4 @@ udeb/usr/lib/xorg/protocol.txt usr/lib/xorg
# from xserver-xorg-core:
udeb/usr/lib/xorg/modules usr/lib/xorg
udeb/usr/bin/Xorg usr/bin
+udeb/usr/share/X11/xorg.conf.d usr/share/X11/
diff --git a/debian/xserver-xorg-core.install b/debian/xserver-xorg-core.install
index 48c1c93..4e04724 100644
--- a/debian/xserver-xorg-core.install
+++ b/debian/xserver-xorg-core.install
@@ -8,3 +8,4 @@ main/usr/bin/cvt usr/bin
main/usr/bin/gtf usr/bin
main/usr/share/man/man1/cvt.1 usr/share/man/man1
main/usr/share/man/man1/gtf.1 usr/share/man/man1
+main/usr/share/X11/xorg.conf.d usr/share/X11/
commit 84b51ffd29ce9783318e7f5d879c54460e384280
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Apr 16 21:10:56 2010 +0200
Drop patch 15-keep-udev-x11-driver.diff
Stop looking for x11_driver property in udev, since we're migrating the
drivers over to xorg.conf.d anyway.
diff --git a/debian/changelog b/debian/changelog
index 8618b8d..02ebe50 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -30,6 +30,8 @@ xorg-server (2:1.7.6.901-1) UNRELEASED; urgency=low
* Bump serverminver for new handling of input config.
* Add Breaks on input drivers installing files in /usr/lib/X11/xorg.conf.d
since we're changing the path.
+ * Stop looking for x11_driver property in udev, since we're migrating the
+ drivers over to xorg.conf.d anyway.
[ Timo Aaltonen ]
* Add 17-xfree86-saner-conf-search-paths.diff. Allows using another
diff --git a/debian/patches/15-keep-udev-x11-driver.diff b/debian/patches/15-keep-udev-x11-driver.diff
deleted file mode 100644
index 7aa8c0a..0000000
--- a/debian/patches/15-keep-udev-x11-driver.diff
+++ /dev/null
@@ -1,19 +0,0 @@
-From: Julien Cristau <jcristau@debian.org>
-Subject: Keep looking for x11_driver in udev for now
-
-Our drivers don't ship xorg.conf.d snippets for now, so keep using
-x11_driver from udev in the transition period.
-
-Index: xorg-server/config/udev.c
-===================================================================
---- xorg-server.orig/config/udev.c
-+++ xorg-server/config/udev.c
-@@ -118,6 +118,8 @@
- add_option(&options, "xkb_model", value);
- else if (!strcasecmp(tmp, "options"))
- add_option(&options, "xkb_options", value);
-+ } else if (!strcmp(key, "x11_driver")) {
-+ add_option(&options, "driver", value);
- } else if (!strcmp(key, "ID_VENDOR")) {
- attrs.vendor = value;
- } else if (!strcmp(key, "ID_INPUT_KEY")) {
diff --git a/debian/patches/series b/debian/patches/series
index 5b135a9..a4d7e4f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -16,6 +16,5 @@
12-xfree86-dont-complain-about-missing-coredevices.diff
13-unbreak-input-abi.diff
14-tone-down-nidr-errors.diff
-15-keep-udev-x11-driver.diff
16-xaa-fbcomposite-fix-negative-size.diff
17-xfree86-saner-conf-search-paths.diff
commit 59f991dde60be97aeee744f7ec80016cbcf15eb3
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Apr 16 20:57:46 2010 +0200
Add Breaks on input drivers installing files in /usr/lib/X11/xorg.conf.d
We're changing the path so force a synchronized update.
diff --git a/debian/changelog b/debian/changelog
index d4b71b3..8618b8d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -28,6 +28,8 @@ xorg-server (2:1.7.6.901-1) UNRELEASED; urgency=low
* xvfb-run: don't rely on /tmp/X$i-lock to bump $SERVERNUM in auto-servernum
mode (closes: #577195). Thanks, Jozef Kutej!
* Bump serverminver for new handling of input config.
+ * Add Breaks on input drivers installing files in /usr/lib/X11/xorg.conf.d
+ since we're changing the path.
[ Timo Aaltonen ]
* Add 17-xfree86-saner-conf-search-paths.diff. Allows using another
diff --git a/debian/control b/debian/control
index f00054c..eb92b70 100644
--- a/debian/control
+++ b/debian/control
@@ -107,6 +107,13 @@ Conflicts:
xserver-xorg-input-2.1,
xserver-xorg-input-4,
xserver-xorg-input-wacom (<< 0.7.8),
+Breaks:
+ xserver-xorg-input-evdev (<= 1:2.3.2-5),
+ xserver-xorg-input-joystick (<= 1:1.5.0-3),
+ xserver-xorg-input-synaptics (<= 1.2.2-1),
+ 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),
Replaces:
xserver-xorg (<< 6.8.2-38),
xserver-xfree86 (<< 1:7.0.0),
commit 510fbaf3483819e11852f0a762adb7adf53ada7e
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Apr 16 20:52:07 2010 +0200
Bump serverminver for new handling of input config.
diff --git a/debian/changelog b/debian/changelog
index b22a6a5..d4b71b3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -27,6 +27,7 @@ xorg-server (2:1.7.6.901-1) UNRELEASED; urgency=low
#573371).
* xvfb-run: don't rely on /tmp/X$i-lock to bump $SERVERNUM in auto-servernum
mode (closes: #577195). Thanks, Jozef Kutej!
+ * Bump serverminver for new handling of input config.
[ Timo Aaltonen ]
* Add 17-xfree86-saner-conf-search-paths.diff. Allows using another
diff --git a/debian/serverminver b/debian/serverminver
index 9d42c16..6561fb0 100644
--- a/debian/serverminver
+++ b/debian/serverminver
@@ -1 +1 @@
-2:1.6.99.900
+2:1.7.6.901
Reply to: