diff options
author | yochananmarqos | 2020-01-28 16:09:23 -0700 |
---|---|---|
committer | yochananmarqos | 2020-01-28 16:09:23 -0700 |
commit | b41c18260259cafabfc7913291c000c6d6e8b971 (patch) | |
tree | d0c731774673572f6575f10a19a5f8b42f8cdec2 | |
parent | eadc8a08a4f342772a77a8538a4bb69400e233f0 (diff) | |
download | aur-b41c18260259cafabfc7913291c000c6d6e8b971.tar.gz |
updated conflicts
-rw-r--r-- | .SRCINFO | 3 | ||||
-rw-r--r-- | PKGBUILD | 5 |
2 files changed, 5 insertions, 3 deletions
@@ -1,7 +1,7 @@ pkgbase = nautilus-ext-git-git pkgdesc = Nautilus extension to add important information about the current git directory pkgver = 1.3.r16.g5389549 - pkgrel = 3 + pkgrel = 4 url = https://github.com/bilelmoussaoui/nautilus-git arch = i686 arch = x86_64 @@ -17,6 +17,7 @@ pkgbase = nautilus-ext-git-git provides = nautilus-git=1.3 conflicts = nautilus-ext-git=1.3 conflicts = nautilus-git=1.3 + conflicts = nautilus-folder-icons source = nautilus-ext-git::git+https://github.com/bilelmoussaoui/nautilus-git sha256sums = SKIP @@ -1,7 +1,7 @@ # Maintainer: Mark Wagie <mark dot wagie at tutanota dot com> pkgname=nautilus-ext-git-git pkgver=1.3.r16.g5389549 -pkgrel=3 +pkgrel=4 pkgdesc="Nautilus extension to add important information about the current git directory" arch=('i686' 'x86_64') url="https://github.com/bilelmoussaoui/nautilus-git" @@ -9,7 +9,8 @@ license=('GPL3') depends=('git' 'gobject-introspection' 'gtk3' 'python-nautilus') makedepends=('gnome-common' 'meson' 'intltool') provides=("${pkgname%-git}=1.3" 'nautilus-git=1.3') -conflicts=("${pkgname%-git}=1.3" 'nautilus-git=1.3') +conflicts=("${pkgname%-git}=1.3" 'nautilus-git=1.3' 'nautilus-folder-icons') + # See https://github.com/bilelmoussaoui/nautilus-folder-icons/issues/34 source=("${pkgname%-git}::git+https://github.com/bilelmoussaoui/nautilus-git") sha256sums=('SKIP') |