summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorCayetano Santos2020-03-21 12:47:47 +0100
committerCayetano Santos2020-03-21 12:47:47 +0100
commitaf2f9334751a06e8935af7f0f2bbc319e4842991 (patch)
tree18928d08bc2642580782010c34fe29349eda6850
parent3594d82be7d2469ff9d126dd4673306745384de6 (diff)
downloadaur-af2f9334751a06e8935af7f0f2bbc319e4842991.tar.gz
Fix conflicts
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD2
2 files changed, 2 insertions, 2 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 9a920ac3b80b..943395d66dac 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -12,7 +12,7 @@ pkgbase = python-cocotb
optdepends = ghdl: for simulating VHDL designs
optdepends = gtkwave: for visualizing waveforms
provides = python-cocotb
- conflicts = python-cocotb
+ conflicts = python-cocotb-git
options = !emptydirs
source = git+https://github.com/cocotb/cocotb#tag=v1.3.1
md5sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 957aac432446..c43601bfff66 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@ pkgdesc="Coroutine based cosimulation library for writing VHDL and Verilog testb
arch=('any')
url="http://github.com/cocotb/cocotb/"
license=('BSD')
-conflicts=('python-cocotb')
+conflicts=('python-cocotb-git')
provides=('python-cocotb')
depends=('python')