.ci/travis/docker_image/before_install.sh

+#!/usr/bin/env bash
+###########################################################################
+#    before_install.sh
+#    ---------------------
+#    Date                 : March 2019
+#    Copyright            : (C) 2019 by Denis Rouzaud
+#    Email                : denis@opengis.ch
+###########################################################################
+#                                                                         #
+#   This program is free software; you can redistribute it and/or modify  #
+#   it under the terms of the GNU General Public License as published by  #
+#   the Free Software Foundation; either version 2 of the License, or     #
+#   (at your option) any later version.                                   #
+#                                                                         #
+###########################################################################
+

.ci/travis/docker_image/before_script.sh

+#!/usr/bin/env bash
+###########################################################################
+#    before_install.sh
+#    ---------------------
+#    Date                 : March 2019
+#    Copyright            : (C) 2019 by Denis Rouzaud
+#    Email                : denis@opengis.ch
+###########################################################################
+#                                                                         #
+#   This program is free software; you can redistribute it and/or modify  #
+#   it under the terms of the GNU General Public License as published by  #
+#   the Free Software Foundation; either version 2 of the License, or     #
+#   (at your option) any later version.                                   #
+#                                                                         #
+###########################################################################
+
+
+set -e
+
+.ci/travis/scripts/echo_travis_var.sh
+
+pushd .docker
+
+
+
+echo "travis_fold:start:docker_build"
+echo "${bold}Docker build deps${endbold}"
+docker --version
+
+docker pull "qgis/qgis3-build-deps:${DOCKER_TAG}" || true
+docker build --cache-from "qgis/qgis3-build-deps:${DOCKER_TAG}" -t "qgis/qgis3-build-deps:${DOCKER_TAG}" -f ${DOCKER_BUILD_DEPS_FILE} .
+
+echo "travis_fold:end:docker_build"
+
+
+popd

scripts/create_new_ts.sh → .ci/travis/docker_image/install.sh

-#!/bin/sh
+#!/usr/bin/env bash
 ###########################################################################
-#    create_new_ts.sh
+#    before_install.sh
 #    ---------------------
-#    Date                 : January 2008
-#    Copyright            : (C) 2008 by Tim Sutton
-#    Email                : tim at kartoza dot com
+#    Date                 : March 2019
+#    Copyright            : (C) 2019 by Denis Rouzaud
+#    Email                : denis@opengis.ch
 ###########################################################################
 #                                                                         #
 #   This program is free software; you can redistribute it and/or modify  #
@@ -15,13 +15,3 @@
 ###########################################################################
 
 
-if [ -z "$1" ] ; then
-  echo 
-  echo "Usage : $(basename $0) [Locale]"
-  echo "Examples :"
-  echo "$(basename $0) en_GB"
-  echo 
-  exit 0
-fi
-
-$(dirname $0)/update_ts_files.sh -a $1

.ci/travis/docker_image/script.sh

+#!/usr/bin/env bash
+###########################################################################
+#    before_install.sh
+#    ---------------------
+#    Date                 : March 2019
+#    Copyright            : (C) 2019 by Denis Rouzaud
+#    Email                : denis@opengis.ch
+###########################################################################
+#                                                                         #
+#   This program is free software; you can redistribute it and/or modify  #
+#   it under the terms of the GNU General Public License as published by  #
+#   the Free Software Foundation; either version 2 of the License, or     #
+#   (at your option) any later version.                                   #
+#                                                                         #
+###########################################################################
+
+
+set -e
+
+mkdir -p "${CCACHE_DIR}"
+
+# copy ccache dir within QGIS source so it can be accessed from docker
+cp -r ${CCACHE_DIR} ${TRAVIS_BUILD_DIR}/.ccache_image_build
+# building docker images
+DIR=$(git rev-parse --show-toplevel)/.docker
+pushd "${DIR}"
+echo "${bold}Building QGIS Docker image '${DOCKER_TAG}'...${endbold}"
+docker build --build-arg DOCKER_TAG="${DOCKER_TAG}" \
+             --cache-from "qgis/qgis:${DOCKER_TAG}" \
+             -t "qgis/qgis:${DOCKER_TAG}" \
+             -f qgis.dockerfile ..
+echo "${bold}Pushing image to docker hub...${endbold}"
+docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD"
+docker push "qgis/qgis:${DOCKER_TAG}"
+echo "Copy build cache from Docker container to Travis cache directory"
+rm -rf "${CCACHE_DIR:?}/"*
+docker run --name qgis_container qgis/qgis:${DOCKER_TAG} /bin/true
+docker cp qgis_container:/usr/src/.ccache_image_build ${CCACHE_DIR}
+docker rm qgis_container
+popd
+echo "Trigger build of PyQGIS Documentation"
+if [[ ${TRIGGER_PYQGIS_DOC} =~ ^TRUE$ ]]; then
+  body='{
+    "request": {
+      "branch":"master",
+      "message": "Trigger PyQGIS doc build after release of new Docker image as __DOCKER_TAG__",
+      "config": {
+        "merge_mode": "deep_merge",
+        "matrix": {
+          "include": {
+            "env": ["QGIS_VERSION_BRANCH=__QGIS_VERSION_BRANCH__"]
+          }
+        }
+      }
+    }
+  }'
+  body=$(sed "s/__QGIS_VERSION_BRANCH__/${TRAVIS_BRANCH}/; s/__DOCKER_TAG__/${DOCKER_TAG}/" <<< $body)
+  curl -s -X POST -H "Content-Type: application/json" -H "Accept: application/json" \
+    -H "Travis-API-Version: 3" -H "Authorization: token $TRAVIS_TOKEN" -d "$body" \
+    https://api.travis-ci.org/repo/qgis%2Fpyqgis/requests
+else
+  echo "skipped from configuration"
+fi

