From 79b3f989fcd4f078dd6fe029806489711601e822 Mon Sep 17 00:00:00 2001 From: Takuya ASADA Date: Wed, 4 Jan 2017 12:06:01 +0900 Subject: [PATCH] dist/ubuntu: generate Ubuntu/Debian revision correctly Ubuntu Packaging Guide says if there's no upstream package (means it's not ported from Debian), revision should be "0ubuntu1", not "ubuntu1" which is we currently using. On Debian, Debian Policy Manual says it's conventional to restart revision from 1 when upstream version increased, so we should specify it to "1". To do it in single script, we will generate the revision on building time. Signed-off-by: Takuya ASADA Message-Id: <1483499161-22557-1-git-send-email-syuu@scylladb.com> --- dist/ubuntu/build_deb.sh | 5 +++++ dist/ubuntu/changelog.in | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dist/ubuntu/build_deb.sh b/dist/ubuntu/build_deb.sh index abb26f7..cc2ad4b 100755 --- a/dist/ubuntu/build_deb.sh +++ b/dist/ubuntu/build_deb.sh @@ -45,6 +45,11 @@ cp dist/ubuntu/rules.in debian/rules 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@@/$CODENAME/g" debian/changelog +if [ "$DISTRIBUTION" = "Ubuntu" ]; then + sed -i -e "s/@@REVISION@@/0ubuntu1/g" debian/changelog +else + sed -i -e "s/@@REVISION@@/1/g" debian/changelog +fi if [ "$RELEASE" = "14.04" ]; then sed -i -e "s/@@DH_INSTALLINIT@@/--upstart-only/g" debian/rules else diff --git a/dist/ubuntu/changelog.in b/dist/ubuntu/changelog.in index 966f785..ad2c675 100644 --- a/dist/ubuntu/changelog.in +++ b/dist/ubuntu/changelog.in @@ -1,4 +1,4 @@ -scylla-jmx (@@VERSION@@-@@RELEASE@@-ubuntu1) @@CODENAME@@; urgency=medium +scylla-jmx (@@VERSION@@-@@RELEASE@@-@@REVISION@@) @@CODENAME@@; urgency=medium * Initial release.