packaging: Fix DEB package definition to handle ABI version changes

Author: rsomla1

packaging/deb-in/CMakeLists.txt

@@ -108,18 +108,36 @@ ENDIF()
 # by debuild to make the packages
 SET (DEB_ROOT ${CMAKE_SOURCE_DIR}/packaging/deb-in)
 FILE(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/debian)
-FILE(GLOB_RECURSE SOURCEFILES RELATIVE "${DEB_ROOT}" "${DEB_ROOT}/*")
-# Skip the copyright file from the "other" product type
-LIST(REMOVE_ITEM SOURCEFILES "copyright.${DEB_REMOVEPATTERN}")
-LIST(REMOVE_ITEM SOURCEFILES "CMakeLists.txt")
-FOREACH (SOURCEFILE ${SOURCEFILES})
-  STRING(REGEX REPLACE "-packagesource-" "${DEB_PRODUCTNAME}-"
-    TMPFILE ${SOURCEFILE})
-  # Strip away the input file endings from the destination filenames
-  STRING(REGEX REPLACE ".in$" "" DESTFILE ${TMPFILE})
-  CONFIGURE_FILE("${DEB_ROOT}/${SOURCEFILE}"
-    "${CMAKE_BINARY_DIR}/debian/${DESTFILE}" @ONLY)
-ENDFOREACH()
+
+foreach(CF changelog control rules compat)
+  set(src "${DEB_ROOT}/${CF}")
+  set(dst "${CMAKE_BINARY_DIR}/debian/${CF}")
+  # message(STATUS "Preparing: ${dst}")
+  if(EXISTS "${src}")
+    configure_file("${src}" "${dst}" COPYONLY)
+  elseif(EXISTS "${src}.in")
+    configure_file("${src}.in" "${dst}" @ONLY)
+  else()
+    message(SEND_ERROR "Control file not found: ${CF}")
+  endif()
+endforeach()
+
+set(pkg_xdevapi "libmysqlcppconnx${ABI_VERSION_MAJOR}")
+set(pkg_jdbc   "libmysqlcppconn${JDBC_ABI_VERSION_MAJOR}")
+set(pkg_devel  "libmysqlcppconn-dev")
+
+foreach(pkg xdevapi jdbc devel)
+  foreach(ext .install .lintian-overrides -dbgsym.install .postinst)
+    set(PACKAGE_BASE_NAME "${pkg_${pkg}}")
+    set(src "${DEB_ROOT}/${pkg}${ext}.in")
+    set(dst "${CMAKE_BINARY_DIR}/debian/${PACKAGE_BASE_NAME}${ext}")
+    if(EXISTS "${src}")
+      # message(STATUS "Preparing: ${dst}, from: ${src}")
+      configure_file("${src}" "${dst}" @ONLY)
+    endif()
+  endforeach()
+endforeach()
+
 EXECUTE_PROCESS(
   COMMAND chmod +x ${CMAKE_BINARY_DIR}/debian/rules
 )

packaging/deb-in/libmysqlcppconn-dev.install.in renamed to packaging/deb-in/devel.install.in

@@ -37,9 +37,9 @@ usr/include/jdbc/*.h usr/include/mysql-cppconn/jdbc
 usr/include/jdbc/cppconn/*.h usr/include/mysql-cppconn/jdbc/cppconn
 
 # Build info
-/usr/INFO_SRC /usr/share/doc/libmysqlcppconn-dev
-/usr/INFO_BIN /usr/share/doc/libmysqlcppconn-dev
+/usr/INFO_SRC /usr/share/doc/@PACKAGE_BASE_NAME@
+/usr/INFO_BIN /usr/share/doc/@PACKAGE_BASE_NAME@
 
 # Legal
-usr/LICENSE.txt /usr/share/doc/libmysqlcppconn-dev
-usr/README.txt /usr/share/doc/libmysqlcppconn-dev
+usr/LICENSE.txt /usr/share/doc/@PACKAGE_BASE_NAME@
+usr/README.txt /usr/share/doc/@PACKAGE_BASE_NAME@

packaging/deb-in/libmysqlcppconn-dev.lintian-overrides.in renamed to packaging/deb-in/devel.lintian-overrides.in

@@ -22,5 +22,5 @@
 # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 # Legal
-usr/LICENSE.txt /usr/share/doc/libmysqlcppconnx2-dbgsym
-usr/README.txt /usr/share/doc/libmysqlcppconnx2-dbgsym
+usr/LICENSE.txt /usr/share/doc/@PACKAGE_BASE_NAME@-dbgsym
+usr/README.txt /usr/share/doc/@PACKAGE_BASE_NAME@-dbgsym

packaging/deb-in/libmysqlcppconnx2-dbgsym.install.in renamed to packaging/deb-in/jdbc-dbgsym.install.in

@@ -21,12 +21,12 @@
 # along with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-usr/lib/*/libmysqlcppconn.so.9*
