From 9ae8fd5cd9e85ab583a5b735f85c9117fe49c9bf Mon Sep 17 00:00:00 2001 From: Daniel Hiltgen Date: Fri, 31 Aug 2018 16:10:23 -0700 Subject: [PATCH] Change deb package filenames to be unique It's generally bad-form to generate two identically named package files that are actually different, so we should name our packages based on the distro and version, not just the distro. Signed-off-by: Daniel Hiltgen (cherry picked from commit 13bde85f0067a751f775d31919705645ecc0a6d7) Signed-off-by: Daniel Hiltgen Upstream-commit: 3c757b281bb623d9622c74143340fd892c8655ad Component: packaging --- components/packaging/deb/build-deb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/packaging/deb/build-deb b/components/packaging/deb/build-deb index da4eb3f7d0..66f4c99b2b 100755 --- a/components/packaging/deb/build-deb +++ b/components/packaging/deb/build-deb @@ -24,7 +24,7 @@ debMaintainer="$(awk -F ': ' '$1 == "Maintainer" { print $2; exit }' debian/cont debDate="$(date --rfc-2822)" cat > "debian/changelog" <<-EOF -$debSource (${EPOCH}${EPOCH_SEP}${DEB_VERSION}-0~${DISTRO}) $SUITE; urgency=low +$debSource (${EPOCH}${EPOCH_SEP}${DEB_VERSION}-0~${DISTRO}-${SUITE}) $SUITE; urgency=low * Version: $VERSION -- $debMaintainer $debDate EOF