From 631605eff1df386344c7e29a418c51d59748c634 Mon Sep 17 00:00:00 2001 From: Takuya ASADA Date: Thu, 10 Aug 2017 16:56:17 +0900 Subject: [PATCH] dist/debian: append postfix '~DISTRIBUTION' to scylla package version We are moving to aptly to release .deb packages, that requires debian repository structure changes. After the change, we will share 'pool' directory between distributions. However, our .deb package name on specific release is exactly same between distributions, so we have file name confliction. To avoid the problem, we need to append distribution name on package version. Signed-off-by: Takuya ASADA Message-Id: <1502351777-11559-1-git-send-email-syuu@scylladb.com> --- dist/debian/build_deb.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dist/debian/build_deb.sh b/dist/debian/build_deb.sh index 73c5ea2..a044942 100755 --- a/dist/debian/build_deb.sh +++ b/dist/debian/build_deb.sh @@ -101,9 +101,9 @@ sed -i -e "s/@@VERSION@@/$SCYLLA_VERSION/g" debian/changelog sed -i -e "s/@@RELEASE@@/$SCYLLA_RELEASE/g" debian/changelog sed -i -e "s/@@CODENAME@@/$TARGET/g" debian/changelog if [ "$TARGET" = "trusty" ] || [ "$TARGET" = "xenial" ] || [ "$TARGET" = "yakkety" ] || [ "$TARGET" = "zesty" ] || [ "$TARGET" = "artful" ]; then - sed -i -e "s/@@REVISION@@/0ubuntu1/g" debian/changelog + sed -i -e "s/@@REVISION@@/0ubuntu1~$TARGET/g" debian/changelog else - sed -i -e "s/@@REVISION@@/1/g" debian/changelog + sed -i -e "s/@@REVISION@@/1~$TARGET/g" debian/changelog fi if [ "$TARGET" = "trusty" ]; then sed -i -e "s/@@DH_INSTALLINIT@@/--upstart-only/g" debian/rules