Merge branch 'patch-1' of https://github.com/mr-c/arvados into mr-c-patch-1

[arvados.git] / sdk / cwl / fpm-info.sh

diff --git a/sdk/cwl/fpm-info.sh b/sdk/cwl/fpm-info.sh
index fa8f43e6e0748728becd62d47356aacd84e6510a..66176b940b0eff5497cbbf995f78ddb65cf0ae5e 100644 (file)
--- a/sdk/cwl/fpm-info.sh
+++ b/sdk/cwl/fpm-info.sh
@@ -6,7 +6,12 @@ case "$TARGET" in
     debian8)
         fpm_depends+=(libgnutls-deb0-28 libcurl3-gnutls)
         ;;
+    debian9 | ubuntu1604)
+        fpm_depends+=(libcurl3-gnutls)
+        ;;
     debian* | ubuntu*)
-        fpm_depends+=(libcurl3-gnutls libpython2.7)
+        fpm_depends+=(libcurl3-gnutls python3-distutils)
         ;;
 esac
+
+fpm_args+=(--conflicts=python-cwltool --conflicts=cwltool)