summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorneodarz <neodarz@neodarz.net>2017-11-02 16:39:17 +0100
committerneodarz <neodarz@neodarz.net>2017-11-02 16:39:31 +0100
commita979c86e9e0788c631c59fcc7a474070860f49e0 (patch)
tree2fa62ad3c6287e2639cfe19eaaa1a8938ca21d97
parentf4c7c1cdace853939f15b81907017ff5d7068198 (diff)
downloadterminalimageviewer-git-a979c86e9e0788c631c59fcc7a474070860f49e0.zip
terminalimageviewer-git-a979c86e9e0788c631c59fcc7a474070860f49e0.tar.xz
Fix conflicts
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD6
2 files changed, 7 insertions, 5 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 030e4e5..95b80f6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,16 @@
pkgbase = terminalimageviewer
pkgdesc = Small C++ program to display images in a (modern) terminal using RGB ANSI codes and unicode block graphics characters
pkgver = r46.65ebc0a
- pkgrel = 1
+ pkgrel = 2
url = https://github.com/stefanhaustein/TerminalImageViewer
arch = i686
arch = x86_64
license = Apache
makedepends = git
provides = TerminalImageViewer
- conflicts = TerminalImageViewer, tiv
+ provides = tiv
+ conflicts = TerminalImageViewer
+ conflicts = tiv
source = terminalimageviewer-git::git+https://github.com/stefanhaustein/TerminalImageViewer.git
md5sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index fd69fd7..a86d7a3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,14 +4,14 @@ pkgbase=terminalimageviewer
pkgname=terminalimageviewer-git
_pkgname=TerminalImageViewer
pkgver=r46.65ebc0a
-pkgrel=1
+pkgrel=2
pkgdesc="Small C++ program to display images in a (modern) terminal using RGB ANSI codes and unicode block graphics characters"
arch=('i686' 'x86_64')
url="https://github.com/stefanhaustein/$_pkgname"
license=('Apache')
makedepends=(git)
-provides=("$_pkgname")
-conflicts=("$_pkgname, tiv")
+provides=("$_pkgname" "tiv")
+conflicts=("$_pkgname" "tiv")
source=("$pkgname"::"git+https://github.com/stefanhaustein/$_pkgname.git")
noextract=()
md5sums=('SKIP')