Release of 2.12 (Lyon)

qgis · Oct 23, 2015 · cd9d645 · cd9d645
1 parent c69f339
commit cd9d645
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 "11")
+SET(CPACK_PACKAGE_VERSION_MINOR "12")
 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 "Lyon")
 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,4 +1,10 @@
-qgis (2.11.0) UNRELEASED; urgency=medium
+qgis (2.12.0) UNRELEASED; urgency=medium
+
+  * Release of 2.12.0
+
+ -- Jürgen E. Fischer <jef@norbit.de>  Fri, 23 Oct 2015 14:10:38 +0200
+
+qgis (2.11.0) unstable; urgency=medium
 
   * New development version 2.11 after branch of 2.10
   * moved grass default.qgc from config to modules
@@ -11,7 +17,7 @@ qgis (2.11.0) UNRELEASED; urgency=medium
   * include geometry checker and snapper plugins
   * merge downstream debian changes from Bas Couwenberg
 
- -- Jürgen E. Fischer <jef@norbit.de>  Thu, 22 Oct 2015 22:33:23 +0200
+ -- Jürgen E. Fischer <jef@norbit.de>  Fri, 23 Oct 2015 14:10:38 +0200
 
 qgis (2.10.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