diff --git a/cmake/developer_package/packaging/debian.cmake b/cmake/developer_package/packaging/debian.cmake index f92c637bd6c..3cd299ab0fb 100644 --- a/cmake/developer_package/packaging/debian.cmake +++ b/cmake/developer_package/packaging/debian.cmake @@ -155,7 +155,7 @@ macro(ov_add_latest_component comp) # take package name if(DEFINED CPACK_DEBIAN_${ucomp}_PACKAGE_NAME) - string(REPLACE "${cpack_ver_mm}" "" + string(REPLACE "-${cpack_ver_mm}" "" CPACK_DEBIAN_${latest}_PACKAGE_NAME "${CPACK_DEBIAN_${ucomp}_PACKAGE_NAME}") else() @@ -188,7 +188,7 @@ macro(ov_debian_components) # core set(CPACK_COMPONENT_CORE_DESCRIPTION "OpenVINO C / C++ Runtime libraries") - set(CPACK_DEBIAN_CORE_PACKAGE_NAME "libopenvino${cpack_ver_mm}") + set(CPACK_DEBIAN_CORE_PACKAGE_NAME "libopenvino-${cpack_ver_mm}") set(CPACK_DEBIAN_CORE_PACKAGE_CONTROL_EXTRA "${def_postinst};${def_postrm};${def_triggers}") ov_add_lintian_suppression(core @@ -198,7 +198,7 @@ macro(ov_debian_components) # core_dev set(CPACK_COMPONENT_CORE_DEV_DESCRIPTION "OpenVINO C / C++ Runtime development files") set(CPACK_COMPONENT_CORE_DEV_DEPENDS "core") - set(CPACK_DEBIAN_CORE_DEV_PACKAGE_NAME "libopenvino${cpack_ver_mm}-dev") + set(CPACK_DEBIAN_CORE_DEV_PACKAGE_NAME "libopenvino-${cpack_ver_mm}-dev") set(CPACK_DEBIAN_CORE_DEV_PACKAGE_CONFLICTS "libopenvino2021.3-dev, libopenvino2021.4-dev") ov_add_lintian_suppression(core_dev) @@ -210,7 +210,7 @@ macro(ov_debian_components) if(ENABLE_HETERO) set(CPACK_COMPONENT_HETERO_DESCRIPTION "OpenVINO Hetero plugin") set(CPACK_COMPONENT_HETERO_DEPENDS "core") - set(CPACK_DEBIAN_HETERO_PACKAGE_NAME "libopenvino-hetero${cpack_ver_mm}") + set(CPACK_DEBIAN_HETERO_PACKAGE_NAME "libopenvino-hetero-${cpack_ver_mm}") set(CPACK_DEBIAN_HETERO_PACKAGE_CONTROL_EXTRA "${def_postinst};${def_postrm};${def_triggers}") list(APPEND installed_plugins "hetero") endif() @@ -219,7 +219,7 @@ macro(ov_debian_components) if(ENABLE_AUTO_BATCH) set(CPACK_COMPONENT_BATCH_DESCRIPTION "OpenVINO Auto Batch plugin") set(CPACK_COMPONENT_BATCH_DEPENDS "core") - set(CPACK_DEBIAN_BATCH_PACKAGE_NAME "libopenvino-auto-batch${cpack_ver_mm}") + set(CPACK_DEBIAN_BATCH_PACKAGE_NAME "libopenvino-auto-batch-${cpack_ver_mm}") set(CPACK_DEBIAN_BATCH_PACKAGE_CONTROL_EXTRA "${def_postinst};${def_postrm};${def_triggers}") list(APPEND installed_plugins "batch") endif() @@ -232,13 +232,13 @@ macro(ov_debian_components) set(CPACK_COMPONENT_MULTI_DESCRIPTION "OpenVINO Multi plugin") endif() set(CPACK_COMPONENT_MULTI_DEPENDS "core") - set(CPACK_DEBIAN_MULTI_PACKAGE_NAME "libopenvino-auto${cpack_ver_mm}") + set(CPACK_DEBIAN_MULTI_PACKAGE_NAME "libopenvino-auto-${cpack_ver_mm}") set(CPACK_DEBIAN_MULTI_PACKAGE_CONTROL_EXTRA "${def_postinst};${def_postrm};${def_triggers}") list(APPEND installed_plugins "multi") elseif(ENABLE_AUTO) set(CPACK_COMPONENT_AUTO_DESCRIPTION "OpenVINO Auto plugin") set(CPACK_COMPONENT_AUTO_DEPENDS "core") - set(CPACK_DEBIAN_AUTO_PACKAGE_NAME "libopenvino-auto${cpack_ver_mm}") + set(CPACK_DEBIAN_AUTO_PACKAGE_NAME "libopenvino-auto-${cpack_ver_mm}") set(CPACK_DEBIAN_AUTO_PACKAGE_CONTROL_EXTRA "${def_postinst};${def_postrm};${def_triggers}") list(APPEND installed_plugins "auto") endif() @@ -247,8 +247,8 @@ macro(ov_debian_components) if(ENABLE_INTEL_CPU) set(CPACK_COMPONENT_CPU_DESCRIPTION "OpenVINO Intel CPU plugin") set(CPACK_COMPONENT_CPU_DEPENDS "core") - set(CPACK_DEBIAN_CPU_PACKAGE_NAME "libopenvino-intel-cpu${cpack_ver_mm}") - set(CPACK_DEBIAN_CPU_PACKAGE_SUGGESTS "libopenvino-auto${cpack_ver_mm} (= ${CPACK_PACKAGE_VERSION}), libopenvino-hetero${cpack_ver_mm} (= ${CPACK_PACKAGE_VERSION})") + set(CPACK_DEBIAN_CPU_PACKAGE_NAME "libopenvino-intel-cpu-${cpack_ver_mm}") + set(CPACK_DEBIAN_CPU_PACKAGE_SUGGESTS "libopenvino-auto-${cpack_ver_mm} (= ${CPACK_PACKAGE_VERSION}), libopenvino-hetero-${cpack_ver_mm} (= ${CPACK_PACKAGE_VERSION})") set(CPACK_DEBIAN_CPU_PACKAGE_CONTROL_EXTRA "${def_postinst};${def_postrm};${def_triggers}") list(APPEND installed_plugins "cpu") endif() @@ -257,8 +257,8 @@ macro(ov_debian_components) if(ENABLE_INTEL_GPU) set(CPACK_COMPONENT_GPU_DESCRIPTION "OpenVINO Intel GPU plugin") set(CPACK_COMPONENT_GPU_DEPENDS "core") - set(CPACK_DEBIAN_GPU_PACKAGE_NAME "libopenvino-intel-gpu${cpack_ver_mm}") - set(CPACK_DEBIAN_GPU_PACKAGE_SUGGESTS "libopenvino-auto${cpack_ver_mm} (= ${CPACK_PACKAGE_VERSION}), libopenvino-hetero${cpack_ver_mm} (= ${CPACK_PACKAGE_VERSION})") + set(CPACK_DEBIAN_GPU_PACKAGE_NAME "libopenvino-intel-gpu-${cpack_ver_mm}") + set(CPACK_DEBIAN_GPU_PACKAGE_SUGGESTS "libopenvino-auto-${cpack_ver_mm} (= ${CPACK_PACKAGE_VERSION}), libopenvino-hetero-${cpack_ver_mm} (= ${CPACK_PACKAGE_VERSION})") set(CPACK_DEBIAN_GPU_PACKAGE_CONTROL_EXTRA "${def_postinst};${def_postrm};${def_triggers}") list(APPEND installed_plugins "gpu") endif() @@ -267,8 +267,8 @@ macro(ov_debian_components) if(ENABLE_INTEL_MYRIAD) set(CPACK_COMPONENT_MYRIAD_DESCRIPTION "OpenVINO Intel Myriad plugin") set(CPACK_COMPONENT_MYRIAD_DEPENDS "core") - set(CPACK_DEBIAN_MYRIAD_PACKAGE_NAME "libopenvino-intel-myriad${cpack_ver_mm}") - set(CPACK_DEBIAN_MYRIAD_PACKAGE_SUGGESTS "libopenvino-auto${cpack_ver_mm} (= ${CPACK_PACKAGE_VERSION}), libopenvino-hetero${cpack_ver_mm} (= ${CPACK_PACKAGE_VERSION})") + set(CPACK_DEBIAN_MYRIAD_PACKAGE_NAME "libopenvino-intel-myriad-${cpack_ver_mm}") + set(CPACK_DEBIAN_MYRIAD_PACKAGE_SUGGESTS "libopenvino-auto-${cpack_ver_mm} (= ${CPACK_PACKAGE_VERSION}), libopenvino-hetero-${cpack_ver_mm} (= ${CPACK_PACKAGE_VERSION})") set(CPACK_DEBIAN_MYRIAD_PACKAGE_CONTROL_EXTRA "${def_postinst};${def_postrm};${def_triggers}") list(APPEND installed_plugins "myriad") endif() @@ -277,8 +277,8 @@ macro(ov_debian_components) if(ENABLE_INTEL_GNA) set(CPACK_COMPONENT_GNA_DESCRIPTION "OpenVINO Intel GNA plugin") set(CPACK_COMPONENT_GNA_DEPENDS "core") - set(CPACK_DEBIAN_GNA_PACKAGE_NAME "libopenvino-intel-gna${cpack_ver_mm}") - set(CPACK_DEBIAN_GNA_PACKAGE_SUGGESTS "libopenvino-auto${cpack_ver_mm} (= ${CPACK_PACKAGE_VERSION}), libopenvino-hetero${cpack_ver_mm} (= ${CPACK_PACKAGE_VERSION})") + set(CPACK_DEBIAN_GNA_PACKAGE_NAME "libopenvino-intel-gna-${cpack_ver_mm}") + set(CPACK_DEBIAN_GNA_PACKAGE_SUGGESTS "libopenvino-auto-${cpack_ver_mm} (= ${CPACK_PACKAGE_VERSION}), libopenvino-hetero-${cpack_ver_mm} (= ${CPACK_PACKAGE_VERSION})") set(CPACK_DEBIAN_GNA_PACKAGE_CONTROL_EXTRA "${def_postinst};${def_postrm};${def_triggers}") list(APPEND installed_plugins "gna") endif() @@ -293,7 +293,7 @@ macro(ov_debian_components) else() set(CPACK_COMPONENT_PYTHON_PYTHON3.8_DEPENDS "core") endif() - set(CPACK_DEBIAN_PYTHON_PYTHON3.8_PACKAGE_NAME "libopenvino-python${cpack_ver_mm}") + set(CPACK_DEBIAN_PYTHON_PYTHON3.8_PACKAGE_NAME "libopenvino-python-${cpack_ver_mm}") set(CPACK_DEBIAN_PYTHON_PYTHON3.8_PACKAGE_CONTROL_EXTRA "${def_postinst};${def_postrm};${def_triggers}") # @@ -306,15 +306,15 @@ macro(ov_debian_components) # c_samples / cpp_samples set(CPACK_COMPONENT_SAMPLES_DESCRIPTION "OpenVINO C / C++ samples") set(CPACK_COMPONENT_SAMPLES_DEPENDS "core_dev") - set(CPACK_DEBIAN_SAMPLES_PACKAGE_NAME "libopenvino-samples${cpack_ver_mm}") - set(CPACK_DEBIAN_SAMPLES_PACKAGE_SUGGESTS "${samples_build_deps_suggest}, libopenvino-hetero${cpack_ver_mm} (= ${CPACK_PACKAGE_VERSION})") + set(CPACK_DEBIAN_SAMPLES_PACKAGE_NAME "libopenvino-samples-${cpack_ver_mm}") + set(CPACK_DEBIAN_SAMPLES_PACKAGE_SUGGESTS "${samples_build_deps_suggest}, libopenvino-hetero-${cpack_ver_mm} (= ${CPACK_PACKAGE_VERSION})") set(CPACK_DEBIAN_SAMPLES_PACKAGE_DEPENDS "libgflags-dev, nlohmann-json3-dev, zlib1g-dev, ${samples_build_deps}") set(CPACK_DEBIAN_SAMPLES_PACKAGE_ARCHITECTURE "all") # python_samples set(CPACK_COMPONENT_PYTHON_SAMPLES_DESCRIPTION "OpenVINO Python samples") set(CPACK_COMPONENT_PYTHON_SAMPLES_DEPENDS "python_python3.8") - set(CPACK_DEBIAN_PYTHON_SAMPLES_PACKAGE_NAME "libopenvino-samples-python${cpack_ver_mm}") + set(CPACK_DEBIAN_PYTHON_SAMPLES_PACKAGE_NAME "libopenvino-samples-python-${cpack_ver_mm}") set(CPACK_DEBIAN_PYTHON_SAMPLES_PACKAGE_ARCHITECTURE "all") # @@ -328,13 +328,13 @@ macro(ov_debian_components) else() set(CPACK_COMPONENT_LIBRARIES_DEPENDS "core") endif() - set(CPACK_DEBIAN_LIBRARIES_PACKAGE_NAME "libopenvino-libraries${cpack_ver_mm}") + set(CPACK_DEBIAN_LIBRARIES_PACKAGE_NAME "libopenvino-libraries-${cpack_ver_mm}") list(APPEND CPACK_COMPONENTS_ALL "libraries") # all libraries-dev set(CPACK_COMPONENT_LIBRARIES_DEV_DESCRIPTION "OpenVINO all runtime libraries and development files") set(CPACK_COMPONENT_LIBRARIES_DEV_DEPENDS "core_dev;${installed_plugins}") - set(CPACK_DEBIAN_LIBRARIES_DEV_PACKAGE_NAME "libopenvino-libraries${cpack_ver_mm}-dev") + set(CPACK_DEBIAN_LIBRARIES_DEV_PACKAGE_NAME "libopenvino-libraries-${cpack_ver_mm}-dev") list(APPEND CPACK_COMPONENTS_ALL "libraries_dev") #