diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2013-03-19 11:22:26 +0100 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-03-19 11:22:26 +0100 |
commit | 56bf63be7060f55d0048fc1f2e37526723bf0dc7 (patch) | |
tree | 5072df371092a3bfded8d6aadca1af5018523291 /extra/xf86-input-synaptics | |
parent | d697117f3e2c400f8a7cae7bbbbf27166edc277a (diff) | |
parent | b54c21859be3590a319ceade1f58d0b89ac5ef32 (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/bitcoin/PKGBUILD
community/chmsee/PKGBUILD
community/projectm/PKGBUILD
extra/apache/PKGBUILD
extra/gv/PKGBUILD
extra/libdc1394/PKGBUILD
extra/libraw1394/PKGBUILD
extra/samba/PKGBUILD
extra/sg3_utils/PKGBUILD
extra/upower/PKGBUILD
extra/xf86-input-aiptek/PKGBUILD
extra/xf86-video-modesetting/PKGBUILD
extra/xorg-server/PKGBUILD
libre/rp-pppoe-libre/PKGBUILD
Diffstat (limited to 'extra/xf86-input-synaptics')
-rw-r--r-- | extra/xf86-input-synaptics/PKGBUILD | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/extra/xf86-input-synaptics/PKGBUILD b/extra/xf86-input-synaptics/PKGBUILD index 499c669a5..e4038a254 100644 --- a/extra/xf86-input-synaptics/PKGBUILD +++ b/extra/xf86-input-synaptics/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 176855 2013-02-01 15:31:40Z andyrtr $ +# $Id: PKGBUILD 180186 2013-03-18 16:08:56Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Thomas Bächler <thomas@archlinux.org> @@ -6,14 +6,14 @@ pkgname=xf86-input-synaptics pkgver=1.6.3 -pkgrel=1 +pkgrel=2 pkgdesc="Synaptics driver for notebook touchpads" arch=('i686' 'x86_64' 'mips64el') license=('custom') url="http://xorg.freedesktop.org/" depends=('libxtst' 'mtdev') -makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=18' 'libxi' 'libx11' 'resourceproto' 'scrnsaverproto') -conflicts=('xorg-server<1.13.0' 'X-ABI-XINPUT_VERSION<18' 'X-ABI-XINPUT_VERSION>=19') +makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=19' 'libxi' 'libx11' 'resourceproto' 'scrnsaverproto') +conflicts=('xorg-server<1.14.0' 'X-ABI-XINPUT_VERSION<19' 'X-ABI-XINPUT_VERSION>=20') replaces=('synaptics') provides=('synaptics') conflicts=('synaptics') |