Merge "Fix for systemd support on Ubuntu, add Ubuntu 16.04 support" from Takuya

"This is bug fix for systemd support on Ubuntu, and add Ubuntu 16.04 support."

dist/ubuntu/build_deb.sh

@@ -48,19 +48,22 @@ sed -i -e "s/@@RELEASE@@/$SCYLLA_RELEASE/g" debian/changelog
 sed -i -e "s/@@CODENAME@@/$CODENAME/g" debian/changelog
 cp dist/ubuntu/rules.in debian/rules
 cp dist/ubuntu/control.in debian/control
-if [ "$RELEASE" = "15.10" ]; then
-    sed -i -e "s/@@COMPILER@@/g++/g" debian/rules
-    sed -i -e "s/@@COMPILER@@/g++/g" debian/control
-else
+if [ "$RELEASE" = "14.04" ]; then
+    sed -i -e "s/@@DH_INSTALLINIT@@/--upstart-only/g" debian/rules
     sed -i -e "s/@@COMPILER@@/g++-5/g" debian/rules
-    sed -i -e "s/@@COMPILER@@/g++-5/g" debian/control
+    sed -i -e "s/@@BUILD_DEPENDS@@/g++-5/g" debian/control
+else
+    sed -i -e "s/@@DH_INSTALLINIT@@//g" debian/rules
+    sed -i -e "s/@@COMPILER@@/g++/g" debian/rules
+    sed -i -e "s/@@BUILD_DEPENDS@@/libsystemd-dev, g++/g" debian/control
 fi
+
 cp dist/common/systemd/scylla-server.service.in debian/scylla-server.service
 sed -i -e "s#@@SYSCONFDIR@@#/etc/default#g" debian/scylla-server.service
 
 ./dist/ubuntu/dep/build_dependency.sh
 
-if [ "$RELEASE" != "15.10" ]; then
+if [ "$RELEASE" = "14.04" ]; then
     sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
     sudo apt-get -y update
 fi

dist/ubuntu/control.in

@@ -4,7 +4,7 @@ Homepage: http://scylladb.com
 Section: database
 Priority: optional
 Standards-Version: 3.9.5
-Build-Depends: debhelper (>= 9), libyaml-cpp-dev, liblz4-dev, libsnappy-dev, libcrypto++-dev, libjsoncpp-dev, libaio-dev, libthrift-dev, thrift-compiler, antlr3, antlr3-c++-dev, ragel, ninja-build, git, libboost-program-options1.55-dev | libboost-program-options-dev, libboost-filesystem1.55-dev | libboost-filesystem-dev, libboost-system1.55-dev | libboost-system-dev, libboost-thread1.55-dev | libboost-thread-dev, libboost-test1.55-dev | libboost-test-dev, libgnutls28-dev, libhwloc-dev, libnuma-dev, libpciaccess-dev, xfslibs-dev, python3-pyparsing, libxml2-dev, @@COMPILER@@
+Build-Depends: debhelper (>= 9), libyaml-cpp-dev, liblz4-dev, libsnappy-dev, libcrypto++-dev, libjsoncpp-dev, libaio-dev, libthrift-dev, thrift-compiler, antlr3, antlr3-c++-dev, ragel, ninja-build, git, libboost-program-options1.55-dev | libboost-program-options-dev, libboost-filesystem1.55-dev | libboost-filesystem-dev, libboost-system1.55-dev | libboost-system-dev, libboost-thread1.55-dev | libboost-thread-dev, libboost-test1.55-dev | libboost-test-dev, libgnutls28-dev, libhwloc-dev, libnuma-dev, libpciaccess-dev, xfslibs-dev, python3-pyparsing, libxml2-dev, @@BUILD_DEPENDS@@
 
 Package: scylla-server
 Architecture: amd64

dist/ubuntu/dep/build_dependency.sh

@@ -41,6 +41,10 @@ if [ ! -f build/libthrift0_1.0.0-dev_amd64.deb ]; then
     tar xpf thrift-0.9.1.tar.gz
     cd thrift-0.9.1
     patch -p0 < ../../dist/ubuntu/dep/thrift.diff
+    if [ "$RELEASE" = "16.04" ]; then
+        sed -i "s/, python-support//" debian/control
+        sed -i "s/dh_pysupport//" debian/rules
+    fi
     echo Y | sudo mk-build-deps -i -r
     debuild -r fakeroot --no-tgz-check -us -uc
     cd ../..
@@ -48,8 +52,8 @@ fi
 
 if [ "$RELEASE" = "14.04" ]; then
     sudo gdebi -n build/antlr3_*.deb
+    sudo gdebi -n build/thrift-compiler_*.deb
 fi
 sudo gdebi -n build/antlr3-c++-dev_*.deb
 sudo gdebi -n build/libthrift0_*.deb
 sudo gdebi -n build/libthrift-dev_*.deb
-sudo gdebi -n build/thrift-compiler_*.deb

dist/ubuntu/rules.in

@@ -81,7 +81,7 @@ override_dh_auto_install:
 	cp $(CURDIR)/scylla-gdb.py $(CURDIR)/debian/scylla-server-dbg/usr/lib/scylla
 
 override_dh_installinit:
-	dh_installinit --no-start --upstart-only
+	dh_installinit --no-start @@DH_INSTALLINIT@@
 
 override_dh_strip:
 	dh_strip --dbg-package=scylla-server-dbg

dist/ubuntu/supported_release

@@ -1,2 +1,3 @@
 14.04
 15.10
+16.04