summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorVictor Tran2017-12-11 10:03:37 +1100
committerVictor Tran2017-12-11 10:03:37 +1100
commit265d327f7d6c123bda93c8b0c5e7b17ee37a9292 (patch)
treea93b6156250375a0389ee2f54eadc1af4aa3eb58
parent77f6e8a970e34a22446022f54b1d57369346efae (diff)
downloadaur-265d327f7d6c123bda93c8b0c5e7b17ee37a9292.tar.gz
Update conflicts
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD4
2 files changed, 6 insertions, 2 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 15dbea0fbcb5..3aefd62adb6a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = tsscreenlock
pkgdesc = Screen Locker for theShell
pkgver = 2.1
- pkgrel = 0
+ pkgrel = 1
url = https://github.com/vicr123/tsscreenlock
arch = x86_64
license = GPL3
@@ -10,6 +10,8 @@ pkgbase = tsscreenlock
depends = qt5-multimedia
depends = qt5-x11extras
depends = qt5-svg
+ conflicts = tscheckpass
+ replaces = tscheckpass
source = tsscreenlock-2.1::git+https://github.com/vicr123/tsscreenlock#branch=master
md5sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 340c4a25c368..18a49f98e4d5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,13 +2,15 @@
# Maintainer: Victor Tran <vicr12345 at gmail dot com>
pkgname=tsscreenlock
pkgver=2.1
-pkgrel=0
+pkgrel=1
pkgdesc="Screen Locker for theShell"
arch=("x86_64")
url="https://github.com/vicr123/tsscreenlock"
license=('GPL3')
depends=('qt5-base' 'qt5-multimedia' 'qt5-x11extras' 'qt5-svg')
makedepends=('git')
+conflicts=('tscheckpass')
+replaces=('tscheckpass')
source=("$pkgname-$pkgver"::'git+https://github.com/vicr123/tsscreenlock#branch=master')
md5sums=('SKIP')