diff --git a/cmake/builds/CommonDeb.cmake b/cmake/builds/CommonDeb.cmake index d729ddefe7..636551e50b 100644 --- a/cmake/builds/CommonDeb.cmake +++ b/cmake/builds/CommonDeb.cmake @@ -107,7 +107,12 @@ set ( CPACK_DEBIAN_PACKAGE_SECTION "misc" ) set ( CPACK_DEBIAN_PACKAGE_PRIORITY "optional" ) set ( CPACK_DEBIAN_BIN_PACKAGE_CONTROL_EXTRA "${MANTICORE_BINARY_DIR}/conffiles;${MANTICORE_BINARY_DIR}/postinst;${MANTICORE_BINARY_DIR}/prerm;${EXTRA_SCRIPTS}" ) set ( CPACK_DEBIAN_PACKAGE_CONTROL_STRICT_PERMISSION "ON" ) -set ( CPACK_DEBIAN_BIN_PACKAGE_REPLACES "sphinxsearch" ) + +set ( CPACK_DEBIAN_BIN_PACKAGE_REPLACES "manticore-bin" ) +set ( CPACK_DEBIAN_BIN_PACKAGE_CONFLICTS "sphinxsearch" ) + +# set applications package name to 'manticore' +set(CPACK_DEBIAN_BIN_PACKAGE_NAME ${CPACK_PACKAGE_NAME}) set ( CONFFILEDIR "${SYSCONFDIR}/manticoresearch" ) diff --git a/dist/CPackOptions.cmake.in b/dist/CPackOptions.cmake.in index afa435157e..0ab31c5e3a 100644 --- a/dist/CPackOptions.cmake.in +++ b/dist/CPackOptions.cmake.in @@ -40,5 +40,8 @@ endif() set ( TARBALL_FILE_NAME "${CPACK_PACKAGE_NAME_LOWERCASE}-${TARBALL_VERSION}-source" ) SET ( CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME_LOWERCASE}${_d}${FULL_VERSION}" ) +# force debian main package file (remove -bin) +set(CPACK_DEBIAN_BIN_FILE_NAME "${CPACK_PACKAGE_FILE_NAME}.deb") + # rpm specific (used inside .spec template) SET ( CPACK_RPM_PACKAGE_VERSION "${VERNUMBERS}-${GIT_TIMESTAMP_ID}.${GIT_COMMIT_ID}" )