From 4a246d12fc3fd0d214fbe48af002d20786f0cb5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Davi=20da=20Silva=20B=C3=B6ger?= Date: Tue, 31 Jan 2017 17:51:10 -0200 Subject: [PATCH] Include bbswitch-dkms in conflicts --- .SRCINFO | 5 +++-- PKGBUILD | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 9bee5a9..c7ff362 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,9 +1,9 @@ # Generated by mksrcinfo v8 -# Tue Jan 31 19:48:13 UTC 2017 +# Tue Jan 31 19:50:40 UTC 2017 pkgbase = bbswitch-dkms-git pkgdesc = kernel module allowing to switch dedicated graphics card on Optimus laptops, dkms version pkgver = 0.8.r0.g0c38f97 - pkgrel = 2 + pkgrel = 3 url = http://github.com/Bumblebee-Project/bbswitch arch = i686 arch = x86_64 @@ -14,6 +14,7 @@ pkgbase = bbswitch-dkms-git provides = bbswitch conflicts = bbswitch-git conflicts = bbswitch + conflicts = bbswitch-dkms conflicts = dkms-bbswitch source = git://github.com/Bumblebee-Project/bbswitch.git#branch=develop sha256sums = SKIP diff --git a/PKGBUILD b/PKGBUILD index 748b1d9..e377d88 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -6,13 +6,13 @@ pkgname=bbswitch-dkms-git _pkgname='bbswitch' pkgver=0.8.r0.g0c38f97 -pkgrel=2 +pkgrel=3 pkgdesc="kernel module allowing to switch dedicated graphics card on Optimus laptops, dkms version" arch=('i686' 'x86_64') url="http://github.com/Bumblebee-Project/bbswitch" license=('GPL') provides=('bbswitch') -conflicts=('bbswitch-git' 'bbswitch' 'dkms-bbswitch') +conflicts=('bbswitch-git' 'bbswitch' 'bbswitch-dkms' 'dkms-bbswitch') depends=('dkms' 'linux-headers') makedepends=('git') _gitroot='git://github.com/Bumblebee-Project/bbswitch.git'