--- xserver-xorg-input-libinput-0.23.0.orig/ChangeLog +++ xserver-xorg-input-libinput-0.23.0/ChangeLog @@ -1,157 +1,3 @@ -commit 1c3ce3ce3c315213511735db1b0fdd74ca8442d0 -Author: Peter Hutterer -Date: Mon Dec 12 14:54:00 2016 +1000 - - xf86-input-libinput 0.23.0 - - Signed-off-by: Peter Hutterer - -commit 4d481ea7c80dad9f53b47c026959c25ad9da5211 -Author: Peter Hutterer -Date: Mon Dec 5 14:25:31 2016 +1000 - - Fix default scroll button number - - Was exposing the evdev code rather than the xorg code. - - Signed-off-by: Peter Hutterer - Reviewed-by: Hans de Goede - -commit 72bac84df9ce72f2baf730655ecc23f1692d1e64 -Author: Peter Hutterer -Date: Tue Nov 15 11:23:08 2016 +1000 - - If the parent libinput_device is unavailable, create a new one - - The parent device ref's the libinput device during pre_init and unref's it - during DEVICE_INIT, so the copy is lost. During DEVICE_ON, the libinput device - is re-added and ref'd, this one stays around now. But the takeaway is: unless - the device is enabled, no libinput device reference is available. - - If a device is a mixed pointer + keyboard device, a subdevice is created - during a WorkProc. The subdevice relied on the parent's libinput_device being - available and didn't even check for it. This WorkProc usually runs after - the parent's DEVICE_ON, so in most cases all is well. - - But when running without logind and the server is vt-switched away, the parent - device only runs PreInit and DEVICE_INIT but never DEVICE_ON, causing the - subdevice to burn, crash, and generally fail horribly when it dereferences the - parent's libinput device. - - Fix this because we have global warming already and don't need to burn more - things and also because it's considered bad user experience to have the - server crash. The simple fix is to check the parent device first and if it is - unavailable, create a new one because it will end up disabled as well anyway, - so the ref goes away as well. The use-case where the parent somehow gets - disabled but the subdevice doesn't is a bit too niche to worry about. - - This doesn't happen with logind because in that case we don't get a usable fd - while VT-switched away, so we can't even run PreInit and never get this far - (see the paused fd handling in the xfree86 code for that). It can be - reproduced by setting AutoEnableDevices off, but why would you do that, - seriously. - - https://bugs.freedesktop.org/show_bug.cgi?id=97117 - - Signed-off-by: Peter Hutterer - Reviewed-by: Hans de Goede - -commit 0b073d90e63d644401769c61611638d65a4eaf44 -Author: Peter Hutterer -Date: Fri Nov 11 12:36:01 2016 +1000 - - Link the left-handed property between the tools - - The property is tablet-wide, not just per tool. So when one tool is updated, - run through all other devices that share the same underlying device. - - Signed-off-by: Peter Hutterer - Reviewed-by: Hans de Goede - -commit 669fbb098516e0bdf6c62c52c1bcb12580de069b -Author: Peter Hutterer -Date: Tue Nov 1 10:42:19 2016 +1000 - - Drop indentation for matrix handling - - Exit early if the string is NULL to reduce indentation. No functional changes. - - Signed-off-by: Peter Hutterer - -commit c4f0a9bcb846f70b85a285e8acea8fe086abdccb -Author: Peter Hutterer -Date: Tue Nov 1 10:06:03 2016 +1000 - - conf: match against tablets too - - Now that we sort below the xf86-input-wacom driver anyway, there's no good - reason to ignore tablets anymore. - - Signed-off-by: Peter Hutterer - -commit a61e156326197dbbf1c1294693946c504af9daee -Author: Peter Hutterer -Date: Mon Oct 24 14:23:16 2016 +1000 - - man: sort the options and properties alphabetically - - Signed-off-by: Peter Hutterer - -commit 552cbaf466a0aede8f789aa2013795f3b9ac253d -Author: Peter Hutterer -Date: Wed Oct 26 15:03:48 2016 +1000 - - Don't init the AccelSpeed/LeftHanded properties on the base tablet device - - This device never sends events, no point in exposing these options - - Signed-off-by: Peter Hutterer - Reviewed-by: Eric Engestrom - -commit bc91d337d7cf765fd23e47783a498e4b3b334f39 -Author: Peter Hutterer -Date: Thu Oct 20 08:42:53 2016 +1000 - - Fix potential NULL pointer dereferencing - - Found by coverity. - - Signed-off-by: Peter Hutterer - -commit c8d2293873d3f86e5cefffa5c51cfe423d09c948 -Author: Peter Hutterer -Date: Thu Oct 20 08:38:24 2016 +1000 - - Remove superfluous check for next being NULL - - is_libinput_device(next) causes a dereference of next anyway, so this cannot - ever be NULL. - - Besides, if next ends up as NULL that means we have lost count of how many - remaining devices use libinput, so we have other issues. - - Found by coverity. - - Signed-off-by: Peter Hutterer - -commit a7014aa8c619ed9bc1cd5c0b38428fd88f1bc8d4 -Author: Peter Hutterer -Date: Thu Oct 20 08:27:01 2016 +1000 - - Remove two unused variables - - They were never used anyway - - Signed-off-by: Peter Hutterer - -commit bf7fffde520277e13b350950de9dc5bf89858951 -Author: Peter Hutterer -Date: Wed Oct 19 11:42:57 2016 +1000 - - Don't init the horiz scroll property on non-pointer devices - - Signed-off-by: Peter Hutterer - commit 728217775626e2086d7c3acd0d242562390f145b Author: Peter Hutterer Date: Wed Oct 19 10:55:12 2016 +1000 --- xserver-xorg-input-libinput-0.23.0.orig/autogen.sh +++ xserver-xorg-input-libinput-0.23.0/autogen.sh @@ -0,0 +1,14 @@ +#! /bin/sh + +srcdir=`dirname $0` +test -z "$srcdir" && srcdir=. + +ORIGDIR=`pwd` +cd $srcdir + +autoreconf -v --install || exit 1 +cd $ORIGDIR || exit $? + +if test -z "$NOCONFIGURE"; then + exec $srcdir/configure "$@" +fi --- xserver-xorg-input-libinput-0.23.0.orig/debian/README.source +++ xserver-xorg-input-libinput-0.23.0/debian/README.source @@ -0,0 +1,49 @@ +------------------------------------------------------ +Quick Guide To Patching This Package For The Impatient +------------------------------------------------------ + +1. Make sure you have quilt installed +2. Unpack the package as usual with "dpkg-source -x" +3. Run the "patch" target in debian/rules +4. Create a new patch with "quilt new" (see quilt(1)) +5. Edit all the files you want to include in the patch with "quilt edit" + (see quilt(1)). +6. Write the patch with "quilt refresh" (see quilt(1)) +7. Run the "clean" target in debian/rules + +Alternatively, instead of using quilt directly, you can drop the patch in to +debian/patches and add the name of the patch to debian/patches/series. + +------------------------------------ +Guide To The X Strike Force Packages +------------------------------------ + +The X Strike Force team maintains X packages in git repositories on +git.debian.org in the pkg-xorg subdirectory. Most upstream packages +are actually maintained in git repositories as well, so they often +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 using this +"upstream-*" branch in the Debian git repository but it is actually +copied from upstream tarballs directly. + +Due to X.org being highly modular, packaging all X.org applications +as their own independent packages would have created too many Debian +packages. For this reason, some X.org applications have been grouped +into larger packages: xutils, xutils-dev, x11-apps, x11-session-utils, +x11-utils, x11-xfs-utils, x11-xkb-utils, x11-xserver-utils. +Most packages, including the X.org server itself and all libraries +and drivers are, however maintained independently. + +The Debian packaging is added by creating the "debian-*" git branch +which contains the aforementioned "upstream-*" branch plus the debian/ +repository files. +When a patch has to be applied to the Debian package, two solutions +are involved: +* If the patch is available in one of the upstream branches, it + may be git'cherry-picked into the Debian repository. In this + case, it appears directly in the .diff.gz. +* Otherwise, the patch is added to debian/patches/ which is managed + with quilt as documented in /usr/share/doc/quilt/README.source. --- xserver-xorg-input-libinput-0.23.0.orig/debian/changelog +++ xserver-xorg-input-libinput-0.23.0/debian/changelog @@ -0,0 +1,103 @@ +xserver-xorg-input-libinput (0.23.0-2) unstable; urgency=medium + + [ Andreas Boll ] + * Cherry-pick commit f47f78e (Ignore LED updates for disabled devices) + from upstream master branch (Closes: #829386). + * Switch URLs to https. + * Move URL from description to Homepage field. + * Bump Standards-Version to 3.9.8. + + -- Timo Aaltonen Thu, 12 Jan 2017 13:48:06 +0200 + +xserver-xorg-input-libinput (0.23.0-1) unstable; urgency=medium + + * New upstream release. + * Bump debhelper compat to 10. + + Let debhelper run autoreconf for us. + * No need to pass --disable-silent-rules to configure, debhelper does + that these days. + * No need for --destdir=debian/tmp as we have multiple binary packages. + + -- Emilio Pozuelo Monfort Mon, 12 Dec 2016 19:15:41 +0100 + +xserver-xorg-input-libinput (0.22.0-1) unstable; urgency=medium + + * New upstream release. + * control: Bump build-dep on libinput-dev. + + -- Timo Aaltonen Fri, 18 Nov 2016 16:03:02 +0200 + +xserver-xorg-input-libinput (0.20.0-1) unstable; urgency=medium + + * New upstream release. + * control, rules: Drop -dbg package. + + -- Timo Aaltonen Fri, 30 Sep 2016 15:05:19 +0300 + +xserver-xorg-input-libinput (0.19.1-1) unstable; urgency=medium + + * Team upload. + * Use https URL in debian/watch. + * New upstream release. + + -- Julien Cristau Sat, 24 Sep 2016 15:58:15 +0200 + +xserver-xorg-input-libinput (0.19.0-1) unstable; urgency=medium + + [ Andreas Boll ] + * control: Fix Vcs-Git field. + + [ Timo Aaltonen ] + * New upstream release. + + -- Timo Aaltonen Tue, 10 May 2016 11:37:55 +0300 + +xserver-xorg-input-libinput (0.18.0-1) unstable; urgency=medium + + * New upstream release. + * control: Update the description to mention that this driver can + replace -evdev and -synaptics. + * control: Bump libinput-dev build-dependency. + * control: Bump Standards-Version to 3.9.7 (no changes). + + -- Timo Aaltonen Thu, 07 Apr 2016 10:20:31 +0300 + +xserver-xorg-input-libinput (0.17.0-1) unstable; urgency=medium + + * New upstream release. + * control: Update Vcs fields to use https. + + -- Timo Aaltonen Sat, 27 Feb 2016 10:03:43 +0200 + +xserver-xorg-input-libinput (0.16.0-1) unstable; urgency=medium + + * New upstream release. + + -- Timo Aaltonen Thu, 14 Jan 2016 14:59:15 +0200 + +xserver-xorg-input-libinput (0.15.0-1) unstable; urgency=medium + + * New upstream release. + * control: Bump libinput-dev build-dep. + * install: Fix conf snippet source path. + + -- Timo Aaltonen Wed, 28 Oct 2015 18:30:03 +0200 + +xserver-xorg-input-libinput (0.14.0-1) unstable; urgency=medium + + * New upstream release. + + -- Timo Aaltonen Wed, 23 Sep 2015 13:12:50 +0300 + +xserver-xorg-input-libinput (0.13.0-1) unstable; urgency=medium + + * New upstream release. + * control: Bump libinput build-dep (Closes: #794032). + + -- Timo Aaltonen Fri, 07 Aug 2015 09:12:38 +0300 + +xserver-xorg-input-libinput (0.11.0-1) unstable; urgency=medium + + * Initial release. (Closes: #784114) + + -- Timo Aaltonen Mon, 06 Jul 2015 16:27:42 +0300 --- xserver-xorg-input-libinput-0.23.0.orig/debian/compat +++ xserver-xorg-input-libinput-0.23.0/debian/compat @@ -0,0 +1 @@ +10 --- xserver-xorg-input-libinput-0.23.0.orig/debian/control +++ xserver-xorg-input-libinput-0.23.0/debian/control @@ -0,0 +1,62 @@ +Source: xserver-xorg-input-libinput +Section: x11 +Priority: optional +Maintainer: Debian X Strike Force +Uploaders: Timo Aaltonen , +Build-Depends: + debhelper (>= 10), + libinput-dev (>= 1.4.901), + libudev-dev, + pkg-config, + quilt, + x11proto-core-dev, + x11proto-input-dev (>= 2.2), + xserver-xorg-dev (>= 2:1.15.99), + xutils-dev, +Standards-Version: 3.9.8 +Homepage: https://www.x.org +Vcs-Git: https://anonscm.debian.org/git/pkg-xorg/driver/xserver-xorg-input-libinput.git +Vcs-Browser: https://anonscm.debian.org/cgit/pkg-xorg/driver/xserver-xorg-input-libinput.git + +Package: xserver-xorg-input-libinput +Architecture: linux-any +Depends: + ${shlibs:Depends}, + ${misc:Depends}, + ${xinpdriver:Depends}, +Provides: + ${xinpdriver:Provides} +Description: X.Org X server -- libinput input driver + This package provides the driver for input devices using libinput library. + It can handle keyboards, mice and touchpads, and essentially replaces the + separate -evdev and -synaptics drivers. + . + This package is built from the X.org xf86-input-libinput driver module. + +Package: xserver-xorg-input-libinput-dev +Section: libdevel +Architecture: all +Depends: + ${shlibs:Depends}, + ${misc:Depends} +Description: X.Org X server -- libinput input driver (development headers) + This package provides the development headers for the libinput input driver + found in xserver-xorg-input-libinput. Non-developers likely have little use + for this package. + . + This package is built from the X.org xf86-input-libinput driver module. + + +Package: xserver-xorg-input-libinput-udeb +XC-Package-Type: udeb +Section: debian-installer +Architecture: linux-any +Depends: + ${shlibs:Depends}, + ${misc:Depends}, + ${xinpdriver:Depends}, + udev-udeb, +Provides: + ${xinpdriver:Provides} +Description: X.Org X server -- libinput input driver + This is a udeb, or a microdeb, for the debian-installer. --- xserver-xorg-input-libinput-0.23.0.orig/debian/copyright +++ xserver-xorg-input-libinput-0.23.0/debian/copyright @@ -0,0 +1,52 @@ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-name: xf86-input-libinput +Source: https://xorg.freedesktop.org/releases/individual/driver/ + +Files: * +Copyright: 2013-2014 Red Hat, Inc. +License: MIT + +Files: configure.ac +Copyright: 2005 Adam Jackson +License: xorg + Permission is hereby granted, free of charge, to any person obtaining a + copy of this software and associated documentation files (the "Software"), + to deal in the Software without restriction, including without limitation + on the rights to use, copy, modify, merge, publish, distribute, sub + license, and/or sell copies of the Software, and to permit persons to whom + the Software is furnished to do so, subject to the following conditions: + . + The above copyright notice and this permission notice (including the next + paragraph) shall be included in all copies or substantial portions of the + Software. + . + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL + ADAM JACKSON BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +Files: debian/* +Copyright: 2014 Timo Aaltonen +License: MIT + +License: MIT + Permission to use, copy, modify, distribute, and sell this software + and its documentation for any purpose is hereby granted without + fee, provided that the above copyright notice appear in all copies + and that both that copyright notice and this permission notice + appear in supporting documentation, and that the name of the authors + not be used in advertising or publicity pertaining to distribution of the + software without specific, written prior permission. The authors make no + representations about the suitability of this software for any + purpose. It is provided "as is" without express or implied + warranty. + . + THE AUTHORS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN + NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY SPECIAL, INDIRECT OR + CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS + OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, + NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN + CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. --- xserver-xorg-input-libinput-0.23.0.orig/debian/patches/series +++ xserver-xorg-input-libinput-0.23.0/debian/patches/series @@ -0,0 +1 @@ +# placeholder --- xserver-xorg-input-libinput-0.23.0.orig/debian/rules +++ xserver-xorg-input-libinput-0.23.0/debian/rules @@ -0,0 +1,17 @@ +#!/usr/bin/make -f + +override_dh_auto_configure: + dh_auto_configure -- \ + --libdir=\$${exec_prefix}/lib + +# Kill *.la files, and forget no-one: +override_dh_install: + find debian/tmp -name '*.la' -delete + dh_install --fail-missing + +# That's a plugin, use appropriate warning level: +override_dh_shlibdeps: + dh_shlibdeps -- --warnings=6 + +%: + dh $@ --with quilt,xsf --builddirectory=build/ --- xserver-xorg-input-libinput-0.23.0.orig/debian/upstream/signing-key.asc +++ xserver-xorg-input-libinput-0.23.0/debian/upstream/signing-key.asc @@ -0,0 +1,24 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1 + +mQGiBD8b0wYRBACph9kRJmP+4+JGsCgFlFoy4vFO0DCG+jmkQN0n1wdInt/N/UtA +sZToO72AUmfmYizA+IEbzBrx0UnUo3w3BDmHxUWf/akZiPUz9AA/YFY4xC3MY2OK +VN2Jz6YSce4zJ5jd2ZRobHm4HuIf/8yqSCcsv7FNfrLaTNIFRs5gYYsqZwCgwmkp +RSLRc8WAnHrTWNQDaEFM2rUEAKTjrTjMN8+KGd0BxNX7HiTSqQP++nXNwAYs1oWB +Yt82YHj9SvRCqCzD1pzJQivYnlNoWDza1VeMnfdAvkdia8z4lYbO/RunXZJvra3Z +VDm+izq+uwUAyvFuEYnNz09VSqwXKT6+XW0Xtz2vHq52r6DS6mK8cGJHZ5OhrRjq +UEYxA/9STh+QfA98xtNoRcf52E/46r7IpCj440oRVc9lMfxQZrLGQNqp7sPdIhGQ +CCo2NUII5hkhdAG71kpbfSXU4Sh32p1cU1KYCAkDFfb49bKuAs+Pff8v6FGZxTdd +AinPZr4BbsYJatk818aTCnu0+s7L8jL5GPfeyuyEMKwzVBx2mLQpUGV0ZXIgSHV0 +dGVyZXIgKFdoby1UKSA8b2ZmaWNlQHdoby10Lm5ldD6IWQQTEQIAGQUCPxvTBgQL +BwMCAxUCAwMWAgECHgECF4AACgkQ4jt+cLRn8L/0RACfWo3KTMUg+uPRqA6RXxk0 +4CWjXaMAoJeIxOpZLB3RBltPnSi7PyVQIkHFuQENBD8b0wgQBACTnqOYOWYVR8O1 +D73J6nbdAeZCbXrUkyXIuyqBOdKmX/0QJmSs7Wfsa+hPfDhj6ai0Gs2C8Qg/0Pzk +86b4p9DLkf0M6RaYjUtCJBpS59xrsV6nz6xZzQa4RRdf1YJmw2tia1MMXzxbwQU2 +bKpYEm8NsGaBURMGd02EvsMN2wI2uwADBQP/e9MjVr/85XDzAlUBN8HwYW5szTyP +8ZVcQOqOmNebkTWGLvkPrBdXmxpzrWjxPolO1WcWQjUL0bN/rbdqefT65iVHJHJZ +/cpTtgGlCPhL5JTA50ltd0I13CABYWLFmswonXES/6tcglf4rr3Nri2sOrY5HggP +ipEzOo5vdKOow/qIRgQYEQIABgUCPxvTCAAKCRDiO35wtGfwv68jAKCDvL2gkrg1 +4NfV7rNc057K1nL2GgCeKApWRgGVzaOkAp0P5tQulaDD6zM= +=7uBX +-----END PGP PUBLIC KEY BLOCK----- --- xserver-xorg-input-libinput-0.23.0.orig/debian/watch +++ xserver-xorg-input-libinput-0.23.0/debian/watch @@ -0,0 +1,4 @@ +#git=git://anongit.freedesktop.org/xorg/driver/xf86-input-libinput +version=3 +opts=pgpsigurlmangle=s/$/.sig/ \ +https://xorg.freedesktop.org/releases/individual/driver/ xf86-input-libinput-(.*)\.tar\.gz --- xserver-xorg-input-libinput-0.23.0.orig/debian/xserver-xorg-input-libinput-dev.install +++ xserver-xorg-input-libinput-0.23.0/debian/xserver-xorg-input-libinput-dev.install @@ -0,0 +1,2 @@ +usr/include/xorg/libinput-properties.h +usr/lib/pkgconfig/* --- xserver-xorg-input-libinput-0.23.0.orig/debian/xserver-xorg-input-libinput-udeb.install +++ xserver-xorg-input-libinput-0.23.0/debian/xserver-xorg-input-libinput-udeb.install @@ -0,0 +1 @@ +usr/lib/xorg/modules/input/*.so --- xserver-xorg-input-libinput-0.23.0.orig/debian/xserver-xorg-input-libinput.install +++ xserver-xorg-input-libinput-0.23.0/debian/xserver-xorg-input-libinput.install @@ -0,0 +1,3 @@ +usr/lib/xorg/modules/input/*.so +usr/share/man +usr/share/X11/xorg.conf.d --- xserver-xorg-input-libinput-0.23.0.orig/debian/xserver-xorg-input-libinput.links +++ xserver-xorg-input-libinput-0.23.0/debian/xserver-xorg-input-libinput.links @@ -0,0 +1 @@ +usr/share/bug/xserver-xorg-core/script usr/share/bug/xserver-xorg-input-libinput/script --- xserver-xorg-input-libinput-0.23.0.orig/src/xf86libinput.c +++ xserver-xorg-input-libinput-0.23.0/src/xf86libinput.c @@ -785,6 +785,9 @@ struct xf86libinput *driver_data = pInfo->private; struct libinput_device *ldevice = driver_data->shared_device->device; + if (!device->enabled) + return; + while (bits[i].xbit) { if (ctrl->leds & bits[i].xbit) leds |= bits[i].code;