[Git][debian-gis-team/qgis][stretch-backports] 15 commits: Bump Standards-Version to 4.3.0, no changes.

Bas Couwenberg gitlab at salsa.debian.org
Sat Jan 26 09:47:22 GMT 2019 

Bas Couwenberg pushed to branch stretch-backports at Debian GIS Project / qgis


Commits:
eaf70be0 by Bas Couwenberg at 2018-12-25T22:11:07Z
Bump Standards-Version to 4.3.0, no changes.

- - - - -
e7405e9e by Bas Couwenberg at 2019-01-15T15:17:55Z
Bump minimum GRASS build dependency version to 7.4.4.

- - - - -
b663eecd by Bas Couwenberg at 2019-01-15T19:07:43Z
Update symbols for amd64.

- - - - -
e0ef0096 by Bas Couwenberg at 2019-01-15T19:07:44Z
Set distribution to unstable.

- - - - -
c1f05a5f by Bas Couwenberg at 2019-01-18T14:39:44Z
New upstream version 2.18.28+dfsg
- - - - -
89c6c67d by Bas Couwenberg at 2019-01-18T14:43:19Z
Merge tag 'upstream/2.18.28+dfsg'

Upstream version 2.18.28+dfsg

- - - - -
49d7e2b9 by Bas Couwenberg at 2019-01-18T14:53:14Z
New upstream release.

- - - - -
272a9efe by Bas Couwenberg at 2019-01-18T15:58:15Z
Update symbols for amd64.

- - - - -
f376735b by Bas Couwenberg at 2019-01-18T16:14:27Z
Fix changelog.

- - - - -
666283bb by Bas Couwenberg at 2019-01-18T16:14:27Z
Set distribution to experimental.

- - - - -
2e3ab634 by Bas Couwenberg at 2019-01-19T12:24:59Z
Update packaging for GRASS 7.6.0.

- - - - -
de8f33ed by Bas Couwenberg at 2019-01-21T06:37:03Z
Update symbols for other architectures.

- - - - -
e2dad31c by Bas Couwenberg at 2019-01-21T06:37:42Z
Set distribution to unstable.

- - - - -
a68cd547 by Bas Couwenberg at 2019-01-26T08:04:29Z
Merge tag 'debian/2.18.28+dfsg-1' into stretch-backports

- - - - -
15ad4948 by Bas Couwenberg at 2019-01-26T08:04:57Z
Rebuild for stretch-backports.

- - - - -


30 changed files:

- CMakeLists.txt
- ChangeLog
- cmake/FindGRASS.cmake
- debian/changelog
- debian/control
- debian/libqgis-analysis2.18.27.install → debian/libqgis-analysis2.18.28.install
- debian/libqgis-analysis2.18.27.symbols → debian/libqgis-analysis2.18.28.symbols
- debian/libqgis-app2.18.27.install → debian/libqgis-app2.18.28.install
- debian/libqgis-app2.18.27.symbols → debian/libqgis-app2.18.28.symbols
- debian/libqgis-core2.18.27.install → debian/libqgis-core2.18.28.install
- debian/libqgis-core2.18.27.symbols → debian/libqgis-core2.18.28.symbols
- debian/libqgis-gui2.18.27.install → debian/libqgis-gui2.18.28.install
- debian/libqgis-gui2.18.27.symbols → debian/libqgis-gui2.18.28.symbols
- debian/libqgis-networkanalysis2.18.27.install → debian/libqgis-networkanalysis2.18.28.install
- debian/libqgis-networkanalysis2.18.27.symbols → debian/libqgis-networkanalysis2.18.28.symbols
- debian/libqgis-server2.18.27.install → debian/libqgis-server2.18.28.install
- debian/libqgis-server2.18.27.symbols → debian/libqgis-server2.18.28.symbols
- debian/libqgisgrass7-2.18.27.install → debian/libqgisgrass7-2.18.28.install
- debian/libqgisgrass7-2.18.27.lintian-overrides → debian/libqgisgrass7-2.18.28.lintian-overrides
- debian/libqgisgrass7-2.18.27.symbols → debian/libqgisgrass7-2.18.28.symbols
- debian/libqgispython2.18.27.install → debian/libqgispython2.18.28.install
- debian/libqgispython2.18.27.symbols → debian/libqgispython2.18.28.symbols
- + debian/patches/grass76.patch
- debian/patches/series
- + python/plugins/processing/algs/grass7/description/r.mapcalc.simple.txt
- − python/plugins/processing/algs/grass7/description/r.mapcalc.txt
- src/analysis/raster/qgsalignraster.cpp
- src/core/qgsogcutils.cpp
- src/providers/oracle/qgsoracleexpressioncompiler.cpp
- tests/src/core/testqgsogcutils.cpp


Changes:

=====================================
CMakeLists.txt
=====================================
@@ -1,6 +1,6 @@
 SET(CPACK_PACKAGE_VERSION_MAJOR "2")
 SET(CPACK_PACKAGE_VERSION_MINOR "18")
-SET(CPACK_PACKAGE_VERSION_PATCH "27")
+SET(CPACK_PACKAGE_VERSION_PATCH "28")
 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,62 @@
