diff --git a/CMakeLists.txt b/CMakeLists.txt index 6e409fc8fb8..b93c82d2cc9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -16,10 +16,10 @@ set(CMAKE_LINK_DEPENDS_NO_SHARED ON) ############################################################# # Project and version set(CPACK_PACKAGE_VERSION_MAJOR "3") -set(CPACK_PACKAGE_VERSION_MINOR "17") +set(CPACK_PACKAGE_VERSION_MINOR "18") set(CPACK_PACKAGE_VERSION_PATCH "0") set(COMPLETE_VERSION ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}) -set(RELEASE_NAME "Master") +set(RELEASE_NAME "Zürich") project(qgis VERSION ${COMPLETE_VERSION}) if (APPLE) diff --git a/INSTALL.md b/INSTALL.md index 189076dd4b4..6a4750105a5 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -512,7 +512,7 @@ For the QGIS build you need to install following packages from cygwin: and from OSGeo4W (select *Advanced Install*): -* qgis-dev-deps +* qgis-rel-deps This will also select packages the above packages depend on. diff --git a/debian/changelog b/debian/changelog index c6c9f43dfaf..a153addfb71 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,14 @@ -qgis (3.17.0) UNRELEASED; urgency=medium +qgis (3.18.0) UNRELEASED; urgency=medium + + * Release of 3.18.0 + + -- Jürgen E. Fischer Fri, 19 Feb 2021 13:09:46 +0100 + +qgis (3.17.0) unstable; urgency=medium * New development version 3.17 after branch of 3.16 - -- Jürgen E. Fischer Fri, 23 Oct 2020 14:12:56 +0200 + -- Jürgen E. Fischer Fri, 19 Feb 2021 13:09:46 +0100 qgis (3.16.0) unstable; urgency=medium diff --git a/images/splash/splash.png b/images/splash/splash.png index 25ceee893eb..f7d4fb2f9a3 100644 Binary files a/images/splash/splash.png and b/images/splash/splash.png differ diff --git a/ms-windows/Installer-Files/WelcomeFinishPage.bmp b/ms-windows/Installer-Files/WelcomeFinishPage.bmp index 3fb81c4b741..865c5a1130c 100644 Binary files a/ms-windows/Installer-Files/WelcomeFinishPage.bmp and b/ms-windows/Installer-Files/WelcomeFinishPage.bmp differ