Merge pull request #4106 from gerasiov/fixes

.gitignore: Move debian/ specific entries to debian/.gitignore

.gitignore

@@ -180,18 +180,10 @@ utils/zookeeper-create-entry-to-download-part/zookeeper-create-entry-to-download
 utils/zookeeper-dump-tree/zookeeper-dump-tree
 utils/zookeeper-remove-by-list/zookeeper-remove-by-list
 dbms/src/Storages/tests/remove_symlink_directory
-debian/control
-debian/copyright
-debian/tmp/
 libs/libcommon/src/tests/json_test
 utils/compressor/zstd_test
 utils/wikistat-loader/wikistat-loader
 dbms/src/Common/tests/pod_array
-debian/clickhouse-benchmark/
-debian/clickhouse-client/
-debian/clickhouse-server-base/
-debian/clickhouse-server-common/
-debian/files
 
 dbms/src/Server/data/*
 dbms/src/Server/metadata/*
@@ -210,9 +202,6 @@ vgcore*
 *.changes
 build-stamp
 configure-stamp
-debian/*.debhelper.log
-debian/*.debhelper
-debian/*.substvars
 
 *.bin
 *.mrk

.travis.yml.bak

@@ -1,50 +0,0 @@
-language: generic
-
-matrix:
-  fast_finish: true
-  include:
-    # We need to have gcc7 headers to compile c++17 code on clang
-#    - os: linux
-#
-#      cache:
-#        ccache: true
-#        timeout: 1000
-#        directories:
-#        - /home/travis/.ccache
-#
-#      addons:
-#        apt:
-#          update: true
-#          sources:
-#            - ubuntu-toolchain-r-test
-#            - llvm-toolchain-trusty-5.0
-#          packages: [ ninja-build, g++-7, clang-5.0, lld-5.0, libicu-dev, libreadline-dev, libmysqlclient-dev, unixodbc-dev, libltdl-dev, libssl-dev, libboost-dev, zlib1g-dev, libdouble-conversion-dev, libsparsehash-dev, librdkafka-dev, libcapnp-dev, libsparsehash-dev, libgoogle-perftools-dev, bash, expect, python, python-lxml, python-termcolor, curl, perl, sudo, openssl]
-#
-#      env:
-#        - MATRIX_EVAL="export CC=clang-5.0 CXX=clang++-5.0"
-#
-#      script:
-#        - utils/travis/normal.sh
-
-    - os: linux
-
-      sudo: required
-
-      cache:
-        timeout: 1000
-        directories:
-        - /var/cache/pbuilder/ccache
-
-      addons:
-        apt:
-          update: true
-          packages: [ pbuilder, fakeroot, debhelper ]
-
-      script:
-        - utils/travis/pbuilder.sh
-
-  allow_failures:
-    - os: osx
-
-before_script:
-    - eval "${MATRIX_EVAL}"

debian/.gitignore

@@ -0,0 +1,12 @@
+control
+copyright
+tmp/
+clickhouse-benchmark/
+clickhouse-client/
+clickhouse-server-base/
+clickhouse-server-common/
+files
+*.debhelper.log
+*.debhelper
+*.substvars
+