deb: use ${server:Version} for the version of the server package

and not ${binary:Version}, which is the version of the current
package, whatever it is.

debian/autobake-deb.sh

@@ -91,10 +91,11 @@ PATCHLEVEL="+maria"
 LOGSTRING="MariaDB build"
 CODENAME="$(lsb_release -sc)"
 EPOCH="1:"
+VERSION="${EPOCH}${UPSTREAM}${PATCHLEVEL}~${CODENAME}"
 
-dch -b -D "${CODENAME}" -v "${EPOCH}${UPSTREAM}${PATCHLEVEL}~${CODENAME}" "Automatic build with ${LOGSTRING}."
+dch -b -D "${CODENAME}" -v "${VERSION}" "Automatic build with ${LOGSTRING}."
 
-echo "Creating package version ${EPOCH}${UPSTREAM}${PATCHLEVEL}~${CODENAME} ... "
+echo "Creating package version ${VERSION} ... "
 
 # On Travis CI and Gitlab-CI, use -b to build binary only packages as there is
 # no need to waste time on generating the source package.

debian/control

@@ -443,7 +443,7 @@ Depends: galera-4 (>=26.4),
          lsb-base (>= 3.0-10),
          lsof [linux-any],
          mariadb-client-10.5 (>= ${source:Version}),
-         mariadb-server-core-10.5 (>= ${binary:Version}),
+         mariadb-server-core-10.5 (>= ${server:Version}),
          passwd,
          perl (>= 5.6),
          procps,
@@ -548,7 +548,7 @@ Description: Backup tool for MariaDB server
 Package: mariadb-plugin-connect
 Architecture: any
 Depends: libxml2,
-         mariadb-server-10.5 (= ${binary:Version}),
+         mariadb-server-10.5 (= ${server:Version}),
          unixodbc,
          ${misc:Depends},
          ${shlibs:Depends}
@@ -569,7 +569,7 @@ Description: Connect storage engine for MariaDB
 Package: mariadb-plugin-s3
 Architecture: any
 Depends: libcurl4,
-         mariadb-server-10.5 (= ${binary:Version}),
+         mariadb-server-10.5 (= ${server:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
 Description: Amazon S3 archival storage engine for MariaDB
@@ -579,7 +579,7 @@ Description: Amazon S3 archival storage engine for MariaDB
 
 Package: mariadb-plugin-rocksdb
 Architecture: amd64 arm64 mips64el ppc64el
-Depends: mariadb-server-10.5 (= ${binary:Version}),
+Depends: mariadb-server-10.5 (= ${server:Version}),
          python3,
          rocksdb-tools,
          ${misc:Depends},
@@ -599,7 +599,7 @@ Description: RocksDB storage engine for MariaDB
 Package: mariadb-plugin-oqgraph
 Architecture: any
 Depends: libjudydebian1,
-         mariadb-server-10.5 (= ${binary:Version}),
+         mariadb-server-10.5 (= ${server:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
 Breaks: mariadb-oqgraph-engine-10.1,
@@ -617,7 +617,7 @@ Description: OQGraph storage engine for MariaDB
 
 Package: mariadb-plugin-mroonga
 Architecture: any-alpha any-amd64 any-arm any-arm64 any-i386 any-ia64 any-mips64el any-mips64r6el any-mipsel any-mipsr6el any-nios2 any-powerpcel any-ppc64el any-sh3 any-sh4 any-tilegx
-Depends: mariadb-server-10.5 (= ${binary:Version}),
+Depends: mariadb-server-10.5 (= ${server:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
 Breaks: mariadb-server-10.0,
@@ -637,7 +637,7 @@ Description: Mroonga storage engine for MariaDB
 
 Package: mariadb-plugin-spider
 Architecture: any
-Depends: mariadb-server-10.5 (= ${binary:Version}),
+Depends: mariadb-server-10.5 (= ${server:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
 Breaks: mariadb-server-10.0,
@@ -659,7 +659,7 @@ Description: Spider storage engine for MariaDB
 Package: mariadb-plugin-gssapi-server
 Architecture: any
 Depends: libgssapi-krb5-2,
-         mariadb-server-10.5 (= ${binary:Version}),
+         mariadb-server-10.5 (= ${server:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
 Breaks: mariadb-gssapi-server-10.1,
@@ -700,7 +700,7 @@ Description: GSSAPI authentication plugin for MariaDB client
 Package: mariadb-plugin-cracklib-password-check
 Architecture: any
 Depends: libcrack2 (>= 2.9.0),
-         mariadb-server-10.5 (= ${binary:Version}),
+         mariadb-server-10.5 (= ${server:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
 Description: CrackLib Password Validation Plugin for MariaDB
@@ -712,7 +712,7 @@ Description: CrackLib Password Validation Plugin for MariaDB
 Package: mariadb-test
 Architecture: any
 Depends: mariadb-client-10.5 (= ${binary:Version}),
-         mariadb-server-10.5 (= ${binary:Version}),
+         mariadb-server-10.5 (= ${server:Version}),
          mariadb-test-data (= ${source:Version}),
          virtual-mysql-testsuite,
          ${misc:Depends},

debian/rules

@@ -82,6 +82,7 @@ ifneq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH))
 	dpkg-architecture -a$(DEB_BUILD_ARCH) -f -c dh_auto_configure --builddirectory=builddir-native
 	dh_auto_build --builddirectory=builddir-native -- import_executables
 endif
+	echo "server:Version=$(DEB_VERSION)" >> debian/substvars
 
 	# Don't build ColumnStore as part of the native build, only build it when
 	# triggered by autobake-deb.sh. Saves build time and disk space.
@@ -188,6 +189,8 @@ override_dh_installinit-arch:
 	dh_installinit --name=mariadb --no-start -- defaults 19 21
 	dh_systemd_start --restart-after-upgrade
 
+override_dh_gencontrol:
+	dh_gencontrol -- -Tdebian/substvars
 
 # If a file is not supposed to be included anywhere, add it to the not-installed
 # file and document the reason. Note that dh_install supports the above mentioned