Skip to content

Commit

Permalink
Release of 3.4 (Madeira)
Browse files Browse the repository at this point in the history
  • Loading branch information
jef-n committed Oct 26, 2018
1 parent 736b0f7 commit 4a4b62e
Show file tree
Hide file tree
Showing 7 changed files with 21 additions and 15 deletions.
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ CMAKE_POLICY (SET CMP0053 NEW)
#############################################################
# Project and version
SET(CPACK_PACKAGE_VERSION_MAJOR "3")
SET(CPACK_PACKAGE_VERSION_MINOR "3")
SET(CPACK_PACKAGE_VERSION_MINOR "4")
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 "Madeira")
PROJECT(qgis VERSION ${COMPLETE_VERSION})
IF (APPLE)
SET(QGIS_APP_NAME "QGIS")
Expand Down
8 changes: 4 additions & 4 deletions INSTALL
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
QGIS
Building QGIS from source - step by step
Sunday October 14, 2018
Friday October 26, 2018


Last Updated: Sunday October 14, 2018
Last Updated: Friday October 26, 2018
Last Change : Sunday October 14, 2018


Expand Down Expand Up @@ -444,7 +444,7 @@ The free (as in free beer) Community installer is available under:
Download and install following packages:

|| Tool | Website |
| CMake | https://cmake.org/files/v3.7/cmake-3.7.2-win64-x64.msi |
| CMake | https://cmake.org/files/v3.12/cmake-3.12.3-win64-x64.msi |
| GNU flex, GNU bison and GIT | http://cygwin.com/setup-x86.exe (32bit) or http://cygwin.com/setup-x86_64.exe (64bit) |
| OSGeo4W | http://download.osgeo.org/osgeo4w/osgeo4w-setup-x86.exe (32bit) or http://download.osgeo.org/osgeo4w/osgeo4w-setup-x86_64.exe (64bit) |
| ninja | https://github.com/ninja-build/ninja/releases/download/v1.7.2/ninja-win.zip |
Expand All @@ -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-ltr-deps

This will also select packages the above packages depend on.

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.3.0) UNRELEASED; urgency=medium
qgis (3.4.0) UNRELEASED; urgency=medium

* Release of 3.4.0

-- Jürgen E. Fischer <jef@norbit.de> Fri, 26 Oct 2018 14:32:55 +0200

qgis (3.3.0) unstable; urgency=medium

* New development version 3.3 after branch of 3.2

-- Jürgen E. Fischer <jef@norbit.de> Fri, 22 Jun 2018 14:15:23 +0200
-- Jürgen E. Fischer <jef@norbit.de> Fri, 26 Oct 2018 14:32:55 +0200

qgis (3.2.0) unstable; urgency=medium

Expand Down
12 changes: 6 additions & 6 deletions doc/INSTALL.html
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -77,12 +77,12 @@
<DIV CLASS="header" ID="header">
<H1>QGIS</H1>
<H2>Building QGIS from source - step by step</H2>
<H3>Sunday October 14, 2018</H3>
<H3>Friday October 26, 2018</H3>
</DIV>

<DIV CLASS="body" ID="body">
<P>
Last Updated: Sunday October 14, 2018
Last Updated: Friday October 26, 2018
Last Change : Sunday October 14, 2018
</P>
<DIV CLASS="toc">
Expand Down Expand Up @@ -714,7 +714,7 @@ <H3>4.1.2. Other tools and dependencies</H3>
</TR>
<TR>
<TD>CMake</TD>
<TD><A HREF="https://cmake.org/files/v3.7/cmake-3.7.2-win64-x64.msi">https://cmake.org/files/v3.7/cmake-3.7.2-win64-x64.msi</A></TD>
<TD><A HREF="https://cmake.org/files/v3.12/cmake-3.12.3-win64-x64.msi">https://cmake.org/files/v3.12/cmake-3.12.3-win64-x64.msi</A></TD>
</TR>
<TR>
<TD>GNU flex, GNU bison and GIT</TD>
Expand Down Expand Up @@ -745,7 +745,7 @@ <H3>4.1.2. Other tools and dependencies</H3>
</P>

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

<P>
Expand Down Expand Up @@ -3113,5 +3113,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>
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-ltr-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 4a4b62e

Please sign in to comment.