summarylogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.SRCINFO4
-rw-r--r--.sync-conflict-20190519-131732-PKPUQWZ.SRCINFO29
-rw-r--r--PKGBUILD2
3 files changed, 32 insertions, 3 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 7a9345623636..f386d5b1a41f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = passwordmanager
pkgdesc = A simple password store using AES-256-CBC encryption via OpenSSL
- pkgver = 4.0.2
+ pkgver = 4.1.0
pkgrel = 1
url = https://github.com/Martchus/passwordmanager
arch = i686
@@ -22,7 +22,7 @@ pkgbase = passwordmanager
depends = xdg-utils
depends = qt5-quickcontrols2
optdepends = kirigami2: Qt Quick GUI
- source = passwordmanager-4.0.2.tar.gz::https://github.com/Martchus/passwordmanager/archive/v4.0.2.tar.gz
+ source = passwordmanager-4.1.0.tar.gz::https://github.com/Martchus/passwordmanager/archive/v4.1.0.tar.gz
sha256sums = 845e119ec24d073411c52b797c8b7a4e44fbce4c793aaf90a11a21f070fcd3fa
pkgname = passwordmanager
diff --git a/.sync-conflict-20190519-131732-PKPUQWZ.SRCINFO b/.sync-conflict-20190519-131732-PKPUQWZ.SRCINFO
new file mode 100644
index 000000000000..5c6bd912b53b
--- /dev/null
+++ b/.sync-conflict-20190519-131732-PKPUQWZ.SRCINFO
@@ -0,0 +1,29 @@
+pkgbase = passwordmanager
+ pkgdesc = A simple password store using AES-256-CBC encryption via OpenSSL
+ pkgver = 4.0.1
+ pkgrel = 1
+ url = https://github.com/Martchus/passwordmanager
+ arch = i686
+ arch = x86_64
+ arch = armv6h
+ arch = armv7h
+ arch = aarch64
+ license = GPL
+ makedepends = cmake
+ makedepends = qt5-tools
+ makedepends = mesa
+ makedepends = kirigami2
+ depends = qt5-base
+ depends = qtutilities
+ depends = passwordfile
+ depends = openssl
+ depends = libxkbcommon-x11
+ depends = desktop-file-utils
+ depends = xdg-utils
+ depends = qt5-quickcontrols2
+ optdepends = kirigami2: Qt Quick GUI
+ source = passwordmanager-4.0.1.tar.gz::https://github.com/Martchus/passwordmanager/archive/v4.0.1.tar.gz
+ sha256sums = 89f10b004c4a2dcbce13f0b24bd9acda3a6ea52d165ef178b42e76fcd3c58079
+
+pkgname = passwordmanager
+
diff --git a/PKGBUILD b/PKGBUILD
index 14acf396b90c..fcc9046b7558 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,7 +8,7 @@ _quick_gui=${PASSWORD_MANAGER_QUICK_GUI:-ON}
_reponame=passwordmanager
pkgname=passwordmanager
-pkgver=4.0.2
+pkgver=4.1.0
pkgrel=1
arch=('i686' 'x86_64' 'armv6h' 'armv7h' 'aarch64')
pkgdesc='A simple password store using AES-256-CBC encryption via OpenSSL'