.ci/travis/linux/before_install.sh

@@ -14,4 +14,3 @@
 #                                                                         #
 ###########################################################################
 
-#pip3 install termcolor

.ci/travis/linux/before_script.sh

@@ -16,39 +16,19 @@
 
 set -e
 
-pushd .docker
-
 DOCKER_DEPS_PUSH=$( [[ $TRAVIS_REPO_SLUG =~ qgis/QGIS ]] && [[ "${TRAVIS_EVENT_TYPE}" != "pull_request" ]] && echo "true" || echo "false" )
-DOCKER_DEPS_IMAGE_REBUILD=$( [[ $TRAVIS_COMMIT_MESSAGE =~ '[docker] update dependencies' ]] && echo "true" || echo "false" )
 
-echo "travis_fold:start:travis_env"
-echo "${bold}Travis environment variables${endbold}"
-echo "TRAVIS_BRANCH: $TRAVIS_BRANCH"
-echo "TRAVIS_EVENT_TYPE: $TRAVIS_EVENT_TYPE"
-echo "DOCKER_TAG: $DOCKER_TAG"
-echo "TRAVIS_COMMIT_MESSAGE: $TRAVIS_COMMIT_MESSAGE"
-echo "DOCKER_DEPS_PUSH: $DOCKER_DEPS_PUSH"
-echo "DOCKER_DEPS_IMAGE_REBUILD: $DOCKER_DEPS_IMAGE_REBUILD"
-echo "DOCKER_BUILD_QGIS_IMAGE: $DOCKER_BUILD_QGIS_IMAGE"
-echo "DOCKER_BUILD_DEPS_FILE: $DOCKER_BUILD_DEPS_FILE"
-echo "TRAVIS_TIMESTAMP: $TRAVIS_TIMESTAMP"
-echo "travis_fold:end:travis_env"
+.ci/travis/scripts/echo_travis_var.sh
 
+pushd .docker
 
 echo "travis_fold:start:docker_build"
 echo "${bold}Docker build deps${endbold}"
 docker --version
-if [[ $DOCKER_BUILD_QGIS_IMAGE =~ false ]]; then
 docker-compose --version
 docker-compose -f ${TRAVIS_BUILD_DIR}/.docker/docker-compose.travis.yml config
-fi
-
-if [[ $DOCKER_DEPS_IMAGE_REBUILD =~ true ]]; then
-  docker build --no-cache -t "qgis/qgis3-build-deps:${DOCKER_TAG}" -f ${DOCKER_BUILD_DEPS_FILE} .
-else
 docker pull "qgis/qgis3-build-deps:${DOCKER_TAG}" || true
 docker build --cache-from "qgis/qgis3-build-deps:${DOCKER_TAG}" -t "qgis/qgis3-build-deps:${DOCKER_TAG}" -f ${DOCKER_BUILD_DEPS_FILE} .
-fi
 echo "travis_fold:end:docker_build"
 
 echo "travis_fold:start:docker_push"

.ci/travis/linux/script.sh

@@ -16,24 +16,6 @@
 
 set -e
 
-mkdir -p "$CCACHE_DIR"
-
-if [[ ${DOCKER_BUILD_QGIS_IMAGE} =~ true ]]; then
-  # copy ccache dir within QGIS source so it can be accessed from docker
-  cp -r ${CCACHE_DIR} ${TRAVIS_BUILD_DIR}/.ccache
-  # building docker images
-  DIR=$(git rev-parse --show-toplevel)/.docker
-  pushd "${DIR}"
-  echo "${bold}Building QGIS Docker image '${DOCKER_TAG}'...${endbold}"
-  docker build --build-arg DOCKER_TAG="${DOCKER_TAG}" \
-               --cache-from "qgis/qgis:${DOCKER_TAG}" \
-               -t "qgis/qgis:${DOCKER_TAG}" \
-               -f qgis.dockerfile ..
-  echo "${bold}Pushing image to docker hub...${endbold}"
-  docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD"
-  docker push "qgis/qgis:${DOCKER_TAG}"
-  popd
-else
-  # running tests
+# running QGIS tests
 docker-compose -f ${TRAVIS_BUILD_DIR}/.docker/docker-compose.travis.yml run --rm qgis-deps
-fi
+

.ci/travis/scripts/ctest2travis.py

@@ -22,7 +22,7 @@ __author__ = 'Matthias Kuhn'
 __date__ = 'March 2017'
 __copyright__ = '(C) 2017, Matthias Kuhn'
 # This will get replaced with a git SHA1 when you do a git archive
-__revision__ = '89ee6f6e2334c1350c78a845ca36a46fe14bf012'
+__revision__ = '514ccce9bdbfeb2a72304f9e1b731e8229cd1fc2'
 
 # This script parses output from ctest and injects
 #

.ci/travis/scripts/echo_travis_var.sh

+#!/usr/bin/env bash
+
+echo "travis_fold:start:travis_env"
+echo "${bold}Travis environment variables${endbold}"
+echo "TRAVIS_BRANCH: $TRAVIS_BRANCH"
+echo "TRAVIS_EVENT_TYPE: $TRAVIS_EVENT_TYPE"
+echo "DOCKER_TAG: $DOCKER_TAG"
+echo "TRAVIS_COMMIT_MESSAGE: $TRAVIS_COMMIT_MESSAGE"
+echo "DOCKER_DEPS_PUSH: $DOCKER_DEPS_PUSH"
+echo "DOCKER_BUILD_DEPS_FILE: $DOCKER_BUILD_DEPS_FILE"
+echo "TRAVIS_TIMESTAMP: $TRAVIS_TIMESTAMP"
+echo "travis_fold:end:travis_env"

