[arch-commits] Commit in xf86-input-libinput/trunk (90-libinput.conf PKGBUILD)

[Laurent Carlier]

    Date: Monday, August 31, 2015 @ 18:03:21
  Author: lcarlier
Revision: 245111

upgpkg: xf86-input-libinput 0.14.0-2

use upstream configuration file for xorg

Modified:
  xf86-input-libinput/trunk/PKGBUILD
Deleted:
  xf86-input-libinput/trunk/90-libinput.conf

------------------+
 90-libinput.conf |   30 ------------------------------
 PKGBUILD         |    6 ++----
 2 files changed, 2 insertions(+), 34 deletions(-)

Deleted: 90-libinput.conf
===================================================================
--- 90-libinput.conf	2015-08-31 15:54:37 UTC (rev 245110)
+++ 90-libinput.conf	2015-08-31 16:03:21 UTC (rev 245111)
@@ -1,30 +0,0 @@
-# Match on all types of devices but tablet devices and joysticks
-
-Section "InputClass"
-        Identifier "libinput pointer catchall"
-        MatchIsPointer "on"
-        MatchDevicePath "/dev/input/event*"
-        Driver "libinput"
-EndSection
-
-Section "InputClass"
-        Identifier "libinput keyboard catchall"
-        MatchIsKeyboard "on"
-        MatchDevicePath "/dev/input/event*"
-        Driver "libinput"
-EndSection
-
-Section "InputClass"
-        Identifier "libinput touchpad catchall"
-        MatchIsTouchpad "on"
-        MatchDevicePath "/dev/input/event*"
-        Driver "libinput"
-EndSection
-
-Section "InputClass"
-        Identifier "libinput touchscreen catchall"
-        MatchIsTouchscreen "on"
-        MatchDevicePath "/dev/input/event*"
-        Driver "libinput"
-EndSection
-

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-08-31 15:54:37 UTC (rev 245110)
+++ PKGBUILD	2015-08-31 16:03:21 UTC (rev 245111)
@@ -3,7 +3,7 @@
 
 pkgname=xf86-input-libinput
 pkgver=0.14.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Generic input driver for the X.Org server based on libinput"
 arch=('i686' 'x86_64')
 license=('custom')
@@ -13,11 +13,9 @@
 conflicts=('xorg-server<1.16' 'X-ABI-XINPUT_VERSION<21.1' 'X-ABI-XINPUT_VERSION>=22')
 groups=('xorg-drivers' 'xorg')
 source=(http://xorg.freedesktop.org/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2{,.sig}
-        90-libinput.conf
         0001-Fedora-use-unaccelerated-vmask-on-input-ABI-21.patch)
 sha256sums=('e8d05798a556e5ea0d9f1823bb632e425487e8bcf89711ed93b079bbee742265'
             'SKIP'
-            'd4a728caadb7924852dcdc0da4de950c6fb9ebd8999d4e3af3d0baaa51cd0e75'
             'e76d54a6d077c20069b99182f174b0f95a8668ba511e6e5d1b8a498dc6b6d96b')
 validpgpkeys=('3C2C43D9447D5938EF4551EBE23B7E70B467F0BF') # Peter Hutterer (Who-T) <office at who-t.net>
 
@@ -41,7 +39,7 @@
   make DESTDIR="${pkgdir}" install
 
   install -m755 -d "${pkgdir}/usr/share/X11/xorg.conf.d"
-  install -m644 ../90-libinput.conf "${pkgdir}/usr/share/X11/xorg.conf.d/"
+  install -m644 conf/99-libinput.conf "${pkgdir}/usr/share/X11/xorg.conf.d/90-libinput.conf"
   install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
   install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
 }