+usr/lib/*/libmysqlcppconn.so.@JDBC_ABI_VERSION_MAJOR@*
 
 # Build info
-/usr/INFO_SRC /usr/share/doc/libmysqlcppconn9
-/usr/INFO_BIN /usr/share/doc/libmysqlcppconn9
+/usr/INFO_SRC /usr/share/doc/@PACKAGE_BASE_NAME@
+/usr/INFO_BIN /usr/share/doc/@PACKAGE_BASE_NAME@
 
 # Legal
-usr/LICENSE.txt /usr/share/doc/libmysqlcppconn9
-usr/README.txt /usr/share/doc/libmysqlcppconn9
+usr/LICENSE.txt /usr/share/doc/@PACKAGE_BASE_NAME@
+usr/README.txt /usr/share/doc/@PACKAGE_BASE_NAME@

packaging/deb-in/libmysqlcppconn9.install.in renamed to packaging/deb-in/jdbc.install.in

@@ -22,7 +22,7 @@
 # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 # Additional license file is needed so overriding this warning
-libmysqlcppconn9: extra-license-file
+@PACKAGE_BASE_NAME@: extra-license-file
 
 # Due to static linking this cannot be avoided and hence being overridden
-libmysqlcppconn9: embedded-library
+@PACKAGE_BASE_NAME@: embedded-library

packaging/deb-in/libmysqlcppconn9.lintian-overrides.in renamed to packaging/deb-in/jdbc.lintian-overrides.in

@@ -22,5 +22,5 @@
 # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 # Legal
-usr/LICENSE.txt /usr/share/doc/libmysqlcppconn9-dbgsym
-usr/README.txt /usr/share/doc/libmysqlcppconn9-dbgsym
+usr/LICENSE.txt /usr/share/doc/@PACKAGE_BASE_NAME@-dbgsym
+usr/README.txt /usr/share/doc/@PACKAGE_BASE_NAME@-dbgsym

packaging/deb-in/libmysqlcppconn9-dbgsym.install.in renamed to packaging/deb-in/xdevapi-dbgsym.install.in

@@ -21,12 +21,12 @@
 # along with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-usr/lib/*/libmysqlcppconnx.so.2*
+usr/lib/*/libmysqlcppconnx.so.@ABI_VERSION_MAJOR@*
 
 # Build info
-/usr/INFO_SRC /usr/share/doc/libmysqlcppconnx2
-/usr/INFO_BIN /usr/share/doc/libmysqlcppconnx2
+/usr/INFO_SRC /usr/share/doc/@PACKAGE_BASE_NAME@
+/usr/INFO_BIN /usr/share/doc/@PACKAGE_BASE_NAME@
 
 # Legal
-usr/LICENSE.txt /usr/share/doc/libmysqlcppconnx2
-usr/README.txt /usr/share/doc/libmysqlcppconnx2
+usr/LICENSE.txt /usr/share/doc/@PACKAGE_BASE_NAME@
+usr/README.txt /usr/share/doc/@PACKAGE_BASE_NAME@

packaging/deb-in/libmysqlcppconnx2.install.in renamed to packaging/deb-in/xdevapi.install.in

@@ -22,4 +22,4 @@
 # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 # Additional license file is needed so overriding this warning
-libmysqlcppconnx2: extra-license-file
+@PACKAGE_BASE_NAME@: extra-license-file