summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorEsben Haabendal2018-06-07 14:02:08 +0200
committerEsben Haabendal2018-06-07 14:02:08 +0200
commit54f5f4cfe0a92b6ad4a11ba3e6249c1a7e292df9 (patch)
treed9a8d4fff84ae143f4de7f4f0764c510807bca9a
parent7a611ea5e240075032d4e07ff030fae98d8e8b45 (diff)
downloadaur-54f5f4cfe0a92b6ad4a11ba3e6249c1a7e292df9.tar.gz
Update to 2.12.3
-rw-r--r--.SRCINFO5
-rw-r--r--PKGBUILD2
2 files changed, 4 insertions, 3 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 98bc068b558..033248ba7ad 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = emacs-magit-popup
pkgdesc = A generic interface for toggling switches and setting options and then invoking an Emacs command which does something with these arguments
- pkgver = 2.12.0
+ pkgver = 2.12.3
pkgrel = 1
url = http://github.com/magit/magit-popup
install = emacs-magit-popup.install
@@ -10,7 +10,8 @@ pkgbase = emacs-magit-popup
depends = emacs>=24.4
depends = emacs-dash=2.13.0
provides = emacs-magit-popup
- source = git+https://github.com/magit/magit-popup.git#tag=v2.12.0
+ conflicts = emacs-magit<=2.11.0
+ source = git+https://github.com/magit/magit-popup.git#tag=v2.12.3
md5sums = SKIP
pkgname = emacs-magit-popup
diff --git a/PKGBUILD b/PKGBUILD
index 210f5cb8c61..dc0c693aaa0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
pkgname=emacs-magit-popup
_github_org="magit"
_github_repo="magit-popup"
-pkgver=2.12.0
+pkgver=2.12.3
pkgrel=1
pkgdesc="A generic interface for toggling switches and setting options and then invoking an Emacs command which does something with these arguments"
arch=('any')