Skip to content

Commit 4a4b62e

Browse files
committed
Release of 3.4 (Madeira)
1 parent 736b0f7 commit 4a4b62e

7 files changed

Lines changed: 21 additions & 15 deletions

File tree

CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ CMAKE_POLICY (SET CMP0053 NEW)
1111
#############################################################
1212
# Project and version
1313
SET(CPACK_PACKAGE_VERSION_MAJOR "3")
14-
SET(CPACK_PACKAGE_VERSION_MINOR "3")
14+
SET(CPACK_PACKAGE_VERSION_MINOR "4")
1515
SET(CPACK_PACKAGE_VERSION_PATCH "0")
1616
SET(COMPLETE_VERSION ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH})
17-
SET(RELEASE_NAME "Master")
17+
SET(RELEASE_NAME "Madeira")
1818
PROJECT(qgis VERSION ${COMPLETE_VERSION})
1919
IF (APPLE)
2020
SET(QGIS_APP_NAME "QGIS")

INSTALL

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
QGIS
22
Building QGIS from source - step by step
3-
Sunday October 14, 2018
3+
Friday October 26, 2018
44

55

6-
Last Updated: Sunday October 14, 2018
6+
Last Updated: Friday October 26, 2018
77
Last Change : Sunday October 14, 2018
88

99

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

446446
|| Tool | Website |
447-
| CMake | https://cmake.org/files/v3.7/cmake-3.7.2-win64-x64.msi |
447+
| CMake | https://cmake.org/files/v3.12/cmake-3.12.3-win64-x64.msi |
448448
| GNU flex, GNU bison and GIT | http://cygwin.com/setup-x86.exe (32bit) or http://cygwin.com/setup-x86_64.exe (64bit) |
449449
| OSGeo4W | http://download.osgeo.org/osgeo4w/osgeo4w-setup-x86.exe (32bit) or http://download.osgeo.org/osgeo4w/osgeo4w-setup-x86_64.exe (64bit) |
450450
| ninja | https://github.com/ninja-build/ninja/releases/download/v1.7.2/ninja-win.zip |
@@ -457,7 +457,7 @@ For the QGIS build you need to install following packages from cygwin:
457457

458458
and from OSGeo4W (select Advanced Installation):
459459

460-
- qgis-dev-deps
460+
- qgis-ltr-deps
461461

462462
This will also select packages the above packages depend on.
463463

debian/changelog

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,14 @@
1-
qgis (3.3.0) UNRELEASED; urgency=medium
1+
qgis (3.4.0) UNRELEASED; urgency=medium
2+
3+
* Release of 3.4.0
4+
5+
-- Jürgen E. Fischer <jef@norbit.de> Fri, 26 Oct 2018 14:32:55 +0200
6+
7+
qgis (3.3.0) unstable; urgency=medium
28

39
* New development version 3.3 after branch of 3.2
410

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

713
qgis (3.2.0) unstable; urgency=medium
814

doc/INSTALL.html

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=utf-8">
66
<TITLE>QGIS</TITLE>
77

8-
<!-- Included /home/fischer/src/qgis/doc/style.css -->
8+
<!-- Included doc/style.css -->
99
<STYLE TYPE="text/css">
1010
body{ background: white;
1111
color: black;
@@ -77,12 +77,12 @@
7777
<DIV CLASS="header" ID="header">
7878
<H1>QGIS</H1>
7979
<H2>Building QGIS from source - step by step</H2>
80-
<H3>Sunday October 14, 2018</H3>
80+
<H3>Friday October 26, 2018</H3>
8181
</DIV>
8282

8383
<DIV CLASS="body" ID="body">
8484
<P>
85-
Last Updated: Sunday October 14, 2018
85+
Last Updated: Friday October 26, 2018
8686
Last Change : Sunday October 14, 2018
8787
</P>
8888
<DIV CLASS="toc">
@@ -714,7 +714,7 @@ <H3>4.1.2. Other tools and dependencies</H3>
714714
</TR>
715715
<TR>
716716
<TD>CMake</TD>
717-
<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>
717+
<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>
718718
</TR>
719719
<TR>
720720
<TD>GNU flex, GNU bison and GIT</TD>
@@ -745,7 +745,7 @@ <H3>4.1.2. Other tools and dependencies</H3>
745745
</P>
746746

747747
<UL>
748-
<LI>qgis-dev-deps
748+
<LI>qgis-ltr-deps
749749
</UL>
750750

751751
<P>
@@ -3113,5 +3113,5 @@ <H1>9. Authors and Acknowledgments</H1>
31133113

31143114
</DIV>
31153115
<!-- html code generated by txt2tags 2.6 (http://txt2tags.org) -->
3116-
<!-- cmdline: txt2tags -\-encoding=utf-8 -o/home/fischer/src/qgis/debian/build/doc/INSTALL.html -t html /home/fischer/src/qgis/doc/INSTALL.t2t -->
3116+
<!-- cmdline: txt2tags -\-encoding=utf-8 -odoc/INSTALL.html -t html doc/INSTALL.t2t -->
31173117
</BODY></HTML>

doc/msvc.t2t

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ For the QGIS build you need to install following packages from cygwin:
3131

3232
and from OSGeo4W (select //Advanced Installation//):
3333

34-
- qgis-dev-deps
34+
- qgis-ltr-deps
3535
-
3636

3737
This will also select packages the above packages depend on.

images/splash/splash.png

1.71 MB
Loading
0 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)