summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorGabriel-Andrew Pollo Guilbert2015-08-09 22:24:12 -0400
committerGabriel-Andrew Pollo Guilbert2015-08-09 22:24:12 -0400
commit9a41000e5491dad22d4ef4732a580ceb435f21a9 (patch)
treed9cf797182255ad1fb3d88ea2d5ca0062f2f1670
parentdc0b834219e62ff8c56e86494ddb4b6ce0c0b97b (diff)
downloadaur-9a41000e5491dad22d4ef4732a580ceb435f21a9.tar.gz
Add vpaint-git conflict
Diffstat
-rw-r--r--.SRCINFO1
-rw-r--r--PKGBUILD2
2 files changed, 2 insertions, 1 deletions
diff --git a/.SRCINFO b/.SRCINFO
index c83cdffddc17..3926ed9a4301 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -13,6 +13,7 @@ pkgbase = vpaint
depends = glu
depends = qt5-base
depends = libxkbcommon-x11
+ conflicts = vpaint-git
source = https://github.com/dalboris/vpaint/archive/v1.5.tar.gz
md5sums = aee4b49c9a9a0345a1d98d734a008b7d
diff --git a/PKGBUILD b/PKGBUILD
index f749e45251f0..571911f31313 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,7 +9,7 @@ license=('MIT')
depends=('qt4' 'glu' 'qt5-base' 'libxkbcommon-x11')
makedepends=('gcc' 'make' 'qtchooser')
url='http://www.vpaint.org'
-conflicts=()
+conflicts=('vpaint-git')
provides=()
source=("https://github.com/dalboris/vpaint/archive/v$pkgver.tar.gz")
md5sums=('aee4b49c9a9a0345a1d98d734a008b7d')