Package: xserver-xorg-input-wacom Version: 0.10.5+20100415-1 Severity: normal Tags: patch
Hi Ron, as discussed the next xorg-server upload will move the xorg.conf.d directory to /usr/share/X11/xorg.conf.d. The attached patch should work (and be ok for upstream), together with a build-dep on xserver-xorg-dev >= 2:1.7.6.901. Cheers, Julien -- System Information: Debian Release: squeeze/sid APT prefers unstable APT policy: (500, 'unstable'), (500, 'testing'), (500, 'stable'), (101, 'experimental') Architecture: amd64 (x86_64) Kernel: Linux 2.6.32-4-amd64 (SMP w/2 CPU cores) Locale: LANG=C, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/bash Versions of packages xserver-xorg-input-wacom depends on: ii xserver-xorg-core 2:1.7.6.901-1 Xorg X server - core server xserver-xorg-input-wacom recommends no packages. Versions of packages xserver-xorg-input-wacom suggests: pn wacom-tools <none> (no description available)
From 7ce1f7468cba95afde4fd338ebefd40f696530c9 Mon Sep 17 00:00:00 2001 From: Julien Cristau <[email protected]> Date: Sat, 17 Apr 2010 02:11:07 +0200 Subject: [PATCH] Install 20-wacom.conf to the sysconfigdir variable exported by the server Based on a patch by Peter Hutterer for xf86-input-synaptics. --- Makefile.am | 3 ++- conf/Makefile.am | 4 +++- configure.ac | 8 ++++++++ 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index 808bb13..c36c530 100644 --- a/Makefile.am +++ b/Makefile.am @@ -19,7 +19,8 @@ # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # Ensure headers are installed below $(prefix) for distcheck -DISTCHECK_CONFIGURE_FLAGS = --with-sdkdir='$${includedir}/xorg' +DISTCHECK_CONFIGURE_FLAGS = --with-sdkdir='$${includedir}/xorg' \ + --with-xorg-conf-dir='$${datadir}/X11/xorg.conf.d' SUBDIRS = conf src man include tools MAINTAINERCLEANFILES = ChangeLog INSTALL diff --git a/conf/Makefile.am b/conf/Makefile.am index 01e4f64..ca1e608 100644 --- a/conf/Makefile.am +++ b/conf/Makefile.am @@ -1,5 +1,7 @@ fdidir = $(datadir)/hal/fdi/policy/20thirdparty dist_fdi_DATA = wacom.fdi -xorgconfdir = $(libdir)/X11/xorg.conf.d +if HAS_XORG_CONF_DIR +xorgconfdir = $(XORG_CONF_DIR) dist_xorgconf_DATA = 20-wacom.conf +endif diff --git a/configure.ac b/configure.ac index 7603b1e..c9ba0fe 100644 --- a/configure.ac +++ b/configure.ac @@ -95,6 +95,14 @@ sdkdir=`$PKG_CONFIG --variable=sdkdir xorg-server` AC_ARG_WITH([sdkdir], [], [sdkdir="$withval"]) AC_SUBST([sdkdir]) +AC_ARG_WITH([xorg-conf-dir], + AC_HELP_STRING([--with-xorg-conf-dir=DIR], + [Default xorg.conf.d directory [[default=from $PKG_CONFIG xorg-server]]]), + [XORG_CONF_DIR="$withval"], + [XORG_CONF_DIR="`$PKG_CONFIG --variable=sysconfigdir xorg-server`"]) +AC_SUBST(XORG_CONF_DIR) +AM_CONDITIONAL(HAS_XORG_CONF_DIR, [test "x$XORG_CONF_DIR" != "x" && test "x$XORG_CONF_DIR" != "xno"]) + DRIVER_NAME=wacom AC_SUBST([DRIVER_NAME]) -- 1.7.0.4
signature.asc
Description: Digital signature
