ChangeLog | 34 +++++++++++++++++ configure.ac | 2 - debian/66-xorg-synaptics.rules | 16 -------- debian/NEWS | 12 ++---- debian/changelog | 42 +++++++++++++++++----- debian/control | 14 ++++++- debian/local/10-synaptics.conf | 5 ++ debian/local/66-xorg-synaptics.rules | 10 +++++ debian/patches/03-man-no-hal.patch | 20 ++++++++++ debian/patches/series | 1 debian/rules | 35 +++++++++++++----- debian/xserver-xorg-input-synaptics-dev.install | 2 + debian/xserver-xorg-input-synaptics.README.Debian | 38 +++++-------------- debian/xserver-xorg-input-synaptics.postinst.in | 23 ++++++++++++ src/synaptics.c | 2 - 15 files changed, 184 insertions(+), 72 deletions(-)
New commits: commit 846c0208b6d10d837663bc703453f4478cdedf5e Author: Timo Aaltonen <[email protected]> Date: Tue Mar 30 16:57:22 2010 +0300 Drop Ubuntu specific quirks from the udev rules, add a placeholder. diff --git a/debian/changelog b/debian/changelog index 808ad2d..1948a44 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,7 @@ xserver-xorg-input-synaptics (1.2.2-1) UNRELEASED; urgency=low (LP: #340340) * Run udevadm trigger on postinst, and depend on udev [linux-any]. * Add 10-synaptics.conf. + * Drop Ubuntu specific quirks from the udev rules, add a placeholder. [ Julien Cristau ] * Add hurd-i386 to the Architecture field. Requested by Samuel Thibault. diff --git a/debian/local/66-xorg-synaptics.rules b/debian/local/66-xorg-synaptics.rules index b3b457f..f4d5069 100644 --- a/debian/local/66-xorg-synaptics.rules +++ b/debian/local/66-xorg-synaptics.rules @@ -3,14 +3,8 @@ KERNEL!="event*", GOTO="xorg_synaptics_end" ENV{ID_INPUT_TOUCHPAD}!="1", GOTO="xorg_synaptics_end" -ENV{x11_driver}="synaptics" +# Placeholder for platform specific quirks needing +# ID_INPUT.tags to be set. -# model specific quirks -ATTR{[dmi/id]product_name}=="Inspiron 1011|Inspiron 1012", \ - ENV{x11_options.JumpyCursorThreshold}="90", \ - ENV{x11_options.AreaBottomEdge}="4100" - -ATTR{[dmi/id]product_name}=="HP MiniNote 1000", \ - ENV{x11_options.JumpyCursorThreshold}="20" LABEL="xorg_synaptics_end" commit b7e39fd17074c1818c3a5c15fe64b1af95a2c389 Author: Timo Aaltonen <[email protected]> Date: Tue Mar 30 15:32:38 2010 +0300 Add 10-synaptics.conf. diff --git a/debian/changelog b/debian/changelog index 91e57ab..808ad2d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ xserver-xorg-input-synaptics (1.2.2-1) UNRELEASED; urgency=low * Add xserver-xorg-input-synaptics-dev for the header and .pc files. (LP: #340340) * Run udevadm trigger on postinst, and depend on udev [linux-any]. + * Add 10-synaptics.conf. [ Julien Cristau ] * Add hurd-i386 to the Architecture field. Requested by Samuel Thibault. diff --git a/debian/local/10-synaptics.conf b/debian/local/10-synaptics.conf new file mode 100644 index 0000000..f1badee --- /dev/null +++ b/debian/local/10-synaptics.conf @@ -0,0 +1,5 @@ +Section "InputClass" + Identifier "touchpad catchall" + MatchIsTouchpad "on" + Driver "synaptics" +EndSection diff --git a/debian/rules b/debian/rules index 72f148e..6e5b476 100755 --- a/debian/rules +++ b/debian/rules @@ -90,6 +90,8 @@ binary-arch: build install serverabi ifeq ($(DEB_HOST_ARCH_OS), linux) install -d debian/xserver-xorg-input-synaptics/lib/udev/rules.d install -m 644 debian/local/66-xorg-synaptics.rules debian/xserver-xorg-input-synaptics/lib/udev/rules.d + install -d debian/xserver-xorg-input-synaptics/usr/lib/X11/xorg.conf.d + install -m 644 debian/local/10-synaptics.conf debian/xserver-xorg-input-synaptics/usr/lib/X11/xorg.conf.d else ifeq ($(DEB_HOST_ARCH_OS), kfreebsd) install -d debian/xserver-xorg-input-synaptics/usr/share/hal/fdi/policy/20thirdparty install -m 0644 fdi/11-x11-synaptics.fdi \ commit 62b51f5f5ba86f62b3fe13cb36ab2a744bec597b Author: Timo Aaltonen <[email protected]> Date: Tue Mar 30 15:19:08 2010 +0300 Move udev rules to debian/local diff --git a/debian/66-xorg-synaptics.rules b/debian/66-xorg-synaptics.rules deleted file mode 100644 index b3b457f..0000000 --- a/debian/66-xorg-synaptics.rules +++ /dev/null @@ -1,16 +0,0 @@ -ACTION!="add|change", GOTO="xorg_synaptics_end" -KERNEL!="event*", GOTO="xorg_synaptics_end" - -ENV{ID_INPUT_TOUCHPAD}!="1", GOTO="xorg_synaptics_end" - -ENV{x11_driver}="synaptics" - -# model specific quirks -ATTR{[dmi/id]product_name}=="Inspiron 1011|Inspiron 1012", \ - ENV{x11_options.JumpyCursorThreshold}="90", \ - ENV{x11_options.AreaBottomEdge}="4100" - -ATTR{[dmi/id]product_name}=="HP MiniNote 1000", \ - ENV{x11_options.JumpyCursorThreshold}="20" - -LABEL="xorg_synaptics_end" diff --git a/debian/local/66-xorg-synaptics.rules b/debian/local/66-xorg-synaptics.rules new file mode 100644 index 0000000..b3b457f --- /dev/null +++ b/debian/local/66-xorg-synaptics.rules @@ -0,0 +1,16 @@ +ACTION!="add|change", GOTO="xorg_synaptics_end" +KERNEL!="event*", GOTO="xorg_synaptics_end" + +ENV{ID_INPUT_TOUCHPAD}!="1", GOTO="xorg_synaptics_end" + +ENV{x11_driver}="synaptics" + +# model specific quirks +ATTR{[dmi/id]product_name}=="Inspiron 1011|Inspiron 1012", \ + ENV{x11_options.JumpyCursorThreshold}="90", \ + ENV{x11_options.AreaBottomEdge}="4100" + +ATTR{[dmi/id]product_name}=="HP MiniNote 1000", \ + ENV{x11_options.JumpyCursorThreshold}="20" + +LABEL="xorg_synaptics_end" diff --git a/debian/rules b/debian/rules index 37ad494..72f148e 100755 --- a/debian/rules +++ b/debian/rules @@ -89,7 +89,7 @@ binary-arch: build install serverabi dh_install --sourcedir=debian/tmp --list-missing --exclude=synaptics_drv.la --exclude=usr/share/man ifeq ($(DEB_HOST_ARCH_OS), linux) install -d debian/xserver-xorg-input-synaptics/lib/udev/rules.d - install -m 644 debian/66-xorg-synaptics.rules debian/xserver-xorg-input-synaptics/lib/udev/rules.d + install -m 644 debian/local/66-xorg-synaptics.rules debian/xserver-xorg-input-synaptics/lib/udev/rules.d else ifeq ($(DEB_HOST_ARCH_OS), kfreebsd) install -d debian/xserver-xorg-input-synaptics/usr/share/hal/fdi/policy/20thirdparty install -m 0644 fdi/11-x11-synaptics.fdi \ commit bfbc6af99031e2263c36270fac43959edb2c91e1 Author: Timo Aaltonen <[email protected]> Date: Fri Mar 26 09:24:04 2010 +0200 Update the changelogs. diff --git a/ChangeLog b/ChangeLog index a5af5a1..e65ab8b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,37 @@ +commit a0d6e90b26044258473d8dae8a53c5adbe2681f1 +Author: Peter Hutterer <[email protected]> +Date: Fri Mar 26 15:13:40 2010 +1000 + + synaptics 1.2.2 + + Signed-off-by: Peter Hutterer <[email protected]> + +commit ba0d227a6da35dd21ba48ded65cabff16ef423ce +Author: Peter Hutterer <[email protected]> +Date: Wed Mar 17 13:52:43 2010 +1000 + + After closing the fd, reset it to -1. + + A DeviceOff() followed by DeviceClose() (which calls DeviceOff()) would try + to close the fd twice, in addition to calling various hooks. + + Signed-off-by: Peter Hutterer <[email protected]> + Reviewed-by: Julien Cristau <[email protected]> + (cherry picked from commit a07fe65031ffa7e8d88898d763bdbc88899fb1e4) + + Signed-off-by: Peter Hutterer <[email protected]> + +commit 5c811a864e8927a8dfcf9bc25ffe0265b5ed8025 +Author: Adam Jackson <[email protected]> +Date: Fri Mar 12 08:32:22 2010 +1000 + + Don't clobber the timer we just created. + + Signed-off-by: Peter Hutterer <[email protected]> + (cherry picked from commit 0fb151b2388ca665b9454b7b284181b4fa180194) + + Signed-off-by: Peter Hutterer <[email protected]> + commit faf250d013b1850d3dbe08b050c71dfeb20a6490 Author: Peter Hutterer <[email protected]> Date: Fri Dec 11 13:46:50 2009 +1000 diff --git a/debian/changelog b/debian/changelog index 483366f..91e57ab 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ -xserver-xorg-input-synaptics (1.2.1-2) UNRELEASED; urgency=low +xserver-xorg-input-synaptics (1.2.2-1) UNRELEASED; urgency=low [ Timo Aaltonen ] + * New upstream release. * Add xserver-xorg-input-synaptics-dev for the header and .pc files. (LP: #340340) * Run udevadm trigger on postinst, and depend on udev [linux-any]. commit a0d6e90b26044258473d8dae8a53c5adbe2681f1 Author: Peter Hutterer <[email protected]> Date: Fri Mar 26 15:13:40 2010 +1000 synaptics 1.2.2 Signed-off-by: Peter Hutterer <[email protected]> diff --git a/configure.ac b/configure.ac index 00181bc..dd2bef7 100644 --- a/configure.ac +++ b/configure.ac @@ -22,7 +22,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-input-synaptics], - 1.2.1, + 1.2.2, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-input-synaptics) commit ba0d227a6da35dd21ba48ded65cabff16ef423ce Author: Peter Hutterer <[email protected]> Date: Wed Mar 17 13:52:43 2010 +1000 After closing the fd, reset it to -1. A DeviceOff() followed by DeviceClose() (which calls DeviceOff()) would try to close the fd twice, in addition to calling various hooks. Signed-off-by: Peter Hutterer <[email protected]> Reviewed-by: Julien Cristau <[email protected]> (cherry picked from commit a07fe65031ffa7e8d88898d763bdbc88899fb1e4) Signed-off-by: Peter Hutterer <[email protected]> diff --git a/src/synaptics.c b/src/synaptics.c index 6cbdcb8..9997674 100644 --- a/src/synaptics.c +++ b/src/synaptics.c @@ -801,6 +801,7 @@ DeviceOff(DeviceIntPtr dev) priv->comm.buffer = NULL; } xf86CloseSerial(local->fd); + local->fd = -1; } dev->public.on = FALSE; return Success; commit 5c811a864e8927a8dfcf9bc25ffe0265b5ed8025 Author: Adam Jackson <[email protected]> Date: Fri Mar 12 08:32:22 2010 +1000 Don't clobber the timer we just created. Signed-off-by: Peter Hutterer <[email protected]> (cherry picked from commit 0fb151b2388ca665b9454b7b284181b4fa180194) Signed-off-by: Peter Hutterer <[email protected]> diff --git a/src/synaptics.c b/src/synaptics.c index e9d1833..6cbdcb8 100644 --- a/src/synaptics.c +++ b/src/synaptics.c @@ -615,7 +615,6 @@ SynapticsPreInit(InputDriverPtr drv, IDevPtr dev, int flags) xf86ErrorFVerb(6, "port opened successfully\n"); /* initialize variables */ - priv->timer = NULL; priv->repeatButtons = 0; priv->nextRepeat = 0; priv->count_packet_finger = 0; commit 9a916a503c09dbe396e1ff7cd5bdd9aeb86c3716 Author: Brice Goglin <[email protected]> Date: Sat Feb 6 12:15:17 2010 +0100 Fix reference to the synaptics manpage in README.Debian diff --git a/debian/changelog b/debian/changelog index a5b9912..483366f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,6 +12,10 @@ xserver-xorg-input-synaptics (1.2.1-2) UNRELEASED; urgency=low * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no good reason. Thanks, Colin Watson! + [ Brice Goglin ] + * Fix reference to the synaptics manpage in README.Debian, + closes: #568628. + -- Timo Aaltonen <[email protected]> Tue, 08 Dec 2009 16:15:58 +0200 xserver-xorg-input-synaptics (1.2.1-1) unstable; urgency=low diff --git a/debian/xserver-xorg-input-synaptics.README.Debian b/debian/xserver-xorg-input-synaptics.README.Debian index d724ec0..19d01a3 100644 --- a/debian/xserver-xorg-input-synaptics.README.Debian +++ b/debian/xserver-xorg-input-synaptics.README.Debian @@ -30,7 +30,7 @@ Section "InputDevice" Option "Protocol" "auto-dev" # # Following lines are optional thus commented in this example. -# Please read the synaptics(5) manpage for a detailed explanation +# Please read the synaptics(4) manpage for a detailed explanation # of the various options' meaning as well as a full list of options # # Option "LeftEdge" "1700" commit c65889b3de7a2d1762669bc7d7be65814faa9373 Author: Julien Cristau <[email protected]> Date: Sat Jan 16 16:48:50 2010 +0000 Rename the build directory to not include DEB_BUILD_GNU_TYPE for no good reason. Thanks, Colin Watson! diff --git a/debian/changelog b/debian/changelog index ba64ff5..a5b9912 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,8 @@ xserver-xorg-input-synaptics (1.2.1-2) UNRELEASED; urgency=low * Add hurd-i386 to the Architecture field. Requested by Samuel Thibault. * Drop references to hal from debian/NEWS, README.Debian and synaptics(4) (closes: #564549). + * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no + good reason. Thanks, Colin Watson! -- Timo Aaltonen <[email protected]> Tue, 08 Dec 2009 16:15:58 +0200 diff --git a/debian/rules b/debian/rules index 3d6de52..37ad494 100755 --- a/debian/rules +++ b/debian/rules @@ -40,18 +40,18 @@ endif configure: $(STAMP_DIR)/patch autoreconf -vfi -obj-$(DEB_BUILD_GNU_TYPE)/config.status: configure - mkdir -p obj-$(DEB_BUILD_GNU_TYPE) - cd obj-$(DEB_BUILD_GNU_TYPE) && \ +build/config.status: configure + mkdir -p build + cd build && \ ../configure --prefix=/usr --mandir=\$${prefix}/share/man \ --infodir=\$${prefix}/share/info $(confflags) \ CFLAGS="$(CFLAGS)" build: build-stamp -build-stamp: obj-$(DEB_BUILD_GNU_TYPE)/config.status +build-stamp: build/config.status dh_testdir - cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE) + cd build && $(MAKE) >$@ clean: xsfclean @@ -63,7 +63,7 @@ clean: xsfclean rm -f */config.cache */config.log */config.status rm -f conftest* */conftest* rm -rf autom4te.cache */autom4te.cache - rm -rf obj-* + rm -rf build rm -f $$(find -name Makefile.in) rm -f compile config.guess config.sub configure depcomp install-sh rm -f ltmain.sh missing aclocal.m4 config.h.in @@ -76,7 +76,7 @@ install: build dh_clean -k dh_installdirs - cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install + cd build && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install # Build architecture-dependent files here. binary-arch: DH_OPTIONS=-s commit c6a5c72572f081e9afb5669c1d1a61ce42d72142 Author: Julien Cristau <[email protected]> Date: Sun Jan 10 09:43:31 2010 +0000 Drop references to hal from the synaptics(4) man page. diff --git a/debian/changelog b/debian/changelog index 9610d60..ba64ff5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,7 +7,8 @@ xserver-xorg-input-synaptics (1.2.1-2) UNRELEASED; urgency=low [ Julien Cristau ] * Add hurd-i386 to the Architecture field. Requested by Samuel Thibault. - * Drop references to hal from debian/NEWS and README.Debian. + * Drop references to hal from debian/NEWS, README.Debian and synaptics(4) + (closes: #564549). -- Timo Aaltonen <[email protected]> Tue, 08 Dec 2009 16:15:58 +0200 diff --git a/debian/patches/03-man-no-hal.patch b/debian/patches/03-man-no-hal.patch new file mode 100644 index 0000000..0650598 --- /dev/null +++ b/debian/patches/03-man-no-hal.patch @@ -0,0 +1,20 @@ +Index: xserver-xorg-input-synaptics/man/synaptics.man +=================================================================== +--- xserver-xorg-input-synaptics.orig/man/synaptics.man ++++ xserver-xorg-input-synaptics/man/synaptics.man +@@ -871,15 +871,6 @@ + 32 bit unsigned, 2 values (read-only), vertical, horizontal in units/millimeter. + + .SH "NOTES" +-There is an example hal policy file in +-.I ${sourcecode}/fdi/11-x11-synaptics.fdi +-which will enable the driver based on the information if the hardware +-is available. Feel free to copy it to +-.I /etc/hal/fdi/policy +-and customize it to your needs. You can pass custom options to the driver +-using x11_options properties. Note that this requires xorg-server-1.5 or +-higher. +-.LP + If either of + .BI "Protocol \*q" auto-dev \*q + (default) or diff --git a/debian/patches/series b/debian/patches/series index 3bb3f92..d1c01f7 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,3 @@ 01-synaptics-dont-grab-if-not-on-current-VT.patch 02-do-not-use-synaptics-for-keyboards.patch +03-man-no-hal.patch commit e9d68b45996ec8faf72b05726277771a93027408 Author: Julien Cristau <[email protected]> Date: Sun Jan 10 09:41:01 2010 +0000 Drop references to hal from README.Debian diff --git a/debian/changelog b/debian/changelog index 33f1dda..9610d60 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,7 +7,7 @@ xserver-xorg-input-synaptics (1.2.1-2) UNRELEASED; urgency=low [ Julien Cristau ] * Add hurd-i386 to the Architecture field. Requested by Samuel Thibault. - * Drop references to hal from debian/NEWS. + * Drop references to hal from debian/NEWS and README.Debian. -- Timo Aaltonen <[email protected]> Tue, 08 Dec 2009 16:15:58 +0200 diff --git a/debian/xserver-xorg-input-synaptics.README.Debian b/debian/xserver-xorg-input-synaptics.README.Debian index 6f5e957..d724ec0 100644 --- a/debian/xserver-xorg-input-synaptics.README.Debian +++ b/debian/xserver-xorg-input-synaptics.README.Debian @@ -1,33 +1,16 @@ xserver-xorg-input-synaptics for Debian ------------------------------------ +--------------------------------------- This package contains the Synaptics TouchPad driver for X.Org X server. See also the README file for details on configuration options. -The following notes are reported from the INSTALL instructions of upstream -package (by Stefan Gmeiner <[email protected]>), but first of all a -security notice about SHMConfig: - - If you want to be able to change driver parameters without - restarting the X server, one option is to enable the "SHMConfig" option in - the X configuration file. You can then use the "synclient" program to - query and modify driver parameters on the fly. - SECURITY NOTE! This is not secure if you are in an untrusted - multiuser environment. All local users can change the parameters at any - time. - - Since version 1.1 the driver doesn't require doesn't require the - SHMConfig option anymore to allow runtime configuration changes, - synclient will only use the shared memory segment when invoked with - the -s option. - -Xorg auto-configuration ------------------------ -Recent X.Org has support for automatic configuration. The synaptics driver does -not support automatic configuration yet but the information required is -supplied by a third party fdi script through HAL. -The file is /usr/share/hal/fdi/policy/20thirdparty/11-x11-synaptics.fdi, -if you need to customize it, you can first copy it to -/etc/hal/fdi/policy and the edit it to match your requirements. + + +Runtime configuration +--------------------- + +The synclient and xinput tools allow configuring various aspects of the +driver's behaviour. See the synaptics(4) man page for details of the +configurable options. Manual configuration @@ -62,7 +45,6 @@ Section "InputDevice" # Option "MinSpeed" "0.06" # Option "MaxSpeed" "0.12" # Option "AccelFactor" "0.0010" -# Option "SHMConfig" "on" # Option "Repeater" "/dev/ps2mouse" EndSection commit 2a3dc9ce34b66147ebc65cfe221e65a19f0e7de8 Author: Julien Cristau <[email protected]> Date: Sat Jan 9 16:38:45 2010 +0000 Drop references to hal from debian/NEWS. diff --git a/debian/NEWS b/debian/NEWS index 3aecc1d..2a749ba 100644 --- a/debian/NEWS +++ b/debian/NEWS @@ -4,8 +4,7 @@ xserver-xorg-input-synaptics (1.2.0-1) unstable; urgency=low The SHMConfig option is still available but the only use is for monitoring the hardware state data. If you have any script that changes the synaptics driver configuration - make sure that you don't use the -s option to synclient. Or even better, - configure the driver via hal. + make sure that you don't use the -s option to synclient. -- Mattia Dongili <[email protected]> Fri, 20 Nov 2009 00:32:58 +0900 @@ -22,10 +21,9 @@ xserver-xorg-input-synaptics (1.1.1~git20090510-1) unstable; urgency=low $ synclient TapButton3=3 Note that the configuration will not be permanently modified, to do - so assign the above option values in your xorg.conf or custom fdi file - (see the synaptics(4) manpage or the documents in - /usr/share/doc/xserver-xorg-input-synaptics for additional details). - Another alternative is to use desktop environment specific tools - like gpointing-device-settings or touchfreeze. + so assign the above option values in your xorg.conf (see the synaptics(4) + manpage or the documents in /usr/share/doc/xserver-xorg-input-synaptics + for additional details). Another alternative is to use desktop + environment specific tools like gpointing-device-settings or touchfreeze. -- David Nusinow <[email protected]> Sat, 11 Apr 2009 16:23:11 -0400 diff --git a/debian/changelog b/debian/changelog index 008915b..33f1dda 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,7 @@ xserver-xorg-input-synaptics (1.2.1-2) UNRELEASED; urgency=low [ Julien Cristau ] * Add hurd-i386 to the Architecture field. Requested by Samuel Thibault. + * Drop references to hal from debian/NEWS. -- Timo Aaltonen <[email protected]> Tue, 08 Dec 2009 16:15:58 +0200 commit c9d571772d1c23a33a6e67a2a53adcb62ba92163 Author: Julien Cristau <[email protected]> Date: Fri Jan 8 14:50:05 2010 +0000 Add dependency on x11proto-core-dev to synaptics-dev diff --git a/debian/control b/debian/control index 0522512..45d4a41 100644 --- a/debian/control +++ b/debian/control @@ -59,7 +59,9 @@ Description: Synaptics TouchPad driver for X.Org server Package: xserver-xorg-input-synaptics-dev Section: libdevel Architecture: all -Depends: ${misc:Depends} +Depends: + x11proto-core-dev, + ${misc:Depends}, Description: Synaptics TouchPad driver for X.Org server (development headers) This package contains the development headers for the Synaptics input driver found in xserver-xorg-input-synaptics. Non-developers likely have commit 562834c0c416fd52dc9a9dd6b31c367d67d547ac Author: Julien Cristau <[email protected]> Date: Fri Jan 8 14:48:18 2010 +0000 Make xserver-xorg-input-synaptics-dev arch:all diff --git a/debian/control b/debian/control index 9364730..0522512 100644 --- a/debian/control +++ b/debian/control @@ -58,8 +58,8 @@ Description: Synaptics TouchPad driver for X.Org server Package: xserver-xorg-input-synaptics-dev Section: libdevel -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} +Architecture: all +Depends: ${misc:Depends} Description: Synaptics TouchPad driver for X.Org server (development headers) This package contains the development headers for the Synaptics input driver found in xserver-xorg-input-synaptics. Non-developers likely have diff --git a/debian/rules b/debian/rules index 5c8cc5c..3d6de52 100755 --- a/debian/rules +++ b/debian/rules @@ -79,6 +79,7 @@ install: build cd obj-$(DEB_BUILD_GNU_TYPE) && $(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 @@ -106,8 +107,22 @@ endif 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 330d14bb38205f1ed7402a9052cdfa491b664795 Author: Julien Cristau <[email protected]> Date: Fri Jan 8 14:38:43 2010 +0000 Add hurd-i386 to the Architecture field. Requested by Samuel Thibault. diff --git a/debian/changelog b/debian/changelog index 522c3c9..008915b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,13 @@ xserver-xorg-input-synaptics (1.2.1-2) UNRELEASED; urgency=low + [ Timo Aaltonen ] * Add xserver-xorg-input-synaptics-dev for the header and .pc files. (LP: #340340) * Run udevadm trigger on postinst, and depend on udev [linux-any]. + [ Julien Cristau ] + * Add hurd-i386 to the Architecture field. Requested by Samuel Thibault. + -- Timo Aaltonen <[email protected]> Tue, 08 Dec 2009 16:15:58 +0200 xserver-xorg-input-synaptics (1.2.1-1) unstable; urgency=low diff --git a/debian/control b/debian/control index 6078e26..9364730 100644 --- a/debian/control +++ b/debian/control @@ -20,7 +20,7 @@ Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-input-synaptics Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-input-synaptics.git Package: xserver-xorg-input-synaptics -Architecture: alpha amd64 arm armeb armel hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 m68k mips mipsel powerpc sh4 sparc +Architecture: alpha amd64 arm armeb armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 m68k mips mipsel powerpc sh4 sparc Depends: udev [linux-any], ${shlibs:Depends}, commit 7f5513736369faf0668c18b2d6d2932116b7077e Author: Timo Aaltonen <[email protected]> Date: Tue Dec 8 16:53:57 2009 +0200 Fix the changelog, this is synaptics and not evdev.. diff --git a/debian/changelog b/debian/changelog index f1ca34e..dbb3af4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,6 @@ xserver-xorg-input-synaptics (1.2.0-4) UNRELEASED; urgency=low - * Add xserver-xorg-input-evdev-dev for the header and .pc files. + * Add xserver-xorg-input-synaptics-dev for the header and .pc files. (LP: #340340) * Run udevadm trigger on postinst, and depend on udev [linux-any]. commit 56ec8cbedc08b2ece202c7d39eaf90fc8c3cc809 Author: Timo Aaltonen <[email protected]> Date: Tue Dec 8 16:16:32 2009 +0200 Run udevadm trigger on postinst, and depend on udev [linux-any]. diff --git a/debian/changelog b/debian/changelog index 67a956f..f1ca34e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,8 +2,9 @@ xserver-xorg-input-synaptics (1.2.0-4) UNRELEASED; urgency=low * Add xserver-xorg-input-evdev-dev for the header and .pc files. (LP: #340340) + * Run udevadm trigger on postinst, and depend on udev [linux-any]. - -- Timo Aaltonen <[email protected]> Tue, 08 Dec 2009 16:02:11 +0200 + -- Timo Aaltonen <[email protected]> Tue, 08 Dec 2009 16:15:58 +0200 xserver-xorg-input-synaptics (1.2.0-3) experimental; urgency=low diff --git a/debian/control b/debian/control index 8dceb07..49f60d4 100644 --- a/debian/control +++ b/debian/control @@ -21,7 +21,9 @@ Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-input-synapti Package: xserver-xorg-input-synaptics Architecture: alpha amd64 arm armeb armel hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 m68k mips mipsel powerpc sh4 sparc -Depends: ${shlibs:Depends}, ${xserver:Depends}, libxi6 +Depends: ${shlibs:Depends}, ${xserver:Depends}, + libxi6, + udev [linux-any], Conflicts: xfree86-driver-synaptics (<< 0.14.4-2), xorg-driver-synaptics Replaces: xfree86-driver-synaptics (<< 0.14.4-2), xorg-driver-synaptics Provides: ${xinpdriver:Provides}, xfree86-driver-synaptics, xorg-driver-synaptics diff --git a/debian/xserver-xorg-input-synaptics.postinst.in b/debian/xserver-xorg-input-synaptics.postinst.in new file mode 100644 index 0000000..aea2faa --- /dev/null +++ b/debian/xserver-xorg-input-synaptics.postinst.in @@ -0,0 +1,23 @@ +#!/bin/sh + +set -e + +THIS_PACKAGE=xserver-xorg-input-synaptics +THIS_SCRIPT=postinst + +#INCLUDE_SHELL_LIB# + +case "$1" in + configure) + if dpkg --compare-versions "$2" lt 1.2.0-4; then + if [ `uname -s` = "Linux" ]; then + udevadm trigger --subsystem-match=input --action=change + fi + fi +esac + +#DEBHELPER# + +exit 0 + +# vim:set ai et sw=2 ts=2 tw=80: commit 54afb6470b28dde5644432d2193e84d7fd9ff617 Author: Timo Aaltonen <[email protected]> Date: Tue Dec 8 16:03:36 2009 +0200 Add xserver-xorg-input-evdev-dev for the header and .pc files. (LP: #340340) diff --git a/debian/changelog b/debian/changelog index b6e1619..67a956f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +xserver-xorg-input-synaptics (1.2.0-4) UNRELEASED; urgency=low + + * Add xserver-xorg-input-evdev-dev for the header and .pc files. + (LP: #340340) + + -- Timo Aaltonen <[email protected]> Tue, 08 Dec 2009 16:02:11 +0200 + xserver-xorg-input-synaptics (1.2.0-3) experimental; urgency=low [ Julien Cristau ] diff --git a/debian/control b/debian/control index 3a6665f..8dceb07 100644 --- a/debian/control +++ b/debian/control @@ -51,3 +51,12 @@ Description: Synaptics TouchPad driver for X.Org server * It also provides a daemon to disable touchpad while typing at the keyboard and thus avoid unwanted mouse movements (see syndaemon(1)). . + +Package: xserver-xorg-input-synaptics-dev +Section: libdevel +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: Synaptics TouchPad driver for X.Org server (development headers) + This package contains the development headers for the Synaptics input + driver found in xserver-xorg-input-synaptics. Non-developers likely have + little use for this package. diff --git a/debian/xserver-xorg-input-synaptics-dev.install b/debian/xserver-xorg-input-synaptics-dev.install new file mode 100644 index 0000000..22f774a --- /dev/null +++ b/debian/xserver-xorg-input-synaptics-dev.install @@ -0,0 +1,2 @@ +usr/include/xorg/* +usr/lib/pkgconfig/xorg-synaptics.pc -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/[email protected]
