summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorOleg Shparber2016-04-16 23:40:59 -0400
committerOleg Shparber2016-04-16 23:40:59 -0400
commit76e3f95eff1629e22a8cef92ba2d06b620518044 (patch)
tree786184fdf57722d4ec78125f95099b79fb53777b
parent4b213af89dd8872cdec2894dc9dd93f844ef74b2 (diff)
downloadaur-76e3f95eff1629e22a8cef92ba2d06b620518044.tar.gz
zeal-git: Conflict with 'zeal' package
-rw-r--r--.SRCINFO7
-rw-r--r--PKGBUILD5
2 files changed, 8 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 47c85935d1d..b6548a3dfa2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,9 @@
+# Generated by mksrcinfo v8
+# Sun Apr 17 03:39:37 UTC 2016
pkgbase = zeal-git
pkgdesc = An offline API documentation browser
- pkgver = 0.2.1.9.ga17a0bb
- pkgrel = 2
+ pkgver = 0.2.1.152.g334e897
+ pkgrel = 1
url = https://zealdocs.org/
install = zeal-git.install
arch = i686
@@ -14,6 +16,7 @@ pkgbase = zeal-git
depends = qt5-x11extras
depends = xcb-util-keysyms
depends = xdg-utils
+ conflicts = zeal
source = git+https://github.com/zealdocs/zeal
sha1sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index b32b10aae56..37748383d8e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,8 +4,8 @@
pkgname=zeal-git
_appname=zeal
-pkgver=0.2.1.9.ga17a0bb
-pkgrel=2
+pkgver=0.2.1.152.g334e897
+pkgrel=1
pkgdesc="An offline API documentation browser"
arch=('i686' 'x86_64')
url="https://zealdocs.org/"
@@ -13,6 +13,7 @@ license=('GPL3')
depends=('libarchive' 'qt5-webkit' 'qt5-imageformats' 'qt5-x11extras'
'xcb-util-keysyms' 'xdg-utils')
makedepends=('git')
+conflicts=('zeal')
source=("git+https://github.com/zealdocs/$_appname")
install=zeal-git.install
sha1sums=('SKIP')