From e387220e25dd7efee43bf36fae02ab215e5dda13 Mon Sep 17 00:00:00 2001
From: Timofey Turenko <timofey.turenko@mariadb.com>
Date: Wed, 19 Aug 2020 01:35:10 +0300
Subject: [PATCH 1/2] Add distro code name into debian/control version

'reprepro' tool needs different values in the
debina/control file, version field in order to
make one single repository for all distributions
---
 cmake/package.cmake     | 4 ++--
 cmake/package_deb.cmake | 6 ++++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/cmake/package.cmake b/cmake/package.cmake
index d044e6e13..429216d5d 100644
--- a/cmake/package.cmake
+++ b/cmake/package.cmake
@@ -73,9 +73,9 @@ else()
 endif()
 
 if(DISTRIB_SUFFIX)
-  set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${MAXSCALE_VERSION}-${MAXSCALE_BUILD_NUMBER}.${DISTRIB_SUFFIX}.${CMAKE_SYSTEM_PROCESSOR}")
+  set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}_${MAXSCALE_VERSION}_${MAXSCALE_BUILD_NUMBER}.${DISTRIB_SUFFIX}.${CMAKE_SYSTEM_PROCESSOR}")
 else()
-  set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${MAXSCALE_VERSION}-${MAXSCALE_BUILD_NUMBER}.${CMAKE_SYSTEM_PROCESSOR}")
+  set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}_${MAXSCALE_VERSION}_${MAXSCALE_BUILD_NUMBER}.${CMAKE_SYSTEM_PROCESSOR}")
 endif()
 
 # See if we are on a RPM-capable or DEB-capable system
diff --git a/cmake/package_deb.cmake b/cmake/package_deb.cmake
index 188d782c0..c9bd4acae 100644
--- a/cmake/package_deb.cmake
+++ b/cmake/package_deb.cmake
@@ -1,8 +1,14 @@
 # DEB specific CPack configuration parameters
 set(CPACK_GENERATOR "${CPACK_GENERATOR};DEB")
+execute_process(COMMAND lsb_release -cs OUTPUT_VARIABLE DEB_CODENAME OUTPUT_STRIP_TRAILING_WHITESPACE)
 execute_process(COMMAND dpkg --print-architecture OUTPUT_VARIABLE DEB_ARCHITECTURE OUTPUT_STRIP_TRAILING_WHITESPACE)
 set(CPACK_DEBIAN_PACKAGE_ARCHITECTURE ${DEB_ARCHITECTURE})
 set(CPACK_DEBIAN_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}")
+set(CPACK_DEBIAN_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}~${DEB_CODENAME}")
+set(CPACK_DEBIAN_PACKAGE_RELEASE "${DEB_CODENAME}")
+message(STATUS "CPACK_DEBIAN_PACKAGE_VERSION ${CPACK_DEBIAN_PACKAGE_VERSION}")
+message(STATUS "DEB_CODENAME ${DEB_CODENAME}")
+message(STATUS "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
 
 if(TARGET_COMPONENT STREQUAL "core" OR TARGET_COMPONENT STREQUAL "all")
   set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)

From e624cf4ecb809635a1230208a1ee6376061f7f45 Mon Sep 17 00:00:00 2001
From: Timofey Turenko <timofey.turenko@mariadb.com>
Date: Wed, 19 Aug 2020 11:49:54 +0300
Subject: [PATCH 2/2] revert to original package names with dashes

---
 cmake/package.cmake | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cmake/package.cmake b/cmake/package.cmake
index 429216d5d..d044e6e13 100644
--- a/cmake/package.cmake
+++ b/cmake/package.cmake
@@ -73,9 +73,9 @@ else()
 endif()
 
 if(DISTRIB_SUFFIX)
-  set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}_${MAXSCALE_VERSION}_${MAXSCALE_BUILD_NUMBER}.${DISTRIB_SUFFIX}.${CMAKE_SYSTEM_PROCESSOR}")
+  set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${MAXSCALE_VERSION}-${MAXSCALE_BUILD_NUMBER}.${DISTRIB_SUFFIX}.${CMAKE_SYSTEM_PROCESSOR}")
 else()
-  set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}_${MAXSCALE_VERSION}_${MAXSCALE_BUILD_NUMBER}.${CMAKE_SYSTEM_PROCESSOR}")
+  set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${MAXSCALE_VERSION}-${MAXSCALE_BUILD_NUMBER}.${CMAKE_SYSTEM_PROCESSOR}")
 endif()
 
 # See if we are on a RPM-capable or DEB-capable system