summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuca Weiss2016-10-13 19:35:41 +0200
committerLuca Weiss2016-10-13 19:35:41 +0200
commit2a41b51d1bc9b2f46e2d40cd79700aaf548adb4b (patch)
treeee3424f7f7243d4a4c9a31f2489b2294e0c3658b
parent66b593250e569554bbec9e0ffbfbcca83d4c96f5 (diff)
downloadaur-2a41b51d1bc9b2f46e2d40cd79700aaf548adb4b.tar.gz
remove "conflicts"
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD1
2 files changed, 1 insertions, 6 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 322dd3d4936..8db356d8b63 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
# Generated by mksrcinfo v8
-# Thu Oct 13 16:57:42 UTC 2016
+# Thu Oct 13 17:33:59 UTC 2016
pkgbase = natron
pkgdesc = Open source compositing software. Node-graph based. Similar in functionalities to Adobe After Effects and Nuke by The Foundry.
pkgver = 2.1.5
@@ -22,10 +22,6 @@ pkgbase = natron
depends = openfx-io
depends = openfx-misc
optdepends = openfx-arena: Extra OpenFX plugins for Natron includes text node
- conflicts = natron-rc
- conflicts = natron-bin
- conflicts = natron-bin-dev
- conflicts = natron-portable
source = natron::git://github.com/MrKepzie/Natron.git#tag=2.1.5
source = https://github.com/MrKepzie/OpenColorIO-Configs/archive/Natron-v2.1.tar.gz
source = config.pri
diff --git a/PKGBUILD b/PKGBUILD
index b92087cc98f..75e47de8315 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,7 +10,6 @@ license=("GPL")
depends=('fontconfig' 'qt4' 'python2-pyside' 'python2-shiboken' 'boost-libs' 'pixman' 'glfw-x11' 'cairo' 'openfx-io' 'openfx-misc')
makedepends=('git' 'expat' 'boost')
optdepends=('openfx-arena: Extra OpenFX plugins for Natron includes text node')
-conflicts=('natron-rc' 'natron-bin' 'natron-bin-dev' 'natron-portable')
source=("$pkgname::git://github.com/MrKepzie/Natron.git#tag=$pkgver"
"https://github.com/MrKepzie/OpenColorIO-Configs/archive/Natron-v${pkgver%.*}.tar.gz"
"config.pri")