...
 
Commits (8)
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+
......
Tom Kralidis <tomkralidis@gmail.com> 2017-12-22
[bugfix] [MetaSearch] make gml:Envelope CRS explicit for spatial queries (fixes #17739)
Juergen E. Fischer <jef@norbit.de> 2017-12-08
Release of 2.14.21
rldhont <rldhont@gmail.com> 2017-11-06
[Server] GetFeatureInfo: enhance raster data values displayed
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@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@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@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.
......
......@@ -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},
......
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@lists.osgeo.org
Source: https://github.com/qgis/QGIS
......
# 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@Base 2.0.1
_ZN12TriDecorator11getTriangleEddP7Point3DPiS1_S2_S1_S2_@Base 2.0.1
_ZN12TriDecorator11getTriangleEddP7Point3DS1_S1_@Base 2.0.1
......
# 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_@Base 2.14.18
(optional=templinst)_Z13qvariant_castI26QUiTranslatableStringValueET_RK8QVariant@Base 2.14.0
(optional=templinst|arch=!amd64 !hurd-i386 !i386 !kfreebsd-amd64 !kfreebsd-i386)_Z13qvariant_castI5QIconET_RK8QVariant@Base 2.14.18
......
# 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@Base 2.0.1
GEOWKT@Base 2.0.1
GEO_EPSG_CRS_AUTHID@Base 2.0.1
......@@ -973,36 +973,36 @@ libqgis_core.so.2.14.21 #PACKAGE# #MINVER#
_ZN14QgsApplication15activeThemePathEv@Base 2.0.1
_ZN14QgsApplication15authorsFilePathEv@Base 2.0.1
_ZN14QgsApplication15licenceFilePathEv@Base 2.0.1
_ZN14QgsApplication15mThemeName21421E@Base 2.14.19
_ZN14QgsApplication15mThemeName21422E@Base 2.14.22
_ZN14QgsApplication15settingsChangedEv@Base 2.14.5
_ZN14QgsApplication15shortNameRegExpEv@Base 2.14.0
_ZN14QgsApplication15userStyleV2PathEv@Base 2.0.1
_ZN14QgsApplication16defaultThemePathEv@Base 2.0.1
_ZN14QgsApplication16mConfigPath21421E@Base 2.14.19
_ZN14QgsApplication16mMaxThreads21421E@Base 2.14.19
_ZN14QgsApplication16mPluginPath21421E@Base 2.14.19
_ZN14QgsApplication16mPrefixPath21421E@Base 2.14.19
_ZN14QgsApplication16mConfigPath21422E@Base 2.14.22
_ZN14QgsApplication16mMaxThreads21422E@Base 2.14.22
_ZN14QgsApplication16mPluginPath21422E@Base 2.14.22
_ZN14QgsApplication16mPrefixPath21422E@Base 2.14.22
_ZN14QgsApplication16reportStyleSheetEv@Base 2.0.1
_ZN14QgsApplication16setAuthDbDirPathERK7QString@Base 2.14.0
_ZN14QgsApplication16sponsorsFilePathEv@Base 2.0.1
_ZN14QgsApplication16staticMetaObjectE@Base 2.0.1
_ZN14QgsApplication16userThemesFolderEv@Base 2.14.0
_ZN14QgsApplication17createThemeFolderEv@Base 2.14.0
_ZN14QgsApplication17mLibexecPath21421E@Base 2.14.19
_ZN14QgsApplication17mLibraryPath21421E@Base 2.14.19
_ZN14QgsApplication17mPkgDataPath21421E@Base 2.14.19
_ZN14QgsApplication17mUIThemeName21421E@Base 2.14.19
_ZN14QgsApplication17mLibexecPath21422E@Base 2.14.22
_ZN14QgsApplication17mLibraryPath21422E@Base 2.14.22
_ZN14QgsApplication17mPkgDataPath21422E@Base 2.14.22
_ZN14QgsApplication17mUIThemeName21422E@Base 2.14.22
_ZN14QgsApplication17restoreGdalDriverERK7QString@Base 2.14.0
_ZN14QgsApplication18defaultStyleV2PathEv@Base 2.0.1
_ZN14QgsApplication18mGdalSkipList21421E@Base 2.14.19
_ZN14QgsApplication18mGdalSkipList21422E@Base 2.14.22
_ZN14QgsApplication18qgisAuthDbFilePathEv@Base 2.14.0
_ZN14QgsApplication18qgisUserDbFilePathEv@Base 2.0.1
_ZN14QgsApplication18registerOgrDriversEv@Base 2.0.1
_ZN14QgsApplication18setDefaultSvgPathsERK11QStringList@Base 2.0.1
_ZN14QgsApplication19defaultThemesFolderEv@Base 2.14.0
_ZN14QgsApplication19emitSettingsChangedEv@Base 2.14.5
_ZN14QgsApplication19mAuthDbDirPath21421E@Base 2.14.19
_ZN14QgsApplication19mSystemEnvVars21421E@Base 2.14.19
_ZN14QgsApplication19mAuthDbDirPath21422E@Base 2.14.22
_ZN14QgsApplication19mSystemEnvVars21422E@Base 2.14.22
_ZN14QgsApplication19qgisSettingsDirPathEv@Base 2.0.1
_ZN14QgsApplication19translatorsFilePathEv@Base 2.0.1
_ZN14QgsApplication20contributorsFilePathEv@Base 2.0.1
......@@ -1010,18 +1010,18 @@ libqgis_core.so.2.14.21 #PACKAGE# #MINVER#
_ZN14QgsApplication21QGIS_APPLICATION_NAMEE@Base 2.4.0
_ZN14QgsApplication21composerTemplatePathsEv@Base 2.14.0
_ZN14QgsApplication21developersMapFilePathEv@Base 2.8.0
_ZN14QgsApplication21mBuildOutputPath21421E@Base 2.14.19
_ZN14QgsApplication21mBuildSourcePath21421E@Base 2.14.19
_ZN14QgsApplication21mDefaultSvgPaths21421E@Base 2.14.19
_ZN14QgsApplication21mBuildOutputPath21422E@Base 2.14.22
_ZN14QgsApplication21mBuildSourcePath21422E@Base 2.14.22
_ZN14QgsApplication21mDefaultSvgPaths21422E@Base 2.14.22
_ZN14QgsApplication22QGIS_ORGANIZATION_NAMEE@Base 2.4.0
_ZN14QgsApplication23applyGdalSkippedDriversEv@Base 2.0.1
_ZN14QgsApplication23mFileOpenEventList21421E@Base 2.14.19
_ZN14QgsApplication23mFileOpenEventList21422E@Base 2.14.22
_ZN14QgsApplication24QGIS_ORGANIZATION_DOMAINE@Base 2.4.0
_ZN14QgsApplication24setFileOpenEventReceiverEP7QObject@Base 2.0.1
_ZN14QgsApplication25mRunningFromBuildDir21421E@Base 2.14.19
_ZN14QgsApplication25mRunningFromBuildDir21422E@Base 2.14.22
_ZN14QgsApplication26absolutePathToRelativePathERK7QStringS2_@Base 2.14.0
_ZN14QgsApplication26relativePathToAbsolutePathERK7QStringS2_@Base 2.14.0
_ZN14QgsApplication27mFileOpenEventReceiver21421E@Base 2.14.19
_ZN14QgsApplication27mFileOpenEventReceiver21422E@Base 2.14.22
_ZN14QgsApplication4initE7QString@Base 2.0.1
_ZN14QgsApplication5eventEP6QEvent@Base 2.0.1
_ZN14QgsApplication6endianEv@Base 2.0.1
......
# 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_@Base 2.14.16
(optional=templinst)_Z13qvariant_castI26QUiTranslatableStringValueET_RK8QVariant@Base 2.0.1
(optional=templinst|arch=!amd64 !hurd-i386 !i386 !kfreebsd-amd64 !kfreebsd-i386 !x32)_Z13qvariant_castI5QIconET_RK8QVariant@Base 2.14.16
......
# 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@Base 2.0.1
_ZN11QgsGraphArcC2Ev@Base 2.0.1
_ZN14QgsGraphVertexC1ERK8QgsPoint@Base 2.0.1
......
# SymbolsHelper-Confirmed: 2.14.9 amd64
libqgis_server.so.2.14.21 #PACKAGE# #MINVER#
libqgis_server.so.2.14.22 #PACKAGE# #MINVER#
_ZN14QgsConfigCache11qt_metacallEN11QMetaObject4CallEiPPv@Base 2.8.0
_ZN14QgsConfigCache11qt_metacastEPKc@Base 2.8.0
_ZN14QgsConfigCache11xmlDocumentERK7QString@Base 2.8.0
......
# 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 *
# 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@Base 2.14.0
Vect_rewrite_line_function_pointer@Base 2.14.0
(arch=!amd64 !kfreebsd-amd64)_Z23qStringComparisonHelperRK7QStringPKc@Base 2.14.18
......
# 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@Base 2.0.1
_ZTS14QgsPythonUtils@Base 2.0.1
instance@Base 2.0.1
......@@ -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
......
......@@ -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():
......