summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD4
2 files changed, 4 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index bd705d322be2..f984a1ea6b6f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = riot-desktop-git
pkgdesc = A glossy Matrix collaboration client for the desktop.
- pkgver = v0.15.1.r0.g4e6c2fdd
+ pkgver = v0.15.6.r3.gc08f31aa
pkgrel = 1
url = https://riot.im
arch = any
@@ -9,7 +9,7 @@ pkgbase = riot-desktop-git
makedepends = npm
depends = electron
provides = riot-desktop
- conflicts = riot-desktop
+ conflicts = riot-desktop riot-web
backup = etc/riot/config.json
source = riot-desktop-git::git://github.com/vector-im/riot-web.git#branch=develop
source = riot-desktop.desktop
diff --git a/PKGBUILD b/PKGBUILD
index 33099522a664..07d1e0b20bed 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
# Maintainer: Marcel Radzio <info@nordgedanken.de>
pkgbase=riot-desktop-git
-pkgver=v0.15.1.r0.g4e6c2fdd
+pkgver=v0.15.6.r3.gc08f31aa
pkgrel=1
pkgname=riot-desktop-git
pkgdesc="A glossy Matrix collaboration client for the desktop."
@@ -9,7 +9,7 @@ url="https://riot.im"
license=('Apache')
depends=('electron')
makedepends=('git' 'npm')
-conflicts=('riot-desktop')
+conflicts=('riot-desktop riot-web')
provides=('riot-desktop')
backup=("etc/riot/config.json")
source=('riot-desktop-git::git://github.com/vector-im/riot-web.git#branch=develop'