From 3c3d7ba8a720c09ae922390a114f92249dc92529 Mon Sep 17 00:00:00 2001
From: Takuya ASADA <syuu@scylladb.com>
Date: Fri, 16 Mar 2018 17:34:23 +0900
Subject: [PATCH] dist/debian: support Ubuntu 18.04

We supported Ubuntu 18.04 on scylla-server, need to support on jmx/tools too.

Signed-off-by: Takuya ASADA <syuu@scylladb.com>
Message-Id: <1521189263-17592-1-git-send-email-syuu@scylladb.com>
---
 dist/debian/build_deb.sh | 2 +-
 dist/debian/pbuilderrc   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dist/debian/build_deb.sh b/dist/debian/build_deb.sh
index 2ed1f12..25016e1 100755
--- a/dist/debian/build_deb.sh
+++ b/dist/debian/build_deb.sh
@@ -100,7 +100,7 @@ cp dist/debian/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@@/$TARGET/g" debian/changelog
-if [ "$TARGET" = "trusty" ] || [ "$TARGET" = "xenial" ] || [ "$TARGET" = "yakkety" ] || [ "$TARGET" = "zesty" ] || [ "$TARGET" = "artful" ]; then
+if [ "$TARGET" = "trusty" ] || [ "$TARGET" = "xenial" ] || [ "$TARGET" = "yakkety" ] || [ "$TARGET" = "zesty" ] || [ "$TARGET" = "artful" ] || [ "$TARGET" = "bionic" ]; then
     sed -i -e "s/@@REVISION@@/0ubuntu1~$TARGET/g" debian/changelog
 else
     sed -i -e "s/@@REVISION@@/1~$TARGET/g" debian/changelog
diff --git a/dist/debian/pbuilderrc b/dist/debian/pbuilderrc
index 9a2d866..77427e4 100644
--- a/dist/debian/pbuilderrc
+++ b/dist/debian/pbuilderrc
@@ -6,7 +6,7 @@ BUILDRESULT="/var/cache/pbuilder/scylla-jmx-$DIST/result/"
 APTCACHE="/var/cache/pbuilder/scylla-jmx-$DIST/aptcache/"
 ALLOWUNTRUSTED=yes
 
-if [ "$DIST" = "trusty" ] || [ "$DIST" = "xenial" ] || [ "$DIST" = "yakkety" ] || [ "$DIST" = "zesty" ] || [ "$DIST" = "artful" ]; then
+if [ "$DIST" = "trusty" ] || [ "$DIST" = "xenial" ] || [ "$DIST" = "yakkety" ] || [ "$DIST" = "zesty" ] || [ "$DIST" = "artful" ] || [ "$DIST" = "bionic" ]; then
     MIRRORSITE="http://archive.ubuntu.com/ubuntu/"
     COMPONENTS="main restricted universe multiverse"
     DEBOOTSTRAPOPTS="--keyring=/usr/share/keyrings/ubuntu-archive-keyring.gpg"