summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorHcra2019-02-18 09:25:27 +0100
committerHcra2019-02-18 09:25:27 +0100
commitc41179f0d1a7255999a27386c3cc644800289a86 (patch)
tree9145ca7ec1e14cd41b9a17d97c742ae682e8c975
parent08dc848b4707c18bde88676fa89afdb75989be77 (diff)
downloadaur-c41179f0d1a7255999a27386c3cc644800289a86.tar.gz
changed conflicts
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD4
2 files changed, 4 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index f1413cf0d85e..a50c3690dbe7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = qweborf-git
pkgdesc = Minimal HTTP server to share your files - Qt frontend
pkgver = 0.15
- pkgrel = 2
+ pkgrel = 3
url = https://ltworf.github.io/weborf/
arch = any
license = GPL3
@@ -12,7 +12,7 @@ pkgbase = qweborf-git
depends = python
depends = python-pyqt5
depends = weborf-git
- conflicts = weborf
+ conflicts = qweborf
source = git+https://github.com/ltworf/weborf.git#branch=master
md5sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 16d138bfdb2c..46942cd1a45f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,14 +3,14 @@
pkgname=qweborf-git
_pkgname="weborf"
pkgver=0.15
-pkgrel=2
+pkgrel=3
pkgdesc="Minimal HTTP server to share your files - Qt frontend"
arch=(any)
url='https://ltworf.github.io/weborf/'
license=(GPL3)
depends=('python' 'python-pyqt5' 'weborf-git')
makedepends=('pacman>=5.1' 'git' 'sudo' 'python-pyqt5')
-conflicts=('weborf')
+conflicts=('qweborf')
source=("git+https://github.com/ltworf/weborf.git#branch=master")
md5sums=("SKIP")