summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO3
-rw-r--r--PKGBUILD4
2 files changed, 3 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 1264167cbc2a..557505fc593d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = meld-dev
pkgdesc = Visual diff and merge tool
pkgver = 3.21.0
- pkgrel = 1
+ pkgrel = 2
url = http://meldmerge.org/
arch = any
license = GPL
@@ -16,7 +16,6 @@ pkgbase = meld-dev
optdepends = python-dbus: open a new tab in an already running instance
provides = meld
conflicts = meld meld-git
- replaces = meld meld-git
options = !emptydirs
source = https://download.gnome.org/sources/meld/3.21/meld-3.21.0.tar.xz
sha256sums = b680114d5ab793324549fd58f4eb202d8e280c0633a0b765ede6dfb34160a81b
diff --git a/PKGBUILD b/PKGBUILD
index 264966f8f874..ea3ef1928795 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
_pkgname=meld
pkgname=$_pkgname-dev
pkgver=3.21.0
-pkgrel=1
+pkgrel=2
pkgdesc='Visual diff and merge tool'
arch=('any')
url='http://meldmerge.org/'
@@ -18,8 +18,8 @@ makedepends=('git'
'meson'
'yelp-tools')
optdepends=('python-dbus: open a new tab in an already running instance')
-conflicts=('meld' 'meld-git')
provides=('meld')
+conflicts=('meld' 'meld-git')
options=('!emptydirs')
source=("https://download.gnome.org/sources/$_pkgname/${pkgver%.*}/meld-${pkgver}.tar.xz")
sha256sums=('b680114d5ab793324549fd58f4eb202d8e280c0633a0b765ede6dfb34160a81b')