Skip to content

Commit

Permalink
Release of 3.8 (Zanzibar)
Browse files Browse the repository at this point in the history
  • Loading branch information
jef-n committed Jun 21, 2019
1 parent 33b48b2 commit 11aff65
Show file tree
Hide file tree
Showing 7 changed files with 27 additions and 14 deletions.
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ SET(CMAKE_LINK_DEPENDS_NO_SHARED ON)
#############################################################
# Project and version
SET(CPACK_PACKAGE_VERSION_MAJOR "3")
SET(CPACK_PACKAGE_VERSION_MINOR "7")
SET(CPACK_PACKAGE_VERSION_MINOR "8")
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 "Zanzibar")
PROJECT(qgis VERSION ${COMPLETE_VERSION})

IF (APPLE)
Expand Down
11 changes: 7 additions & 4 deletions INSTALL
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
QGIS
Building QGIS from source - step by step
Tuesday May 07, 2019
Friday June 21, 2019


Last Updated: Tuesday May 07, 2019
Last Change : Tuesday May 07, 2019
Last Updated: Friday June 21, 2019
Last Change : Friday May 31, 2019


1. Introduction
Expand Down Expand Up @@ -461,7 +461,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.

Expand Down Expand Up @@ -1101,6 +1101,9 @@ is required.
5. Building on MacOS X
======================

This document is outdated and there is currently no up to date documentation for building on mac.
You might want to consider to read an approach using Homebrew although not up to date either: https://github.com/qgis/QGIS/mac/development.md

In this approach I will try to avoid as much as possible building dependencies
from source and rather use frameworks wherever possible.

Expand Down
10 changes: 8 additions & 2 deletions debian/changelog
Original file line number Diff line number Diff line change
@@ -1,8 +1,14 @@
qgis (3.7.0) UNRELEASED; urgency=medium
qgis (3.8.0) UNRELEASED; urgency=medium

* Release of 3.8.0

-- Jürgen E. Fischer <jef@norbit.de> Fri, 21 Jun 2019 14:32:23 +0200

qgis (3.7.0) unstable; urgency=medium

* New development version 3.7 after branch of 3.6

-- Jürgen E. Fischer <jef@norbit.de> Fri, 22 Feb 2019 13:48:26 +0100
-- Jürgen E. Fischer <jef@norbit.de> Fri, 21 Jun 2019 14:32:23 +0200

qgis (3.6.0) unstable; urgency=medium

Expand Down
14 changes: 9 additions & 5 deletions doc/INSTALL.html
Original file line number Diff line number Diff line change
Expand Up @@ -77,13 +77,13 @@
<DIV CLASS="header" ID="header">
<H1>QGIS</H1>
<H2>Building QGIS from source - step by step</H2>
<H3>Tuesday May 07, 2019</H3>
<H3>Friday June 21, 2019</H3>
</DIV>

<DIV CLASS="body" ID="body">
<P>
Last Updated: Tuesday May 07, 2019
Last Change : Tuesday May 07, 2019
Last Updated: Friday June 21, 2019
Last Change : Friday May 31, 2019
</P>
<DIV CLASS="toc">

Expand Down Expand Up @@ -750,7 +750,7 @@ <H3>4.1.2. Other tools and dependencies</H3>
</P>

<UL>
<LI>qgis-dev-deps
<LI>qgis-rel-deps
</UL>

<P>
Expand Down Expand Up @@ -1546,6 +1546,10 @@ <H3>4.4.2. Testing QGIS</H3>
<A NAME="toc18"></A>
<H1>5. Building on MacOS X</H1>

<P>
This document is outdated and there is currently no up to date documentation for building on mac.
You might want to consider to read an approach using Homebrew although not up to date either: <A HREF="https://github.com/qgis/QGIS/mac/development.md">https://github.com/qgis/QGIS/mac/development.md</A>
</P>
<P>
In this approach I will try to avoid as much as possible building dependencies
from source and rather use frameworks wherever possible.
Expand Down Expand Up @@ -3126,5 +3130,5 @@ <H1>9. Authors and Acknowledgments</H1>

</DIV>
<!-- html code generated by txt2tags 2.6 (http://txt2tags.org) -->
<!-- cmdline: txt2tags -\-encoding=utf-8 -o doc/INSTALL.html -t html doc/INSTALL.t2t -->
<!-- cmdline: txt2tags -\-encoding=utf-8 -odoc/INSTALL.html -t html doc/INSTALL.t2t -->
</BODY></HTML>
2 changes: 1 addition & 1 deletion doc/msvc.t2t
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
Binary file modified images/splash/splash.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ms-windows/Installer-Files/WelcomeFinishPage.bmp
Binary file not shown.

0 comments on commit 11aff65

Please sign in to comment.