[Git][debian-gis-team/qgis][experimental] 8 commits: New upstream version 2.14.22+dfsg
Sebastiaan Couwenberg
gitlab at salsa.debian.org
Fri Jan 26 13:38:53 UTC 2018
Sebastiaan Couwenberg pushed to branch experimental at Debian GIS Project / qgis
Commits:
6fa9dfdd by Bas Couwenberg at 2018-01-20T08:45:28+01:00
New upstream version 2.14.22+dfsg
- - - - -
6caac7de by Bas Couwenberg at 2018-01-20T08:57:27+01:00
Merge tag 'upstream/2.14.22+dfsg'
Upstream version 2.14.22+dfsg
- - - - -
c7866af5 by Bas Couwenberg at 2018-01-20T08:59:25+01:00
New upstream release.
- - - - -
6685f6a0 by Bas Couwenberg at 2018-01-20T09:12:25+01:00
Update version specific symbols.
- - - - -
aa478ea0 by Bas Couwenberg at 2018-01-20T09:12:26+01:00
Set distribution to experimental.
- - - - -
ffdcc9a0 by Bas Couwenberg at 2018-01-20T15:39:11+01:00
Update copyright-format URL to use HTTPS.
- - - - -
df8cd17b by Bas Couwenberg at 2018-01-23T18:16:05+01:00
Set distribution to unstable.
- - - - -
3e6f596b by Bas Couwenberg at 2018-01-26T11:42:50+01:00
Merge tag 'debian/2.14.22+dfsg-1' into experimental
- - - - -
24 changed files:
- CMakeLists.txt
- ChangeLog
- debian/changelog
- debian/control
- debian/copyright
- debian/libqgis-analysis2.14.21.install → debian/libqgis-analysis2.14.22.install
- debian/libqgis-analysis2.14.21.symbols → debian/libqgis-analysis2.14.22.symbols
- debian/libqgis-app2.14.21.install → debian/libqgis-app2.14.22.install
- debian/libqgis-app2.14.21.symbols → debian/libqgis-app2.14.22.symbols
- debian/libqgis-core2.14.21.install → debian/libqgis-core2.14.22.install
- debian/libqgis-core2.14.21.symbols → debian/libqgis-core2.14.22.symbols
- debian/libqgis-gui2.14.21.install → debian/libqgis-gui2.14.22.install
- debian/libqgis-gui2.14.21.symbols → debian/libqgis-gui2.14.22.symbols
- debian/libqgis-networkanalysis2.14.21.install → debian/libqgis-networkanalysis2.14.22.install
- debian/libqgis-networkanalysis2.14.21.symbols → debian/libqgis-networkanalysis2.14.22.symbols
- debian/libqgis-server2.14.21.install → debian/libqgis-server2.14.22.install
- debian/libqgis-server2.14.21.symbols → debian/libqgis-server2.14.22.symbols
- debian/libqgisgrass7-2.14.21.install → debian/libqgisgrass7-2.14.22.install
- debian/libqgisgrass7-2.14.21.lintian-overrides → debian/libqgisgrass7-2.14.22.lintian-overrides
- debian/libqgisgrass7-2.14.21.symbols → debian/libqgisgrass7-2.14.22.symbols
- debian/libqgispython2.14.21.install → debian/libqgispython2.14.22.install
- debian/libqgispython2.14.21.symbols → debian/libqgispython2.14.22.symbols
- python/ext-libs/owslib/fes.py
- python/plugins/MetaSearch/dialogs/maindialog.py
Changes:
=====================================
CMakeLists.txt
=====================================
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,6 @@
SET(CPACK_PACKAGE_VERSION_MAJOR "2")
SET(CPACK_PACKAGE_VERSION_MINOR "14")
-SET(CPACK_PACKAGE_VERSION_PATCH "21")
+SET(CPACK_PACKAGE_VERSION_PATCH "22")
SET(COMPLETE_VERSION ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH})
SET(RELEASE_NAME "Essen")
IF (POLICY CMP0048) # in CMake 3.0.0+
=====================================
ChangeLog
=====================================
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Tom Kralidis <tomkralidis at gmail.com> 2017-12-22
+
+ [bugfix] [MetaSearch] make gml:Envelope CRS explicit for spatial queries (fixes #17739)
+
+Juergen E. Fischer <jef at norbit.de> 2017-12-08
+
+ Release of 2.14.21
+
rldhont <rldhont at gmail.com> 2017-11-06
[Server] GetFeatureInfo: enhance raster data values displayed
=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,27 @@
-qgis (2.14.21+dfsg-4) UNRELEASED; urgency=medium
+qgis (2.14.22+dfsg-2) UNRELEASED; urgency=medium
* Update packaging for GRASS 7.4.
-- Bas Couwenberg <sebastic at debian.org> Sun, 10 Dec 2017 16:30:08 +0100
+qgis (2.14.22+dfsg-1) unstable; urgency=medium
+
+ * Update copyright-format URL to use HTTPS.
+ * Move from experimental to unstable.
+
+ -- Bas Couwenberg <sebastic at debian.org> Tue, 23 Jan 2018 18:15:36 +0100
+
+qgis (2.14.22+dfsg-1~exp1) experimental; urgency=medium
+
+ [ Jürgen E. Fischer ]
+ * Release of 2.14.22
+
+ [ Bas Couwenberg ]
+ * New upstream release.
+ * Update version specific symbols.
+
+ -- Bas Couwenberg <sebastic at debian.org> Sat, 20 Jan 2018 09:01:38 +0100
+
qgis (2.14.21+dfsg-3) unstable; urgency=medium
* Replace libqca2-plugin-ossl transitional package with libqca2-plugins.
=====================================
debian/control
=====================================
--- a/debian/control
+++ b/debian/control
@@ -107,7 +107,7 @@ Description: QGIS - architecture-independent data
This package contains architecture-independent supporting data files for use
with QGIS.
-Package: libqgis-app2.14.21
+Package: libqgis-app2.14.22
Architecture: any
Section: libs
Depends: ${shlibs:Depends},
@@ -118,7 +118,7 @@ Description: QGIS - shared app library
.
This package contains the shared app library.
-Package: libqgis-core2.14.21
+Package: libqgis-core2.14.22
Architecture: any
Section: libs
Depends: ${shlibs:Depends},
@@ -129,7 +129,7 @@ Description: QGIS - shared core library
.
This package contains the shared core library.
-Package: libqgis-gui2.14.21
+Package: libqgis-gui2.14.22
Architecture: any
Section: libs
Depends: ${shlibs:Depends},
@@ -140,7 +140,7 @@ Description: QGIS - shared gui library
.
This package contains the shared gui library.
-Package: libqgis-analysis2.14.21
+Package: libqgis-analysis2.14.22
Architecture: any
Section: libs
Depends: ${shlibs:Depends},
@@ -151,7 +151,7 @@ Description: QGIS - shared analysis library
.
This package contains the shared analysis library.
-Package: libqgis-networkanalysis2.14.21
+Package: libqgis-networkanalysis2.14.22
Architecture: any
Section: libs
Depends: ${shlibs:Depends},
@@ -162,7 +162,7 @@ Description: QGIS - shared network analysis library
.
This package contains the shared network analysis library.
-Package: libqgisgrass7-2.14.21
+Package: libqgisgrass7-2.14.22
Architecture: any
Section: libs
Depends: ${shlibs:Depends},
@@ -173,7 +173,7 @@ Description: QGIS - shared grass library
.
This package contains the shared grass library.
-Package: libqgispython2.14.21
+Package: libqgispython2.14.22
Architecture: any
Section: libs
Depends: ${shlibs:Depends},
@@ -204,7 +204,7 @@ Description: QGIS custom widgets for Qt Designer
.
This package contains a library to use specific QGIS widgets in Qt Designer.
-Package: libqgis-server2.14.21
+Package: libqgis-server2.14.22
Architecture: any
Section: libs
Depends: ${shlibs:Depends},
@@ -225,14 +225,14 @@ Depends: grass-dev (>= 7.4.0~),
libgsl-dev,
libpq-dev,
libproj-dev,
- libqgis-app2.14.21 (= ${binary:Version}),
- libqgis-core2.14.21 (= ${binary:Version}),
- libqgis-gui2.14.21 (= ${binary:Version}),
- libqgis-analysis2.14.21 (= ${binary:Version}),
- libqgis-networkanalysis2.14.21 (= ${binary:Version}),
- libqgis-server2.14.21 (= ${binary:Version}),
- libqgisgrass7-2.14.21 (= ${binary:Version}),
- libqgispython2.14.21 (= ${binary:Version}),
+ libqgis-app2.14.22 (= ${binary:Version}),
+ libqgis-core2.14.22 (= ${binary:Version}),
+ libqgis-gui2.14.22 (= ${binary:Version}),
+ libqgis-analysis2.14.22 (= ${binary:Version}),
+ libqgis-networkanalysis2.14.22 (= ${binary:Version}),
+ libqgis-server2.14.22 (= ${binary:Version}),
+ libqgisgrass7-2.14.22 (= ${binary:Version}),
+ libqgispython2.14.22 (= ${binary:Version}),
libqt4-dev (>= 4.7.0),
libsqlite3-dev,
python-qt4 (>= 4.1.0),
@@ -335,7 +335,7 @@ Depends: python-qgis-common (= ${source:Version}),
python-six,
python-tz,
python-yaml,
- libqgispython2.14.21,
+ libqgispython2.14.22,
${shlibs:Depends},
${python:Depends},
${misc:Depends},
=====================================
debian/copyright
=====================================
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,4 +1,4 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: QGIS
Upstream-Contact: qgis-developer at lists.osgeo.org
Source: https://github.com/qgis/QGIS
=====================================
debian/libqgis-analysis2.14.21.install → debian/libqgis-analysis2.14.22.install
=====================================
=====================================
debian/libqgis-analysis2.14.21.symbols → debian/libqgis-analysis2.14.22.symbols
=====================================
--- a/debian/libqgis-analysis2.14.21.symbols
+++ b/debian/libqgis-analysis2.14.22.symbols
@@ -1,5 +1,5 @@
# SymbolsHelper-Confirmed: 2.14.21 alpha hppa kfreebsd-amd64 mips64el mipsel
-libqgis_analysis.so.2.14.21 #PACKAGE# #MINVER#
+libqgis_analysis.so.2.14.22 #PACKAGE# #MINVER#
_ZN12TriDecorator10calcNormalEddP8Vector3D at Base 2.0.1
_ZN12TriDecorator11getTriangleEddP7Point3DPiS1_S2_S1_S2_ at Base 2.0.1
_ZN12TriDecorator11getTriangleEddP7Point3DS1_S1_ at Base 2.0.1
=====================================
debian/libqgis-app2.14.21.install → debian/libqgis-app2.14.22.install
=====================================
=====================================
debian/libqgis-app2.14.21.symbols → debian/libqgis-app2.14.22.symbols
=====================================
--- a/debian/libqgis-app2.14.21.symbols
+++ b/debian/libqgis-app2.14.22.symbols
@@ -1,5 +1,5 @@
# SymbolsHelper-Confirmed: 2.14.21 alpha amd64 arm64 armel armhf hppa i386 kfreebsd-amd64 kfreebsd-i386 m68k mips mips64el mipsel powerpc ppc64 ppc64el s390x
-libqgis_app.so.2.14.21 #PACKAGE# #MINVER#
+libqgis_app.so.2.14.22 #PACKAGE# #MINVER#
(optional=templinst|arch=!amd64 !hurd-i386 !i386 !kfreebsd-amd64 !kfreebsd-i386)_Z10qDeleteAllI5QListIPN13QFormInternal11DomPropertyEEEvRKT_ at Base 2.14.18
(optional=templinst)_Z13qvariant_castI26QUiTranslatableStringValueET_RK8QVariant at Base 2.14.0
(optional=templinst|arch=!amd64 !hurd-i386 !i386 !kfreebsd-amd64 !kfreebsd-i386)_Z13qvariant_castI5QIconET_RK8QVariant at Base 2.14.18
=====================================
debian/libqgis-core2.14.21.install → debian/libqgis-core2.14.22.install
=====================================
=====================================
debian/libqgis-core2.14.21.symbols → debian/libqgis-core2.14.22.symbols
=====================================
--- a/debian/libqgis-core2.14.21.symbols
+++ b/debian/libqgis-core2.14.22.symbols
@@ -1,5 +1,5 @@
# SymbolsHelper-Confirmed: 2.14.21 alpha amd64 arm64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc ppc64 ppc64el s390x
-libqgis_core.so.2.14.21 #PACKAGE# #MINVER#
+libqgis_core.so.2.14.22 #PACKAGE# #MINVER#
GEOPROJ4 at Base 2.0.1
GEOWKT at Base 2.0.1
GEO_EPSG_CRS_AUTHID at Base 2.0.1
@@ -973,36 +973,36 @@ libqgis_core.so.2.14.21 #PACKAGE# #MINVER#
_ZN14QgsApplication15activeThemePathEv at Base 2.0.1
_ZN14QgsApplication15authorsFilePathEv at Base 2.0.1
_ZN14QgsApplication15licenceFilePathEv at Base 2.0.1
- _ZN14QgsApplication15mThemeName21421E at Base 2.14.19
+ _ZN14QgsApplication15mThemeName21422E at Base 2.14.22
_ZN14QgsApplication15settingsChangedEv at Base 2.14.5
_ZN14QgsApplication15shortNameRegExpEv at Base 2.14.0
_ZN14QgsApplication15userStyleV2PathEv at Base 2.0.1
_ZN14QgsApplication16defaultThemePathEv at Base 2.0.1
- _ZN14QgsApplication16mConfigPath21421E at Base 2.14.19
- _ZN14QgsApplication16mMaxThreads21421E at Base 2.14.19
- _ZN14QgsApplication16mPluginPath21421E at Base 2.14.19
- _ZN14QgsApplication16mPrefixPath21421E at Base 2.14.19
+ _ZN14QgsApplication16mConfigPath21422E at Base 2.14.22
+ _ZN14QgsApplication16mMaxThreads21422E at Base 2.14.22
+ _ZN14QgsApplication16mPluginPath21422E at Base 2.14.22
+ _ZN14QgsApplication16mPrefixPath21422E at Base 2.14.22
_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
- _ZN14QgsApplication17mLibexecPath21421E at Base 2.14.19
- _ZN14QgsApplication17mLibraryPath21421E at Base 2.14.19
- _ZN14QgsApplication17mPkgDataPath21421E at Base 2.14.19
- _ZN14QgsApplication17mUIThemeName21421E at Base 2.14.19
+ _ZN14QgsApplication17mLibexecPath21422E at Base 2.14.22
+ _ZN14QgsApplication17mLibraryPath21422E at Base 2.14.22
+ _ZN14QgsApplication17mPkgDataPath21422E at Base 2.14.22
+ _ZN14QgsApplication17mUIThemeName21422E at Base 2.14.22
_ZN14QgsApplication17restoreGdalDriverERK7QString at Base 2.14.0
_ZN14QgsApplication18defaultStyleV2PathEv at Base 2.0.1
- _ZN14QgsApplication18mGdalSkipList21421E at Base 2.14.19
+ _ZN14QgsApplication18mGdalSkipList21422E at Base 2.14.22
_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
- _ZN14QgsApplication19mAuthDbDirPath21421E at Base 2.14.19
- _ZN14QgsApplication19mSystemEnvVars21421E at Base 2.14.19
+ _ZN14QgsApplication19mAuthDbDirPath21422E at Base 2.14.22
+ _ZN14QgsApplication19mSystemEnvVars21422E at Base 2.14.22
_ZN14QgsApplication19qgisSettingsDirPathEv at Base 2.0.1
_ZN14QgsApplication19translatorsFilePathEv at Base 2.0.1
_ZN14QgsApplication20contributorsFilePathEv at Base 2.0.1
@@ -1010,18 +1010,18 @@ libqgis_core.so.2.14.21 #PACKAGE# #MINVER#
_ZN14QgsApplication21QGIS_APPLICATION_NAMEE at Base 2.4.0
_ZN14QgsApplication21composerTemplatePathsEv at Base 2.14.0
_ZN14QgsApplication21developersMapFilePathEv at Base 2.8.0
- _ZN14QgsApplication21mBuildOutputPath21421E at Base 2.14.19
- _ZN14QgsApplication21mBuildSourcePath21421E at Base 2.14.19
- _ZN14QgsApplication21mDefaultSvgPaths21421E at Base 2.14.19
+ _ZN14QgsApplication21mBuildOutputPath21422E at Base 2.14.22
+ _ZN14QgsApplication21mBuildSourcePath21422E at Base 2.14.22
+ _ZN14QgsApplication21mDefaultSvgPaths21422E at Base 2.14.22
_ZN14QgsApplication22QGIS_ORGANIZATION_NAMEE at Base 2.4.0
_ZN14QgsApplication23applyGdalSkippedDriversEv at Base 2.0.1
- _ZN14QgsApplication23mFileOpenEventList21421E at Base 2.14.19
+ _ZN14QgsApplication23mFileOpenEventList21422E at Base 2.14.22
_ZN14QgsApplication24QGIS_ORGANIZATION_DOMAINE at Base 2.4.0
_ZN14QgsApplication24setFileOpenEventReceiverEP7QObject at Base 2.0.1
- _ZN14QgsApplication25mRunningFromBuildDir21421E at Base 2.14.19
+ _ZN14QgsApplication25mRunningFromBuildDir21422E at Base 2.14.22
_ZN14QgsApplication26absolutePathToRelativePathERK7QStringS2_ at Base 2.14.0
_ZN14QgsApplication26relativePathToAbsolutePathERK7QStringS2_ at Base 2.14.0
- _ZN14QgsApplication27mFileOpenEventReceiver21421E at Base 2.14.19
+ _ZN14QgsApplication27mFileOpenEventReceiver21422E at Base 2.14.22
_ZN14QgsApplication4initE7QString at Base 2.0.1
_ZN14QgsApplication5eventEP6QEvent at Base 2.0.1
_ZN14QgsApplication6endianEv at Base 2.0.1
=====================================
debian/libqgis-gui2.14.21.install → debian/libqgis-gui2.14.22.install
=====================================
=====================================
debian/libqgis-gui2.14.21.symbols → debian/libqgis-gui2.14.22.symbols
=====================================
--- a/debian/libqgis-gui2.14.21.symbols
+++ b/debian/libqgis-gui2.14.22.symbols
@@ -1,5 +1,5 @@
# SymbolsHelper-Confirmed: 2.14.21 amd64 arm64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc ppc64 ppc64el s390x
-libqgis_gui.so.2.14.21 #PACKAGE# #MINVER#
+libqgis_gui.so.2.14.22 #PACKAGE# #MINVER#
(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
(optional=templinst|arch=!amd64 !hurd-i386 !i386 !kfreebsd-amd64 !kfreebsd-i386 !x32)_Z13qvariant_castI5QIconET_RK8QVariant at Base 2.14.16
=====================================
debian/libqgis-networkanalysis2.14.21.install → debian/libqgis-networkanalysis2.14.22.install
=====================================
=====================================
debian/libqgis-networkanalysis2.14.21.symbols → debian/libqgis-networkanalysis2.14.22.symbols
=====================================
--- a/debian/libqgis-networkanalysis2.14.21.symbols
+++ b/debian/libqgis-networkanalysis2.14.22.symbols
@@ -1,5 +1,5 @@
# SymbolsHelper-Confirmed: 2.14.0 amd64 arm64 armel armhf i386 mips64el mipsel powerpc ppc64el s390x
-libqgis_networkanalysis.so.2.14.21 #PACKAGE# #MINVER#
+libqgis_networkanalysis.so.2.14.22 #PACKAGE# #MINVER#
_ZN11QgsGraphArcC1Ev at Base 2.0.1
_ZN11QgsGraphArcC2Ev at Base 2.0.1
_ZN14QgsGraphVertexC1ERK8QgsPoint at Base 2.0.1
=====================================
debian/libqgis-server2.14.21.install → debian/libqgis-server2.14.22.install
=====================================
=====================================
debian/libqgis-server2.14.21.symbols → debian/libqgis-server2.14.22.symbols
=====================================
--- a/debian/libqgis-server2.14.21.symbols
+++ b/debian/libqgis-server2.14.22.symbols
@@ -1,5 +1,5 @@
# SymbolsHelper-Confirmed: 2.14.9 amd64
-libqgis_server.so.2.14.21 #PACKAGE# #MINVER#
+libqgis_server.so.2.14.22 #PACKAGE# #MINVER#
_ZN14QgsConfigCache11qt_metacallEN11QMetaObject4CallEiPPv at Base 2.8.0
_ZN14QgsConfigCache11qt_metacastEPKc at Base 2.8.0
_ZN14QgsConfigCache11xmlDocumentERK7QString at Base 2.8.0
=====================================
debian/libqgisgrass7-2.14.21.install → debian/libqgisgrass7-2.14.22.install
=====================================
=====================================
debian/libqgisgrass7-2.14.21.lintian-overrides → debian/libqgisgrass7-2.14.22.lintian-overrides
=====================================
--- a/debian/libqgisgrass7-2.14.21.lintian-overrides
+++ b/debian/libqgisgrass7-2.14.22.lintian-overrides
@@ -1,4 +1,4 @@
# Build uses -D_FORTIFY_SOURCE=2, but hardening-check reports:
# Fortify Source functions: no, only unprotected functions found!
-libqgisgrass7-2.14.21: hardening-no-fortify-functions *
+libqgisgrass7-2.14.22: hardening-no-fortify-functions *
=====================================
debian/libqgisgrass7-2.14.21.symbols → debian/libqgisgrass7-2.14.22.symbols
=====================================
--- a/debian/libqgisgrass7-2.14.21.symbols
+++ b/debian/libqgisgrass7-2.14.22.symbols
@@ -1,5 +1,5 @@
# SymbolsHelper-Confirmed: 2.14.21 alpha
-libqgisgrass7.so.2.14.21 #PACKAGE# #MINVER#
+libqgisgrass7.so.2.14.22 #PACKAGE# #MINVER#
Vect_delete_line_function_pointer at Base 2.14.0
Vect_rewrite_line_function_pointer at Base 2.14.0
(arch=!amd64 !kfreebsd-amd64)_Z23qStringComparisonHelperRK7QStringPKc at Base 2.14.18
=====================================
debian/libqgispython2.14.21.install → debian/libqgispython2.14.22.install
=====================================
=====================================
debian/libqgispython2.14.21.symbols → debian/libqgispython2.14.22.symbols
=====================================
--- a/debian/libqgispython2.14.21.symbols
+++ b/debian/libqgispython2.14.22.symbols
@@ -1,5 +1,5 @@
# SymbolsHelper-Confirmed: 2.14.0 amd64 arm64 armel armhf i386 mips64el mipsel powerpc ppc64el s390x
-libqgispython.so.2.14.21 #PACKAGE# #MINVER#
+libqgispython.so.2.14.22 #PACKAGE# #MINVER#
_ZTI14QgsPythonUtils at Base 2.0.1
_ZTS14QgsPythonUtils at Base 2.0.1
instance at Base 2.0.1
=====================================
python/ext-libs/owslib/fes.py
=====================================
--- a/python/ext-libs/owslib/fes.py
+++ b/python/ext-libs/owslib/fes.py
@@ -340,12 +340,15 @@ class PropertyIsBetween(OgcExpression):
class BBox(OgcExpression):
"""Construct a BBox, two pairs of coordinates (west-south and east-north)"""
- def __init__(self, bbox):
+ def __init__(self, bbox, crs=None):
self.bbox = bbox
+ self.crs = crs
def toXML(self):
tmp = etree.Element(util.nspath_eval('ogc:BBOX', namespaces))
etree.SubElement(tmp, util.nspath_eval('ogc:PropertyName', namespaces)).text = 'ows:BoundingBox'
tmp2 = etree.SubElement(tmp, util.nspath_eval('gml:Envelope', namespaces))
+ if self.crs is not None:
+ tmp2.set('srsName', self.crs)
etree.SubElement(tmp2, util.nspath_eval('gml:lowerCorner', namespaces)).text = '%s %s' % (self.bbox[0], self.bbox[1])
etree.SubElement(tmp2, util.nspath_eval('gml:upperCorner', namespaces)).text = '%s %s' % (self.bbox[2], self.bbox[3])
return tmp
=====================================
python/plugins/MetaSearch/dialogs/maindialog.py
=====================================
--- a/python/plugins/MetaSearch/dialogs/maindialog.py
+++ b/python/plugins/MetaSearch/dialogs/maindialog.py
@@ -438,6 +438,8 @@ class MetaSearchDialog(QDialog, BASE_CLASS):
self.timeout = self.spnTimeout.value()
# bbox
+ # CRS is WGS84 with axis order longitude, latitude
+ # defined by 'urn:ogc:def:crs:OGC:1.3:CRS84'
minx = self.leWest.text()
miny = self.leSouth.text()
maxx = self.leEast.text()
@@ -448,7 +450,8 @@ class MetaSearchDialog(QDialog, BASE_CLASS):
# even for a global bbox, if a spatial filter is applied, then
# the CSW server will skip records without a bbox
if bbox != ['-180', '-90', '180', '90']:
- self.constraints.append(BBox(bbox))
+ self.constraints.append(BBox(bbox,
+ crs='urn:ogc:def:crs:OGC:1.3:CRS84'))
# keywords
if self.leKeywords.text():
View it on GitLab: https://salsa.debian.org/debian-gis-team/qgis/compare/ac7474ec18a42a4372dba1c63d93e41623c0a45a...3e6f596ba5a47c8178bb1158f87b30592bc7b6d5
---
View it on GitLab: https://salsa.debian.org/debian-gis-team/qgis/compare/ac7474ec18a42a4372dba1c63d93e41623c0a45a...3e6f596ba5a47c8178bb1158f87b30592bc7b6d5
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.alioth.debian.org/pipermail/pkg-grass-devel/attachments/20180126/6000459c/attachment-0001.html>
More information about the Pkg-grass-devel
mailing list