Release of 2.18 (Las Palmas)

qgis · Oct 21, 2016 · b7fe4bb · b7fe4bb
1 parent f60e1ef
commit b7fe4bb
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 4 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,8 +1,8 @@
 SET(CPACK_PACKAGE_VERSION_MAJOR "2")
-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 "Las Palmas")
 IF (POLICY CMP0048) # in CMake 3.0.0+
   CMAKE_POLICY (SET CMP0048 OLD) # keep PROJECT() from clearing VERSION variables
 ENDIF (POLICY CMP0048)

diff --git a/debian/changelog b/debian/changelog
@@ -1,12 +1,18 @@
-qgis (2.17.0) UNRELEASED; urgency=medium
+qgis (2.18.0) UNRELEASED; urgency=medium
+
+  * Release of 2.18.0
+
+ -- Jürgen E. Fischer <jef@norbit.de>  Fri, 21 Oct 2016 14:14:02 +0200
+
+qgis (2.17.0) unstable; urgency=medium
 
   * New development version 2.17 after branch of 2.16
   * drop support for debian wheezy and ubuntu wily
   * add python-requests dependency for metasearch plugin
   * lintian fixes
   * add version constraint to libqgis-customwidgets dependency.
 
- -- Jürgen E. Fischer <jef@norbit.de>  Thu, 04 Aug 2016 11:38:39 +0200
+ -- Jürgen E. Fischer <jef@norbit.de>  Fri, 21 Oct 2016 14:14:02 +0200
 
 qgis (2.16.0) unstable; urgency=medium
 

diff --git a/images/splash/splash.png b/images/splash/splash.png
diff --git a/ms-windows/Installer-Files/WelcomeFinishPage.bmp b/ms-windows/Installer-Files/WelcomeFinishPage.bmp