+Merge: b411f36bca 87442a536e
+Matthias Kuhn <matthias at opengis.ch>	2019-01-15
+
+    Merge pull request #8835 from rldhont/bugfix-oracle-compile-expression-like-218
+
+    [Bugfix][Oracle] Add ESCAPE when compiling LIKE
+
+rldhont <rldhont at gmail.com>	2019-01-11
+
+    [Bugfix][Oracle] Add ESCAPE when compiling LIKE
+
+    The oracle SQL documentation specifies that *there is no default escape character* and *the escape character, if specified, must be a character string of length 1*.
+    In expression the underscore (_) and the percent sign (%) can be escaped with the backslash (\). So in the Oracle Expression Compiler if the ESCAPE clause is not specified, the pattern is not valid.
+    To fix it, the Oracle Expression Compiler has to add the ESCAPE clause.
+
+    https://docs.oracle.com/cd/B12037_01/server.101/b10759/conditions016.htm
+
+Merge: 86ff500887 0ab834e2bc
+rldhont <rldhont at gmail.com>	2019-01-09
+
+    Merge pull request #8816 from rldhont/sld-read-like-escapeChar-218
+
+    [BUGFIX] SLD : Support escapeChar attribute of PropertyIsLike
+
+rldhont <rldhont at gmail.com>	2019-01-08
+
+    [BUGFIX] SLD : Support escapeChar attribute of PropertyIsLike
+
+    In OGC FilterEncoding standard, the PropertyIsLike element has an escapeChar attribute in place of escape attribute.
+
+    In the QgsOgcUtils class, the attribute escape or escapeChar is added to PropertyIsLike element, but it only checks escape attribute when it decodes it.
+
+    The commit fixed it and adds test.
+
+Merge: 5eb1853f01 71c1581789
+Luigi Pirelli <luipir at gmail.com>	2019-01-07
+
+    Merge pull request #8802 from NaturalGIS/release-2_18
+
+    re-add the r.mapcalculator module (as r.mapcalc.simple) and remove the not working r.mapcalc
+
+Giovanni Manghi <giovanni.manghi at naturalgis.pt>	2019-01-07
+
+    re-add the r.mapcalculator momodule (as r.mapcalc.simple) and remove the not working r.mapcalc
+
+Markus Neteler <neteler at gmail.com>	2018-12-27
+
+    Added grass76 support
+
+    Added grass76 support; search for newer versions first
+
+Juergen E. Fischer <jef at norbit.de>	2018-12-22
+
+    updates for GDAL 2.5 with VC2010
+
+Juergen E. Fischer <jef at norbit.de>	2018-12-21
+
+    Release of 2.18.27
+
 Marco Bernasocchi <marco at opengis.ch>	2018-12-14
 
     allow building WITH_SERVER_PLUGINS=OFF (#8674)


=====================================
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/grass72 /usr/lib/grass72 /usr/lib64/grass74 /usr/lib/grass74)
+    LIST(APPEND GRASS_PATHS /usr/lib64/grass76 /usr/lib/grass76 /usr/lib64/grass74 /usr/lib/grass74 /usr/lib64/grass72 /usr/lib/grass72 /usr/lib64/grass70 /usr/lib/grass70)
   ENDIF ()
 ENDIF (UNIX)
 
@@ -149,9 +149,10 @@ IF (APPLE)
     )
   ELSEIF (GRASS_FIND_VERSION EQUAL 7)
     LIST(APPEND GRASS_PATHS
-      /Applications/GRASS-7.0.app/Contents/MacOS
-      /Applications/GRASS-7.2.app/Contents/MacOS
+      /Applications/GRASS-7.6.app/Contents/MacOS
       /Applications/GRASS-7.4.app/Contents/MacOS
+      /Applications/GRASS-7.2.app/Contents/MacOS
+      /Applications/GRASS-7.0.app/Contents/MacOS
     )
   ENDIF ()
   LIST(APPEND GRASS_PATHS /Applications/GRASS.app/Contents/Resources)


=====================================
debian/changelog
=====================================
@@ -1,3 +1,36 @@
+qgis (2.18.28+dfsg-1~bpo9+1) stretch-backports; urgency=medium
+
+  * Rebuild for stretch-backports.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Sat, 26 Jan 2019 09:04:33 +0100
+
+qgis (2.18.28+dfsg-1) unstable; urgency=medium
+
+  * Update packaging for GRASS 7.6.0.
+  * Update symbols for other architectures.
+  * Move from experimental to unstable.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Mon, 21 Jan 2019 07:37:16 +0100
+
+qgis (2.18.28+dfsg-1~exp1) experimental; urgency=medium
+
+  [ Jürgen E. Fischer ]
+  * Release of 2.18.28
+
+  [ Bas Couwenberg ]
+  * New upstream release.
+  * Update symbols for amd64.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Fri, 18 Jan 2019 15:56:42 +0100
+
+qgis (2.18.27+dfsg-2) unstable; urgency=medium
+
+  * Bump Standards-Version to 4.3.0, no changes.
+  * Bump minimum GRASS build dependency version to 7.4.4.
+  * Update symbols for amd64.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Tue, 15 Jan 2019 18:17:49 +0100
+
 qgis (2.18.27+dfsg-1~bpo9+1) stretch-backports; urgency=medium
 
   * Rebuild for stretch-backports.


=====================================
debian/control
=====================================
@@ -67,7 +67,7 @@ Build-Depends: bison,
                pkg-kde-tools
 Build-Conflicts: libqgis-dev,
                  qgis-dev
-Standards-Version: 4.2.1
+Standards-Version: 4.3.0
 Vcs-Browser: https://salsa.debian.org/debian-gis-team/qgis
 Vcs-Git: https://salsa.debian.org/debian-gis-team/qgis.git -b stretch-backports
 Homepage: https://qgis.org/
@@ -110,7 +110,7 @@ Description: QGIS - architecture-independent data
  This package contains architecture-independent supporting data files for use
  with QGIS.
 
-Package: libqgis-app2.18.27
+Package: libqgis-app2.18.28
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends},
@@ -121,7 +121,7 @@ Description: QGIS - shared app library
  .
  This package contains the shared app library.
 
