summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Andres2019-10-06 13:11:52 +0200
committerThomas Andres2019-10-06 13:11:52 +0200
commitbe409e05459e0818e33a2883cd365adb2d9dbd36 (patch)
treefd55320b565269754c001bbec45fb8499f98431d
parent2ac990450bbdcee5678716edbb9c8c569831767b (diff)
downloadaur-be409e05459e0818e33a2883cd365adb2d9dbd36.tar.gz
added openhantek-git 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 76bc3854d4b..ecab1fbae02 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -18,6 +18,7 @@ pkgbase = openhantek6022-git
provides = openhantek6022
conflicts = openhantek6022
conflicts = openhantek
+ conflicts = openhantek-git
source = git+https://github.com/OpenHantek/OpenHantek6022.git
md5sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 82cbee0d548..c852b405185 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 openhantek)
+conflicts=(openhantek6022 openhantek openhantek-git)
provides=(openhantek6022)
source=('git+https://github.com/OpenHantek/OpenHantek6022.git')
md5sums=('SKIP')