X-Original-To: alpine-aports@mail.alpinelinux.org Delivered-To: alpine-aports@mail.alpinelinux.org Received: from mail.alpinelinux.org (dallas-a1.alpinelinux.org [127.0.0.1]) by mail.alpinelinux.org (Postfix) with ESMTP id 42359DC122E for ; Tue, 3 Nov 2015 11:09:42 +0000 (UTC) Received: from lithium.8pit.net (lithium.8pit.net [141.101.32.65]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.alpinelinux.org (Postfix) with ESMTPS id 967DEDC120F; Tue, 3 Nov 2015 11:09:38 +0000 (UTC) Received: from localhost (eduroam-pool6-0339.wlan.uni-bremen.de [134.102.25.83]); by lithium.8pit.net (OpenSMTPD) with ESMTPSA id 231068b6; TLS version=TLSv1/SSLv3 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO; Tue, 3 Nov 2015 12:09:36 +0100 (CET) From: =?UTF-8?q?S=C3=B6ren=20Tempel?= To: alpine-aports@lists.alpinelinux.org Subject: [alpine-aports] [PATCH] main/xf86-input-evdev: don't conflict with xorg-server Date: Tue, 3 Nov 2015 12:09:19 +0100 Message-Id: <1446548959-7775-1-git-send-email-soeren+git@soeren-tempel.net> X-Mailer: git-send-email 2.6.1 X-Virus-Scanned: ClamAV using ClamSMTP X-Mailinglist: alpine-aports Precedence: list List-Id: Alpine Development List-Unsubscribe: List-Post: List-Help: List-Subscribe: --- main/xf86-input-evdev/APKBUILD | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/main/xf86-input-evdev/APKBUILD b/main/xf86-input-evdev/APKBUILD index ee77e4c..56b9c11 100644 --- a/main/xf86-input-evdev/APKBUILD +++ b/main/xf86-input-evdev/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa pkgname=xf86-input-evdev pkgver=2.10.0 -pkgrel=1 +pkgrel=2 pkgdesc="X.org evdev input driver" url="http://xorg.freedesktop.org/" arch="all" @@ -27,7 +27,12 @@ build() { package() { cd "$_builddir" make DESTDIR="$pkgdir" install || return 1 + + # Install custom license install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING + + # Don't conflict with xorg-server + rm -f "$pkgdir"/usr/share/X11/xorg.conf.d/10-evdev.conf || return 1 } md5sums="b1183c55125981d346102d1be704760b xf86-input-evdev-2.10.0.tar.bz2" -- 2.6.1 --- Unsubscribe: alpine-aports+unsubscribe@lists.alpinelinux.org Help: alpine-aports+help@lists.alpinelinux.org ---