From 53e59eb87c4e5d91691d377c4128bbd6ebde4403 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B6ren=20Tempel?= Date: Tue, 3 Nov 2015 15:06:03 +0100 Subject: main/xorg-server: Don't conflict with xf86-input-evdev --- main/xorg-server/APKBUILD | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/main/xorg-server/APKBUILD b/main/xorg-server/APKBUILD index 962ea8a3f0..dabf2e7073 100644 --- a/main/xorg-server/APKBUILD +++ b/main/xorg-server/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Natanael Copa pkgname=xorg-server pkgver=1.17.4 -pkgrel=0 +pkgrel=1 pkgdesc="X.Org X servers" url="http://xorg.freedesktop.org" arch="all" @@ -145,6 +145,9 @@ package() { make -j1 DESTDIR="$pkgdir" install || return 1 chmod u+s "$pkgdir"/usr/bin/Xorg + # Don't conflict with xf86-input-evdev + rm -f "$pkgdir"/usr/share/X11/xorg.conf.d/10-evdev.conf || return 1 + install -m755 -d "$pkgdir"/etc/X11/xorg.conf.d || return 1 install -m644 "$srcdir"/20-modules.conf "$pkgdir"/etc/X11/xorg.conf.d/ \ || return 1 -- cgit v1.2.3