summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO1
-rw-r--r--PKGBUILD2
2 files changed, 2 insertions, 1 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 53d9cf2ce60..9ad3819df8a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -9,6 +9,7 @@ pkgbase = roundcubemail-plugin-carddav
depends = roundcubemail
conflicts = roundcube-rcmcarddav
conflicts = roundcube-rcmcarddav-git
+ conflicts = roundcubemail-plugin-carddav-git
backup = etc/webapps/roundcubemail/plugins/carddav/config.inc.php
source = https://github.com/blind-coder/rcmcarddav/releases/download/v4.0.0-alpha1/carddav-v4.0.0-alpha1.tgz
md5sums = 525688b0e165821bc1843ac5be7628c6
diff --git a/PKGBUILD b/PKGBUILD
index 7f020bf4bb2..05abdb52af1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@ pkgver=4.0.0
pkgrel=1
pkgdesc="CardDAV plugin for RoundCube Webmailer"
arch=("any")
-conflicts=("roundcube-rcmcarddav" "roundcube-rcmcarddav-git")
+conflicts=("roundcube-rcmcarddav" "roundcube-rcmcarddav-git" "roundcubemail-plugin-carddav-git")
url="https://github.com/blind-coder/rcmcarddav"
license=("GPL2")
depends=("roundcubemail")