summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnatol Pomozov2019-12-02 05:39:46 -0800
committerAnatol Pomozov2019-12-02 05:39:46 -0800
commita134258d75d960549dcdb39746797971c87c8a8f (patch)
tree885f64f2dbe612eb8b38f88d3d0a61eae8e6bb58
parent5d976e79201f9f1ab93a5aa294b72123489e8195 (diff)
downloadaur-a134258d75d960549dcdb39746797971c87c8a8f.tar.gz
Add conflict with non-git version
-rw-r--r--.SRCINFO5
-rw-r--r--PKGBUILD7
2 files changed, 9 insertions, 3 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 0f5a8fe8e49..033be3eae6f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = libsigrok4dsl-git
pkgdesc = A library which provides the basic API for DreamSourceLab hardware
- pkgver = 1.01.r31.gb018742
+ pkgver = 1.01.r33.gce65e84
pkgrel = 1
url = https://github.com/DreamSourceLab/DSView
arch = i686
@@ -10,6 +10,9 @@ pkgbase = libsigrok4dsl-git
depends = libzip
depends = libusb
depends = libserialport
+ provides = libsigrok4dsl
+ conflicts = libsigrok4dsl
+ replaces = libsigrok4dsl
source = git://github.com/DreamSourceLab/DSView.git
sha1sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 3b81971050f..0780839bae4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Anatol Pomozov <anatol.pomozov@gmail.com>
pkgname=libsigrok4dsl-git
-pkgver=1.01.r31.gb018742
+pkgver=1.01.r33.gce65e84
pkgrel=1
pkgdesc='A library which provides the basic API for DreamSourceLab hardware'
url='https://github.com/DreamSourceLab/DSView'
@@ -9,7 +9,10 @@ arch=(i686 x86_64)
license=(GPL3)
depends=(libzip libusb libserialport)
makedepends=(git)
-source=(git://github.com/DreamSourceLab/DSView.git) #branch=develop
+conflicts=(libsigrok4dsl)
+provides=(libsigrok4dsl)
+replaces=(libsigrok4dsl)
+source=(git://github.com/DreamSourceLab/DSView.git)
sha1sums=('SKIP')
pkgver() {