summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Landau2017-01-24 20:52:11 +0200
committerDaniel Landau2017-01-24 20:52:11 +0200
commit62e3a504e5d965fe508a5b05fc8c47631e0da878 (patch)
tree49baab026147c97ddf1f41117a0c589c9163d23b
parentd12f2379f226ce99666194dc8cfc2a74a6c0bc4e (diff)
downloadaur-62e3a504e5d965fe508a5b05fc8c47631e0da878.tar.gz
Use master branch of upstream and conflict with keepassxc
-rw-r--r--.SRCINFO15
-rw-r--r--PKGBUILD6
2 files changed, 11 insertions, 10 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 8e81b92ae514..93d5e8c46cbc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
# Generated by mksrcinfo v8
-# Sat Jan 21 17:30:27 UTC 2017
+# Tue Jan 24 18:51:44 UTC 2017
pkgbase = keepassxc-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.3.http.r128.g5458d77
+ pkgver = 2.1.0.r0.g8a3ac7a
pkgrel = 1
url = https://github.com/keepassxreboot/keepassxc
install = keepassxc.install
@@ -22,10 +22,10 @@ pkgbase = keepassxc-git
depends = hicolor-icon-theme
depends = desktop-file-utils
depends = libmicrohttpd
- provides = keepassx=2.0.3.http.r128.g5458d77
- provides = keepassx2=2.0.3.http.r128.g5458d77
- provides = keepassx-svn=2.0.3.http.r128.g5458d77
- provides = keepassx2-git=2.0.3.http.r128.g5458d77
+ provides = keepassx=2.1.0.r0.g8a3ac7a
+ provides = keepassx2=2.1.0.r0.g8a3ac7a
+ provides = keepassx-svn=2.1.0.r0.g8a3ac7a
+ provides = keepassx2-git=2.1.0.r0.g8a3ac7a
conflicts = keepassx-svn
conflicts = keepassx
conflicts = keepassx-git
@@ -33,10 +33,11 @@ pkgbase = keepassxc-git
conflicts = keepassx2
conflicts = keepassx2-yubikey-git
conflicts = keepassx-http
+ conflicts = keepassxc
replaces = keepassx-http
replaces = keepassx-reboot-git
options = !emptydirs
- source = git+https://github.com/keepassxreboot/keepassxc.git
+ source = git+https://github.com/keepassxreboot/keepassxc.git#branch=master
md5sums = SKIP
pkgname = keepassxc-git
diff --git a/PKGBUILD b/PKGBUILD
index 689a322bf2a2..cdd5a15e72da 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,7 +9,7 @@
pkgname=keepassxc-git
_gitname=keepassxc
-pkgver=2.0.3.http.r128.g5458d77
+pkgver=2.1.0.r0.g8a3ac7a
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,11 +18,11 @@ license=('GPL2')
depends=('libxtst' 'shared-mime-info' 'qt5-x11extras' 'hicolor-icon-theme' 'desktop-file-utils' 'libmicrohttpd')
install=keepassxc.install
makedepends=('git' 'intltool' 'cmake' 'qt5-base' 'qt5-tools' 'zlib' 'libgcrypt')
-conflicts=('keepassx-svn' 'keepassx' 'keepassx-git' 'keepassx2-git' 'keepassx2' 'keepassx2-yubikey-git' 'keepassx-http' )
+conflicts=('keepassx-svn' 'keepassx' 'keepassx-git' 'keepassx2-git' 'keepassx2' 'keepassx2-yubikey-git' 'keepassx-http' 'keepassxc')
provides=("keepassx"{,2}"=${pkgver}" "keepassx-svn=${pkgver}" "keepassx2-git=${pkgver}")
replaces=('keepassx-http' 'keepassx-reboot-git')
options=(!emptydirs)
-source=(git+https://github.com/keepassxreboot/keepassxc.git)
+source=(git+https://github.com/keepassxreboot/keepassxc.git#branch=master)
md5sums=('SKIP')
pkgver() {