debian/README.source | 2 debian/changelog | 64 +++++++++++++++++++++++++++ debian/control | 25 ++++++---- debian/local/65-xorg-evdev.rules | 9 --- debian/rules | 35 ++++++++++---- debian/xserver-xorg-input-evdev-udeb.install | 1 debian/xserver-xorg-input-evdev.install | 1 debian/xserver-xorg-input-evdev.postinst.in | 23 --------- debian/xsfbs/xsfbs.mk | 31 ++++++++----- 9 files changed, 126 insertions(+), 65 deletions(-)
New commits: commit 6b4bdea60a6caaef8f4f33d08d3b8bf6c9030cbb Author: Cyril Brulebois <[email protected]> Date: Tue Oct 12 23:53:39 2010 +0200 Upload to experimental. diff --git a/debian/changelog b/debian/changelog index 6807d35..a814a0a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -xserver-xorg-input-evdev (1:2.3.2-7) UNRELEASED; urgency=low +xserver-xorg-input-evdev (1:2.3.2-7) experimental; urgency=low * Build against Xserver 1.9.1 rc1. - -- Cyril Brulebois <[email protected]> Mon, 11 Oct 2010 10:53:39 +0200 + -- Cyril Brulebois <[email protected]> Tue, 12 Oct 2010 23:52:24 +0200 xserver-xorg-input-evdev (1:2.3.2-6) unstable; urgency=low commit a9a5222673e0dfca26467b40e57fc09e3b8b0696 Author: Cyril Brulebois <[email protected]> Date: Mon Oct 11 10:54:20 2010 +0200 Build against Xserver 1.9.1 rc1. diff --git a/debian/changelog b/debian/changelog index 861eb0c..6807d35 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +xserver-xorg-input-evdev (1:2.3.2-7) UNRELEASED; urgency=low + + * Build against Xserver 1.9.1 rc1. + + -- Cyril Brulebois <[email protected]> Mon, 11 Oct 2010 10:53:39 +0200 + xserver-xorg-input-evdev (1:2.3.2-6) unstable; urgency=low [ Julien Cristau ] diff --git a/debian/control b/debian/control index 89c7495..e6e695c 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,7 @@ Build-Depends: debhelper (>= 5.0.0), pkg-config, quilt, - xserver-xorg-dev (>= 2:1.7.6.901), + xserver-xorg-dev (>= 2:1.9.0.901), x11proto-core-dev, x11proto-randr-dev, x11proto-input-dev, commit c50b97738d5072f930cf685933abbc116d002fa5 Author: Mikhail Gusarov <[email protected]> Date: Fri May 7 18:58:55 2010 +0700 Remove duplicate xorg.fd.o URL and confusing mailing list URL from debian/control diff --git a/debian/control b/debian/control index 9ed92d8..89c7495 100644 --- a/debian/control +++ b/debian/control @@ -33,8 +33,6 @@ Description: X.Org X server -- evdev input driver . More information about X.Org can be found at: <URL:http://www.X.org> - <URL:http://xorg.freedesktop.org> - <URL:http://lists.freedesktop.org/mailman/listinfo/xorg> . This package is built from the X.org xf86-input-evdev driver module. @@ -59,7 +57,5 @@ Description: X.Org X server -- evdev input driver (development headers) . More information about X.Org can be found at: <URL:http://www.X.org> - <URL:http://xorg.freedesktop.org> - <URL:http://lists.freedesktop.org/mailman/listinfo/xorg> . This package is built from the X.org xf86-input-evdev driver module. commit ccd7faf17d467d03605be3a9c821cecdb4065817 Author: Cyril Brulebois <[email protected]> Date: Sat Apr 17 21:40:27 2010 +0200 Upload to unstable. diff --git a/debian/changelog b/debian/changelog index 46fa594..861eb0c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,12 @@ -xserver-xorg-input-evdev (1:2.3.2-6) UNRELEASED; urgency=low +xserver-xorg-input-evdev (1:2.3.2-6) unstable; urgency=low + [ Julien Cristau ] * Drop 05-evdev.conf, this moved to the server. * Build-Depend on xserver-xorg-dev 1.7.6.901. * Sanitize manpage installation. * Update to new xsfbs, use ${xinpdriver:Depends} in debian/control. - -- Julien Cristau <[email protected]> Sat, 17 Apr 2010 00:35:44 +0200 + -- Cyril Brulebois <[email protected]> Sat, 17 Apr 2010 21:40:15 +0200 xserver-xorg-input-evdev (1:2.3.2-5) unstable; urgency=low commit 9ebeafb521e62e964397c2d4c0ca830489ce59e4 Author: Julien Cristau <[email protected]> Date: Sat Apr 17 00:41:04 2010 +0200 Update to new xsfbs, use ${xinpdriver:Depends} in debian/control. diff --git a/debian/changelog b/debian/changelog index 7450b8e..46fa594 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ xserver-xorg-input-evdev (1:2.3.2-6) UNRELEASED; urgency=low * Drop 05-evdev.conf, this moved to the server. * Build-Depend on xserver-xorg-dev 1.7.6.901. * Sanitize manpage installation. + * Update to new xsfbs, use ${xinpdriver:Depends} in debian/control. -- Julien Cristau <[email protected]> Sat, 17 Apr 2010 00:35:44 +0200 diff --git a/debian/control b/debian/control index 448573b..9ed92d8 100644 --- a/debian/control +++ b/debian/control @@ -23,7 +23,7 @@ Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-input-evdev.g Package: xserver-xorg-input-evdev Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, ${xserver:Depends}, +Depends: ${shlibs:Depends}, ${misc:Depends}, ${xinpdriver:Depends}, Provides: ${xinpdriver:Provides} Replaces: xserver-xorg (<< 6.8.2-35) Description: X.Org X server -- evdev input driver commit 0938db63064936ce0765577b6b62feada4f40441 Author: Julien Cristau <[email protected]> Date: Sat Apr 17 00:39:22 2010 +0200 Sanitize manpage installation. diff --git a/debian/changelog b/debian/changelog index c99e7f2..7450b8e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ xserver-xorg-input-evdev (1:2.3.2-6) UNRELEASED; urgency=low * Drop 05-evdev.conf, this moved to the server. * Build-Depend on xserver-xorg-dev 1.7.6.901. + * Sanitize manpage installation. -- Julien Cristau <[email protected]> Sat, 17 Apr 2010 00:35:44 +0200 diff --git a/debian/rules b/debian/rules index a97788b..3e2e15b 100755 --- a/debian/rules +++ b/debian/rules @@ -80,7 +80,7 @@ binary-arch: build install serverabi dh_installdocs dh_installchangelogs ChangeLog - dh_install --sourcedir=debian/tmp --list-missing --exclude=evdev_drv.la --exclude=usr/share/man/man4 + dh_install --sourcedir=debian/tmp --list-missing --exclude=evdev_drv.la dh_installman dh_link dh_strip diff --git a/debian/xserver-xorg-input-evdev.install b/debian/xserver-xorg-input-evdev.install index 4ac2576..97e3c20 100644 --- a/debian/xserver-xorg-input-evdev.install +++ b/debian/xserver-xorg-input-evdev.install @@ -1 +1,2 @@ usr/lib/xorg/modules/input/*.so +usr/share/man commit 458a8cf158fc8b1d35bd6011a82ad75a5e997f78 Author: Julien Cristau <[email protected]> Date: Sat Apr 17 00:37:39 2010 +0200 Update for new xorg.conf.d * Drop 05-evdev.conf, this moved to the server. * Build-Depend on xserver-xorg-dev 1.7.6.901. diff --git a/debian/changelog b/debian/changelog index b2202dd..c99e7f2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +xserver-xorg-input-evdev (1:2.3.2-6) UNRELEASED; urgency=low + + * Drop 05-evdev.conf, this moved to the server. + * Build-Depend on xserver-xorg-dev 1.7.6.901. + + -- Julien Cristau <[email protected]> Sat, 17 Apr 2010 00:35:44 +0200 + xserver-xorg-input-evdev (1:2.3.2-5) unstable; urgency=low * Install 05-evdev.conf in /usr/lib/X11/xorg.conf.d. diff --git a/debian/control b/debian/control index bee2453..448573b 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,7 @@ Build-Depends: debhelper (>= 5.0.0), pkg-config, quilt, - xserver-xorg-dev (>= 2:1.7), + xserver-xorg-dev (>= 2:1.7.6.901), x11proto-core-dev, x11proto-randr-dev, x11proto-input-dev, diff --git a/debian/local/05-evdev.conf b/debian/local/05-evdev.conf deleted file mode 100644 index 0eb9e47..0000000 --- a/debian/local/05-evdev.conf +++ /dev/null @@ -1,39 +0,0 @@ -# Catchall classes for input devices -# 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/debian/rules b/debian/rules index 0acce07..a97788b 100755 --- a/debian/rules +++ b/debian/rules @@ -81,10 +81,6 @@ binary-arch: build install serverabi dh_installdocs dh_installchangelogs ChangeLog dh_install --sourcedir=debian/tmp --list-missing --exclude=evdev_drv.la --exclude=usr/share/man/man4 - install -d debian/xserver-xorg-input-evdev/usr/lib/X11/xorg.conf.d - install -m 644 debian/local/05-evdev.conf debian/xserver-xorg-input-evdev/usr/lib/X11/xorg.conf.d - install -d debian/xserver-xorg-input-evdev-udeb/usr/lib/X11/xorg.conf.d - install -m 644 debian/local/05-evdev.conf debian/xserver-xorg-input-evdev-udeb/usr/lib/X11/xorg.conf.d dh_installman dh_link dh_strip commit b045afbd8277ad0c44e29d7c45802053c4335ccd Author: Julien Cristau <[email protected]> Date: Fri Apr 16 22:14:46 2010 +0200 Update serverabi rule for xserver 1.7.6.901 Add new variables ${xviddriver:Depends} and ${xinpdriver:Depends} for drivers. The ${xserver:Depends} variable is deprecated. diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk index 351fea5..77c4a39 100755 --- a/debian/xsfbs/xsfbs.mk +++ b/debian/xsfbs/xsfbs.mk @@ -253,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: commit 8bd2e9b523da35493db1bd781d4ef6bfbbeb2eff Author: Julien Cristau <[email protected]> Date: Tue Apr 13 14:06:33 2010 +0200 xsfbs.mk: don't use a directory as a make target The timestamp on the directory gets updated each time a file is added in it, which causes useless rebuilds. diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk index 5e16b10..351fea5 100755 --- 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 \ commit 734e3b2d1dcfe5db07cb19902617fd1212c0c186 Author: Cyril Brulebois <[email protected]> Date: Thu Apr 1 20:49:15 2010 +0200 Fix typo. diff --git a/debian/README.source b/debian/README.source index 34ab4bf..b09a1ab 100644 --- a/debian/README.source +++ b/debian/README.source @@ -25,7 +25,7 @@ just need to be pulled into git.debian.org in a "upstream-*" branch. Otherwise, the upstream sources are manually installed in the Debian git repository. -The .orig.tar.gz upstream source file could be generated this +The .orig.tar.gz upstream source file could be generated using this "upstream-*" branch in the Debian git repository but it is actually copied from upstream tarballs directly. commit d0234f89cf8dbe0973c9165c69b9977b5b950ff9 Author: Timo Aaltonen <[email protected]> Date: Tue Mar 30 21:41:39 2010 +0300 Release to unstable. diff --git a/debian/changelog b/debian/changelog index 30c4e85..b2202dd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,10 @@ -xserver-xorg-input-evdev (1:2.3.2-5) UNRELEASED; urgency=low +xserver-xorg-input-evdev (1:2.3.2-5) unstable; urgency=low * Install 05-evdev.conf in /usr/lib/X11/xorg.conf.d. * Remove 65-xorg-evdev.rules, obsoleted by the above. * Drop the postinst, and don't depend on udev. - -- Timo Aaltonen <[email protected]> Sun, 21 Mar 2010 20:51:38 +0200 + -- Timo Aaltonen <[email protected]> Tue, 30 Mar 2010 21:40:54 +0300 xserver-xorg-input-evdev (1:2.3.2-4) unstable; urgency=low commit cd5f45bca92f0ebf7611996857ecf78c8de82cde Author: Timo Aaltonen <[email protected]> Date: Tue Mar 30 17:42:14 2010 +0300 Drop the postinst, and don't depend on udev. diff --git a/debian/changelog b/debian/changelog index 9e5a411..30c4e85 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ xserver-xorg-input-evdev (1:2.3.2-5) UNRELEASED; urgency=low * Install 05-evdev.conf in /usr/lib/X11/xorg.conf.d. * Remove 65-xorg-evdev.rules, obsoleted by the above. + * Drop the postinst, and don't depend on udev. -- Timo Aaltonen <[email protected]> Sun, 21 Mar 2010 20:51:38 +0200 diff --git a/debian/control b/debian/control index 3953e61..bee2453 100644 --- a/debian/control +++ b/debian/control @@ -24,7 +24,6 @@ Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-input-evdev.g Package: xserver-xorg-input-evdev Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, ${xserver:Depends}, - udev [linux-any], Provides: ${xinpdriver:Provides} Replaces: xserver-xorg (<< 6.8.2-35) Description: X.Org X server -- evdev input driver diff --git a/debian/xserver-xorg-input-evdev.postinst.in b/debian/xserver-xorg-input-evdev.postinst.in deleted file mode 100644 index 014c92b..0000000 --- a/debian/xserver-xorg-input-evdev.postinst.in +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/sh - -set -e - -THIS_PACKAGE=xserver-xorg-input-evdev -THIS_SCRIPT=postinst - -#INCLUDE_SHELL_LIB# - -case "$1" in - configure) - if dpkg --compare-versions "$2" lt 1:2.3.2-3; then - udevadm trigger --subsystem-match=input --action=change - fi -esac - -#DEBHELPER# - -exit 0 - -# vim:set ai et sw=2 ts=2 tw=80: commit 301d89eda34c6b1c91ae854e50870dd2c7cdae93 Author: Timo Aaltonen <[email protected]> Date: Tue Mar 30 17:30:28 2010 +0300 Use tabs in 05-evdev.conf diff --git a/debian/local/05-evdev.conf b/debian/local/05-evdev.conf index 877aa4a..0eb9e47 100644 --- a/debian/local/05-evdev.conf +++ b/debian/local/05-evdev.conf @@ -4,36 +4,36 @@ # matches everything but joysticks. Section "InputClass" - Identifier "evdev pointer catchall" - MatchIsPointer "on" - MatchDevicePath "/dev/input/event*" - Driver "evdev" + 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" + 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" + 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" + 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" + Identifier "evdev touchscreen catchall" + MatchIsTouchscreen "on" + MatchDevicePath "/dev/input/event*" + Driver "evdev" EndSection commit ce5cdb99182409cdca4a7c742d4967fcdafd97fb Author: Timo Aaltonen <[email protected]> Date: Tue Mar 30 15:08:10 2010 +0300 Remove 65-xorg-evdev.rules, obsoleted by the above. diff --git a/debian/changelog b/debian/changelog index 4921e60..9e5a411 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,7 @@ xserver-xorg-input-evdev (1:2.3.2-5) UNRELEASED; urgency=low - * 65-xorg-evdev.rules: Check for ID_INPUT_TABLET too, and set x11_driver - if found. * Install 05-evdev.conf in /usr/lib/X11/xorg.conf.d. + * Remove 65-xorg-evdev.rules, obsoleted by the above. -- Timo Aaltonen <[email protected]> Sun, 21 Mar 2010 20:51:38 +0200 diff --git a/debian/local/65-xorg-evdev.rules b/debian/local/65-xorg-evdev.rules deleted file mode 100644 index 8d9b84a..0000000 --- a/debian/local/65-xorg-evdev.rules +++ /dev/null @@ -1,14 +0,0 @@ -ACTION!="add|change", GOTO="xorg_evdev_end" - -# By default, we use the -evdev driver for every mouse, keyboard, touchscreen -# or touchpad; later rules can then change the driver for specific input -# devices. -KERNEL!="event*", GOTO="xorg_evdev_end" -ENV{ID_INPUT}=="", GOTO="xorg_evdev_end" -ENV{ID_INPUT_MOUSE}=="?*", ENV{x11_driver}="evdev" -ENV{ID_INPUT_KEY}=="?*", ENV{x11_driver}="evdev" -ENV{ID_INPUT_TOUCHSCREEN}=="?*", ENV{x11_driver}="evdev" -ENV{ID_INPUT_TOUCHPAD}=="?*", ENV{x11_driver}="evdev" -ENV{ID_INPUT_TABLET}=="?*", ENV{x11_driver}="evdev" - -LABEL="xorg_evdev_end" diff --git a/debian/rules b/debian/rules index 32ba6a6..0acce07 100755 --- a/debian/rules +++ b/debian/rules @@ -81,10 +81,6 @@ binary-arch: build install serverabi dh_installdocs dh_installchangelogs ChangeLog dh_install --sourcedir=debian/tmp --list-missing --exclude=evdev_drv.la --exclude=usr/share/man/man4 - install -d debian/xserver-xorg-input-evdev/lib/udev/rules.d - install -m 644 debian/local/65-xorg-evdev.rules debian/xserver-xorg-input-evdev/lib/udev/rules.d/ - install -d debian/xserver-xorg-input-evdev-udeb/lib/udev/rules.d - install -m 644 debian/local/65-xorg-evdev.rules debian/xserver-xorg-input-evdev-udeb/lib/udev/rules.d/ install -d debian/xserver-xorg-input-evdev/usr/lib/X11/xorg.conf.d install -m 644 debian/local/05-evdev.conf debian/xserver-xorg-input-evdev/usr/lib/X11/xorg.conf.d install -d debian/xserver-xorg-input-evdev-udeb/usr/lib/X11/xorg.conf.d commit 941e6cdbe1baaf60aa3f07da39a1642357a02a81 Author: Timo Aaltonen <[email protected]> Date: Tue Mar 30 14:35:09 2010 +0300 Install 05-evdev.conf in /usr/lib/X11/xorg.conf.d. diff --git a/debian/changelog b/debian/changelog index 405c8fd..4921e60 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ xserver-xorg-input-evdev (1:2.3.2-5) UNRELEASED; urgency=low * 65-xorg-evdev.rules: Check for ID_INPUT_TABLET too, and set x11_driver if found. + * Install 05-evdev.conf in /usr/lib/X11/xorg.conf.d. -- Timo Aaltonen <[email protected]> Sun, 21 Mar 2010 20:51:38 +0200 diff --git a/debian/local/05-evdev.conf b/debian/local/05-evdev.conf new file mode 100644 index 0000000..877aa4a --- /dev/null +++ b/debian/local/05-evdev.conf @@ -0,0 +1,39 @@ +# Catchall classes for input devices +# 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/debian/rules b/debian/rules index c1aa6ff..32ba6a6 100755 --- a/debian/rules +++ b/debian/rules @@ -85,6 +85,10 @@ binary-arch: build install serverabi install -m 644 debian/local/65-xorg-evdev.rules debian/xserver-xorg-input-evdev/lib/udev/rules.d/ install -d debian/xserver-xorg-input-evdev-udeb/lib/udev/rules.d install -m 644 debian/local/65-xorg-evdev.rules debian/xserver-xorg-input-evdev-udeb/lib/udev/rules.d/ + install -d debian/xserver-xorg-input-evdev/usr/lib/X11/xorg.conf.d + install -m 644 debian/local/05-evdev.conf debian/xserver-xorg-input-evdev/usr/lib/X11/xorg.conf.d + install -d debian/xserver-xorg-input-evdev-udeb/usr/lib/X11/xorg.conf.d + install -m 644 debian/local/05-evdev.conf debian/xserver-xorg-input-evdev-udeb/usr/lib/X11/xorg.conf.d dh_installman dh_link dh_strip commit 39c4405782957190024e8e38dd09c6163d172c99 Author: Timo Aaltonen <[email protected]> Date: Sun Mar 21 20:53:18 2010 +0200 65-xorg-evdev.rules: Check for ID_INPUT_TABLET too, and set x11_driver if found. diff --git a/debian/changelog b/debian/changelog index 734e679..405c8fd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +xserver-xorg-input-evdev (1:2.3.2-5) UNRELEASED; urgency=low + + * 65-xorg-evdev.rules: Check for ID_INPUT_TABLET too, and set x11_driver + if found. + + -- Timo Aaltonen <[email protected]> Sun, 21 Mar 2010 20:51:38 +0200 + xserver-xorg-input-evdev (1:2.3.2-4) unstable; urgency=low [ Julien Cristau ] diff --git a/debian/local/65-xorg-evdev.rules b/debian/local/65-xorg-evdev.rules index d423b38..8d9b84a 100644 --- a/debian/local/65-xorg-evdev.rules +++ b/debian/local/65-xorg-evdev.rules @@ -9,5 +9,6 @@ ENV{ID_INPUT_MOUSE}=="?*", ENV{x11_driver}="evdev" ENV{ID_INPUT_KEY}=="?*", ENV{x11_driver}="evdev" ENV{ID_INPUT_TOUCHSCREEN}=="?*", ENV{x11_driver}="evdev" ENV{ID_INPUT_TOUCHPAD}=="?*", ENV{x11_driver}="evdev" +ENV{ID_INPUT_TABLET}=="?*", ENV{x11_driver}="evdev" LABEL="xorg_evdev_end" commit ed3d0d75ccccd4abef2ec7475f9742466f5910a9 Author: Cyril Brulebois <[email protected]> Date: Fri Mar 12 01:03:23 2010 +0100 Upload to unstable. diff --git a/debian/changelog b/debian/changelog index 5d5067a..734e679 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xserver-xorg-input-evdev (1:2.3.2-4) UNRELEASED; urgency=low +xserver-xorg-input-evdev (1:2.3.2-4) unstable; urgency=low [ Julien Cristau ] * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no @@ -15,7 +15,7 @@ xserver-xorg-input-evdev (1:2.3.2-4) UNRELEASED; urgency=low * Bump Standards-Version from 3.8.3 to 3.8.4 (no changes needed). * Add myself to Uploaders. - -- Robert Hooker <[email protected]> Sun, 24 Jan 2010 14:44:34 -0500 + -- Cyril Brulebois <[email protected]> Fri, 12 Mar 2010 01:02:58 +0100 xserver-xorg-input-evdev (1:2.3.2-3) unstable; urgency=low commit 624b8f0ef947b66084e979aba8bc467d87cf340b Author: Cyril Brulebois <[email protected]> Date: Fri Mar 12 01:02:56 2010 +0100 Add myself to Uploaders. diff --git a/debian/changelog b/debian/changelog index a83572b..5d5067a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,6 +13,7 @@ xserver-xorg-input-evdev (1:2.3.2-4) UNRELEASED; urgency=low * Add udeb needed for the graphical installer: xserver-xorg-input-evdev-udeb. * Bump Standards-Version from 3.8.3 to 3.8.4 (no changes needed). + * Add myself to Uploaders. -- Robert Hooker <[email protected]> Sun, 24 Jan 2010 14:44:34 -0500 diff --git a/debian/control b/debian/control index 06a3377..3953e61 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: xserver-xorg-input-evdev Section: x11 Priority: optional Maintainer: Debian X Strike Force <[email protected]> -Uploaders: David Nusinow <[email protected]>, Drew Parsons <[email protected]>, Brice Goglin <[email protected]> +Uploaders: David Nusinow <[email protected]>, Drew Parsons <[email protected]>, Brice Goglin <[email protected]>, Cyril Brulebois <[email protected]> Build-Depends: debhelper (>= 5.0.0), pkg-config, commit ad20edab760c95f53f27adccf5ec20e14c00205f Author: Cyril Brulebois <[email protected]> Date: Fri Mar 12 01:00:02 2010 +0100 Bump Standards-Version from 3.8.3 to 3.8.4 (no changes needed). diff --git a/debian/changelog b/debian/changelog index f26b4e7..a83572b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,6 +12,7 @@ xserver-xorg-input-evdev (1:2.3.2-4) UNRELEASED; urgency=low [ Cyril Brulebois ] * Add udeb needed for the graphical installer: xserver-xorg-input-evdev-udeb. + * Bump Standards-Version from 3.8.3 to 3.8.4 (no changes needed). -- Robert Hooker <[email protected]> Sun, 24 Jan 2010 14:44:34 -0500 diff --git a/debian/control b/debian/control index 3765dc6..06a3377 100644 --- a/debian/control +++ b/debian/control @@ -17,7 +17,7 @@ Build-Depends: automake, libtool, xutils-dev (>= 1:7.5~1) -Standards-Version: 3.8.3 +Standards-Version: 3.8.4 Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-input-evdev Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-input-evdev.git commit 79e63613fce4b887eca26d9a0b9b7274cf7e4eee Author: Cyril Brulebois <[email protected]> Date: Sun Feb 28 00:05:02 2010 +0100 Use XC-Package-Type to save some memory. diff --git a/debian/control b/debian/control index 69f91f6..3765dc6 100644 --- a/debian/control +++ b/debian/control @@ -40,7 +40,7 @@ Description: X.Org X server -- evdev input driver This package is built from the X.org xf86-input-evdev driver module. Package: xserver-xorg-input-evdev-udeb -Package-Type: udeb +XC-Package-Type: udeb Section: debian-installer Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, ${xserver:Depends}, commit 879e1eedc9b607363bd02083784f586b8483927e Author: Cyril Brulebois <[email protected]> Date: Tue Feb 2 22:34:08 2010 +0000 Also install 65-xorg-evdev.rules diff --git a/debian/rules b/debian/rules index 2acc6ae..c1aa6ff 100755 --- a/debian/rules +++ b/debian/rules @@ -83,6 +83,8 @@ binary-arch: build install serverabi dh_install --sourcedir=debian/tmp --list-missing --exclude=evdev_drv.la --exclude=usr/share/man/man4 install -d debian/xserver-xorg-input-evdev/lib/udev/rules.d install -m 644 debian/local/65-xorg-evdev.rules debian/xserver-xorg-input-evdev/lib/udev/rules.d/ + install -d debian/xserver-xorg-input-evdev-udeb/lib/udev/rules.d + install -m 644 debian/local/65-xorg-evdev.rules debian/xserver-xorg-input-evdev-udeb/lib/udev/rules.d/ dh_installman dh_link dh_strip commit 6289aacef6f289d3554e4ed4cf652914616c0802 Author: Cyril Brulebois <[email protected]> Date: Sat Feb 6 22:57:49 2010 +0000 Add udeb needed for the graphical installer: xserver-xorg-input-evdev-udeb. diff --git a/debian/changelog b/debian/changelog index d823557..f26b4e7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,10 @@ xserver-xorg-input-evdev (1:2.3.2-4) UNRELEASED; urgency=low [ Robert Hooker ] * Build xserver-xorg-input-evdev-dev on arch: all. + [ Cyril Brulebois ] + * Add udeb needed for the graphical installer: + xserver-xorg-input-evdev-udeb. + -- Robert Hooker <[email protected]> Sun, 24 Jan 2010 14:44:34 -0500 xserver-xorg-input-evdev (1:2.3.2-3) unstable; urgency=low diff --git a/debian/control b/debian/control index 1565072..69f91f6 100644 --- a/debian/control +++ b/debian/control @@ -39,6 +39,16 @@ Description: X.Org X server -- evdev input driver . This package is built from the X.org xf86-input-evdev driver module. +Package: xserver-xorg-input-evdev-udeb +Package-Type: udeb +Section: debian-installer +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, ${xserver:Depends}, + udev-udeb [linux-any], +Provides: ${xinpdriver:Provides} +Description: X.Org X server -- evdev input driver + This is a udeb, or a microdeb, for the debian-installer. + Package: xserver-xorg-input-evdev-dev Section: libdevel Architecture: all diff --git a/debian/xserver-xorg-input-evdev-udeb.install b/debian/xserver-xorg-input-evdev-udeb.install new file mode 100644 index 0000000..4ac2576 --- /dev/null +++ b/debian/xserver-xorg-input-evdev-udeb.install @@ -0,0 +1 @@ +usr/lib/xorg/modules/input/*.so commit 2eff57cb9613e862075e3fc7b2fee53f4e42399c Author: Julien Cristau <[email protected]> Date: Tue Mar 9 00:58:35 2010 +0100 65-xorg-evdev.rules: only set x11_driver for event devices. No point setting the driver to evdev for devices it doesn't support. diff --git a/debian/changelog b/debian/changelog index c99565a..d823557 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ xserver-xorg-input-evdev (1:2.3.2-4) UNRELEASED; urgency=low * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no good reason. Thanks, Colin Watson! * Remove myself from Uploaders + * 65-xorg-evdev.rules: only set x11_driver for event devices. [ Robert Hooker ] * Build xserver-xorg-input-evdev-dev on arch: all. diff --git a/debian/local/65-xorg-evdev.rules b/debian/local/65-xorg-evdev.rules index ea4a9bb..d423b38 100644 --- a/debian/local/65-xorg-evdev.rules +++ b/debian/local/65-xorg-evdev.rules @@ -3,6 +3,7 @@ ACTION!="add|change", GOTO="xorg_evdev_end" # By default, we use the -evdev driver for every mouse, keyboard, touchscreen # or touchpad; later rules can then change the driver for specific input # devices. +KERNEL!="event*", GOTO="xorg_evdev_end" ENV{ID_INPUT}=="", GOTO="xorg_evdev_end" ENV{ID_INPUT_MOUSE}=="?*", ENV{x11_driver}="evdev" ENV{ID_INPUT_KEY}=="?*", ENV{x11_driver}="evdev" commit 02df52780654ba076a1c230e241ce8c71ccf3d97 Author: Robert Hooker <[email protected]> Date: Sun Jan 24 15:41:47 2010 -0500 debian/rules: Adjust build for xserver-xorg-input-evdev-dev being arch: all. diff --git a/debian/rules b/debian/rules index 356b9da..2acc6ae 100755 --- a/debian/rules +++ b/debian/rules @@ -73,6 +73,7 @@ install: build cd build && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install # Build architecture-dependent files here. +binary-arch: DH_OPTIONS=-s binary-arch: build install serverabi dh_testdir dh_testroot @@ -94,8 +95,22 @@ binary-arch: build install serverabi dh_builddeb # Build architecture-independent files here. +binary-indep: DH_OPTIONS=-i binary-indep: build install -# Nothing to do + dh_testdir + dh_testroot + dh_installdocs + dh_installchangelogs + dh_install --sourcedir=debian/tmp + dh_installman + dh_link + dh_strip + dh_compress + dh_fixperms + dh_installdeb + dh_gencontrol + dh_md5sums + dh_builddeb binary: binary-indep binary-arch .PHONY: build clean binary-indep binary-arch binary install commit 699c6499475855d17a666e029217849ea1f8e3bb Author: Robert Hooker <[email protected]> Date: Sun Jan 24 14:45:03 2010 -0500 debian/control: Build xserver-xorg-input-evdev-dev on arch: all. diff --git a/debian/changelog b/debian/changelog index d31d1fc..c99565a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,14 @@ xserver-xorg-input-evdev (1:2.3.2-4) UNRELEASED; urgency=low + [ Julien Cristau ] * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no good reason. Thanks, Colin Watson! * Remove myself from Uploaders -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/[email protected]