.docker/qgis.dockerfile

@@ -16,7 +16,9 @@ ENV LANG=C.UTF-8
 
 COPY . /usr/src/QGIS
 
-ENV CCACHE_DIR=/usr/src/QGIS/.ccache
+# If this directory is changed, also adapt script.sh which copies the directory
+RUN mkdir -p /usr/src/.ccache_image_build
+ENV CCACHE_DIR=/usr/src/.ccache_image_build
 RUN ccache -M 1G
 RUN ccache -s
 

.travis.yml

@@ -7,16 +7,20 @@ cache:
   apt: true
   pip: true
   directories:
-    - ${HOME}/.ccache
+    - ${HOME}/.ccache_testing
+    - ${HOME}/.ccache_docker_build_cosmic
+    - ${HOME}/.ccache_docker_build_bionic
   timeout: 1000
+if: NOT branch =~ /^(cherry-pick-)?backport-\d+-on-/
 
 env:
   global:
     - TRAVIS_TIMESTAMP=$(date +%s)
-    - CCACHE_DIR=${HOME}/.ccache
     # Docker hub username and passowrd
     - secure: "b7eMDIolaAnq1voGKC1ez7Kcf+/A0WZDJEHBvNwk2KubBfrGOE83GMDrFNF4NqjIprqIAvVKj+TrX1ckCvs24re3IqUJo71TaF1IgxzDDPwSsmNh5UMmvZkeiJys9bWjqDO9wYR5ietNmIE18qyMc8ToJk8oKm6AXuAG2n6znmM="
     - secure: "PHCp7F3nApp38Mz6b4/OLxgfBiikRGzPQDHg3R5LX+SQOll24c/DMtwpPwizNuFEiCFcRmJ9uc1t0HWEerIZe5uqm7AtE/nMXBsvDZ+hj4Tz/fEBF98a1k4WLYheN1exFidVkJgdAeiwMOOUQXw5KuIX62bxBdzsdcd0QGwxiXo="
+    # Travis Token to create PyQGIS Documentation Travis build after Docker push
+    - secure: "bKJnk+GatxJItCWpC8gJs9N0bEbwK1TrIzTLgnXsl9vwqQLLhIfUMa40yj06HsbVY07AOdmr1+Wk5t+DKGf8YkaaFWBB1tIG8G/T0naN9vfWeBTEd7TlmV5a9ldEPcr6pjfi0he7/RDalvlPvDauEFKL28aVFd2BAe2Tj1euGpY="
 
 matrix:
   fast_finish: true
@@ -36,8 +40,8 @@ matrix:
       services: docker
       env:
         - TRAVIS_CONFIG=linux
+        - CCACHE_DIR=${HOME}/.ccache_testing
         - DOCKER_TAG=$( [[ $TRAVIS_REPO_SLUG =~ qgis/QGIS ]] && echo $TRAVIS_BRANCH | sed 's/master/latest/' || echo "latest" )
-        - DOCKER_BUILD_QGIS_IMAGE=false
         - DOCKER_BUILD_DEPS_FILE=qgis3-build-deps.dockerfile
 
       ##########################################################
@@ -96,9 +100,10 @@ matrix:
       if: repo = qgis/QGIS AND (tag IS PRESENT OR type = cron)
       services: docker
       env:
-        - TRAVIS_CONFIG=linux
+        - TRAVIS_CONFIG=docker_image
+        - CCACHE_DIR=${HOME}/.ccache_docker_build_bionic
+        - TRIGGER_PYQGIS_DOC=FALSE
         - DOCKER_TAG=$( echo $TRAVIS_BRANCH | sed 's/master/latest/' )
-        - DOCKER_BUILD_QGIS_IMAGE=true
         - DOCKER_BUILD_DEPS_FILE=qgis3-build-deps.dockerfile
 
       ##########################################################
@@ -108,9 +113,10 @@ matrix:
       if: repo = qgis/QGIS AND (tag IS PRESENT OR type = cron)
       services: docker
       env:
-        - TRAVIS_CONFIG=linux
+        - TRAVIS_CONFIG=docker_image
+        - CCACHE_DIR=${HOME}/.ccache_docker_build_cosmic
+        - TRIGGER_PYQGIS_DOC=TRUE
         - DOCKER_TAG="$( echo $TRAVIS_BRANCH | sed 's/master/latest/' )_cosmic"
-        - DOCKER_BUILD_QGIS_IMAGE=true
         - DOCKER_BUILD_DEPS_FILE=qgis3-build-deps-cosmic.dockerfile
 
 

CMakeLists.txt

@@ -12,7 +12,7 @@ CMAKE_POLICY (SET CMP0053 NEW)
 # Project and version
 SET(CPACK_PACKAGE_VERSION_MAJOR "3")
 SET(CPACK_PACKAGE_VERSION_MINOR "4")
-SET(CPACK_PACKAGE_VERSION_PATCH "5")
+SET(CPACK_PACKAGE_VERSION_PATCH "6")
 SET(COMPLETE_VERSION ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH})
 SET(RELEASE_NAME "Madeira")
 PROJECT(qgis VERSION ${COMPLETE_VERSION})

INSTALL

 QGIS
 Building QGIS from source - step by step
-Friday October 26, 2018
+Thursday March 21, 2019
 
 
-Last Updated: Friday October 26, 2018
-Last Change : Sunday October 14, 2018
+Last Updated: Thursday March 21, 2019
+Last Change : Thursday March 21, 2019
 
 
   1. Introduction
@@ -180,12 +180,12 @@ Now update your local sources database:
   ===============================
 
   || Distribution | install command for packages |
