[qgis] 01/02: Merge tag 'debian/2.14.9+dfsg-1' into jessie-backports
Bas Couwenberg
sebastic at debian.org
Sun Dec 4 19:08:30 UTC 2016
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch jessie-backports
in repository qgis.
commit cea4f068f5a4bf5eb421f121c17fa4b016a75928
Merge: 79ac0b2 8ee8262
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Sun Dec 4 18:45:58 2016 +0100
Merge tag 'debian/2.14.9+dfsg-1' into jessie-backports
Conflicts:
debian/changelog
debian/control
debian/libqgis-app2.14.9.symbols
debian/libqgis-gui2.14.9.symbols
debian/libqgisgrass6-2.14.8.install
debian/libqgisgrass6-2.14.8.lintian-overrides
debian/libqgisgrass6-2.14.8.symbols
debian/libqgisgrass7-2.14.8.install
debian/libqgisgrass7-2.14.8.lintian-overrides
debian/libqgisgrass7-2.14.8.symbols
debian/libqgisgrass7-2.14.9.install
debian/libqgisgrass7-2.14.9.lintian-overrides
debian/libqgisgrass7-2.14.9.symbols
CMakeLists.txt | 2 +-
ChangeLog | 285 +++++++++++++++++++++
ci/travis/linux/qt4/script.sh | 2 +-
debian/changelog | 21 ++
debian/control | 50 ++--
debian/copyright | 2 +-
...14.8.install => libqgis-analysis2.14.9.install} | 0
...14.8.symbols => libqgis-analysis2.14.9.symbols} | 4 +-
...app2.14.8.install => libqgis-app2.14.9.install} | 0
...app2.14.8.symbols => libqgis-app2.14.9.symbols} | 133 +++-------
...re2.14.8.install => libqgis-core2.14.9.install} | 0
...re2.14.8.symbols => libqgis-core2.14.9.symbols} | 47 ++--
...gui2.14.8.install => libqgis-gui2.14.9.install} | 0
...gui2.14.8.symbols => libqgis-gui2.14.9.symbols} | 170 +++++-------
...stall => libqgis-networkanalysis2.14.9.install} | 0
...mbols => libqgis-networkanalysis2.14.9.symbols} | 2 +-
...2.14.8.install => libqgis-server2.14.9.install} | 0
...2.14.8.symbols => libqgis-server2.14.9.symbols} | 5 +-
...2.14.8.install => libqgisgrass6-2.14.9.install} | 0
...ides => libqgisgrass6-2.14.9.lintian-overrides} | 2 +-
...2.14.8.symbols => libqgisgrass6-2.14.9.symbols} | 2 +-
...n2.14.8.install => libqgispython2.14.9.install} | 0
...n2.14.8.symbols => libqgispython2.14.9.symbols} | 2 +-
debian/rules | 2 +-
python/core/geometry/qgsabstractgeometryv2.sip | 4 +-
python/core/geometry/qgscircularstringv2.sip | 4 +-
python/core/geometry/qgscompoundcurvev2.sip | 4 +-
python/core/geometry/qgscurvepolygonv2.sip | 5 +-
python/core/geometry/qgscurvev2.sip | 4 +-
python/core/geometry/qgsgeometrycollectionv2.sip | 5 +-
python/core/geometry/qgslinestringv2.sip | 1 +
python/core/geometry/qgsmulticurvev2.sip | 4 +-
python/core/geometry/qgsmultilinestringv2.sip | 4 +-
python/core/geometry/qgsmultipointv2.sip | 5 +-
python/core/geometry/qgsmultipolygonv2.sip | 4 +-
python/core/geometry/qgsmultisurfacev2.sip | 4 +-
python/core/geometry/qgspointv2.sip | 1 +
python/core/geometry/qgspolygonv2.sip | 4 +-
python/core/geometry/qgssurfacev2.sip | 2 +-
python/core/symbology-ng/qgssymbollayerv2.sip | 68 +++--
python/gui/gui.sip | 1 +
python/gui/layertree/qgslayertreeview.sip | 8 +
python/gui/qgsextentgroupbox.sip | 2 +-
python/gui/qgsfiledownloader.sip | 66 +++++
python/gui/qgsgeometryrubberband.sip | 2 +-
python/plugins/processing/algs/help/qgis.yaml | 4 +-
python/plugins/processing/algs/qgis/Eliminate.py | 5 +-
python/plugins/processing/algs/qgis/Union.py | 2 +-
python/plugins/processing/algs/r/RUtils.py | 2 +-
src/app/composer/qgsattributeselectiondialog.cpp | 2 +-
src/app/nodetool/qgsmaptoolnodetool.cpp | 7 +-
src/app/qgisapp.cpp | 4 +-
src/app/qgsattributetabledialog.cpp | 4 +-
src/app/qgsfeatureaction.cpp | 32 ++-
src/app/qgsfieldcalculator.cpp | 4 +-
src/app/qgsidentifyresultsdialog.cpp | 52 ++++
src/app/qgsidentifyresultsdialog.h | 7 +
src/core/composer/qgscomposerattributetablev2.cpp | 2 +-
src/core/composer/qgscomposermapgrid.cpp | 8 +-
src/core/geometry/qgsabstractgeometryv2.h | 2 +-
src/core/geometry/qgscircularstringv2.cpp | 3 +
src/core/geometry/qgscurvepolygonv2.cpp | 23 +-
src/core/geometry/qgscurvepolygonv2.h | 1 +
src/core/geometry/qgsgeometry.cpp | 9 +-
src/core/geometry/qgsgeometrycollectionv2.cpp | 16 ++
src/core/geometry/qgsgeometrycollectionv2.h | 2 +
src/core/geometry/qgsgeometryutils.cpp | 1 +
src/core/geometry/qgsgeometryutils.h | 8 +-
src/core/geometry/qgslinestringv2.cpp | 10 +-
src/core/geometry/qgslinestringv2.h | 1 +
src/core/geometry/qgsmultipointv2.h | 1 +
src/core/geometry/qgspointv2.h | 1 +
src/core/qgsconditionalstyle.cpp | 2 +-
src/core/qgsexpression.cpp | 2 +-
src/core/qgsexpressioncontext.cpp | 4 +-
src/core/qgsogcutils.cpp | 2 +-
src/core/qgspointlocator.cpp | 2 +
src/core/qgsvectorlayerrenderer.cpp | 2 +-
src/core/qgswebpage.h | 4 +
src/core/symbology-ng/qgssymbolv2.cpp | 10 +-
src/gui/CMakeLists.txt | 3 +
.../qgsfieldconditionalformatwidget.cpp | 2 +-
src/gui/layertree/qgslayertreeview.cpp | 46 ++++
src/gui/layertree/qgslayertreeview.h | 8 +
src/gui/qgsattributedialog.cpp | 5 +-
src/gui/qgsattributedialog.h | 5 +-
src/gui/qgsextentgroupbox.h | 2 +-
src/gui/qgsfiledownloader.cpp | 203 +++++++++++++++
src/gui/qgsfiledownloader.h | 112 ++++++++
src/gui/qgsmapcanvas.cpp | 11 +-
src/gui/symbology-ng/qgssymbollayerv2widget.cpp | 2 +-
src/providers/ogr/qgsogrprovider.cpp | 34 ++-
src/providers/oracle/qgsoracleprovider.cpp | 9 +-
src/providers/spatialite/qgsspatialiteprovider.cpp | 11 +-
.../virtual/qgsvirtuallayersqlitehelper.cpp | 14 +-
.../virtual/qgsvirtuallayersqlitemodule.cpp | 2 +-
src/providers/wms/qgswmsdataitems.cpp | 33 ++-
src/providers/wms/qgswmsprovider.cpp | 3 +-
src/server/qgshostedrdsbuilder.cpp | 2 +-
src/server/qgsserverprojectparser.cpp | 45 ++++
src/server/qgsserverprojectparser.h | 3 +
src/server/qgswfsserver.cpp | 23 ++
src/server/qgswmsconfigparser.cpp | 12 +-
src/server/qgswmsprojectparser.cpp | 9 +-
src/server/qgswmsserver.cpp | 10 +
tests/src/core/testqgsgeometry.cpp | 5 +-
tests/src/core/testqgspointlocator.cpp | 43 ++++
tests/src/gui/CMakeLists.txt | 2 +-
tests/src/gui/testqgsfiledownloader.cpp | 251 ++++++++++++++++++
tests/src/python/CMakeLists.txt | 4 +
tests/src/python/qgis_wrapped_server.py | 156 +++++++++++
tests/src/python/test_authmanager_password_ows.py | 186 ++++++++++++++
tests/src/python/test_authmanager_pki_ows.py | 207 +++++++++++++++
tests/src/python/test_authmanager_pki_postgres.py | 233 +++++++++++++++++
tests/src/python/test_provider_ogr_gpkg.py | 56 +++-
tests/src/python/test_qgsfiledownloader.py | 147 +++++++++++
tests/src/python/test_qgsserver.py | 16 +-
tests/src/python/utilities.py | 23 ++
tests/testdata/qgis_server/getprojectsettings.txt | 21 +-
.../{test+project.qgs => test_project.qgs} | 239 ++++++++++-------
...roject_inspire.qgs => test_project_inspire.qgs} | 0
.../{test+project_wfs.qgs => test_project_wfs.qgs} | 0
122 files changed, 2811 insertions(+), 561 deletions(-)
diff --cc debian/changelog
index e9934bd,4af8afc..0ee7590
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,24 +1,30 @@@
+ qgis (2.14.9+dfsg-1) unstable; urgency=medium
+
+ * Update symbols for other architectures.
+ * Move from experimental to unstable.
+
+ -- Bas Couwenberg <sebastic at debian.org> Tue, 29 Nov 2016 07:15:41 +0100
+
+ qgis (2.14.9+dfsg-1~exp1) experimental; urgency=medium
+
+ [ Jürgen E. Fischer ]
+ * Release of 2.14.9
+
+ [ Bas Couwenberg ]
+ * New upstream release.
+ * Update symbols for other architectures.
+ * Run doxygen in a subshell.
+ * Update copyright years for Alessandro Pasotti.
+ * Update symbols for amd64.
+
+ -- Bas Couwenberg <sebastic at debian.org> Fri, 25 Nov 2016 15:37:03 +0100
+
+qgis (2.14.8+dfsg-1~bpo8+1) jessie-backports; urgency=medium
+
+ * Rebuild for jessie-backports.
+
+ -- Bas Couwenberg <sebastic at debian.org> Sat, 05 Nov 2016 09:38:35 +0100
+
qgis (2.14.8+dfsg-1) unstable; urgency=medium
* Update symbols for other architectures.
diff --cc debian/control
index 3fbfbe0,d6589dc..b8edd94
--- a/debian/control
+++ b/debian/control
@@@ -162,7 -163,7 +162,7 @@@ Description: QGIS - shared network anal
.
This package contains the shared network analysis library.
- Package: libqgisgrass6-2.14.8
-Package: libqgisgrass7-2.14.9
++Package: libqgisgrass6-2.14.9
Architecture: any
Section: libs
Depends: ${shlibs:Depends},
@@@ -221,17 -222,17 +221,17 @@@ Depends: grass-dev
libexpat1-dev,
libgdal-dev (>= 1.10.1-0~),
libgeos-dev (>= 3.0.0),
- libgsl-dev,
+ libgsl0-dev,
libpq-dev,
libproj-dev,
- libqgis-app2.14.8 (= ${binary:Version}),
- libqgis-core2.14.8 (= ${binary:Version}),
- libqgis-gui2.14.8 (= ${binary:Version}),
- libqgis-analysis2.14.8 (= ${binary:Version}),
- libqgis-networkanalysis2.14.8 (= ${binary:Version}),
- libqgis-server2.14.8 (= ${binary:Version}),
- libqgisgrass6-2.14.8 (= ${binary:Version}),
- libqgispython2.14.8 (= ${binary:Version}),
+ libqgis-app2.14.9 (= ${binary:Version}),
+ libqgis-core2.14.9 (= ${binary:Version}),
+ libqgis-gui2.14.9 (= ${binary:Version}),
+ libqgis-analysis2.14.9 (= ${binary:Version}),
+ libqgis-networkanalysis2.14.9 (= ${binary:Version}),
+ libqgis-server2.14.9 (= ${binary:Version}),
- libqgisgrass7-2.14.9 (= ${binary:Version}),
++ libqgisgrass6-2.14.9 (= ${binary:Version}),
+ libqgispython2.14.9 (= ${binary:Version}),
libqt4-dev (>= 4.7.0),
libsqlite3-dev,
python-qt4 (>= 4.1.0),
@@@ -253,14 -254,14 +253,14 @@@ Package: qgis-db
Architecture: any
Section: debug
Priority: extra
- Depends: libqgis-app2.14.8 (= ${binary:Version}),
- libqgis-core2.14.8 (= ${binary:Version}),
- libqgis-gui2.14.8 (= ${binary:Version}),
- libqgis-analysis2.14.8 (= ${binary:Version}),
- libqgis-networkanalysis2.14.8 (= ${binary:Version}),
- libqgis-server2.14.8 (= ${binary:Version}),
- libqgisgrass6-2.14.8 (= ${binary:Version}),
- libqgispython2.14.8 (= ${binary:Version}),
+ Depends: libqgis-app2.14.9 (= ${binary:Version}),
+ libqgis-core2.14.9 (= ${binary:Version}),
+ libqgis-gui2.14.9 (= ${binary:Version}),
+ libqgis-analysis2.14.9 (= ${binary:Version}),
+ libqgis-networkanalysis2.14.9 (= ${binary:Version}),
+ libqgis-server2.14.9 (= ${binary:Version}),
- libqgisgrass7-2.14.9 (= ${binary:Version}),
++ libqgisgrass6-2.14.9 (= ${binary:Version}),
+ libqgispython2.14.9 (= ${binary:Version}),
${misc:Depends}
Suggests: gdb
Description: QGIS - debugging symbols
diff --cc debian/libqgis-app2.14.9.symbols
index 6dc6896,41b5e97..8020e21
--- a/debian/libqgis-app2.14.9.symbols
+++ b/debian/libqgis-app2.14.9.symbols
@@@ -3173,8 -3093,8 +3142,9 @@@ libqgis_app.so.2.14.9 #PACKAGE# #MINVER
(optional=templinst)_ZN5QHashIPKN13QFormInternal20QAbstractFormBuilderEPNS0_17QFormBuilderExtraEE13detach_helperEv at Base 2.14.0
(optional=templinst)_ZN5QHashIPKN13QFormInternal20QAbstractFormBuilderEPNS0_17QFormBuilderExtraEE13duplicateNodeEPN9QHashData4NodeEPv at Base 2.14.0
(optional=templinst)_ZN5QListI10QByteArrayE18detach_helper_growEii at Base 2.14.0
+ (optional=templinst)_ZN5QListI10QByteArrayE4freeEPN9QListData4DataE at Base 2.14.0
(optional=templinst)_ZN5QListI10QByteArrayE6appendERKS0_ at Base 2.14.0
+ (optional=templinst)_ZN5QListI10QByteArrayE7reserveEi at Base 2.14.4
(optional=templinst)_ZN5QListI26FormBuilderSaveLayoutEntryE13detach_helperEi at Base 2.14.0
(optional=templinst)_ZN5QListI26FormBuilderSaveLayoutEntryE18detach_helper_growEii at Base 2.14.0
(optional=templinst)_ZN5QListI26FormBuilderSaveLayoutEntryE6appendERKS0_ at Base 2.14.0
@@@ -3228,9 -3135,8 +3184,7 @@@
(optional=templinst)_ZN5QListIPN13QFormInternal11DomPropertyEE6appendERKS2_ at Base 2.14.0
(optional=templinst)_ZN5QListIPN13QFormInternal11DomPropertyEEC1ERKS3_ at Base 2.14.0
(optional=templinst)_ZN5QListIPN13QFormInternal11DomPropertyEEC2ERKS3_ at Base 2.14.0
- (optional=templinst)_ZN5QListIPN13QFormInternal11DomPropertyEED1Ev at Base 2.14.0
- (optional=templinst)_ZN5QListIPN13QFormInternal11DomPropertyEED2Ev at Base 2.14.0
(optional=templinst|arch=alpha armel armhf mips mips64el mipsel s390x)_ZN5QListIPN13QFormInternal11DomPropertyEEaSERKS3_ at Base 2.14.0
- (optional=templinst)_ZN5QListIPN13QFormInternal11DomResourceEE13detach_helperEi at Base 2.14.0
(optional=templinst)_ZN5QListIPN13QFormInternal11DomResourceEE18detach_helper_growEii at Base 2.14.0
(optional=templinst)_ZN5QListIPN13QFormInternal11DomResourceEE5clearEv at Base 2.14.0
(optional=templinst)_ZN5QListIPN13QFormInternal11DomResourceEE6appendERKS2_ at Base 2.14.0
diff --cc debian/libqgis-gui2.14.9.symbols
index 5848021,93f6934..86f0fb3
--- a/debian/libqgis-gui2.14.9.symbols
+++ b/debian/libqgis-gui2.14.9.symbols
@@@ -6533,8 -6097,8 +6524,9 @@@ libqgis_gui.so.2.14.9 #PACKAGE# #MINVER
(optional=templinst)_ZN5QHashIPKN13QFormInternal20QAbstractFormBuilderEPNS0_17QFormBuilderExtraEE13detach_helperEv at Base 2.0.1
(optional=templinst)_ZN5QHashIPKN13QFormInternal20QAbstractFormBuilderEPNS0_17QFormBuilderExtraEE13duplicateNodeEPN9QHashData4NodeEPv at Base 2.0.1
(optional=templinst)_ZN5QListI10QByteArrayE18detach_helper_growEii at Base 2.0.1
+ (optional=templinst)_ZN5QListI10QByteArrayE4freeEPN9QListData4DataE at Base 2.8.3
(optional=templinst)_ZN5QListI10QByteArrayE6appendERKS0_ at Base 2.0.1
+ (optional=templinst)_ZN5QListI10QByteArrayE7reserveEi at Base 2.14.4
(optional=templinst)_ZN5QListI26FormBuilderSaveLayoutEntryE13detach_helperEi at Base 2.0.1
(optional=templinst)_ZN5QListI26FormBuilderSaveLayoutEntryE18detach_helper_growEii at Base 2.0.1
(optional=templinst)_ZN5QListI26FormBuilderSaveLayoutEntryE6appendERKS0_ at Base 2.0.1
@@@ -6589,9 -6141,8 +6568,7 @@@
(optional=templinst)_ZN5QListIPN13QFormInternal11DomPropertyEE6appendERKS2_ at Base 2.0.1
(optional=templinst)_ZN5QListIPN13QFormInternal11DomPropertyEEC1ERKS3_ at Base 2.0.1
(optional=templinst)_ZN5QListIPN13QFormInternal11DomPropertyEEC2ERKS3_ at Base 2.0.1
- (optional=templinst)_ZN5QListIPN13QFormInternal11DomPropertyEED1Ev at Base 2.0.1
- (optional=templinst)_ZN5QListIPN13QFormInternal11DomPropertyEED2Ev at Base 2.0.1
(optional=templinst|arch=alpha armel armhf mips mips64el mipsel s390x)_ZN5QListIPN13QFormInternal11DomPropertyEEaSERKS3_ at Base 2.8.3
- (optional=templinst)_ZN5QListIPN13QFormInternal11DomResourceEE13detach_helperEi at Base 2.8.3
(optional=templinst)_ZN5QListIPN13QFormInternal11DomResourceEE18detach_helper_growEii at Base 2.0.1
(optional=templinst)_ZN5QListIPN13QFormInternal11DomResourceEE5clearEv at Base 2.0.1
(optional=templinst)_ZN5QListIPN13QFormInternal11DomResourceEE6appendERKS2_ at Base 2.0.1
diff --cc debian/libqgisgrass6-2.14.9.lintian-overrides
index fea4815,24b3b78..a14a303
--- a/debian/libqgisgrass6-2.14.9.lintian-overrides
+++ b/debian/libqgisgrass6-2.14.9.lintian-overrides
@@@ -1,4 -1,4 +1,4 @@@
# Build uses -D_FORTIFY_SOURCE=2, but hardening-check reports:
# Fortify Source functions: no, only unprotected functions found!
- libqgisgrass6-2.14.8: hardening-no-fortify-functions *
-libqgisgrass7-2.14.9: hardening-no-fortify-functions *
++libqgisgrass6-2.14.9: hardening-no-fortify-functions *
diff --cc debian/libqgisgrass6-2.14.9.symbols
index 57b49f5,ad96c1b..ae2cf47
--- a/debian/libqgisgrass6-2.14.9.symbols
+++ b/debian/libqgisgrass6-2.14.9.symbols
@@@ -1,5 -1,5 +1,5 @@@
# SymbolsHelper-Confirmed: 2.14.7 arm64 hppa kfreebsd-amd64 kfreebsd-i386 ppc64el
- libqgisgrass6.so.2.14.8 #PACKAGE# #MINVER#
-libqgisgrass7.so.2.14.9 #PACKAGE# #MINVER#
++libqgisgrass6.so.2.14.9 #PACKAGE# #MINVER#
Vect_delete_line_function_pointer at Base 2.14.0
Vect_rewrite_line_function_pointer at Base 2.14.0
_Z23qStringComparisonHelperRK7QStringPKc at Base 2.8.4
diff --cc debian/libqgispython2.14.9.symbols
index a22e7a3,39070b4..6e5cba8
--- a/debian/libqgispython2.14.9.symbols
+++ b/debian/libqgispython2.14.9.symbols
@@@ -1,6 -1,5 +1,6 @@@
# SymbolsHelper-Confirmed: 2.14.0 amd64 arm64 armel armhf i386 mips64el mipsel powerpc ppc64el s390x
- libqgispython.so.2.14.8 #PACKAGE# #MINVER#
+ libqgispython.so.2.14.9 #PACKAGE# #MINVER#
_ZTI14QgsPythonUtils at Base 2.0.1
_ZTS14QgsPythonUtils at Base 2.0.1
+ _ZTV14QgsPythonUtils at Base 2.14.4
instance at Base 2.0.1
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/qgis.git
More information about the Pkg-grass-devel
mailing list