summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD6
2 files changed, 7 insertions, 1 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 098379501678..0963c81d1b77 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -14,6 +14,8 @@ pkgbase = themix-import-images-git
optdepends = python-haishoku: additional image analyzer
provides = themix-import-images
conflicts = themix-import-images
+ conflicts = oomox
+ conflicts = oomox-git
source = git+https://github.com/themix-project/oomox.git#branch=master
md5sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 9ecd7c0148f5..be2be3de887e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -26,7 +26,11 @@ optdepends=(
'python-haishoku: additional image analyzer'
)
provides=($_pkgname)
-conflicts=($_pkgname)
+conflicts=(
+ $_pkgname
+ 'oomox'
+ 'oomox-git'
+)
pkgver() {
cd "${srcdir}/oomox"