-  | stretch | ``apt-get install bison ca-certificates ccache cmake cmake-curses-gui dh-python doxygen expect flex gdal-bin git graphviz grass-dev libexpat1-dev libfcgi-dev libgdal-dev libgeos-dev libgsl-dev libpq-dev libproj-dev libqca-qt5-2-dev libqca-qt5-2-plugins libqt5opengl5-dev libqt5scintilla2-dev libqt5serialport5-dev libqt5sql5-sqlite libqt5svg5-dev libqt5webkit5-dev libqt5xmlpatterns5-dev libqwt-qt5-dev libspatialindex-dev libspatialite-dev libsqlite3-dev libsqlite3-mod-spatialite libyaml-tiny-perl libzip-dev lighttpd locales ninja-build opencl-headers pkg-config poppler-utils pyqt5-dev pyqt5-dev-tools pyqt5.qsci-dev python-autopep8 python3-all-dev python3-dateutil python3-dev python3-future python3-gdal python3-httplib2 python3-jinja2 python3-markupsafe python3-mock python3-nose2 python3-owslib python3-plotly python3-psycopg2 python3-pygments python3-pyproj python3-pyqt5 python3-pyqt5.qsci python3-pyqt5.qtsql python3-pyqt5.qtsvg python3-pyqt5.qtwebkit python3-requests python3-sip python3-sip-dev python3-six python3-termcolor python3-tz python3-yaml qt5-default qt5keychain-dev qtbase5-dev qtbase5-private-dev qtpositioning5-dev qttools5-dev qttools5-dev-tools spawn-fcgi txt2tags xauth xfonts-100dpi xfonts-75dpi xfonts-base xfonts-scalable xvfb`` |
-  | buster | ``apt-get install bison ca-certificates ccache cmake cmake-curses-gui dh-python doxygen expect flex gdal-bin git graphviz grass-dev libexpat1-dev libfcgi-dev libgdal-dev libgeos-dev libgsl-dev libosgearth-dev libpq-dev libproj-dev libqca-qt5-2-dev libqca-qt5-2-plugins libqt5opengl5-dev libqt5scintilla2-dev libqt5serialport5-dev libqt5sql5-sqlite libqt5svg5-dev libqt5webkit5-dev libqt5xmlpatterns5-dev libqwt-qt5-dev libspatialindex-dev libspatialite-dev libsqlite3-dev libsqlite3-mod-spatialite libyaml-tiny-perl libzip-dev lighttpd locales ninja-build opencl-headers pkg-config poppler-utils pyqt5-dev pyqt5-dev-tools pyqt5.qsci-dev python-autopep8 python3-all-dev python3-dateutil python3-dev python3-future python3-gdal python3-httplib2 python3-jinja2 python3-markupsafe python3-mock python3-nose2 python3-owslib python3-plotly python3-psycopg2 python3-pygments python3-pyproj python3-pyqt5 python3-pyqt5.qsci python3-pyqt5.qtsql python3-pyqt5.qtsvg python3-pyqt5.qtwebkit python3-requests python3-sip python3-sip-dev python3-six python3-termcolor python3-tz python3-yaml qt5-default qt5keychain-dev qtbase5-dev qtbase5-private-dev qtpositioning5-dev qttools5-dev qttools5-dev-tools spawn-fcgi txt2tags xauth xfonts-100dpi xfonts-75dpi xfonts-base xfonts-scalable xvfb`` |
-  | xenial | ``apt-get install bison ca-certificates ccache cmake cmake-curses-gui dh-python doxygen expect flex gdal-bin git graphviz grass-dev libexpat1-dev libfcgi-dev libgdal-dev libgeos-dev libgsl-dev libpq-dev libproj-dev libqca-qt5-2-dev libqca-qt5-2-plugins libqt5opengl5-dev libqt5scintilla2-dev libqt5serialport5-dev libqt5sql5-sqlite libqt5svg5-dev libqt5webkit5-dev libqt5xmlpatterns5-dev libqwt-qt5-dev libspatialindex-dev libspatialite-dev libsqlite3-dev libsqlite3-mod-spatialite libyaml-tiny-perl libzip-dev lighttpd locales ninja-build opencl-headers pkg-config poppler-utils pyqt5-dev pyqt5-dev-tools pyqt5.qsci-dev python-autopep8 python3-all-dev python3-dateutil python3-dev python3-future python3-gdal python3-httplib2 python3-jinja2 python3-markupsafe python3-mock python3-nose2 python3-owslib python3-plotly python3-psycopg2 python3-pygments python3-pyproj python3-pyqt5 python3-pyqt5.qsci python3-pyqt5.qtsql python3-pyqt5.qtsvg python3-pyqt5.qtwebkit python3-requests python3-sip python3-sip-dev python3-six python3-termcolor python3-tz python3-yaml qt5-default qt5keychain-dev qtbase5-dev qtpositioning5-dev qttools5-dev qttools5-dev-tools spawn-fcgi txt2tags xauth xfonts-100dpi xfonts-75dpi xfonts-base xfonts-scalable xvfb`` |
-  | bionic | ``apt-get install bison ca-certificates ccache cmake cmake-curses-gui dh-python doxygen expect flex gdal-bin git graphviz grass-dev libexpat1-dev libfcgi-dev libgdal-dev libgeos-dev libgsl-dev libosgearth-dev libpq-dev libproj-dev libqca-qt5-2-dev libqca-qt5-2-plugins libqt5opengl5-dev libqt5scintilla2-dev libqt5serialport5-dev libqt5sql5-sqlite libqt5svg5-dev libqt5webkit5-dev libqt5xmlpatterns5-dev libqwt-qt5-dev libspatialindex-dev libspatialite-dev libsqlite3-dev libsqlite3-mod-spatialite libyaml-tiny-perl libzip-dev lighttpd locales ninja-build opencl-headers pkg-config poppler-utils pyqt5-dev pyqt5-dev-tools pyqt5.qsci-dev python-autopep8 python3-all-dev python3-dateutil python3-dev python3-future python3-gdal python3-httplib2 python3-jinja2 python3-markupsafe python3-mock python3-nose2 python3-owslib python3-plotly python3-psycopg2 python3-pygments python3-pyproj python3-pyqt5 python3-pyqt5.qsci python3-pyqt5.qtsql python3-pyqt5.qtsvg python3-pyqt5.qtwebkit python3-requests python3-sip python3-sip-dev python3-six python3-termcolor python3-tz python3-yaml qt3d-assimpsceneimport-plugin qt3d-defaultgeometryloader-plugin qt3d-gltfsceneio-plugin qt3d-scene2d-plugin qt3d5-dev qt5-default qt5keychain-dev qtbase5-dev qtbase5-private-dev qtpositioning5-dev qttools5-dev qttools5-dev-tools spawn-fcgi txt2tags xauth xfonts-100dpi xfonts-75dpi xfonts-base xfonts-scalable xvfb`` |
-  | cosmic | ``apt-get install bison ca-certificates ccache cmake cmake-curses-gui dh-python doxygen expect flex gdal-bin git graphviz grass-dev libexpat1-dev libfcgi-dev libgdal-dev libgeos-dev libgsl-dev libosgearth-dev libpq-dev libproj-dev libqca-qt5-2-dev libqca-qt5-2-plugins libqt5opengl5-dev libqt5scintilla2-dev libqt5serialport5-dev libqt5sql5-sqlite libqt5svg5-dev libqt5webkit5-dev libqt5xmlpatterns5-dev libqwt-qt5-dev libspatialindex-dev libspatialite-dev libsqlite3-dev libsqlite3-mod-spatialite libyaml-tiny-perl libzip-dev lighttpd locales ninja-build opencl-headers pkg-config poppler-utils pyqt5-dev pyqt5-dev-tools pyqt5.qsci-dev python-autopep8 python3-all-dev python3-dateutil python3-dev python3-future python3-gdal python3-httplib2 python3-jinja2 python3-markupsafe python3-mock python3-nose2 python3-owslib python3-plotly python3-psycopg2 python3-pygments python3-pyproj python3-pyqt5 python3-pyqt5.qsci python3-pyqt5.qtsql python3-pyqt5.qtsvg python3-pyqt5.qtwebkit python3-requests python3-sip python3-sip-dev python3-six python3-termcolor python3-tz python3-yaml qt5-default qt5keychain-dev qtbase5-dev qtbase5-private-dev qtpositioning5-dev qttools5-dev qttools5-dev-tools spawn-fcgi txt2tags xauth xfonts-100dpi xfonts-75dpi xfonts-base xfonts-scalable xvfb`` |
-  | sid | ``apt-get install bison ca-certificates ccache cmake cmake-curses-gui dh-python doxygen expect flex gdal-bin git graphviz grass-dev libexpat1-dev libfcgi-dev libgdal-dev libgeos-dev libgsl-dev libosgearth-dev libpq-dev libproj-dev libqca-qt5-2-dev libqca-qt5-2-plugins libqt5opengl5-dev libqt5scintilla2-dev libqt5serialport5-dev libqt5sql5-sqlite libqt5svg5-dev libqt5webkit5-dev libqt5xmlpatterns5-dev libqwt-qt5-dev libspatialindex-dev libspatialite-dev libsqlite3-dev libsqlite3-mod-spatialite libyaml-tiny-perl libzip-dev lighttpd locales ninja-build opencl-headers pkg-config poppler-utils pyqt5-dev pyqt5-dev-tools pyqt5.qsci-dev python-autopep8 python3-all-dev python3-dateutil python3-dev python3-future python3-gdal python3-httplib2 python3-jinja2 python3-markupsafe python3-mock python3-nose2 python3-owslib python3-plotly python3-psycopg2 python3-pygments python3-pyproj python3-pyqt5 python3-pyqt5.qsci python3-pyqt5.qtsql python3-pyqt5.qtsvg python3-pyqt5.qtwebkit python3-requests python3-sip python3-sip-dev python3-six python3-termcolor python3-tz python3-yaml qt5-default qt5keychain-dev qtbase5-dev qtbase5-private-dev qtpositioning5-dev qttools5-dev qttools5-dev-tools spawn-fcgi txt2tags xauth xfonts-100dpi xfonts-75dpi xfonts-base xfonts-scalable xvfb`` |
+  | stretch | ``apt-get install bison ca-certificates ccache cmake cmake-curses-gui dh-python doxygen expect flex gdal-bin git graphviz grass-dev libexpat1-dev libfcgi-dev libgdal-dev libgeos-dev libgsl-dev libpq-dev libproj-dev libqca-qt5-2-dev libqca-qt5-2-plugins libqscintilla2-qt5-dev libqt5opengl5-dev libqt5serialport5-dev libqt5sql5-sqlite libqt5svg5-dev libqt5webkit5-dev libqt5xmlpatterns5-dev libqwt-qt5-dev libspatialindex-dev libspatialite-dev libsqlite3-dev libsqlite3-mod-spatialite libyaml-tiny-perl libzip-dev lighttpd locales ninja-build ocl-icd-opencl-dev opencl-headers pkg-config poppler-utils pyqt5-dev pyqt5-dev-tools pyqt5.qsci-dev python3-all-dev python3-autopep8 python3-dateutil python3-dev python3-future python3-gdal python3-httplib2 python3-jinja2 python3-markupsafe python3-mock python3-nose2 python3-owslib python3-plotly python3-psycopg2 python3-pygments python3-pyproj python3-pyqt5 python3-pyqt5.qsci python3-pyqt5.qtsql python3-pyqt5.qtsvg python3-pyqt5.qtwebkit python3-requests python3-sip python3-sip-dev python3-six python3-termcolor python3-tz python3-yaml qt5-default qt5keychain-dev qtbase5-dev qtbase5-private-dev qtpositioning5-dev qttools5-dev qttools5-dev-tools saga spawn-fcgi txt2tags xauth xfonts-100dpi xfonts-75dpi xfonts-base xfonts-scalable xvfb`` |
+  | buster | ``apt-get install bison ca-certificates ccache cmake cmake-curses-gui dh-python doxygen expect flex gdal-bin git graphviz grass-dev libexpat1-dev libfcgi-dev libgdal-dev libgeos-dev libgsl-dev libosgearth-dev libpq-dev libproj-dev libqca-qt5-2-dev libqca-qt5-2-plugins libqscintilla2-qt5-dev libqt5opengl5-dev libqt5serialport5-dev libqt5sql5-sqlite libqt5svg5-dev libqt5webkit5-dev libqt5xmlpatterns5-dev libqwt-qt5-dev libspatialindex-dev libspatialite-dev libsqlite3-dev libsqlite3-mod-spatialite libyaml-tiny-perl libzip-dev lighttpd locales ninja-build ocl-icd-opencl-dev opencl-headers pkg-config poppler-utils pyqt5-dev pyqt5-dev-tools pyqt5.qsci-dev python3-all-dev python3-autopep8 python3-dateutil python3-dev python3-future python3-gdal python3-httplib2 python3-jinja2 python3-markupsafe python3-mock python3-nose2 python3-owslib python3-plotly python3-psycopg2 python3-pygments python3-pyproj python3-pyqt5 python3-pyqt5.qsci python3-pyqt5.qtsql python3-pyqt5.qtsvg python3-pyqt5.qtwebkit python3-requests python3-sip python3-sip-dev python3-six python3-termcolor python3-tz python3-yaml qt3d-assimpsceneimport-plugin qt3d-defaultgeometryloader-plugin qt3d-gltfsceneio-plugin qt3d-scene2d-plugin qt3d5-dev qt5-default qt5keychain-dev qtbase5-dev qtbase5-private-dev qtpositioning5-dev qttools5-dev qttools5-dev-tools saga spawn-fcgi txt2tags xauth xfonts-100dpi xfonts-75dpi xfonts-base xfonts-scalable xvfb`` |
+  | xenial | ``apt-get install bison ca-certificates ccache cmake cmake-curses-gui dh-python doxygen expect flex gdal-bin git graphviz grass-dev libexpat1-dev libfcgi-dev libgdal-dev libgeos-dev libgsl-dev libpq-dev libproj-dev libqca-qt5-2-dev libqca-qt5-2-plugins libqscintilla2-qt5-dev libqt5opengl5-dev libqt5serialport5-dev libqt5sql5-sqlite libqt5svg5-dev libqt5webkit5-dev libqt5xmlpatterns5-dev libqwt-qt5-dev libspatialindex-dev libspatialite-dev libsqlite3-dev libsqlite3-mod-spatialite libyaml-tiny-perl libzip-dev lighttpd locales ninja-build ocl-icd-opencl-dev opencl-headers pkg-config poppler-utils pyqt5-dev pyqt5-dev-tools pyqt5.qsci-dev python3-all-dev python3-autopep8 python3-dateutil python3-dev python3-future python3-gdal python3-httplib2 python3-jinja2 python3-markupsafe python3-mock python3-nose2 python3-owslib python3-plotly python3-psycopg2 python3-pygments python3-pyproj python3-pyqt5 python3-pyqt5.qsci python3-pyqt5.qtsql python3-pyqt5.qtsvg python3-pyqt5.qtwebkit python3-requests python3-sip python3-sip-dev python3-six python3-termcolor python3-tz python3-yaml qt5-default qt5keychain-dev qtbase5-dev qtpositioning5-dev qttools5-dev qttools5-dev-tools saga spawn-fcgi txt2tags xauth xfonts-100dpi xfonts-75dpi xfonts-base xfonts-scalable xvfb`` |
+  | bionic | ``apt-get install bison ca-certificates ccache cmake cmake-curses-gui dh-python doxygen expect flex gdal-bin git graphviz grass-dev libexpat1-dev libfcgi-dev libgdal-dev libgeos-dev libgsl-dev libosgearth-dev libpq-dev libproj-dev libqca-qt5-2-dev libqca-qt5-2-plugins libqscintilla2-qt5-dev libqt5opengl5-dev libqt5serialport5-dev libqt5sql5-sqlite libqt5svg5-dev libqt5webkit5-dev libqt5xmlpatterns5-dev libqwt-qt5-dev libspatialindex-dev libspatialite-dev libsqlite3-dev libsqlite3-mod-spatialite libyaml-tiny-perl libzip-dev lighttpd locales ninja-build ocl-icd-opencl-dev opencl-headers pkg-config poppler-utils pyqt5-dev pyqt5-dev-tools pyqt5.qsci-dev python3-all-dev python3-autopep8 python3-dateutil python3-dev python3-future python3-gdal python3-httplib2 python3-jinja2 python3-markupsafe python3-mock python3-nose2 python3-owslib python3-plotly python3-psycopg2 python3-pygments python3-pyproj python3-pyqt5 python3-pyqt5.qsci python3-pyqt5.qtsql python3-pyqt5.qtsvg python3-pyqt5.qtwebkit python3-requests python3-sip python3-sip-dev python3-six python3-termcolor python3-tz python3-yaml qt3d-assimpsceneimport-plugin qt3d-defaultgeometryloader-plugin qt3d-gltfsceneio-plugin qt3d-scene2d-plugin qt3d5-dev qt5-default qt5keychain-dev qtbase5-dev qtbase5-private-dev qtpositioning5-dev qttools5-dev qttools5-dev-tools saga spawn-fcgi txt2tags xauth xfonts-100dpi xfonts-75dpi xfonts-base xfonts-scalable xvfb`` |
+  | cosmic | ``apt-get install bison ca-certificates ccache cmake cmake-curses-gui dh-python doxygen expect flex gdal-bin git graphviz grass-dev libexpat1-dev libfcgi-dev libgdal-dev libgeos-dev libgsl-dev libosgearth-dev libpq-dev libproj-dev libqca-qt5-2-dev libqca-qt5-2-plugins libqscintilla2-qt5-dev libqt5opengl5-dev libqt5serialport5-dev libqt5sql5-sqlite libqt5svg5-dev libqt5webkit5-dev libqt5xmlpatterns5-dev libqwt-qt5-dev libspatialindex-dev libspatialite-dev libsqlite3-dev libsqlite3-mod-spatialite libyaml-tiny-perl libzip-dev lighttpd locales ninja-build ocl-icd-opencl-dev opencl-headers pkg-config poppler-utils pyqt5-dev pyqt5-dev-tools pyqt5.qsci-dev python3-all-dev python3-autopep8 python3-dateutil python3-dev python3-future python3-gdal python3-httplib2 python3-jinja2 python3-markupsafe python3-mock python3-nose2 python3-owslib python3-plotly python3-psycopg2 python3-pygments python3-pyproj python3-pyqt5 python3-pyqt5.qsci python3-pyqt5.qtsql python3-pyqt5.qtsvg python3-pyqt5.qtwebkit python3-requests python3-sip python3-sip-dev python3-six python3-termcolor python3-tz python3-yaml qt3d-assimpsceneimport-plugin qt3d-defaultgeometryloader-plugin qt3d-gltfsceneio-plugin qt3d-scene2d-plugin qt3d5-dev qt5-default qt5keychain-dev qtbase5-dev qtbase5-private-dev qtpositioning5-dev qttools5-dev qttools5-dev-tools saga spawn-fcgi txt2tags xauth xfonts-100dpi xfonts-75dpi xfonts-base xfonts-scalable xvfb`` |
+  | sid | ``apt-get install bison ca-certificates ccache cmake cmake-curses-gui dh-python doxygen expect flex gdal-bin git graphviz grass-dev libexpat1-dev libfcgi-dev libgdal-dev libgeos-dev libgsl-dev libosgearth-dev libpq-dev libproj-dev libqca-qt5-2-dev libqca-qt5-2-plugins libqscintilla2-qt5-dev libqt5opengl5-dev libqt5serialport5-dev libqt5sql5-sqlite libqt5svg5-dev libqt5webkit5-dev libqt5xmlpatterns5-dev libqwt-qt5-dev libspatialindex-dev libspatialite-dev libsqlite3-dev libsqlite3-mod-spatialite libyaml-tiny-perl libzip-dev lighttpd locales ninja-build ocl-icd-opencl-dev opencl-headers pkg-config poppler-utils pyqt5-dev pyqt5-dev-tools pyqt5.qsci-dev python3-all-dev python3-autopep8 python3-dateutil python3-dev python3-future python3-gdal python3-httplib2 python3-jinja2 python3-markupsafe python3-mock python3-nose2 python3-owslib python3-plotly python3-psycopg2 python3-pygments python3-pyproj python3-pyqt5 python3-pyqt5.qsci python3-pyqt5.qtsql python3-pyqt5.qtsvg python3-pyqt5.qtwebkit python3-requests python3-sip python3-sip-dev python3-six python3-termcolor python3-tz python3-yaml qt3d-assimpsceneimport-plugin qt3d-defaultgeometryloader-plugin qt3d-gltfsceneio-plugin qt3d-scene2d-plugin qt3d5-dev qt5-default qt5keychain-dev qtbase5-dev qtbase5-private-dev qtpositioning5-dev qttools5-dev qttools5-dev-tools saga spawn-fcgi txt2tags xauth xfonts-100dpi xfonts-75dpi xfonts-base xfonts-scalable xvfb`` |
 
 (extracted from the control.in file in debian/)
 

