Merge branch 'master' of github.com:yandex/ClickHouse

CMakeLists.txt

@@ -9,9 +9,9 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
         message (FATAL_ERROR "GCC version must be at least 7! For example, if GCC 7 is available under gcc-7, g++-7 names, do the following: export CC=gcc-7 CXX=g++-7; rm -rf CMakeCache.txt CMakeFiles; and re run cmake or ./release.")
     endif ()
 elseif (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
-    # Require at least clang 3.8
-    if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 3.8)
-        message (FATAL_ERROR "Clang version must be at least 3.8! Recommended 4+")
+    # Require at least clang 3.9
+    if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 3.9)
+        message (FATAL_ERROR "Clang version must be at least 3.9! Recommended 4+")
     endif ()
     if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4)
         message (WARNING "Compilation has only been tested with Clang 4+")

debian/clickhouse-server-base.install

@@ -2,6 +2,7 @@
 /usr/bin/clickhouse-server
 /usr/bin/clickhouse-clang
 /usr/bin/clickhouse-lld
+/etc/systemd/system/clickhouse-server.service
 /etc/init.d/clickhouse-server
 /etc/cron.d/clickhouse-server
 /usr/share/clickhouse/*

debian/control

@@ -3,7 +3,7 @@ Priority: optional
 Maintainer: Alexey Milovidov <milovidov@yandex-team.ru>
 Build-Depends: debhelper (>= 9),
                cmake3 | cmake,
-               gcc-7 | gcc-6, g++-7 | g++-6,
+               gcc-7, g++-7,
                libmariadbclient-dev | default-libmysqlclient-dev | libmysqlclient-dev,
                libicu-dev,
                libltdl-dev,

debian/rules

@@ -23,8 +23,8 @@ CMAKE_FLAGS += -DENABLE_TESTS=0
 
 DEB_CLANG ?= $(shell which clang-6.0 || which clang-5.0 || which clang-4.0 || which clang || which clang-3.9 || which clang-3.8)
 
-#DEB_CC ?= gcc-6
-#DEB_CXX ?= g++-6
+#DEB_CC ?= gcc-7
+#DEB_CXX ?= g++-7
 
 ifdef DEB_CXX
     DEB_BUILD_GNU_TYPE := $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)