inputenc only expects one option

[lyx.git] / development / cmake / LyxPackaging.cmake

diff --git a/development/cmake/LyxPackaging.cmake b/development/cmake/LyxPackaging.cmake
index 8ffeea0c1a31fe5924456ccddcf7182b0df62fb3..6d308d06d959286b0310a335b7c81aa7aca320b5 100644 (file)
--- a/development/cmake/LyxPackaging.cmake
+++ b/development/cmake/LyxPackaging.cmake
@@ -50,7 +50,7 @@ elseif(WIN32)
 
         # RKH
         # get_filename_component(MINGW_RUNTIME_PATH ${GCC_LIBGCC} PATH)
-        set(MINGW_RUNTIME_PATH "C:/Program Files/mingw64/bin")
+        set(MINGW_RUNTIME_PATH "/usr/i686-w64-mingw32/sys-root/mingw/bin")
         macro(add_runtime_dll _DLL)
             file(GLOB GCC_RUNTIME ${MINGW_RUNTIME_PATH}/${_DLL})
             list(APPEND runtime ${GCC_RUNTIME})
@@ -151,7 +151,10 @@ 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.6)")
+# 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")
+set(CPACK_DEBIAN_PACKAGE_SECTION "universe/editors")
 
 # use dpkg-shlibdeps to generate additional info for package dependency list.
 set(CPACK_DEBIAN_PACKAGE_RELEASE ${LYX_PACKAGE_RELEASE})