[arch-commits] Commit in xf86-input-synaptics/trunk (3 files)

[Jan de Groot]

    Date: Sunday, May 9, 2010 @ 10:34:20
  Author: jgc
Revision: 79922

upgpkg: xf86-input-synaptics 1.2.2-2
Enable tapping by default

Modified:
  xf86-input-synaptics/trunk/10-synaptics.conf
  xf86-input-synaptics/trunk/PKGBUILD
Deleted:
  xf86-input-synaptics/trunk/11-x11-synaptics.fdi

----------------------+
 10-synaptics.conf    |    3 +++
 11-x11-synaptics.fdi |   37 -------------------------------------
 PKGBUILD             |    8 ++++----
 3 files changed, 7 insertions(+), 41 deletions(-)

Modified: 10-synaptics.conf
===================================================================
--- 10-synaptics.conf	2010-05-09 14:21:13 UTC (rev 79921)
+++ 10-synaptics.conf	2010-05-09 14:34:20 UTC (rev 79922)
@@ -2,4 +2,7 @@
         Identifier "touchpad catchall"
         Driver "synaptics"
         MatchIsTouchpad "on"
+	      Option "TapButton1" "1"
+	      Option "TapButton2" "2"
+	      Option "TapButton3" "3"
 EndSection

Deleted: 11-x11-synaptics.fdi
===================================================================
--- 11-x11-synaptics.fdi	2010-05-09 14:21:13 UTC (rev 79921)
+++ 11-x11-synaptics.fdi	2010-05-09 14:34:20 UTC (rev 79922)
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<deviceinfo version="0.2">
-  <device>
-    <match key="info.product" contains="ETPS/2 Elantech Touchpad">
-        <append key="info.capabilities" type="strlist">input.touchpad</append>
-    </match> 
-    <match key="info.capabilities" contains="input.touchpad">
-        <merge key="input.x11_driver" type="string">synaptics</merge>
-	<merge key="input.x11_options.TapButton1" type="string">1</merge>
-	<merge key="input.x11_options.TapButton2" type="string">2</merge>
-	<merge key="input.x11_options.TapButton3" type="string">3</merge>
-        <!-- Arbitrary options can be passed to the driver using
-             the input.x11_options property since xorg-server-1.5. -->
-        <!-- EXAMPLES:
-        Switch on shared memory, enables the driver to be configured at runtime
-	<merge key="input.x11_options.SHMConfig" type="string">true</merge>
-
-	Maximum movement of the finger for detecting a tap
-	<merge key="input.x11_options.MaxTapMove" type="string">2000</merge>
-
-	Enable vertical scrolling when dragging along the right edge
-	<merge key="input.x11_options.VertEdgeScroll" type="string">true</merge>
-
-	Enable vertical scrolling when dragging with two fingers anywhere on the touchpad
-	<merge key="input.x11_options.VertTwoFingerScroll" type="string">true</merge>
-
-	Enable horizontal scrolling when dragging with two fingers anywhere on the touchpad
-	<merge key="input.x11_options.HorizTwoFingerScroll" type="string">true</merge>
-
-	If on, circular scrolling is used
-	<merge key="input.x11_options.CircularScrolling" type="string">true</merge>
-
-	For other possible options, check CONFIGURATION DETAILS in synaptics man page
-        -->
-    </match>
-  </device>
-</deviceinfo>

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-05-09 14:21:13 UTC (rev 79921)
+++ PKGBUILD	2010-05-09 14:34:20 UTC (rev 79922)
@@ -5,14 +5,14 @@
 # Contributor: Alexander Baldeck <alexander at archlinux.org>
 pkgname=xf86-input-synaptics
 pkgver=1.2.2
-pkgrel=1
+pkgrel=2
 pkgdesc="synaptics driver for notebook touchpads"
 arch=(i686 x86_64)
 license=('custom')
 url="http://xorg.freedesktop.org/"
 depends=('libxi>=1.3' 'libxtst>=1.1.0')
-makedepends=('pkgconfig' 'xorg-server>=1.7.0')
-conflicts=('xorg-server<1.7.0')
+makedepends=('pkgconfig' 'xorg-server>=1.8.0' 'xorg-util-macros')
+conflicts=('xorg-server<1.8.0')
 replaces=('synaptics')
 provides=('synaptics')
 conflicts=('synaptics')
@@ -22,7 +22,7 @@
 source=(http://xorg.freedesktop.org/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
         10-synaptics.conf)
 sha1sums=('20ee874ef3dd391dbcfb03285b1b352c0234a00f'
-          '55fae33c190367d1fcd01388da9f657afd96048a')
+          '70ddc39abc03c3b5b8071b70b5553f84e01d78b2')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"