-Package: libqgis-core2.18.27
+Package: libqgis-core2.18.28
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends},
@@ -132,7 +132,7 @@ Description: QGIS - shared core library
  .
  This package contains the shared core library.
 
-Package: libqgis-gui2.18.27
+Package: libqgis-gui2.18.28
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends},
@@ -143,7 +143,7 @@ Description: QGIS - shared gui library
  .
  This package contains the shared gui library.
 
-Package: libqgis-analysis2.18.27
+Package: libqgis-analysis2.18.28
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends},
@@ -154,7 +154,7 @@ Description: QGIS - shared analysis library
  .
  This package contains the shared analysis library.
 
-Package: libqgis-networkanalysis2.18.27
+Package: libqgis-networkanalysis2.18.28
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends},
@@ -165,7 +165,7 @@ Description: QGIS - shared network analysis library
  .
  This package contains the shared network analysis library.
 
-Package: libqgisgrass7-2.18.27
+Package: libqgisgrass7-2.18.28
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends},
@@ -176,7 +176,7 @@ Description: QGIS - shared grass library
  .
  This package contains the shared grass library.
 
-Package: libqgispython2.18.27
+Package: libqgispython2.18.28
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends},
@@ -207,7 +207,7 @@ Description: QGIS custom widgets for Qt Designer
  .
  This package contains a library to use specific QGIS widgets in Qt Designer.
 
-Package: libqgis-server2.18.27
+Package: libqgis-server2.18.28
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends},
@@ -228,14 +228,14 @@ Depends: grass-dev (>= 7.2.0),
          libgsl-dev,
          libpq-dev,
          libproj-dev,
-         libqgis-app2.18.27 (= ${binary:Version}),
-         libqgis-core2.18.27 (= ${binary:Version}),
-         libqgis-gui2.18.27 (= ${binary:Version}),
-         libqgis-analysis2.18.27 (= ${binary:Version}),
-         libqgis-networkanalysis2.18.27 (= ${binary:Version}),
-         libqgis-server2.18.27 (= ${binary:Version}),
-         libqgisgrass7-2.18.27 (= ${binary:Version}),
-         libqgispython2.18.27 (= ${binary:Version}),
+         libqgis-app2.18.28 (= ${binary:Version}),
+         libqgis-core2.18.28 (= ${binary:Version}),
+         libqgis-gui2.18.28 (= ${binary:Version}),
+         libqgis-analysis2.18.28 (= ${binary:Version}),
+         libqgis-networkanalysis2.18.28 (= ${binary:Version}),
+         libqgis-server2.18.28 (= ${binary:Version}),
+         libqgisgrass7-2.18.28 (= ${binary:Version}),
+         libqgispython2.18.28 (= ${binary:Version}),
          libqt4-dev (>= 4.7.0),
          libsqlite3-dev,
          python-qt4 (>= 4.1.0),
@@ -342,7 +342,7 @@ Depends: python-qgis-common (= ${source:Version}),
          python-six,
          python-tz,
          python-yaml,
-         libqgispython2.18.27,
+         libqgispython2.18.28,
          ${shlibs:Depends},
          ${python:Depends},
          ${misc:Depends},


=====================================
debian/libqgis-analysis2.18.27.install → debian/libqgis-analysis2.18.28.install
=====================================


=====================================
debian/libqgis-analysis2.18.27.symbols → debian/libqgis-analysis2.18.28.symbols
=====================================
@@ -1,5 +1,5 @@
 # SymbolsHelper-Confirmed: 2.18.25 arm64 armel armhf i386 m68k mips powerpc ppc64 ppc64el s390x x32
-libqgis_analysis.so.2.18.27 #PACKAGE# #MINVER#
+libqgis_analysis.so.2.18.28 #PACKAGE# #MINVER#
 * Build-Depends-Package: libqgis-dev
  _ZN12TriDecorator10calcNormalEddP8Vector3D at Base 2.0.1
  _ZN12TriDecorator11getTriangleEddP7Point3DPiS1_S2_S1_S2_ at Base 2.0.1


=====================================
debian/libqgis-app2.18.27.install → debian/libqgis-app2.18.28.install
=====================================


=====================================
debian/libqgis-app2.18.27.symbols → debian/libqgis-app2.18.28.symbols
=====================================
@@ -1,5 +1,5 @@
-# SymbolsHelper-Confirmed: 2.18.26 hurd-i386
-libqgis_app.so.2.18.27 #PACKAGE# #MINVER#
+# SymbolsHelper-Confirmed: 2.18.28 riscv64
+libqgis_app.so.2.18.28 #PACKAGE# #MINVER#
 * Build-Depends-Package: libqgis-dev
  (optional=templinst|arch=!amd64 !hurd-i386 !i386 !kfreebsd-amd64 !kfreebsd-i386 !x32)_Z10qDeleteAllI5QListIPN13QFormInternal11DomPropertyEEEvRKT_ at Base 2.14.18
  (optional=templinst)_Z13qvariant_castI26QUiTranslatableStringValueET_RK8QVariant at Base 2.14.0
@@ -2159,7 +2159,6 @@ libqgis_app.so.2.18.27 #PACKAGE# #MINVER#
  _ZN20QgsVisibilityPresetsD0Ev at Base 2.18.17
  _ZN20QgsVisibilityPresetsD1Ev at Base 2.18.17
  _ZN20QgsVisibilityPresetsD2Ev at Base 2.18.17
- (optional=templinst|arch=!amd64 !hurd-i386 !i386 !m68k !x32)_ZN21QScopedPointerDeleterI16QUiLoaderPrivateE7cleanupEPS0_ at Base 2.18.22
  _ZN21QgsDecorationScaleBar11projectReadEv at Base 2.14.0
  _ZN21QgsDecorationScaleBar11qt_metacallEN11QMetaObject4CallEiPPv at Base 2.14.0
  _ZN21QgsDecorationScaleBar11qt_metacastEPKc at Base 2.14.0


=====================================
debian/libqgis-core2.18.27.install → debian/libqgis-core2.18.28.install
=====================================


=====================================
debian/libqgis-core2.18.27.symbols → debian/libqgis-core2.18.28.symbols
=====================================
@@ -1,5 +1,5 @@
-# SymbolsHelper-Confirmed: 2.18.27 armel armhf hurd-i386 i386 mips powerpc
-libqgis_core.so.2.18.27 #PACKAGE# #MINVER#
+# SymbolsHelper-Confirmed: 2.18.28 arm64 ppc64el riscv64 s390x
+libqgis_core.so.2.18.28 #PACKAGE# #MINVER#
 * Build-Depends-Package: libqgis-dev
  GEOPROJ4 at Base 2.0.1
  GEOWKT at Base 2.0.1
@@ -14,6 +14,7 @@ libqgis_core.so.2.18.27 #PACKAGE# #MINVER#
  (subst)_Z9qgsCalloc{size_t}{size_t}@Base 2.14.0
  (subst)_Z9qgsMalloc{size_t}@Base 2.14.0
  _ZN10QgsClipper14clippedLineWKBER14QgsConstWkbPtrRK12QgsRectangleR9QPolygonF at Base 2.18.17
+ _ZN10QgsClipper15clipLineSegmentEddddRdS0_S0_S0_ at Base 2.18.28
  _ZN10QgsClipper21connectSeparatedLinesEddddRK12QgsRectangleR9QPolygonF at Base 2.0.1
  (arch=mips mipsel)_ZN10QgsClipper21trimPolygonToBoundaryERK9QPolygonFRS0_RK12QgsRectangleNS_8BoundaryEd at Base 2.18.23
  _ZN10QgsClipper5MAX_XE at Base 2.0.1
@@ -864,8 +865,8 @@ libqgis_core.so.2.18.27 #PACKAGE# #MINVER#
  _ZN13QgsBlurEffectD0Ev at Base 2.14.0
  _ZN13QgsBlurEffectD1Ev at Base 2.14.0
  _ZN13QgsBlurEffectD2Ev at Base 2.14.0
- (arch=alpha armel mips mips64el mipsel)_ZN13QgsExpression11HelpExampleC1ERK7QStringS3_S3_ at Base 2.18.17
- (arch=alpha armel mips mips64el mipsel)_ZN13QgsExpression11HelpExampleC2ERK7QStringS3_S3_ at Base 2.18.17
+ (arch=alpha armel mips mips64el mipsel riscv64)_ZN13QgsExpression11HelpExampleC1ERK7QStringS3_S3_ at Base 2.18.28
+ (arch=alpha armel mips mips64el mipsel riscv64)_ZN13QgsExpression11HelpExampleC2ERK7QStringS3_S3_ at Base 2.18.28
  _ZN13QgsExpression11HelpExampleD1Ev at Base 2.18.17
  _ZN13QgsExpression11HelpExampleD2Ev at Base 2.18.17
  _ZN13QgsExpression11HelpVariantC1ERK7QStringS3_RK5QListINS_7HelpArgEEbRKS4_INS_11HelpExampleEES3_ at Base 2.18.17
@@ -1157,36 +1158,36 @@ libqgis_core.so.2.18.27 #PACKAGE# #MINVER#
  _ZN14QgsApplication15activeThemePathEv at Base 2.0.1
  _ZN14QgsApplication15authorsFilePathEv at Base 2.0.1
  _ZN14QgsApplication15licenceFilePathEv at Base 2.0.1
- _ZN14QgsApplication15mThemeName21827E at Base 2.18.27
+ _ZN14QgsApplication15mThemeName21828E at Base 2.18.28
  _ZN14QgsApplication15settingsChangedEv at Base 2.14.5
  _ZN14QgsApplication15shortNameRegExpEv at Base 2.14.0
  _ZN14QgsApplication15userStyleV2PathEv at Base 2.0.1
  _ZN14QgsApplication16defaultThemePathEv at Base 2.0.1
- _ZN14QgsApplication16mConfigPath21827E at Base 2.18.27
- _ZN14QgsApplication16mMaxThreads21827E at Base 2.18.27
- _ZN14QgsApplication16mPluginPath21827E at Base 2.18.27
- _ZN14QgsApplication16mPrefixPath21827E at Base 2.18.27
+ _ZN14QgsApplication16mConfigPath21828E at Base 2.18.28
+ _ZN14QgsApplication16mMaxThreads21828E at Base 2.18.28
+ _ZN14QgsApplication16mPluginPath21828E at Base 2.18.28
+ _ZN14QgsApplication16mPrefixPath21828E at Base 2.18.28
  _ZN14QgsApplication16reportStyleSheetEv at Base 2.0.1
  _ZN14QgsApplication16setAuthDbDirPathERK7QString at Base 2.14.0
  _ZN14QgsApplication16sponsorsFilePathEv at Base 2.0.1
  _ZN14QgsApplication16staticMetaObjectE at Base 2.0.1
  _ZN14QgsApplication16userThemesFolderEv at Base 2.14.0
  _ZN14QgsApplication17createThemeFolderEv at Base 2.14.0
- _ZN14QgsApplication17mLibexecPath21827E at Base 2.18.27
- _ZN14QgsApplication17mLibraryPath21827E at Base 2.18.27
- _ZN14QgsApplication17mPkgDataPath21827E at Base 2.18.27
- _ZN14QgsApplication17mUIThemeName21827E at Base 2.18.27
+ _ZN14QgsApplication17mLibexecPath21828E at Base 2.18.28
+ _ZN14QgsApplication17mLibraryPath21828E at Base 2.18.28
+ _ZN14QgsApplication17mPkgDataPath21828E at Base 2.18.28
+ _ZN14QgsApplication17mUIThemeName21828E at Base 2.18.28
  _ZN14QgsApplication17restoreGdalDriverERK7QString at Base 2.14.0
  _ZN14QgsApplication18defaultStyleV2PathEv at Base 2.0.1
- _ZN14QgsApplication18mGdalSkipList21827E at Base 2.18.27
+ _ZN14QgsApplication18mGdalSkipList21828E at Base 2.18.28
  _ZN14QgsApplication18qgisAuthDbFilePathEv at Base 2.14.0
  _ZN14QgsApplication18qgisUserDbFilePathEv at Base 2.0.1
  _ZN14QgsApplication18registerOgrDriversEv at Base 2.0.1
  _ZN14QgsApplication18setDefaultSvgPathsERK11QStringList at Base 2.0.1
  _ZN14QgsApplication19defaultThemesFolderEv at Base 2.14.0
  _ZN14QgsApplication19emitSettingsChangedEv at Base 2.14.5
- _ZN14QgsApplication19mAuthDbDirPath21827E at Base 2.18.27
- _ZN14QgsApplication19mSystemEnvVars21827E at Base 2.18.27
+ _ZN14QgsApplication19mAuthDbDirPath21828E at Base 2.18.28
+ _ZN14QgsApplication19mSystemEnvVars21828E at Base 2.18.28
  _ZN14QgsApplication19qgisSettingsDirPathEv at Base 2.0.1
  _ZN14QgsApplication19translatorsFilePathEv at Base 2.0.1
  _ZN14QgsApplication20contributorsFilePathEv at Base 2.0.1
@@ -1194,18 +1195,18 @@ libqgis_core.so.2.18.27 #PACKAGE# #MINVER#
  _ZN14QgsApplication21QGIS_APPLICATION_NAMEE at Base 2.4.0
  _ZN14QgsApplication21composerTemplatePathsEv at Base 2.14.0
  _ZN14QgsApplication21developersMapFilePathEv at Base 2.8.0
- _ZN14QgsApplication21mBuildOutputPath21827E at Base 2.18.27
- _ZN14QgsApplication21mBuildSourcePath21827E at Base 2.18.27
- _ZN14QgsApplication21mDefaultSvgPaths21827E at Base 2.18.27
+ _ZN14QgsApplication21mBuildOutputPath21828E at Base 2.18.28
+ _ZN14QgsApplication21mBuildSourcePath21828E at Base 2.18.28
+ _ZN14QgsApplication21mDefaultSvgPaths21828E at Base 2.18.28
  _ZN14QgsApplication22QGIS_ORGANIZATION_NAMEE at Base 2.4.0
  _ZN14QgsApplication23applyGdalSkippedDriversEv at Base 2.0.1
- _ZN14QgsApplication23mFileOpenEventList21827E at Base 2.18.27
+ _ZN14QgsApplication23mFileOpenEventList21828E at Base 2.18.28
  _ZN14QgsApplication24QGIS_ORGANIZATION_DOMAINE at Base 2.4.0
  _ZN14QgsApplication24setFileOpenEventReceiverEP7QObject at Base 2.0.1
- _ZN14QgsApplication25mRunningFromBuildDir21827E at Base 2.18.27
+ _ZN14QgsApplication25mRunningFromBuildDir21828E at Base 2.18.28
  _ZN14QgsApplication26absolutePathToRelativePathERK7QStringS2_ at Base 2.14.0
  _ZN14QgsApplication26relativePathToAbsolutePathERK7QStringS2_ at Base 2.14.0
- _ZN14QgsApplication27mFileOpenEventReceiver21827E at Base 2.18.27
+ _ZN14QgsApplication27mFileOpenEventReceiver21828E at Base 2.18.28
  _ZN14QgsApplication4initE7QString at Base 2.0.1
  _ZN14QgsApplication5eventEP6QEvent at Base 2.0.1
  _ZN14QgsApplication6endianEv at Base 2.0.1
@@ -1268,7 +1269,7 @@ libqgis_core.so.2.18.27 #PACKAGE# #MINVER#
  _ZN14QgsAuthManager18smAuthServersTableE at Base 2.14.0
  _ZN14QgsAuthManager18storeCertAuthorityERK15QSslCertificate at Base 2.14.0
  _ZN14QgsAuthManager18updateNetworkReplyEP13QNetworkReplyRK7QStringS4_ at Base 2.14.0
- (arch=!amd64 !hurd-i386 !i386 !m68k !x32)_ZN14QgsAuthManager19clearMasterPasswordEv at Base 2.18.17
+ (arch=!amd64 !hurd-i386 !i386 !m68k !riscv64 !x32)_ZN14QgsAuthManager19clearMasterPasswordEv at Base 2.18.17
  _ZN14QgsAuthManager19existsCertAuthorityERK15QSslCertificate at Base 2.14.0
  _ZN14QgsAuthManager19getUntrustedCaCertsE5QListI15QSslCertificateE at Base 2.14.0
  _ZN14QgsAuthManager19insertCaCertInCacheEN16QgsAuthCertUtils12CaCertSourceERK5QListI15QSslCertificateE at Base 2.14.0
@@ -3785,8 +3786,8 @@ libqgis_core.so.2.18.27 #PACKAGE# #MINVER#
  _ZN17QgsSimplifyMethod25setForceLocalOptimizationEb at Base 2.2.0
  _ZN17QgsSimplifyMethodC1Ev at Base 2.2.0
  _ZN17QgsSimplifyMethodC2Ev at Base 2.2.0
- (arch=!amd64 !hppa !hurd-i386 !i386 !m68k !x32)_ZN17QgsVectorJoinInfoC1ERKS_ at Base 2.18.22
- (arch=!amd64 !hppa !hurd-i386 !i386 !m68k !x32)_ZN17QgsVectorJoinInfoC2ERKS_ at Base 2.18.22
+ (arch=!amd64 !hppa !hurd-i386 !i386 !m68k !riscv64 !x32)_ZN17QgsVectorJoinInfoC1ERKS_ at Base 2.18.22
+ (arch=!amd64 !hppa !hurd-i386 !i386 !m68k !riscv64 !x32)_ZN17QgsVectorJoinInfoC2ERKS_ at Base 2.18.22
  _ZN17QgsVectorJoinInfoD1Ev at Base 2.18.17
  _ZN17QgsVectorJoinInfoD2Ev at Base 2.18.17
  _ZN18QgsColorRampShader16setColorRampTypeENS_14ColorRamp_TYPEE at Base 2.0.1
@@ -4607,8 +4608,8 @@ libqgis_core.so.2.18.27 #PACKAGE# #MINVER#
  _ZN19QgsVectorFileWriter10addFeatureER10QgsFeatureP20QgsFeatureRendererV2N4QGis8UnitTypeE at Base 2.0.1
  _ZN19QgsVectorFileWriter10stopRenderEP14QgsVectorLayer at Base 2.14.0
  _ZN19QgsVectorFileWriter11startRenderEP14QgsVectorLayer at Base 2.14.0
- (arch=!amd64 !hppa !hurd-i386 !i386 !m68k !powerpc !ppc64 !ppc64el !riscv64 !x32)_ZN19QgsVectorFileWriter12HiddenOptionC1ERK7QString at Base 2.18.22
- (arch=!amd64 !hppa !hurd-i386 !i386 !m68k !powerpc !ppc64 !ppc64el !riscv64 !x32)_ZN19QgsVectorFileWriter12HiddenOptionC2ERK7QString at Base 2.18.22
+ (arch=!amd64 !hppa !hurd-i386 !i386 !m68k !powerpc !ppc64 !ppc64el !x32)_ZN19QgsVectorFileWriter12HiddenOptionC1ERK7QString at Base 2.18.28
+ (arch=!amd64 !hppa !hurd-i386 !i386 !m68k !powerpc !ppc64 !ppc64el !x32)_ZN19QgsVectorFileWriter12HiddenOptionC2ERK7QString at Base 2.18.28
  _ZN19QgsVectorFileWriter12HiddenOptionD0Ev at Base 2.18.17
  _ZN19QgsVectorFileWriter12HiddenOptionD1Ev at Base 2.18.17
  _ZN19QgsVectorFileWriter12HiddenOptionD2Ev at Base 2.18.17
@@ -10619,7 +10620,7 @@ libqgis_core.so.2.18.27 #PACKAGE# #MINVER#
  (optional=templinst)_ZNSt6vectorIN8QgsLabel10labelpointESaIS1_EE17_M_realloc_insertIJRKS1_EEEvN9__gnu_cxx17__normal_iteratorIPS1_S3_EEDpOT_ at Base 2.14.18
  (optional=templinst)_ZNSt6vectorISt4pairIidESaIS1_EE17_M_realloc_insertIJS1_EEEvN9__gnu_cxx17__normal_iteratorIPS1_S3_EEDpOT_ at Base 2.14.18
  (optional=templinst|arch=armel armhf hurd-i386 i386 m68k mips mipsel powerpc x32)_ZNSt6vectorIiSaIiEE17_M_default_appendEj at Base 2.18.22
- (optional=templinst|arch=amd64 arm64 ppc64 ppc64el s390x)_ZNSt6vectorIiSaIiEE17_M_default_appendEm at Base 2.18.22
+ (optional=templinst)_ZNSt6vectorIiSaIiEE17_M_default_appendEm at Base 2.18.22
  (optional=templinst)_ZSt4swapI18QgsRendererRangeV2ENSt9enable_ifIXsrSt6__and_IJSt6__not_ISt15__is_tuple_likeIT_EESt21is_move_constructibleIS5_ESt18is_move_assignableIS5_EEE5valueEvE4typeERS5_SF_ at Base 2.14.18
  (optional=templinst|arch=alpha arm64 armel armhf mips mips64el mipsel powerpc s390x)_ZSt4swapI21QgsRendererCategoryV2ENSt9enable_ifIXsrSt6__and_IJSt6__not_ISt15__is_tuple_likeIT_EESt21is_move_constructibleIS5_ESt18is_move_assignableIS5_EEE5valueEvE4typeERS5_SF_ at Base 2.14.18
  _ZTI10QgsCurveV2 at Base 2.14.0


=====================================
debian/libqgis-gui2.18.27.install → debian/libqgis-gui2.18.28.install
=====================================


=====================================
debian/libqgis-gui2.18.27.symbols → debian/libqgis-gui2.18.28.symbols
=====================================
@@ -1,5 +1,5 @@
 # SymbolsHelper-Confirmed: 2.18.26 hurd-i386
