From d8d3023334348f875533032d91cae74d2877fe0d Mon Sep 17 00:00:00 2001 From: Takuya ASADA Date: Sat, 30 Apr 2016 07:42:33 +0000 Subject: [PATCH] dist/ubuntu: generate correct distribution codename on debian/changelog Since we supported more than one version of Ubuntu, need to generate each codename on changelog. --- 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 348b9c8..97ac500 100644 --- a/dist/ubuntu/build_deb.sh +++ b/dist/ubuntu/build_deb.sh @@ -9,6 +9,10 @@ if [ -e debian ] || [ -e build ] || [ -e target ] || [ -e m2 ] || [ -e dependenc rm -rf debian build target m2 dependency-reduced-pom.xml fi +DISTRIBUTION=`lsb_release -i|awk '{print $3}'` +RELEASE=`lsb_release -r|awk '{print $2}'` +CODENAME=`lsb_release -c|awk '{print $2}'` + VERSION=$(./SCYLLA-VERSION-GEN) SCYLLA_VERSION=$(cat build/SCYLLA-VERSION-FILE | sed 's/\.rc/~rc/') SCYLLA_RELEASE=$(cat build/SCYLLA-RELEASE-FILE) @@ -22,6 +26,7 @@ cp -a dist/ubuntu/debian debian cp dist/ubuntu/changelog.in debian/changelog 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 sudo apt-get -y install debhelper maven openjdk-7-jdk devscripts debuild -r fakeroot -us -uc diff --git a/dist/ubuntu/changelog.in b/dist/ubuntu/changelog.in index e6f6b89..966f785 100644 --- a/dist/ubuntu/changelog.in +++ b/dist/ubuntu/changelog.in @@ -1,4 +1,4 @@ -scylla-jmx (@@VERSION@@-@@RELEASE@@-ubuntu1) trusty; urgency=medium +scylla-jmx (@@VERSION@@-@@RELEASE@@-ubuntu1) @@CODENAME@@; urgency=medium * Initial release.