summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorwenLiangcan2016-02-26 09:24:15 +0800
committerwenLiangcan2016-02-26 09:24:15 +0800
commit284a8f399431afc2bbc9a91077549e71be2f3e2e (patch)
tree06d97f8dff73f3c4979b2153c3b470cfa7a283bc
parentca9a3bf554d507ae5afdd1e3f4fc21818ccf918c (diff)
downloadaur-284a8f399431afc2bbc9a91077549e71be2f3e2e.tar.gz
keeweb-git 1.0.4.0.ga6e7afe-2.
Add keeweb-desktop to conflicts list.
-rw-r--r--.SRCINFO5
-rw-r--r--PKGBUILD4
2 files changed, 5 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 3362db2d07eb..0f743c47c3d2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# Fri Feb 26 01:16:33 UTC 2016
+# Fri Feb 26 01:23:55 UTC 2016
pkgbase = keeweb-git
pkgdesc = Desktop password manager compatible with KeePass databases.
pkgver = 1.0.4.0.ga6e7afe
- pkgrel = 1
+ pkgrel = 2
url = https://github.com/antelle/keeweb
arch = any
license = MIT
@@ -15,6 +15,7 @@ pkgbase = keeweb-git
provides = keeweb
provides = keeweb-desktop
conflicts = keeweb
+ conflicts = keeweb-desktop
source = git+https://github.com/antelle/keeweb.git
sha1sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 6b1e274c26cd..8186310dc255 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
pkgname=keeweb-git
_pkgname=keeweb
pkgver=1.0.4.0.ga6e7afe
-pkgrel=1
+pkgrel=2
pkgdesc="Desktop password manager compatible with KeePass databases."
arch=('any')
url="https://github.com/antelle/keeweb"
@@ -11,7 +11,7 @@ license=('MIT')
depends=('electron' 'xdg-utils' 'sh')
makedepends=('nodejs-grunt' 'npm')
provides=("${_pkgname}" "${_pkgname}-desktop")
-conflicts=("${_pkgname}")
+conflicts=("${_pkgname}" "${_pkgname}-desktop")
source=('git+https://github.com/antelle/keeweb.git')
sha1sums=('SKIP')
_desktop="${_pkgname}.desktop"