summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Andres2019-10-06 13:01:01 +0200
committerThomas Andres2019-10-06 13:01:01 +0200
commit2ac990450bbdcee5678716edbb9c8c569831767b (patch)
tree67e3974d6b67f92452f8dedb5a1b0c5504943839
parent4c11e4a5f6a9a87ee11bc8750577e621ea9c16e3 (diff)
downloadaur-2ac990450bbdcee5678716edbb9c8c569831767b.tar.gz
added openhantek to conflicting packages
-rw-r--r--.SRCINFO1
-rw-r--r--PKGBUILD2
2 files changed, 2 insertions, 1 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 37b19a43937a..76bc3854d4b9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -17,6 +17,7 @@ pkgbase = openhantek6022-git
depends = qt5-base
provides = openhantek6022
conflicts = openhantek6022
+ conflicts = openhantek
source = git+https://github.com/OpenHantek/OpenHantek6022.git
md5sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index f98da2e075e5..82cbee0d548e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,7 +9,7 @@ url=https://github.com/OpenHantek/OpenHantek6022
license=('GPL3')
depends=('fftw' 'qt5-base')
makedepends=('git' 'cmake' 'make' 'sed' 'binutils' 'gcc' 'gendesk')
-conflicts=(openhantek6022)
+conflicts=(openhantek6022 openhantek)
provides=(openhantek6022)
source=('git+https://github.com/OpenHantek/OpenHantek6022.git')
md5sums=('SKIP')