summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaxqia2016-01-10 11:29:51 -0800
committerMaxqia2016-01-10 11:29:51 -0800
commit80c79fd9f2a5a14da87f02e94250450c44088686 (patch)
tree50aa7c294d43bba2b78070db72bacd420e5befd5
parentabba8f84db9c5a40e508da43e3ed7854afcfdbeb (diff)
downloadaur-80c79fd9f2a5a14da87f02e94250450c44088686.tar.gz
Change to 2.0 Branch
-rw-r--r--.SRCINFO7
-rw-r--r--.gitignore6
-rw-r--r--PKGBUILD8
3 files changed, 12 insertions, 9 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 656ac0944e82..5b7cb7facb20 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,8 @@
+# Generated by mksrcinfo v8
+# Sun Jan 10 19:19:55 UTC 2016
pkgbase = keepassx-http
pkgdesc = KeepassX, with eugenesan's merge request for keepasshttp.
- pkgver = 2.0.alpha6.r214.g8b6d49a
+ pkgver = 2.0.alpha6.r252.g279c329
pkgrel = 1
url = https://github.com/eugenesan/keepassx/tree/http
install = keepassx.install
@@ -21,6 +23,7 @@ pkgbase = keepassx-http
depends = desktop-file-utils
depends = qjson
depends = libmicrohttpd
+ depends = oath-toolkit
conflicts = keepassx-svn
conflicts = keepassx
conflicts = keepassx2-git
@@ -29,7 +32,7 @@ pkgbase = keepassx-http
conflicts = keepassx-http
conflicts = keepassx-git
options = !emptydirs
- source = git+https://github.com/eugenesan/keepassx.git#branch=2.0-http-totp-beta2
+ source = git+https://github.com/eugenesan/keepassx.git#branch=2.0-http-totp
md5sums = SKIP
pkgname = keepassx-http
diff --git a/.gitignore b/.gitignore
index 7e61a0b672b2..59f424aa104d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
-keepassx-git-*.src.tar.gz
-keepassx-git-*.pkg.tar.xz
+keepassx-http-*.src.tar.gz
+keepassx-http-*.pkg.tar.xz
keepassx/
src/
-pkg/ \ No newline at end of file
+pkg/
diff --git a/PKGBUILD b/PKGBUILD
index d9d4aac2890c..55740d3fddee 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,19 +1,19 @@
-# Maintainer: Maxqia maxqia@kliznoe.com
+# Maintainer: Maxqia contrib@maxqia.com
pkgname=keepassx-http
_gitname=keepassx
-pkgver=2.0.alpha6.r214.g8b6d49a
+pkgver=2.0.alpha6.r252.g279c329
pkgrel=1
pkgdesc="KeepassX, with eugenesan's merge request for keepasshttp."
arch=('i686' 'x86_64')
url="https://github.com/eugenesan/keepassx/tree/http"
license=('GPL2')
-depends=('libxtst' 'shared-mime-info' 'qt5-x11extras' 'hicolor-icon-theme' 'desktop-file-utils' 'qjson' 'libmicrohttpd')
+depends=('libxtst' 'shared-mime-info' 'qjson' 'libmicrohttpd' 'oath-toolkit')
install=keepassx.install
makedepends=('git' 'intltool' 'cmake' 'qt5-base' 'qt5-tools' 'zlib' 'libgcrypt')
conflicts=('keepassx-svn' 'keepassx' 'keepassx2-git' 'keepassx2' 'keepassx2-yubikey-git' 'keepassx-http' 'keepassx-git')
options=(!emptydirs)
-source=(git+https://github.com/eugenesan/keepassx.git#branch=2.0-http-totp-beta2)
+source=(git+https://github.com/eugenesan/keepassx.git#branch=2.0-http-totp)
md5sums=('SKIP')
pkgver() {