diff options
-rw-r--r-- | .SRCINFO | 2 | ||||
-rw-r--r-- | PKGBUILD | 4 |
2 files changed, 4 insertions, 2 deletions
@@ -15,6 +15,7 @@ pkgname = python-catkin_lint depends = python depends = python-catkin_pkg conflicts = python-catkin-lint + conflicts = python2-catkin_lint replaces = python-catkin-lint pkgname = python2-catkin_lint @@ -22,5 +23,6 @@ pkgname = python2-catkin_lint depends = python2 depends = python2-catkin_pkg conflicts = python2-catkin-lint + conflicts = python-catkin_lint replaces = python2-catkin-lint @@ -28,7 +28,7 @@ build() { package_python-catkin_lint() { depends+=('python' 'python-catkin_pkg') - conflicts=('python-catkin-lint') + conflicts=('python-catkin-lint' 'python2-catkin_lint') replaces=('python-catkin-lint') cd "${srcdir}/${_module}-${pkgver}" python setup.py install --root="${pkgdir}" --optimize=1 --skip-build @@ -36,7 +36,7 @@ package_python-catkin_lint() { package_python2-catkin_lint() { depends+=('python2' 'python2-catkin_pkg') - conflicts=('python2-catkin-lint') + conflicts=('python2-catkin-lint' 'python-catkin_lint') replaces=('python2-catkin-lint') cd "${srcdir}/${_module}-${pkgver}-python2" python2 setup.py install --root="${pkgdir}" --optimize=1 --skip-build |