summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorVirtualTam2015-09-26 21:16:35 +0200
committerVirtualTam2015-09-26 21:16:35 +0200
commit7b5975ff2ecd6539aeb9c505a76db5783d7d41b6 (patch)
tree5eccbcc5aed659ea0bb8b058fa45800440b8fddb
parentbce41da506238ac9d7b3649f9d77df6b38436947 (diff)
downloadaur-7b5975ff2ecd6539aeb9c505a76db5783d7d41b6.tar.gz
IanniX: update conflict array
Signed-off-by: VirtualTam <virtualtam@flibidi.net>
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD3
2 files changed, 5 insertions, 2 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 6961c015c93f..d8e320a7e9ce 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = iannix-git
pkgdesc = A graphical sequencer, based on Iannis Xenakis' works, for digital art.
pkgver = 0.9.16.r27.gee2e7ec
- pkgrel = 2
+ pkgrel = 3
url = http://www.iannix.org/
arch = i686
arch = x86_64
@@ -25,6 +25,8 @@ pkgbase = iannix-git
optdepends = libfreenect: XBox Kinect
optdepends = libwacom: Wacom tablets and trackpads
provides = iannix
+ conflicts = iannix
+ conflicts = iannix-qt5-git
source = iannix::git+http://github.com/iannix/IanniX.git
sha256sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 1fe4d92b7a21..f8fb674bbbab 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: VirtualTam <<virtualtam@flibidi.net>>
pkgname=iannix-git
pkgver=0.9.16.r27.gee2e7ec
-pkgrel=2
+pkgrel=3
pkgdesc="A graphical sequencer, based on Iannis Xenakis' works, for digital art."
arch=('i686' 'x86_64')
url="http://www.iannix.org/"
@@ -14,6 +14,7 @@ optdepends=('ffmpeg: record and convert audio streams'
'libfreenect: XBox Kinect'
'libwacom: Wacom tablets and trackpads')
provides=('iannix')
+conflicts=('iannix' 'iannix-qt5-git')
_gitname=iannix
source=("${_gitname}::git+http://github.com/iannix/IanniX.git")
sha256sums=('SKIP')