diff options
| author | neodarz <neodarz@neodarz.net> | 2017-11-02 16:39:17 +0100 |
|---|---|---|
| committer | neodarz <neodarz@neodarz.net> | 2017-11-02 16:39:31 +0100 |
| commit | a979c86e9e0788c631c59fcc7a474070860f49e0 (patch) | |
| tree | 2fa62ad3c6287e2639cfe19eaaa1a8938ca21d97 | |
| parent | f4c7c1cdace853939f15b81907017ff5d7068198 (diff) | |
| download | terminalimageviewer-git-a979c86e9e0788c631c59fcc7a474070860f49e0.tar.xz terminalimageviewer-git-a979c86e9e0788c631c59fcc7a474070860f49e0.zip | |
Fix conflicts
| -rw-r--r-- | .SRCINFO | 6 | ||||
| -rw-r--r-- | PKGBUILD | 6 |
2 files changed, 7 insertions, 5 deletions
@@ -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 @@ -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') |