summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO10
-rw-r--r--PKGBUILD6
2 files changed, 12 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 69867f3a5978..d12ec8474b79 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
# Generated by mksrcinfo v8
-# Thu Oct 6 05:51:29 UTC 2016
+# Thu Oct 6 06:02:45 UTC 2016
pkgbase = keepassx-reboot-git
pkgdesc = A reboot with keepasshttp of an OpenSource password safe which helps you to manage your passwords in an easy and secure way
- pkgver = 2.0.2.r175.g5eadd10
+ pkgver = 2.0.2.r219.g5bb27b2
pkgrel = 1
url = https://github.com/keepassxreboot/keepassx
install = keepassx.install
@@ -22,12 +22,18 @@ pkgbase = keepassx-reboot-git
depends = hicolor-icon-theme
depends = desktop-file-utils
depends = libmicrohttpd
+ provides = keepassx=2.0.2.r219.g5bb27b2
+ provides = keepassx2=2.0.2.r219.g5bb27b2
+ provides = keepassx-svn=2.0.2.r219.g5bb27b2
+ provides = keepassx2-git=2.0.2.r219.g5bb27b2
conflicts = keepassx-svn
conflicts = keepassx
conflicts = keepassx-git
conflicts = keepassx2-git
conflicts = keepassx2
conflicts = keepassx2-yubikey-git
+ conflicts = keepassx-http
+ replaces = keepassx-http
options = !emptydirs
source = git+https://github.com/keepassxreboot/keepassx.git
md5sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 1e33c7fd6c76..bb6a0c01c715 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,7 +9,7 @@
pkgname=keepassx-reboot-git
_gitname=keepassx
-pkgver=2.0.2.r175.g5eadd10
+pkgver=2.0.2.r219.g5bb27b2
pkgrel=1
pkgdesc="A reboot with keepasshttp of an OpenSource password safe which helps you to manage your passwords in an easy and secure way"
arch=('i686' 'x86_64')
@@ -18,7 +18,9 @@ license=('GPL2')
depends=('libxtst' 'shared-mime-info' 'qt5-x11extras' 'hicolor-icon-theme' 'desktop-file-utils' 'libmicrohttpd')
install=keepassx.install
makedepends=('git' 'intltool' 'cmake' 'qt5-base' 'qt5-tools' 'zlib' 'libgcrypt')
-conflicts=('keepassx-svn' 'keepassx' 'keepassx-git' 'keepassx2-git' 'keepassx2' 'keepassx2-yubikey-git')
+conflicts=('keepassx-svn' 'keepassx' 'keepassx-git' 'keepassx2-git' 'keepassx2' 'keepassx2-yubikey-git' 'keepassx-http' )
+provides=("keepassx"{,2}"=${pkgver}" "keepassx-svn=${pkgver}" "keepassx2-git=${pkgver}")
+replaces=('keepassx-http')
options=(!emptydirs)
source=(git+https://github.com/keepassxreboot/keepassx.git)
md5sums=('SKIP')