summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaxime “pep” Buquet2017-10-20 03:18:58 +0100
committerMaxime “pep” Buquet2017-10-20 03:21:07 +0100
commit69904c8791c51b6f0899971a35ed7f3f8eeefddb (patch)
tree00f1f1dd776321983c134ea5a91ed2d1ec4ac9ab
parent56323076523a2c0dc5cbbfed3a09fc1105ba67f2 (diff)
downloadaur-69904c8791c51b6f0899971a35ed7f3f8eeefddb.tar.gz
Now conflicts with 'movim'
-rw-r--r--.SRCINFO3
-rw-r--r--PKGBUILD3
2 files changed, 4 insertions, 2 deletions
diff --git a/.SRCINFO b/.SRCINFO
index d92b081e5de4..5a9716310857 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = movim-git
pkgdesc = Movim is a decentralized social network, written in PHP and HTML5 and based on the XMPP standard protocol.
pkgver = r5307.5705ffc9
- pkgrel = 2
+ pkgrel = 3
url = https://movim.eu
install = movim.install
arch = any
@@ -17,6 +17,7 @@ pkgbase = movim-git
optdepends = apache: reverse proxy
optdepends = php-fpm: PHP FactCGI process manager
provides = movim
+ conflicts = movim
backup = etc/webapps/movim/db.inc.php
backup = etc/default/movim
source = movim::git+https://github.com/movim/movim
diff --git a/PKGBUILD b/PKGBUILD
index 60d438f25d31..687f92dfc371 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,12 +4,13 @@
_pkgbase='movim'
pkgname=movim-git
pkgver=r5307.5705ffc9
-pkgrel=2
+pkgrel=3
pkgdesc="Movim is a decentralized social network, written in PHP and HTML5 and based on the XMPP standard protocol."
arch=('any')
url='https://movim.eu'
license=('AGPL3')
provides=('movim')
+conflicts=('movim')
depends=('php-gd' 'php-imagick')
optdepends=('postgresql: to use the postgresql database backend'
'php-pgsql: php bindings for postgresql'