Update to 340.96-6

2 files changed, 7 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1d249b938849..700f3df94fb6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Tue Apr 12 21:07:46 UTC 2016
+# Wed Apr 20 21:04:10 UTC 2016
 pkgbase = nvidia-340xx-ck
 	pkgdesc = NVIDIA drivers for linux-ck, 340xx legacy branch.
 	pkgver = 340.96
-	pkgrel = 5
+	pkgrel = 6
 	url = http://www.nvidia.com/
 	install = nvidia-340xx-ck.install
 	arch = i686
@@ -29,6 +29,7 @@ pkgbase = nvidia-340xx-ck
 	conflicts = nvidia-ck-core2
 	conflicts = nvidia-ck-haswell
 	conflicts = nvidia-ck-broadwell
+	conflicts = nvidia-ck-skylake
 	conflicts = nvidia-ck-ivybridge
 	conflicts = nvidia-ck-kx
 	conflicts = nvidia-ck-k10
@@ -43,6 +44,7 @@ pkgbase = nvidia-340xx-ck
 	conflicts = nvidia-304xx-ck-core2
 	conflicts = nvidia-304xx-ck-haswell
 	conflicts = nvidia-304xx-ck-broadwell
+	conflicts = nvidia-304xx-ck-skylake
 	conflicts = nvidia-304xx-ck-ivybridge
 	conflicts = nvidia-304xx-ck-kx
 	conflicts = nvidia-304xx-ck-k10
@@ -57,6 +59,7 @@ pkgbase = nvidia-340xx-ck
 	conflicts = nvidia-340xx-ck-core2
 	conflicts = nvidia-340xx-ck-haswell
 	conflicts = nvidia-340xx-ck-broadwell
+	conflicts = nvidia-340xx-ck-skylake
 	conflicts = nvidia-340xx-ck-ivybridge
 	conflicts = nvidia-340xx-ck-kx
 	conflicts = nvidia-340xx-ck-k10
diff --git a/PKGBUILD b/PKGBUILD
index 9e8dec44e2d5..463c63e14ae9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,13 +4,13 @@
 pkgname=nvidia-340xx-ck
 pkgver=340.96
 _extramodules=extramodules-4.4-ck
-pkgrel=5
+pkgrel=6
 pkgdesc="NVIDIA drivers for linux-ck, 340xx legacy branch."
 arch=('i686' 'x86_64')
 url="http://www.nvidia.com/"
 depends=('linux-ck>=4.4' 'linux-ck<4.5' 'libgl' "nvidia-340xx-utils=${pkgver}")
 makedepends=('linux-ck-headers>=4.4' 'linux-ck-headers<4.5' 'nvidia-340xx-libgl')
-conflicts=('nvidia-ck' 'nvidia-304xx-ck' 'nvidia-275xx-ck' 'nvidia-319-ck' 'nvidia-96xx-ck' 'nvidia-beta-ck' 'nvidia-ck-atom' 'nvidia-ck-barcelona' 'nvidia-ck-bulldozer' 'nvidia-ck-corex' 'nvidia-ck-core2' 'nvidia-ck-haswell' 'nvidia-ck-broadwell' 'nvidia-ck-ivybridge' 'nvidia-ck-kx' 'nvidia-ck-k10' 'nvidia-ck-nehalem' 'nvidia-ck-p4' 'nvidia-ck-piledriver' 'nvidia-ck-pentm' 'nvidia-ck-sandybridge' 'nvidia-304xx-ck-atom' 'nvidia-304xx-ck-barcelona' 'nvidia-304xx-ck-corex' 'nvidia-304xx-ck-core2' 'nvidia-304xx-ck-haswell' 'nvidia-304xx-ck-broadwell' 'nvidia-304xx-ck-ivybridge' 'nvidia-304xx-ck-kx' 'nvidia-304xx-ck-k10' 'nvidia-304xx-ck-nehalem' 'nvidia-304xx-ck-p4' 'nvidia-304xx-ck-piledriver' 'nvidia-304xx-ck-pentm' 'nvidia-304xx-ck-sandybridge' 'nvidia-340xx-ck-atom' 'nvidia-340xx-ck-barcelona' 'nvidia-340xx-ck-bulldozer' 'nvidia-340xx-ck-core2' 'nvidia-340xx-ck-haswell' 'nvidia-340xx-ck-broadwell' 'nvidia-340xx-ck-ivybridge' 'nvidia-340xx-ck-kx' 'nvidia-340xx-ck-k10' 'nvidia-340xx-ck-nehalem' 'nvidia-340xx-ck-p4' 'nvidia-340xx-ck-piledriver' 'nvidia-340xx-ck-pentm' 'nvidia-340xx-ck-sandybridge')
+conflicts=('nvidia-ck' 'nvidia-304xx-ck' 'nvidia-275xx-ck' 'nvidia-319-ck' 'nvidia-96xx-ck' 'nvidia-beta-ck' 'nvidia-ck-atom' 'nvidia-ck-barcelona' 'nvidia-ck-bulldozer' 'nvidia-ck-corex' 'nvidia-ck-core2' 'nvidia-ck-haswell' 'nvidia-ck-broadwell' 'nvidia-ck-skylake' 'nvidia-ck-ivybridge' 'nvidia-ck-kx' 'nvidia-ck-k10' 'nvidia-ck-nehalem' 'nvidia-ck-p4' 'nvidia-ck-piledriver' 'nvidia-ck-pentm' 'nvidia-ck-sandybridge' 'nvidia-304xx-ck-atom' 'nvidia-304xx-ck-barcelona' 'nvidia-304xx-ck-corex' 'nvidia-304xx-ck-core2' 'nvidia-304xx-ck-haswell' 'nvidia-304xx-ck-broadwell' 'nvidia-304xx-ck-skylake' 'nvidia-304xx-ck-ivybridge' 'nvidia-304xx-ck-kx' 'nvidia-304xx-ck-k10' 'nvidia-304xx-ck-nehalem' 'nvidia-304xx-ck-p4' 'nvidia-304xx-ck-piledriver' 'nvidia-304xx-ck-pentm' 'nvidia-304xx-ck-sandybridge' 'nvidia-340xx-ck-atom' 'nvidia-340xx-ck-barcelona' 'nvidia-340xx-ck-bulldozer' 'nvidia-340xx-ck-core2' 'nvidia-340xx-ck-haswell' 'nvidia-340xx-ck-broadwell' 'nvidia-340xx-ck-skylake' 'nvidia-340xx-ck-ivybridge' 'nvidia-340xx-ck-kx' 'nvidia-340xx-ck-k10' 'nvidia-340xx-ck-nehalem' 'nvidia-340xx-ck-p4' 'nvidia-340xx-ck-piledriver' 'nvidia-340xx-ck-pentm' 'nvidia-340xx-ck-sandybridge')
 #groups=('ck-generic')
 #replaces=()
 license=('custom')