On Sat, Apr 17, 2010 at 15:15:15 +0100, Neil Williams wrote: > Please include the patch into the bug report. > diff follows. The substvar change and xsfbs update are not strictly necessary, the important part is installing a config snippet to /usr/share/X11/xorg.conf.d instead of udev rules, and build-depending on newer xserver to make that work.
It's possible you'll want to add MatchDevicePath "/dev/input/event*" to the inputclass section to match what your udev rule was doing. See e.g. http://cgit.freedesktop.org/xorg/driver/xf86-input-synaptics/commit/?id=87b29e6004a9a7f744eb6e9c2bf9539579ecefbf for the matching change in the xf86-input-synaptics driver. Cheers, Julien diff --git a/debian/10-x11-input-tslib.fdi b/debian/10-x11-input-tslib.fdi deleted file mode 100644 index 3559d0c..0000000 --- a/debian/10-x11-input-tslib.fdi +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<deviceinfo version="0.2"> - <device> - <match key="info.capabilities" contains="input.touchpad"> - <merge key="input.x11_driver" type="string">tslib</merge> - </match> - </device> -</deviceinfo> diff --git a/debian/50-tslib.conf b/debian/50-tslib.conf new file mode 100644 index 0000000..7756ea3 --- /dev/null +++ b/debian/50-tslib.conf @@ -0,0 +1,5 @@ +Section "InputClass" + Identifier "tslib touchscreen" + Driver "tslib" + MatchIsTouchscreen "on" +EndSection diff --git a/debian/66-xorg-tslib.rules b/debian/66-xorg-tslib.rules deleted file mode 100644 index 2ba55ae..0000000 --- a/debian/66-xorg-tslib.rules +++ /dev/null @@ -1,6 +0,0 @@ -ACTION!="add|change", GOTO="xorg_tslib_end" -KERNEL!="event*", GOTO="xorg_tslib_end" - -ENV{ID_INPUT_TOUCHSCREEN}=="?*", ENV{x11_driver}="tslib" - -LABEL="xorg_tslib_end" diff --git a/debian/changelog b/debian/changelog index ef0f30f..b7b3672 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +xf86-input-tslib (0.0.6-4) UNRELEASED; urgency=low + + * Replace hal fdi and udev rules with xorg.conf.d snippet. Build-Depend on + xserver-xorg-dev 1.7.6.901 to make that work. + * Use new xsfbs and ${xinpdriver:Depends} substvar. + + -- Julien Cristau <jcris...@debian.org> Sat, 17 Apr 2010 15:36:34 +0200 + xf86-input-tslib (0.0.6-3) unstable; urgency=low [ Hector Oron ] diff --git a/debian/control b/debian/control index 993c98b..2d5d1df 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Debian Embedded <debian-embed...@lists.debian.org> Uploaders: Hector Oron <zu...@debian.org>, Neil Williams <codeh...@debian.org>, Jonas Smedegaard <j...@debian.org> Build-Depends: debhelper (>= 5), - xserver-xorg-dev (>= 2:1.4), + xserver-xorg-dev (>= 2:1.7.6.901), pkg-config, quilt, libts-dev (>= 1.0-4) Standards-Version: 3.8.3 @@ -14,7 +14,7 @@ Vcs-Browser: http://git.debian.org/?p=collab-maint/xf86-input-tslib.git;a=summar Package: xserver-xorg-input-tslib Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, ${xserver:Depends} +Depends: ${shlibs:Depends}, ${misc:Depends}, ${xinpdriver:Depends} Recommends: hal Provides: xf86-input-tslib, ${xinpdriver:Provides} Replaces: xf86-input-tslib diff --git a/debian/install b/debian/install index 2e6ad90..f8f650c 100644 --- a/debian/install +++ b/debian/install @@ -1,2 +1 @@ -debian/10-x11-input-tslib.fdi usr/share/hal/fdi/policy/20thirdparty -debian/66-xorg-tslib.rules lib/udev/rules.d +debian/50-tslib.conf usr/share/X11/xorg.conf.d/ diff --git a/debian/xsfbs/repack.sh b/debian/xsfbs/repack.sh old mode 100644 new mode 100755 diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk index 5e16b10..77c4a39 100644 --- a/debian/xsfbs/xsfbs.mk +++ b/debian/xsfbs/xsfbs.mk @@ -110,14 +110,15 @@ $(STAMP_DIR)/stampdir: .PHONY: prepare stampdir_targets+=prepare prepare: $(STAMP_DIR)/prepare -$(STAMP_DIR)/prepare: $(STAMP_DIR)/log $(STAMP_DIR)/genscripts +$(STAMP_DIR)/prepare: $(STAMP_DIR)/logdir $(STAMP_DIR)/genscripts >$@ -.PHONY: log -stampdir_targets+=log -log: $(STAMP_DIR)/log -$(STAMP_DIR)/log: $(STAMP_DIR)/stampdir +.PHONY: logdir +stampdir_targets+=logdir +logdir: $(STAMP_DIR)/logdir +$(STAMP_DIR)/logdir: $(STAMP_DIR)/stampdir mkdir -p $(STAMP_DIR)/log + >$@ # Apply all patches to the upstream source. .PHONY: patch @@ -145,7 +146,7 @@ $(STAMP_DIR)/patch: $(STAMP_DIR)/prepare # Revert all patches to the upstream source. .PHONY: unpatch -unpatch: $(STAMP_DIR)/log +unpatch: $(STAMP_DIR)/logdir rm -f $(STAMP_DIR)/patch @echo -n "Unapplying patches..."; \ if $(QUILT) applied >/dev/null 2>/dev/null; then \ @@ -252,25 +253,33 @@ $(STAMP_DIR)/genscripts: $(STAMP_DIR)/stampdir # debian/*.prerm >$@ -SERVERMINVERS = $(shell cat /usr/share/xserver-xorg/serverminver 2>/dev/null) +# Compute dependencies for drivers +# +VIDEODEP = $(shell cat /usr/share/xserver-xorg/videodrvdep 2>/dev/null) +INPUTDEP = $(shell cat /usr/share/xserver-xorg/xinputdep 2>/dev/null) + +# these two can be removed post-squeeze VIDEOABI = $(shell cat /usr/share/xserver-xorg/videoabiver 2>/dev/null) INPUTABI = $(shell cat /usr/share/xserver-xorg/inputabiver 2>/dev/null) -SERVER_DEPENDS = xserver-xorg-core (>= $(SERVERMINVERS)) VIDDRIVER_PROVIDES = xserver-xorg-video-$(VIDEOABI) INPDRIVER_PROVIDES = xserver-xorg-input-$(INPUTABI) + ifeq ($(PACKAGE),) PACKAGE=$(shell awk '/^Package:/ { print $$2; exit }' < debian/control) endif .PHONY: serverabi serverabi: install -ifeq ($(SERVERMINVERS),) - @echo error: xserver-xorg-dev needs to be installed +ifeq ($(VIDEODEP),) + @echo 'error: xserver-xorg-dev >= 1.7.6.901 needs to be installed' @exit 1 else - echo "xserver:Depends=$(SERVER_DEPENDS)" >> debian/$(PACKAGE).substvars + echo "xviddriver:Depends=$(VIDEODEP)" >> debian/$(PACKAGE).substvars + echo "xinpdriver:Depends=$(INPUTDEP)" >> debian/$(PACKAGE).substvars + # the following is there for compatibility... echo "xviddriver:Provides=$(VIDDRIVER_PROVIDES)" >> debian/$(PACKAGE).substvars echo "xinpdriver:Provides=$(INPDRIVER_PROVIDES)" >> debian/$(PACKAGE).substvars + echo "xserver:Depends=$(VIDEODEP), $(INPUTDEP)" >> debian/$(PACKAGE).substvars endif # vim:set noet ai sts=8 sw=8 tw=0:
signature.asc
Description: Digital signature
