xorg-server: Changes to 'debian-unstable'
debian/changelog | 7 +++++++
debian/local/10-kbd.conf | 5 +++++
debian/local/10-mouse.conf | 5 +++++
debian/rules | 8 ++++++++
4 files changed, 25 insertions(+)
New commits:
commit 842fe3a28c6ec7ae1faa12d169e2629841b92d0a
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Apr 18 14:46:31 2010 +0200
On !linux, install mouse and kbd catchall snippets in the xorg.conf.d directory.
Fixes FTBFS on those archs.
diff --git a/debian/changelog b/debian/changelog
index fce68a2..4d5747e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xorg-server (2:1.7.6.901-3) UNRELEASED; urgency=low
+
+ * On !linux, install mouse and kbd catchall snippets in the xorg.conf.d
+ directory. Fixes FTBFS on those archs.
+
+ -- Julien Cristau <jcristau@debian.org> Sun, 18 Apr 2010 14:45:43 +0200
+
xorg-server (2:1.7.6.901-2) unstable; urgency=low
* Fix dependency generation: Replace PKG_CONFIG_DIR with PKG_CONFIG_PATH
diff --git a/debian/local/10-kbd.conf b/debian/local/10-kbd.conf
new file mode 100644
index 0000000..fee5fc8
--- /dev/null
+++ b/debian/local/10-kbd.conf
@@ -0,0 +1,5 @@
+Section "InputClass"
+ Identifier "kbd catchall"
+ MatchIsKeyboard "on"
+ Driver "kbd"
+EndSection
diff --git a/debian/local/10-mouse.conf b/debian/local/10-mouse.conf
new file mode 100644
index 0000000..49c3bae
--- /dev/null
+++ b/debian/local/10-mouse.conf
@@ -0,0 +1,5 @@
+Section "InputClass"
+ Identifier "mouse catchall"
+ MatchIsMouse "on"
+ Driver "mouse"
+EndSection
diff --git a/debian/rules b/debian/rules
index 6cbb19d..e5685bd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -249,6 +249,14 @@ endif
install -m 755 debian/local/xvfb-run debian/tmp/main/usr/bin
install debian/local/xvfb-run.1 debian/tmp/main/usr/share/man/man1
+ifneq ($(DEB_HOST_ARCH_OS), linux)
+ install -d debian/tmp/main/usr/share/X11/xorg.conf.d
+ install -m 644 debian/local/10-*.conf debian/tmp/main/usr/share/X11/xorg.conf.d
+ifeq ($(udeb), yes)
+ install -d debian/tmp/udeb/usr/share/X11/xorg.conf.d
+ install -m 644 debian/local/10-*.conf debian/tmp/udeb/usr/share/X11/xorg.conf.d
+endif
+endif
# stub to start building deb files, used by binary-indep and binary-arch
binary-initial:
Reply to: