CMakeLists.txt

@@ -1,6 +1,6 @@
 SET(CPACK_PACKAGE_VERSION_MAJOR "2")
 SET(CPACK_PACKAGE_VERSION_MINOR "18")
-SET(CPACK_PACKAGE_VERSION_PATCH "16")
+SET(CPACK_PACKAGE_VERSION_PATCH "17")
 SET(COMPLETE_VERSION ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH})
 SET(RELEASE_NAME "Las Palmas")
 IF (POLICY CMP0048) # in CMake 3.0.0+

ChangeLog

@@ -1,3 +1,221 @@
+Merge: 9c2a0f8ae7 193e0a7e42
+Hugo Mercier <hugo.mercier@oslandia.com>	2018-02-22
+
+    Merge pull request #6419 from mhugo/release-2_18
+
+    Fix call to representValue in identifydialog
+
+Hugo Mercier <hugo.mercier@oslandia.com>	2018-02-22
+
+    Fix call to representValue in identifydialog
+
+    This should fix the problem of queries with WHERE (id = 'NULL') when the
+    string 'NULL' cannot be converted to integer / uuid, as seen with
+    relation reference widgets.
+
+    (cherry-picked from 5e70e962f704)
+
+Juergen E. Fischer <jef@norbit.de>	2018-02-21
+
+    Add GRASS74 support (backported from 2dece58b679)
+
+Merge: 9aa6a4d743 40b67e28d4
+mhugent <marco.hugentobler@sourcepole.ch>	2018-02-21
+
+    Merge pull request #6279 from mhugent/featureinfo_gml_id
+
+    Server: if there is a primary key, use the pk value(s) as gml id inst…
+
+Marco Hugentobler <marco.hugentobler@sourcepole.ch>	2018-02-21
+
+    Use @@ as primary key separator
+
+Juergen E. Fischer <jef@norbit.de>	2018-02-20
+
+    german translation update
+
+Marco Hugentobler <marco.hugentobler@sourcepole.ch>	2018-02-20
+
+    Use gml feature id also for non-gml output formats of WMS GetFeatureInfo
+
+rldhont <rldhont@gmail.com>	2018-02-19
+
+    [BUGFIX][Server] WFS GetFeature GML: segfault with geometry null
+
+Marco Hugentobler <marco.hugentobler@sourcepole.ch>	2018-02-19
+
+    Use pk as WFS id in GeoJSON export
+
+Marco Hugentobler <marco.hugentobler@sourcepole.ch>	2018-02-19
+
+    Consider pk/fid in wfs transaction
+
+Merge: b082ba8fcf eb6d7613d3
+Alessandro Pasotti <elpaso@itopen.it>	2018-02-19
+
+    Merge pull request #6210 from DelazJ/218_DBManager
+
+     [DB Manager]Allow preset query combobox to expand
+
+Merge: 5293044d31 4ab983e731
+Marco Hugentobler <marco.hugentobler@sourcepole.ch>	2018-02-13
+
+    Merge branch 'release-2_18' of https://github.com/qgis/QGIS into release-2_18
+
+Denis Rouzaud <denis.rouzaud@gmail.com>	2018-02-13
+
+    fix link to Qt 4.8 doc
+
+    fix #18088
+
+Marco Hugentobler <marco.hugentobler@sourcepole.ch>	2018-02-13
+
+    Escape spaces in MTEXT
+
+Merge: 265bc68689 1be269adc2
+Salvatore Larosa <lrssvtml@gmail.com>	2018-02-13
+
+    Merge pull request #6302 from slarosa/split_v_drape
+
+    Split v.drape command
+
+Merge: c2baf1b91b c9e637e6e7
+mhugent <marco.hugentobler@sourcepole.ch>	2018-02-13
+
+    Merge pull request #6319 from mhugent/dxf_label_layers
+
+    Fix dxf export for label layers with labeling but without symbology
+
+Denis Rouzaud <denis.rouzaud@gmail.com>	2018-02-12
+
+    [dxf] use struct instead of QPair for addLayers (#6323)
+
+    fix #11790
+
+Marco Hugentobler <marco.hugentobler@sourcepole.ch>	2018-02-12
+
+    Fix dxf export for label layers with labeling but without symbology
+
+Merge: c34f23ce08 42dd971368
+Denis Rouzaud <denis.rouzaud@gmail.com>	2018-02-11
+
+    Merge pull request #6310 from 3nids/pd_domain_218
+
+    [postgres] fix domain not in public schema
+
+Denis Rouzaud <denis.rouzaud@gmail.com>	2018-02-11
+
+    make code compatible with QGIS 2.x
+
+Denis Rouzaud <denis.rouzaud@gmail.com>	2018-02-11
+
+    [postgres] fix domain not in public schema
+
+    fix #18053
+    see PR #6304
+
+Salvatore Larosa <lrssvtml@gmail.com>	2018-02-09
+
+    split v.drape alg to be used without where command
+
+Marco Hugentobler <marco.hugentobler@sourcepole.ch>	2018-02-06
+
+    Server: if there is a primary key, use the pk value(s) as gml id instead of the feature id
+
+Alexander Bruy <alexander.bruy@gmail.com>	2018-02-06
+
+    [processing] add missed information to the error message (fix #18049)
+
+Juergen E. Fischer <jef@norbit.de>	2018-02-02
+
+    INSTALL: use meta package to install osgeo4w build dependencies
+
+Alexander Bruy <alexander.bruy@gmail.com>	2018-02-01
+
+    [processing] pass '-of' parameter to gdaldem algorithms (fix #17930)
+
+Alexander Bruy <alexander.bruy@gmail.com>	2018-02-01
+
+    [processing] pass '-of' parameter to gdal_grid algorithms (fix #18013)
+
+Alexander Bruy <alexander.bruy@gmail.com>	2018-02-01
+
+    [processing] fix typo in the parameter name (refs #18013)
+
+Juergen E. Fischer <jef@norbit.de>	2018-02-01
+
+    debian packaging: adapt libqca2-plugin-ossl dependency
+
+Alexander Bruy <alexander.bruy@gmail.com>	2018-01-30
+
+    indentation
+
+Alexander Bruy <alexander.bruy@gmail.com>	2018-01-30
+
+    [processing] fetch scripts and models from qgis-2 branch to avoid
+    overlapping with scripts and models for QGIS 3
+
+Harrissou Sant-anna <delazj@gmail.com>	2018-01-29
+
+    [DB Manager]Allow preset query combobox to expand
+
+Harrissou Sant-anna <delazj@gmail.com>	2018-01-29
+
+    [DB Manager]Allow preset query combobox to expand
+
+Salvatore Larosa <lrssvtml@gmail.com>	2018-01-28
+
+    Fixes #17929 - output file paths not quoted (m.cogo, v.out.vtk)
+
+Juergen E. Fischer <jef@norbit.de>	2018-01-26
+
+    update package*.cmd for GRASS 7.4
+
+Merge: 141be446aa 222eee437c
+Salvatore Larosa <lrssvtml@gmail.com>	2018-01-25
+
+    Merge pull request #6128 from DelazJ/ProcessingBatchResize
+
+    [processing] Fix cannot resize columns in batch dialog
+
+Merge: 1c34b25589 12b3011283
+Nyall Dawson <nyall.dawson@gmail.com>	2018-01-25
+
+    Merge pull request #6153 from agiudiceandrea/patch-1
+
+    Fixes a typo in syncDb() that improperly set "Imported from GDAL" as name for all geogcs imported from GDAL/PROJ
+
+Luigi Pirelli <luipir@gmail.com>	2018-01-24
+
+    Add out layer to registry before its update.
+
+    Useful only in case of use waterfall aggregate functions because they get
+    layer from registry basing on layer scope.
+
+    Fixes #17300
+    (https://github.com/qgis/QGIS/pull/5950)
+
+Andrea Giudiceandrea <andreaerdna@libero.it>	2018-01-24
+
+    Fixes a typo in syncDb()
+
+    Fixes a typo in QgsCoordinateReferenceSystem::syncDb() that improperly set "Imported from GDAL" as name for all geographical coordinate systems imported from GDAL/PROJ definitions during postintall CRS database synch.
+
+Borys Jurgiel <info@borysjurgiel.pl>	2018-01-23
+
+    [tr] Polish translation update
+
+Harrissou Sant-anna <delazj@gmail.com>	2018-01-22
+
+    [processing] Fix cannot resize columns in batch dialog
+
+    Fixes #17819
+    Cherry-picked from 797437823c
+
+Juergen E. Fischer <jef@norbit.de>	2018-01-19
+
+    Release of 2.18.16
+
 Nyall Dawson <nyall.dawson@gmail.com>	2018-01-19
 
     Fix virtual layers fail if table field names have special characters

INSTALL

@@ -1,9 +1,9 @@
 QGIS
 Building QGIS from source - step by step
-Wednesday April 12, 2017
+Sunday January 14, 2018
 
 
-Last Updated: Wednesday April 12, 2017
+Last Updated: Sunday January 14, 2018
 Last Change : Wednesday April 12, 2017
 
 

cmake/FindGRASS.cmake

@@ -137,7 +137,7 @@ IF (UNIX)
   IF (GRASS_FIND_VERSION EQUAL 6)
     LIST(APPEND GRASS_PATHS /usr/lib64/grass64 /usr/lib/grass64)
   ELSEIF (GRASS_FIND_VERSION EQUAL 7)
-    LIST(APPEND GRASS_PATHS /usr/lib64/grass70 /usr/lib/grass70 /usr/lib64/grass71 /usr/lib/grass71 /usr/lib64/grass72 /usr/lib/grass72)
+    LIST(APPEND GRASS_PATHS /usr/lib64/grass70 /usr/lib/grass70 /usr/lib64/grass72 /usr/lib/grass72 /usr/lib64/grass74 /usr/lib/grass74)
   ENDIF ()
 ENDIF (UNIX)
 
@@ -150,8 +150,8 @@ IF (APPLE)
   ELSEIF (GRASS_FIND_VERSION EQUAL 7)
     LIST(APPEND GRASS_PATHS
       /Applications/GRASS-7.0.app/Contents/MacOS
-      /Applications/GRASS-7.1.app/Contents/MacOS
       /Applications/GRASS-7.2.app/Contents/MacOS
+      /Applications/GRASS-7.4.app/Contents/MacOS
     )
   ENDIF ()
   LIST(APPEND GRASS_PATHS /Applications/GRASS.app/Contents/Resources)

debian/changelog

@@ -1,8 +1,14 @@
-qgis (2.18.16) UNRELEASED; urgency=medium
+qgis (2.18.17) UNRELEASED; urgency=medium
+
+  * Release of 2.18.17
+
+ -- Jürgen E. Fischer <jef@norbit.de>  Fri, 23 Feb 2018 13:02:21 +0100
+
+qgis (2.18.16) unstable; urgency=medium
 
   * Release of 2.18.16
 
- -- Jürgen E. Fischer <jef@norbit.de>  Fri, 19 Jan 2018 14:13:44 +0100
+ -- Jürgen E. Fischer <jef@norbit.de>  Fri, 23 Feb 2018 13:02:21 +0100
 
 qgis (2.18.15) unstable; urgency=medium
 

debian/control.in

@@ -20,7 +20,6 @@ Build-Depends:
  libqt4-dev (>= 4.7.0),
  libqt4-opengl-dev,
  libqca2-dev,
- libqca2-plugin-ossl,
  libqtwebkit-dev,
 #    jessie         trusty                                   # libgsl0-dev, libqca2-plugin-ossl,
 #sid        stretch        xenial yakkety zesty artful bionic# libgsl-dev, libqca2-plugins,
@@ -413,7 +412,8 @@ Pre-Depends: ${misc:Pre-Depends}
 Depends:
  qgis-providers-common (= ${source:Version}),
  libqt4-sql-sqlite,
- libqca2-plugin-ossl,
+#    jessie         trusty                                   # libqca2-plugin-ossl,
+#sid        stretch        xenial yakkety zesty artful bionic# libqca2-plugins,
  ${shlibs:Depends},
  ${misc:Depends}
 Breaks: qgis (<= 1.6)

doc/CMakeLists.txt

@@ -5,7 +5,7 @@ SET (WITH_APIDOC FALSE CACHE BOOL "Determines whether the QGIS API doxygen docum
 SET (WITH_TXT2TAGS_PDF FALSE CACHE BOOL "Determines whether PDF should be generate for the txt2tags documentation")
 
 # include Qt documentation
-SET (QT_DOC_URL "http://doc.qt.io/qt-4.8/" CACHE STRING "URL for Qt docs")
+SET (QT_DOC_URL "http://doc.qt.io/archives/qt-4.8/" CACHE STRING "URL for Qt docs")
 
 INCLUDE(Txt2Tags)
 FIND_TXT2TAGS()

doc/INSTALL.html

@@ -77,12 +77,12 @@
 <DIV CLASS="header" ID="header">
 <H1>QGIS</H1>
 <H2>Building QGIS from source - step by step</H2>
-<H3>Wednesday April 12, 2017</H3>
+<H3>Sunday January 14, 2018</H3>
 </DIV>
 
 <DIV CLASS="body" ID="body">
 <P>
-Last Updated: Wednesday April 12, 2017
+Last Updated: Sunday January 14, 2018
 Last Change : Wednesday April 12, 2017
 </P>
 <DIV CLASS="toc">