cmake/FindSIP.cmake

@@ -56,3 +56,5 @@ ELSE(SIP_VERSION)
   ENDIF(SIP_FOUND)
 
 ENDIF(SIP_VERSION)
+
+ADD_DEFINITIONS(-DSIP_VERSION=0x${SIP_VERSION})

debian/changelog

+qgis (3.4.6+dfsg-1~exp1) experimental; urgency=medium
+
+  [ Jürgen E. Fischer ]
+  * Release of 3.4.6
+
+  [ Bas Couwenberg ]
+  * New upstream release.
+  * Update copyright years for Denis Rouzaud.
+  * Drop spelling-errors.patch, applied upstream.
+  * Drop trailing comma.
+  * Update symbols for amd64.
+
+ -- Bas Couwenberg <sebastic@debian.org>  Fri, 22 Mar 2019 15:32:24 +0100
+
 qgis (3.4.5+dfsg-1) unstable; urgency=medium
 
   * Move from experimental to unstable.

debian/control

@@ -91,11 +91,11 @@ Homepage: https://qgis.org/
 
 Package: qgis
 Architecture: any
-Depends: ${shlibs:Depends},
-         ${misc:Depends},
-         python3-qgis (= ${binary:Version}),
+Depends: python3-qgis (= ${binary:Version}),
+         qgis-common (= ${source:Version}),
          qgis-providers (= ${binary:Version}),
