Release of 3.6 (Noosa)

jef-n · jef-n · commit 58734527abdb · 2019-02-22T13:47:21.000+01:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -11,10 +11,10 @@ CMAKE_POLICY (SET CMP0053 NEW)
 #############################################################
 # Project and version
 SET(CPACK_PACKAGE_VERSION_MAJOR "3")
-SET(CPACK_PACKAGE_VERSION_MINOR "5")
+SET(CPACK_PACKAGE_VERSION_MINOR "6")
 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 "Noosa")
 PROJECT(qgis VERSION ${COMPLETE_VERSION})
 
 IF (APPLE)
diff --git a/INSTALL b/INSTALL
@@ -1,9 +1,9 @@
 QGIS
 Building QGIS from source - step by step
-Friday November 30, 2018
+Friday February 22, 2019
 
 
-Last Updated: Friday November 30, 2018
+Last Updated: Friday February 22, 2019
 Last Change : Friday November 30, 2018
 
 
@@ -457,7 +457,7 @@ For the QGIS build you need to install following packages from cygwin:
 
 and from OSGeo4W (select Advanced Installation):
 
-- qgis-dev-deps
+- qgis-rel-deps
 
 This will also select packages the above packages depend on.
 
diff --git a/debian/changelog b/debian/changelog
@@ -1,8 +1,14 @@
-qgis (3.5.0) UNRELEASED; urgency=medium
+qgis (3.6.0) UNRELEASED; urgency=medium
+
+  * Release of 3.6.0
+
+ -- Jürgen E. Fischer <jef@norbit.de>  Fri, 22 Feb 2019 13:47:20 +0100
+
+qgis (3.5.0) unstable; urgency=medium
 
   * New development version 3.5 after branch of 3.4
 
- -- Jürgen E. Fischer <jef@norbit.de>  Fri, 26 Oct 2018 14:34:02 +0200
+ -- Jürgen E. Fischer <jef@norbit.de>  Fri, 22 Feb 2019 13:47:20 +0100
 
 qgis (3.4.0) unstable; urgency=medium
 
diff --git a/doc/INSTALL.html b/doc/INSTALL.html
@@ -5,7 +5,7 @@
 <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=utf-8">
 <TITLE>QGIS</TITLE>
 
-<!-- Included /home/fischer/src/qgis/doc/style.css -->
+<!-- Included doc/style.css -->
 <STYLE TYPE="text/css">
 body{  background: white;
   color: black;
@@ -77,13 +77,13 @@
 <DIV CLASS="header" ID="header">
 <H1>QGIS</H1>
 <H2>Building QGIS from source - step by step</H2>
-<H3>Saturday February 16, 2019</H3>
+<H3>Friday February 22, 2019</H3>
 </DIV>
 
 <DIV CLASS="body" ID="body">
 <P>
-Last Updated: Saturday February 16, 2019
-Last Change : Saturday February 16, 2019
+Last Updated: Friday February 22, 2019
+Last Change : Friday November 30, 2018
 </P>
 <DIV CLASS="toc">
 
@@ -745,7 +745,7 @@ <H3>4.1.2. Other tools and dependencies</H3>
 </P>
 
 <UL>
-<LI>qgis-dev-deps
+<LI>qgis-rel-deps
 </UL>
 
 <P>
@@ -3121,5 +3121,5 @@ <H1>9. Authors and Acknowledgments</H1>
 
 </DIV>
 <!-- html code generated by txt2tags 2.6 (http://txt2tags.org) -->
-<!-- cmdline: txt2tags -\-encoding=utf-8 -o/home/fischer/src/qgis/debian/build/doc/INSTALL.html -t html /home/fischer/src/qgis/doc/INSTALL.t2t -->
+<!-- cmdline: txt2tags -\-encoding=utf-8 -odoc/INSTALL.html -t html doc/INSTALL.t2t -->
 </BODY></HTML>
diff --git a/doc/msvc.t2t b/doc/msvc.t2t
@@ -31,7 +31,7 @@ For the QGIS build you need to install following packages from cygwin:
 
 and from OSGeo4W (select //Advanced Installation//):
 
-- qgis-dev-deps
+- qgis-rel-deps
 -
 
 This will also select packages the above packages depend on.
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

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ For the QGIS build you need to install following packages from cygwin:`
`31`	`31`
`32`	`32`	`and from OSGeo4W (select //Advanced Installation//):`
`33`	`33`
`34`		`-- qgis-dev-deps`
	`34`	`+- qgis-rel-deps`
`35`	`35`	`-`
`36`	`36`
`37`	`37`	`This will also select packages the above packages depend on.`