From 1f2ff9323e13e6b042f7c237e62d9bfb0b671041 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Wed, 11 Jan 2023 20:40:20 +0100 Subject: [PATCH] deb: scan: include packaging revision and distro version in version MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Aligning the plugin's version with the format used for docker-ce and docker-ce-cli, as updated in 39772a761dfdf810cc23a1ec6084ea3100e6abf0 Before this patch: deb/debbuild/ └── ubuntu-jammy ├── docker-buildx-plugin_0.10.0-1~ubuntu.22.04-jammy_arm64.deb ├── docker-ce-cli_23.0.0~rc.2-1~ubuntu.22.04~jammy_arm64.deb ├── docker-ce-rootless-extras_23.0.0~rc.2-1~ubuntu.22.04~jammy_arm64.deb ├── docker-ce_23.0.0~rc.2-1~ubuntu.22.04~jammy_arm64.deb ├── docker-compose-plugin_2.15.1-1~ubuntu.22.04-jammy_arm64.deb └── docker-scan-plugin_0.23.0~ubuntu-jammy_arm64.deb With this patch: deb/debbuild/ └── ubuntu-jammy ├── docker-buildx-plugin_0.10.0-1~ubuntu.22.04-jammy_arm64.deb ├── docker-ce-cli_23.0.0~rc.2-1~ubuntu.22.04~jammy_arm64.deb ├── docker-ce-rootless-extras_23.0.0~rc.2-1~ubuntu.22.04~jammy_arm64.deb ├── docker-ce_23.0.0~rc.2-1~ubuntu.22.04~jammy_arm64.deb ├── docker-compose-plugin_2.15.1-1~ubuntu.22.04-jammy_arm64.deb └── docker-scan-plugin_0.23.0-1~ubuntu.22.04~jammy_arm64.deb Signed-off-by: Sebastiaan van Stijn --- deb/common/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deb/common/rules b/deb/common/rules index 2933c7bf63..e64aa78987 100755 --- a/deb/common/rules +++ b/deb/common/rules @@ -124,7 +124,7 @@ override_dh_gencontrol: # TODO override "Source" field in control as well (to point to scan-cli-plugin, as it doesn't match the package name) # TODO change once we support scan-plugin on other architectures (see dpkg-architecture -L) if [ "$(TARGET_ARCH)" = "amd64" ]; then \ - dh_gencontrol -pdocker-scan-plugin -- -v$${SCAN_DEB_VERSION#v}~$${DISTRO}-$${SUITE}; \ + dh_gencontrol -pdocker-scan-plugin -- -v$${SCAN_DEB_VERSION#v}-$${PKG_REVISION}~$${DISTRO}.$${VERSION_ID}~$${SUITE}; \ fi dh_gencontrol --remaining-packages