Update conflicts and makedeps

2 files changed, 11 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1f4d23713e9b..e71dd92e3df7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Thu Jul 20 13:56:07 UTC 2017
+# Wed Sep  6 00:35:53 UTC 2017
 pkgbase = python-elektronn2-git
 	pkgdesc = A highly configurable toolkit for training 3D/2D CNNs and general Neural Networks
-	pkgver = 0.3.0
-	pkgrel = 0
+	pkgver = 0.5.0
+	pkgrel = 1
 	url = https://github.com/ELEKTRONN/ELEKTRONN2
 	arch = any
 	license = GPLv3
@@ -29,6 +29,7 @@ pkgname = python-elektronn2-git
 	depends = python-pydotplus
 	depends = python-psutil
 	conflicts = python-elektronn2
+	conflicts = python-theano-git
 
 pkgname = python2-elektronn2-git
 	depends = python2
@@ -49,4 +50,5 @@ pkgname = python2-elektronn2-git
 	depends = python2-pydotplus
 	depends = python2-psutil
 	conflicts = python2-elektronn2
+	conflicts = python2-theano-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 9538f189f61b..a1e48d0f8841 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=('python-elektronn2-git' 'python2-elektronn2-git')
 _gitname='ELEKTRONN2'
-pkgver=0.3.0
+pkgver=0.5.0+2.g35dd2f1
 pkgrel=0
 pkgdesc='A highly configurable toolkit for training 3D/2D CNNs and general Neural Networks'
 url='https://github.com/ELEKTRONN/ELEKTRONN2'
@@ -36,8 +36,8 @@ package_python-elektronn2-git() {
         'python-pydotplus'
         'python-psutil'
     )
-    makedepends=('python-setuptools')
-    conflicts=('python-elektronn2')
+    makedepends=('python-setuptools' 'python-numpy')
+    conflicts=('python-elektronn2' 'python-theano-git')
 
     cd "${srcdir}/${_gitname}"
     python setup.py install --root="${pkgdir}" --optimize=1
@@ -63,11 +63,11 @@ package_python2-elektronn2-git() {
         'python2-pydotplus'
         'python2-psutil'
     )
-    makedepends=('python2-setuptools')
-    conflicts=('python2-elektronn2')
+    makedepends=('python2-setuptools' 'python2-numpy')
+    conflicts=('python2-elektronn2' 'python2-theano-git')
 
     cd "${srcdir}/${_gitname}"
     python2 setup.py install --root="${pkgdir}" --optimize=1
     mv "${pkgdir}/usr/bin/elektronn2-train" "${pkgdir}/usr/bin/elektronn2-train2"
     mv "${pkgdir}/usr/bin/elektronn2-profile" "${pkgdir}/usr/bin/elektronn2-profile2"
-}
\ No newline at end of file
+}