summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorFinn-Thorben Sell2022-07-11 12:54:35 +0200
committerFinn-Thorben Sell2022-07-11 12:54:35 +0200
commitee72ebc778c3c0155dcd98aa035d93cd3f45e6df (patch)
tree69386eb50926249ac22e4a233886917272986cff
parentfd60b749152e546b378668425d51bc1e825f5a41 (diff)
downloadaur-python-catkin-tools-git.tar.gz
update package conflicts
python-catkin-tools has been updated to python3. The conflict declaration to that package has been updated accordingly.
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD2
2 files changed, 2 insertions, 2 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 14cb1f7af643..02c267a42934 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -11,7 +11,7 @@ pkgbase = python-catkin-tools-git
depends = python-yaml
depends = python-setuptools
depends = python-osrf_pycommon
- conflicts = python2-catkin-tools
+ conflicts = python-catkin-tools
source = catkin_tools::git+https://github.com/catkin/catkin_tools.git#branch=main
sha256sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 61f218b213ed..94cf0466635c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,7 +10,7 @@ url="https://github.com/catkin/catkin_tools"
license=("Apache")
makedepends=("git")
depends=("python" "python-catkin_pkg" "python-yaml" "python-setuptools" "python-osrf_pycommon")
-conflicts=("python2-catkin-tools")
+conflicts=("python-catkin-tools")
source=("${_gitname}::git+https://github.com/catkin/${_gitname}.git#branch=${_gitbranch}")
sha256sums=("SKIP")