-         qgis-common (= ${source:Version})
+         ${shlibs:Depends},
+         ${misc:Depends}
 Recommends: qgis-plugin-grass
 Suggests: gpsbabel
 Breaks: qgis-provider-grass (<< 2.14.0)
@@ -124,7 +124,7 @@ Description: QGIS - architecture-independent data
  This package contains architecture-independent supporting data files for use
  with QGIS.
 
-Package: libqgis-3d3.4.5
+Package: libqgis-3d3.4.6
 Architecture: any
 Section: libs
 Depends: qt3d-assimpsceneimport-plugin,
@@ -139,7 +139,7 @@ Description: QGIS - shared 3d library
  .
  This package contains the shared 3d library.
 
-Package: libqgis-analysis3.4.5
+Package: libqgis-analysis3.4.6
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends},
@@ -150,7 +150,7 @@ Description: QGIS - shared analysis library
  .
  This package contains the shared analysis library.
 
-Package: libqgis-app3.4.5
+Package: libqgis-app3.4.6
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends},
@@ -161,7 +161,7 @@ Description: QGIS - shared app library
  .
  This package contains the shared app library.
 
-Package: libqgis-core3.4.5
+Package: libqgis-core3.4.6
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends},
@@ -172,7 +172,7 @@ Description: QGIS - shared core library
  .
  This package contains the shared core library.
 
