summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorGavin Lloyd2015-09-25 11:22:17 -0700
committerGavin Lloyd2015-09-25 11:22:17 -0700
commitc4a6912ec73f5b40efdb2fddf755314910d11db3 (patch)
treee097b0f1e39c90068d61b6f6303c465c1e95cab2
parent859cfc081ed2f394ab67f067c2f4230fe4a7ee69 (diff)
downloadaur-c4a6912ec73f5b40efdb2fddf755314910d11db3.tar.gz
Update conflicts
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD4
2 files changed, 5 insertions, 5 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 7639152b39a4..ba30a6883397 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = bbswitch-git
pkgdesc = kernel module allowing to switch dedicated graphics card on Optimus laptops (Git version)
pkgver = v0.8
- pkgrel = 1
+ pkgrel = 2
url = http://github.com/Bumblebee-Project/bbswitch
install = bbswitch.install
arch = i686
@@ -11,8 +11,8 @@ pkgbase = bbswitch-git
makedepends = git
provides = bbswitch
conflicts = bbswitch
- conflicts = dkms-bbswitch
- conflicts = dkms-bbswitch-git
+ conflicts = bbswitch-dkms
+ conflicts = bbswitch-git-dkms
source = bbswitch-git::git+https://github.com/Bumblebee-Project/bbswitch.git#branch=develop
md5sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index aa7afdf8eeae..305b71fba998 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,13 +3,13 @@
pkgname=bbswitch-git
pkgver=v0.8
-pkgrel=1
+pkgrel=2
pkgdesc='kernel module allowing to switch dedicated graphics card on Optimus laptops (Git version)'
arch=('i686' 'x86_64')
license=('GPL')
url='http://github.com/Bumblebee-Project/bbswitch'
provides=('bbswitch')
-conflicts=('bbswitch' 'dkms-bbswitch' 'dkms-bbswitch-git')
+conflicts=('bbswitch' 'bbswitch-dkms' 'bbswitch-git-dkms')
makedepends=('linux-headers' 'git')
source=("${pkgname}::git+https://github.com/Bumblebee-Project/bbswitch.git#branch=develop")
md5sums=('SKIP')