Version 1.60-2, added boost to conflict array

2 files changed, 6 insertions, 3 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6edb9c130cad..e5f042b1bde2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,17 @@
 # Generated by mksrcinfo v8
-# Sun Jan 10 17:07:13 UTC 2016
+# Mon Feb 29 11:05:52 UTC 2016
 pkgbase = boost-build
 	pkgdesc = Boost.Build makes it easy to build C++ projects, everywhere.
 	pkgver = 1.60
-	pkgrel = 1
+	pkgrel = 2
 	url = http://www.boost.org/build/
 	arch = any
 	license = custom:boost
 	depends = boost
 	depends = gcc
 	depends = python
+	conflicts = boost
+	conflicts = boost-build-nightly
 	source = https://github.com/boostorg/build/archive/boost-1.60.0.tar.gz
 	source = http://www.boost.org/LICENSE_1_0.txt
 	md5sums = 987767d1e22e34e5b90e54ff6b526f40
diff --git a/PKGBUILD b/PKGBUILD
index 039550c1250a..14914c46b667 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,12 +3,13 @@
 
 pkgname=boost-build
 pkgver=1.60
-pkgrel=1
+pkgrel=2
 pkgdesc="Boost.Build makes it easy to build C++ projects, everywhere."
 arch=('any')
 url="http://www.boost.org/build/"
 license=('custom:boost')
 depends=('boost' 'gcc' 'python')
+conflicts=('boost' 'boost-build-nightly')
 source=("https://github.com/boostorg/build/archive/boost-${pkgver}.0.tar.gz"
         "http://www.boost.org/LICENSE_1_0.txt")
 md5sums=('987767d1e22e34e5b90e54ff6b526f40'