-libqgis_gui.so.2.18.27 #PACKAGE# #MINVER#
+libqgis_gui.so.2.18.28 #PACKAGE# #MINVER#
 * Build-Depends-Package: libqgis-dev
  (optional=templinst|arch=!amd64 !hurd-i386 !i386 !kfreebsd-amd64 !kfreebsd-i386 !x32)_Z10qDeleteAllI5QListIPN13QFormInternal11DomPropertyEEEvRKT_ at Base 2.14.16
  (optional=templinst)_Z13qvariant_castI26QUiTranslatableStringValueET_RK8QVariant at Base 2.0.1


=====================================
debian/libqgis-networkanalysis2.18.27.install → debian/libqgis-networkanalysis2.18.28.install
=====================================


=====================================
debian/libqgis-networkanalysis2.18.27.symbols → debian/libqgis-networkanalysis2.18.28.symbols
=====================================
@@ -1,5 +1,5 @@
 # SymbolsHelper-Confirmed: 2.18.24 x32
-libqgis_networkanalysis.so.2.18.27 #PACKAGE# #MINVER#
+libqgis_networkanalysis.so.2.18.28 #PACKAGE# #MINVER#
 * Build-Depends-Package: libqgis-dev
  _ZN11QgsGraphArcC1Ev at Base 2.0.1
  _ZN11QgsGraphArcC2Ev at Base 2.0.1


=====================================
debian/libqgis-server2.18.27.install → debian/libqgis-server2.18.28.install
=====================================


=====================================
debian/libqgis-server2.18.27.symbols → debian/libqgis-server2.18.28.symbols
=====================================
@@ -1,5 +1,5 @@
-# SymbolsHelper-Confirmed: 2.18.27 arm64 armel mips
-libqgis_server.so.2.18.27 #PACKAGE# #MINVER#
+# SymbolsHelper-Confirmed: 2.18.28 amd64 arm64 armel mips riscv64
+libqgis_server.so.2.18.28 #PACKAGE# #MINVER#
 * Build-Depends-Package: libqgis-dev
  _ZN14QgsConfigCache11qt_metacallEN11QMetaObject4CallEiPPv at Base 2.8.0
  _ZN14QgsConfigCache11qt_metacastEPKc at Base 2.8.0
@@ -88,9 +88,9 @@ libqgis_server.so.2.18.27 #PACKAGE# #MINVER#
  _ZN22QgsAccessControlFilterD1Ev at Base 2.14.0
  _ZN22QgsAccessControlFilterD2Ev at Base 2.14.0
  _ZN22QgsMapServiceExceptionC1ERK7QStringS2_ at Base 2.8.0
- _ZN22QgsMapServiceExceptionC1ERKS_ at Base 2.18.27
+ (arch=!amd64)_ZN22QgsMapServiceExceptionC1ERKS_ at Base 2.18.28
  _ZN22QgsMapServiceExceptionC2ERK7QStringS2_ at Base 2.8.0
- _ZN22QgsMapServiceExceptionC2ERKS_ at Base 2.18.27
+ (arch=!amd64)_ZN22QgsMapServiceExceptionC2ERKS_ at Base 2.18.28
  _ZN22QgsMapServiceExceptionD1Ev at Base 2.18.17
  _ZN22QgsMapServiceExceptionD2Ev at Base 2.18.17
  _ZN22QgsServerProjectParser24sublayersOfEmbeddedGroupERK7QStringS2_R4QSetIS0_E at Base 2.8.0


=====================================
debian/libqgisgrass7-2.18.27.install → debian/libqgisgrass7-2.18.28.install
=====================================


=====================================
debian/libqgisgrass7-2.18.27.lintian-overrides → debian/libqgisgrass7-2.18.28.lintian-overrides
=====================================


=====================================
debian/libqgisgrass7-2.18.27.symbols → debian/libqgisgrass7-2.18.28.symbols
=====================================
@@ -1,5 +1,5 @@
 # SymbolsHelper-Confirmed: 2.18.17 alpha amd64 arm64 armel armhf i386 mips mips64el mipsel powerpc ppc64 ppc64el s390x
-libqgisgrass7.so.2.18.27 #PACKAGE# #MINVER#
+libqgisgrass7.so.2.18.28 #PACKAGE# #MINVER#
 * Build-Depends-Package: libqgis-dev
  _ZN11QgsGrassWin10hideWindowEi at Base 2.14.0
  _ZN12QgsGrassCopy11qt_metacallEN11QMetaObject4CallEiPPv at Base 2.14.0


=====================================
debian/libqgispython2.18.27.install → debian/libqgispython2.18.28.install
=====================================


=====================================
debian/libqgispython2.18.27.symbols → debian/libqgispython2.18.28.symbols
=====================================
@@ -1,5 +1,5 @@
 # SymbolsHelper-Confirmed: 2.14.0 amd64 arm64 armel armhf i386 mips64el mipsel powerpc ppc64el s390x
-libqgispython.so.2.18.27 #PACKAGE# #MINVER#
+libqgispython.so.2.18.28 #PACKAGE# #MINVER#
 * Build-Depends-Package: libqgis-dev
  _ZTI14QgsPythonUtils at Base 2.0.1
  _ZTS14QgsPythonUtils at Base 2.0.1