-Package: libqgis-gui3.4.5
+Package: libqgis-gui3.4.6
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends},
@@ -183,7 +183,7 @@ Description: QGIS - shared gui library
  .
  This package contains the shared gui library.
 
-Package: libqgis-native3.4.5
+Package: libqgis-native3.4.6
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends},
@@ -194,7 +194,7 @@ Description: QGIS - shared native gui library
  .
  This package contains the shared native gui library.
 
-Package: libqgis-server3.4.5
+Package: libqgis-server3.4.6
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends},
@@ -205,7 +205,7 @@ Description: QGIS - shared server library
  .
  This package contains the shared server library.
 
-Package: libqgisgrass7-3.4.5
+Package: libqgisgrass7-3.4.6
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends},
@@ -216,7 +216,7 @@ Description: QGIS - shared grass library
  .
  This package contains the shared grass library.
 
-Package: libqgispython3.4.5
+Package: libqgispython3.4.6
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends},
@@ -249,15 +249,15 @@ Depends: grass-dev (>= 7.6.0),
          libpq-dev,
          libproj-dev,
          libqca-qt5-2-dev,
-         libqgis-3d3.4.5 (= ${binary:Version}),
-         libqgis-analysis3.4.5 (= ${binary:Version}),
-         libqgis-app3.4.5 (= ${binary:Version}),
-         libqgis-core3.4.5 (= ${binary:Version}),
-         libqgis-gui3.4.5 (= ${binary:Version}),
-         libqgis-native3.4.5 (= ${binary:Version}),
-         libqgis-server3.4.5 (= ${binary:Version}),
-         libqgisgrass7-3.4.5 (= ${binary:Version}),
-         libqgispython3.4.5 (= ${binary:Version}),
+         libqgis-3d3.4.6 (= ${binary:Version}),
+         libqgis-analysis3.4.6 (= ${binary:Version}),
+         libqgis-app3.4.6 (= ${binary:Version}),
+         libqgis-core3.4.6 (= ${binary:Version}),
+         libqgis-gui3.4.6 (= ${binary:Version}),
+         libqgis-native3.4.6 (= ${binary:Version}),
+         libqgis-server3.4.6 (= ${binary:Version}),
+         libqgisgrass7-3.4.6 (= ${binary:Version}),
+         libqgispython3.4.6 (= ${binary:Version}),
          libqscintilla2-qt5-dev,
          libqt5svg5-dev,
          libqt5webkit5-dev,
