summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorEsben Haabendal2017-12-16 10:56:33 +0100
committerEsben Haabendal2017-12-16 10:56:33 +0100
commitdefdc2c8fdd483897e3142aeec771899f98da24a (patch)
tree7bc45482bab1abb299c163a3443347d52e003c29
parent428c847ed81067c976db64de9292b729dc3d35a3 (diff)
downloadaur-defdc2c8fdd483897e3142aeec771899f98da24a.tar.gz
Add dependency/conflicts for emacs-magit-popup
This version ships with magit-popup.el, so we cannot co-exist with emacs-magit-popup. Next release (2.12.0) will most likely have to change this to a depends on emacs-magit-popup instead, as is done in emacs-magit-git now.
-rw-r--r--PKGBUILD4
1 files changed, 2 insertions, 2 deletions
diff --git a/PKGBUILD b/PKGBUILD
index bfede664bc56..08997492316b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,8 +11,8 @@ url="http://github.com/${_github_org}/${_github_repo}"
license=('GPL3')
depends=('emacs' 'git' 'emacs-dash>=2.13.0' 'emacs-with-editor-git>=2.6.0')
makedepends=('git' 'ed')
-provides=('emacs-magit')
-conflicts=('emacs-magit')
+provides=('emacs-magit' 'emacs-magit-popup')
+conflicts=('emacs-magit-git' 'emacs-magit-popup')
install="${pkgname}.install"
source=("git+https://github.com/${_github_org}/${_github_repo}.git#tag=$pkgver")
md5sums=('SKIP')