=====================================
debian/patches/grass76.patch
=====================================
@@ -0,0 +1,14 @@
+Description: Add support for GRASS 7.6.
+Author: Bas Couwenberg <sebastic at debian.org>
+
+--- a/python/plugins/processing/algs/grass7/Grass7Utils.py
++++ b/python/plugins/processing/algs/grass7/Grass7Utils.py
+@@ -84,7 +84,7 @@ class Grass7Utils:
+         if Grass7Utils.grassPath() is None:
+             return None
+ 
+-        for command in ["grass74", "grass72", "grass71", "grass70", "grass"]:
++        for command in ["grass76", "grass74", "grass72", "grass71", "grass70", "grass"]:
+             proc = subprocess.Popen(
+                 ["{} -v".format(command)],
+                 shell=True,


=====================================
debian/patches/series
=====================================
@@ -5,3 +5,4 @@ exclude-elvensword-resources.patch
 occurred-typo.patch
 number-typo.patch
 columns-typo.patch
+grass76.patch


=====================================
python/plugins/processing/algs/grass7/description/r.mapcalc.simple.txt
=====================================
@@ -0,0 +1,11 @@
+r.mapcalc.simple
+Calculate new raster map from a r.mapcalc expression.
+Raster (r.*)
+ParameterRaster|a|Raster layer A|False
+ParameterRaster|b|Raster layer B|True
+ParameterRaster|c|Raster layer C|True
+ParameterRaster|d|Raster layer D|True
+ParameterRaster|e|Raster layer E|True
+ParameterRaster|f|Raster layer F|True
+ParameterString|expression|Formula|A*2
+OutputRaster|output|Calculated


=====================================
python/plugins/processing/algs/grass7/description/r.mapcalc.txt deleted
=====================================
@@ -1,9 +0,0 @@
-r.mapcalc
-Raster map calculator. 
-Raster (r.*)
-ParameterMultipleInput|maps|Raster maps used in the calculator|3|True
-ParameterString|expression|Expression to evaluate. The raster names used in expression should be the same than in QGIS|None|True|True
-ParameterFile|file|File containing expression(s) to evaluate (same rule for raster names than above)|True
-ParameterString|seed|Integer seed for rand() function|None|False|True
-*ParameterBoolean|-s|Generate random seed (result is non-deterministic)|False
-OutputDirectory|output_dir|Results Directory


=====================================
src/analysis/raster/qgsalignraster.cpp
=====================================
@@ -19,8 +19,11 @@
 #include <cpl_conv.h>
 
 #if defined(_MSC_VER) && _MSC_VER >= 1600 && _MSC_VER < 1900
+#include <cpl_multiproc.h>
 // we need GDALWarpKernel
 #undef CPL_SUPRESS_CPLUSPLUS
+#undef CPL_DISALLOW_COPY_ASSIGN
+#define CPL_DISALLOW_COPY_ASSIGN(className)
 #endif
 
 #include <gdalwarper.h>


=====================================
src/core/qgsogcutils.cpp
=====================================
@@ -1808,6 +1808,10 @@ QgsExpression::NodeBinaryOperator* QgsOgcUtils::nodeBinaryOperatorFromOgcFilter(
       {
         escape = element.attribute( "escape" );
       }
+      else if ( element.hasAttribute( "escapeChar" ) )
+      {
+        escape = element.attribute( "escapeChar" );
+      }
       // replace
       QString oprValue = static_cast<const QgsExpression::NodeLiteral*>( opRight )->value().toString();
       if ( !wildCard.isEmpty() && wildCard != "%" )


=====================================
src/providers/oracle/qgsoracleexpressioncompiler.cpp
=====================================
@@ -57,11 +57,11 @@ QgsSqlExpressionCompiler::Result QgsOracleExpressionCompiler::compileNode( const
             return Complete;
 
           case QgsExpression::boILike:
-            result = QString( "lower(%1) LIKE lower(%2)" ).arg( op1, op2 );
+            result = QString( "lower(%1) LIKE lower(%2) ESCAPE '\\'" ).arg( op1, op2 );
             return Complete;
 
           case QgsExpression::boNotILike:
-            result = QString( "NOT lower(%1) LIKE lower(%2)" ).arg( op1, op2 );
+            result = QString( "NOT lower(%1) LIKE lower(%2) ESCAPE '\\'" ).arg( op1, op2 );
             return Complete;
 
           case QgsExpression::boIntDiv:


=====================================
tests/src/core/testqgsogcutils.cpp
=====================================
@@ -330,13 +330,19 @@ void TestQgsOgcUtils::testExpressionFromOgcFilter_data()
     "<PropertyName>NAME</PropertyName><Literal>._QGIS.\\.</Literal></PropertyIsLike>"
     "</Filter>" )
   << QString( "NAME LIKE '_\\\\_QGIS_.'" );
-  // different single chars
+  // different escape chars
   QTest::newRow( "like escape char" ) << QString(
     "<Filter>"
     "<PropertyIsLike wildCard=\"*\" singleChar=\".\" escape=\"!\">"
     "<PropertyName>NAME</PropertyName><Literal>_QGIS.!.!!%QGIS*!*</Literal></PropertyIsLike>"
     "</Filter>" )
   << QString( "NAME LIKE '\\\\_QGIS_.!\\\\%QGIS%*'" );
+  QTest::newRow( "like escape char" ) << QString(
+    "<Filter>"
+    "<PropertyIsLike wildCard=\"*\" singleChar=\".\" escapeChar=\"!\">"
+    "<PropertyName>NAME</PropertyName><Literal>_QGIS.!.!!%QGIS*!*</Literal></PropertyIsLike>"
+    "</Filter>" )
+  << QString( "NAME LIKE '\\\\_QGIS_.!\\\\%QGIS%*'" );
 
   QTest::newRow( "is null" ) << QString(
     "<Filter>"



View it on GitLab: https://salsa.debian.org/debian-gis-team/qgis/compare/7ff54fde2da417ea04eb10379dc1ebea1938b182...15ad49488dd06ca583b7e6f50a645747b446266e

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/qgis/compare/7ff54fde2da417ea04eb10379dc1ebea1938b182...15ad49488dd06ca583b7e6f50a645747b446266e
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20190126/a9d568d6/attachment-0001.html>

More information about the Pkg-grass-devel mailing list