@@ -327,7 +327,7 @@ Package: python3-qgis
 Architecture: any
 Section: python
 Depends: python3-qgis-common (= ${source:Version}),
-         libqgispython3.4.5,
+         libqgispython3.4.6,
          libsqlite3-mod-spatialite,
          python3-dateutil,
          python3-future,
@@ -352,7 +352,7 @@ Depends: python3-qgis-common (= ${source:Version}),
          ${python3:Depends},
          ${shlibs:Depends},
          ${sip3:Depends},
-         ${misc:Depends},
+         ${misc:Depends}
 Provides: ${python3:Provides}
 Description: Python bindings to QGIS
  QGIS is a Geographic Information System (GIS) which manages, analyzes and

debian/copyright

@@ -151,7 +151,6 @@ Copyright:
                   2005-2018, Martin Dobias
                   2008-2018, Jürgen E. Fischer
  2009, 2011-2014, 2016-2018, Alexander Bruy
-                  2012-2018, Denis Rouzaud
                   2012-2018, Matthias Kuhn
  2012-2013, 2005, 2017-2018, René-Luc D'Hont
                   2014-2018, Alessandro Pasotti
@@ -167,6 +166,7 @@ Copyright:
                   2017-2018, Viktor Sklencar
                        2018, Anita Graser
                        2018, elpaso
+                  2012-2019, Denis Rouzaud
                   2012-2019, The QGIS Project
                   2013-2019, Nyall Dawson
 License: GPL-2+

debian/libqgis-3d3.4.5.symbols → debian/libqgis-3d3.4.6.symbols

 # SymbolsHelper-Confirmed: 3.4.5 amd64
-libqgis_3d.so.3.4.5 #PACKAGE# #MINVER#
+libqgis_3d.so.3.4.6 #PACKAGE# #MINVER#
 * Build-Depends-Package: libqgis-dev
  _ZN10QByteArrayD1Ev@Base 3.4.5
  _ZN10QByteArrayD2Ev@Base 3.4.5