summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-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')