summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorAinola2017-10-24 11:12:03 -0600
committerAinola2017-10-24 11:12:03 -0600
commitcc1358a75854166e211ff8a98344d9dd119e879a (patch)
tree45a5da4e2bcea009c680bd9c23b604d5bea79277
parente0a61c432617d25688aaf81dd6fe5d2cc99edc04 (diff)
downloadaur-cc1358a75854166e211ff8a98344d9dd119e879a.tar.gz
conflict with imv
-rw-r--r--.SRCINFO3
-rw-r--r--PKGBUILD4
2 files changed, 4 insertions, 3 deletions
diff --git a/.SRCINFO b/.SRCINFO
index b673d782450e..ae53ffd2270b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
# Generated by mksrcinfo v8
-# Tue Oct 24 17:08:59 UTC 2017
+# Tue Oct 24 17:11:44 UTC 2017
pkgbase = imv-git
pkgdesc = Image viewer for Wayland and X11
pkgver = v2.1.3.r61.gc51dff6
@@ -14,6 +14,7 @@ pkgbase = imv-git
depends = fontconfig
optdepends = cmocka: for running unit tests
conflicts = renameutils
+ conflicts = imv
source = git+https://github.com/eXeC64/imv.git
sha1sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 1ac369854e68..8f9e4be227c1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
pkgname=imv-git
pkgver=v2.1.3.r61.gc51dff6
-pkgrel=1
+pkgrel=2
pkgdesc='Image viewer for Wayland and X11'
url="https://github.com/eXeC64/imv"
arch=('x86_64' 'i686')
@@ -10,7 +10,7 @@ license=('GPL')
depends=('freeimage' 'sdl2_ttf' 'fontconfig')
makedepends=('git')
optdepends=('cmocka: for running unit tests')
-conflicts=('renameutils')
+conflicts=('renameutils' 'imv')
source=("git+https://github.com/eXeC64/imv.git")
sha1sums=('SKIP')