]> git.lyx.org Git - features.git/commitdiff
CMake deb: support "python2 | python3" dependency
authorScott Kostyshak <skostysh@lyx.org>
Mon, 19 Oct 2020 18:59:17 +0000 (14:59 -0400)
committerScott Kostyshak <skostysh@lyx.org>
Fri, 30 Oct 2020 01:55:45 +0000 (21:55 -0400)
The latest debian-based distributions have moved away from
the "python" package dependency to "python2" and "python3".

(cherry picked from commit fe1cbc06c320677bf5930d3e3e943f7d9a75bdcf)

development/cmake/LyxPackaging.cmake

index 8dd7fa4231612b5ea3170ab535018f6940d47e37..5d7acd12ed26c15b9de98c09d98bf4802ef2cf8e 100644 (file)
@@ -151,7 +151,9 @@ set(CPACK_PACKAGE_CONTACT "${PACKAGE_BUGREPORT}")
 set(CPACK_SOURCE_PACKAGE_FILE_NAME "${LYX_PROJECT}-${LYX_INSTALL_SUFFIX}")
 
 # We depend on python scripting
-set(CPACK_DEBIAN_PACKAGE_DEPENDS "python (>= 2.7)")
+# Currently no need to specify versions for pythonx since they are only
+# available in newest distributions.
+set(CPACK_DEBIAN_PACKAGE_DEPENDS "python (>= 2.7) | python3 | python2")
 
 # use dpkg-shlibdeps to generate additional info for package dependency list.
 set(CPACK_DEBIAN_PACKAGE_RELEASE ${LYX_PACKAGE_RELEASE})