summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristopher Arndt2019-12-08 15:56:07 +0100
committerChristopher Arndt2019-12-08 15:56:07 +0100
commit3e292748091b4451bcb8887992f26130c0a4b600 (patch)
tree2c124341009891f1401521740a9005d47183c0ef
parent1f52d6470e2ad0d208000a12aecc4ed2596dfcce (diff)
downloadaur-geany-plugins-git.tar.gz
Add 'geany-plugin-markdown' to conflicts
-rw-r--r--.SRCINFO3
-rw-r--r--PKGBUILD4
2 files changed, 4 insertions, 3 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 0bd3ced5cdad..b334eabf9fee 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = geany-plugins-git
pkgdesc = Various plugins for Geany
pkgver = 1.36.0.r19.g0bfe89d1
- pkgrel = 1
+ pkgrel = 2
url = https://plugins.geany.org/
arch = x86_64
arch = i686
@@ -20,6 +20,7 @@ pkgbase = geany-plugins-git
provides = geany-plugins
conflicts = geany-plugins-svn
conflicts = geany-plugins
+ conflicts = geany-plugin-markdown
source = git+https://github.com/geany/geany-plugins.git
md5sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 3fec861291ed..cad76968a9fd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,7 +9,7 @@
_gitname=geany-plugins
pkgname=$_gitname-git
pkgver=1.36.0.r19.g0bfe89d1
-pkgrel=1
+pkgrel=2
pkgdesc='Various plugins for Geany'
arch=('x86_64' 'i686')
url='https://plugins.geany.org/'
@@ -17,7 +17,7 @@ license=('GPL')
depends=('geany' 'ctpl' 'gpgme' 'gtkspell3' 'libgit2' 'lua51' 'webkit2gtk' 'vte3')
makedepends=('git' 'intltool' 'python')
provides=("$_gitname")
-conflicts=("$_gitname-svn" "$_gitname")
+conflicts=("$_gitname-svn" "$_gitname" 'geany-plugin-markdown')
source=("git+https://github.com/geany/geany-plugins.git")
md5sums=('SKIP')