This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch jessie-backports in repository qgis.
commit 56fdd1eec2eda4a21e47bd188ea090f6bb19e414 Merge: 0c6068f bf1e5f2 Author: Bas Couwenberg <[email protected]> Date: Thu Dec 29 07:26:59 2016 +0100 Merge tag 'debian/2.14.10+dfsg-1' into jessie-backports Conflicts: debian/changelog debian/control debian/libqgisgrass6-2.14.9.install debian/libqgisgrass6-2.14.9.lintian-overrides debian/libqgisgrass6-2.14.9.symbols debian/libqgisgrass7-2.14.10.install debian/libqgisgrass7-2.14.10.lintian-overrides debian/libqgisgrass7-2.14.10.symbols debian/libqgisgrass7-2.14.9.install debian/libqgisgrass7-2.14.9.lintian-overrides debian/libqgisgrass7-2.14.9.symbols CMakeLists.txt | 2 +- ChangeLog | 157 +++++++++++++++++++++ debian/changelog | 18 +++ debian/control | 50 +++---- ...4.9.install => libqgis-analysis2.14.10.install} | 0 ...4.9.symbols => libqgis-analysis2.14.10.symbols} | 6 +- ...pp2.14.9.install => libqgis-app2.14.10.install} | 0 ...pp2.14.9.symbols => libqgis-app2.14.10.symbols} | 93 +++++++++++- ...e2.14.9.install => libqgis-core2.14.10.install} | 0 ...e2.14.9.symbols => libqgis-core2.14.10.symbols} | 43 +++--- ...ui2.14.9.install => libqgis-gui2.14.10.install} | 0 ...ui2.14.9.symbols => libqgis-gui2.14.10.symbols} | 100 +++++++++++-- ...tall => libqgis-networkanalysis2.14.10.install} | 0 ...bols => libqgis-networkanalysis2.14.10.symbols} | 2 +- ....14.9.install => libqgis-server2.14.10.install} | 0 ....14.9.symbols => libqgis-server2.14.10.symbols} | 2 +- ....14.9.install => libqgisgrass6-2.14.10.install} | 0 ...des => libqgisgrass6-2.14.10.lintian-overrides} | 2 +- ....14.9.symbols => libqgisgrass6-2.14.10.symbols} | 2 +- ...2.14.9.install => libqgispython2.14.10.install} | 0 ...2.14.9.symbols => libqgispython2.14.10.symbols} | 2 +- .../plugins/processing/algs/taudem/TauDEMUtils.py | 13 ++ .../plugins/processing/modeler/ModelerAlgorithm.py | 5 +- python/plugins/processing/tools/dataobjects.py | 3 +- src/app/qgscustomization.cpp | 2 +- .../symbology-ng/qgspointdisplacementrenderer.cpp | 7 + .../symbology-ng/qgspointdisplacementrenderer.h | 4 + src/gui/qgsfiledownloader.cpp | 14 +- src/gui/qgsfiledownloader.h | 2 - .../checks/qgsgeometrygapcheck.cpp | 4 +- .../geometry_checker/utils/qgsfeaturepool.cpp | 9 +- .../virtual/qgsvirtuallayersqlitemodule.cpp | 10 +- src/server/qgsconfigparserutils.cpp | 12 +- src/server/qgsserverprojectparser.cpp | 2 +- src/server/qgswmsserver.cpp | 130 +++++++++++++++-- src/server/qgswmsserver.h | 6 +- tests/src/gui/testqgsfiledownloader.cpp | 12 +- tests/src/python/test_qgsfiledownloader.py | 14 +- tests/src/python/test_qgsserver.py | 130 +++++++++++++++++ tests/src/python/test_qgsserver_accesscontrol.py | 32 ++--- .../WMS_GetLegendGraphic_BBox.png | Bin 0 -> 839 bytes .../WMS_GetLegendGraphic_BBox2.png | Bin 0 -> 601 bytes .../WMS_GetLegendGraphic_Basic.png | Bin 0 -> 601 bytes .../WMS_GetLegendGraphic_BoxSpace.png | Bin 0 -> 3938 bytes .../WMS_GetLegendGraphic_IconLabelSpace.png | Bin 0 -> 783 bytes .../WMS_GetLegendGraphic_SymbolSize.png | Bin 0 -> 1248 bytes .../WMS_GetLegendGraphic_SymbolSpace.png | Bin 0 -> 968 bytes tests/testdata/qgis_server/getcapabilities.txt | 4 +- .../qgis_server/getcapabilities_inspire.txt | 4 +- tests/testdata/qgis_server/getprojectsettings.txt | 4 +- tests/testdata/qgis_server/wfs_getcapabilities.txt | 2 +- 51 files changed, 766 insertions(+), 138 deletions(-) diff --cc debian/changelog index 72d3ee0,749c8d6..e090a21 --- a/debian/changelog +++ b/debian/changelog @@@ -1,9 -1,21 +1,27 @@@ + qgis (2.14.10+dfsg-1) unstable; urgency=medium + + * Update symbols for other architectures. + * Move from experimental to unstable. + + -- Bas Couwenberg <[email protected]> Sun, 18 Dec 2016 14:54:37 +0100 + + qgis (2.14.10+dfsg-1~exp1) experimental; urgency=medium + + [ Jürgen E. Fischer ] + * Release of 2.14.10 + + [ Bas Couwenberg ] + * New upstream release. + * Update symbols for amd64. + + -- Bas Couwenberg <[email protected]> Fri, 16 Dec 2016 15:01:27 +0100 + +qgis (2.14.9+dfsg-1~bpo8+1) jessie-backports; urgency=medium + + * Rebuild for jessie-backports. + + -- Bas Couwenberg <[email protected]> Sun, 04 Dec 2016 18:46:02 +0100 + qgis (2.14.9+dfsg-1) unstable; urgency=medium * Update symbols for other architectures. diff --cc debian/control index b8edd94,53ba716..6d009e9 --- 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.9 -Package: libqgisgrass7-2.14.10 ++Package: libqgisgrass6-2.14.10 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.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}), - libqgisgrass6-2.14.9 (= ${binary:Version}), - libqgispython2.14.9 (= ${binary:Version}), + libqgis-app2.14.10 (= ${binary:Version}), + libqgis-core2.14.10 (= ${binary:Version}), + libqgis-gui2.14.10 (= ${binary:Version}), + libqgis-analysis2.14.10 (= ${binary:Version}), + libqgis-networkanalysis2.14.10 (= ${binary:Version}), + libqgis-server2.14.10 (= ${binary:Version}), - libqgisgrass7-2.14.10 (= ${binary:Version}), ++ libqgisgrass6-2.14.10 (= ${binary:Version}), + libqgispython2.14.10 (= ${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.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}), - libqgisgrass6-2.14.9 (= ${binary:Version}), - libqgispython2.14.9 (= ${binary:Version}), + Depends: libqgis-app2.14.10 (= ${binary:Version}), + libqgis-core2.14.10 (= ${binary:Version}), + libqgis-gui2.14.10 (= ${binary:Version}), + libqgis-analysis2.14.10 (= ${binary:Version}), + libqgis-networkanalysis2.14.10 (= ${binary:Version}), + libqgis-server2.14.10 (= ${binary:Version}), - libqgisgrass7-2.14.10 (= ${binary:Version}), ++ libqgisgrass6-2.14.10 (= ${binary:Version}), + libqgispython2.14.10 (= ${binary:Version}), ${misc:Depends} Suggests: gdb Description: QGIS - debugging symbols diff --cc debian/libqgis-analysis2.14.10.symbols index 6e2606f,e0cac7d..112ba8d --- a/debian/libqgis-analysis2.14.10.symbols +++ b/debian/libqgis-analysis2.14.10.symbols @@@ -497,13 -494,11 +497,13 @@@ libqgis_analysis.so.2.14.10 #PACKAGE# # _ZNK8Vector3D9getLengthEv@Base 2.0.1 _ZNK8Vector3DeqERKS_@Base 2.14.0 _ZNK8Vector3DneERKS_@Base 2.14.0 - (optional=templinst)_ZNSt8_Rb_treeIdSt4pairIKdiESt10_Select1stIS2_ESt4lessIdESaIS2_EE12_M_erase_auxESt23_Rb_tree_const_iteratorIS2_E@Base 2.14.1 + (optional=templinst|arch=amd64)_ZNSt8_Rb_treeIdSt4pairIKdiESt10_Select1stIS2_ESt4lessIdESaIS2_EE12_M_erase_auxESt23_Rb_tree_const_iteratorIS2_E@Base 2.14.10 (optional=templinst)_ZNSt8_Rb_treeIdSt4pairIKdiESt10_Select1stIS2_ESt4lessIdESaIS2_EE15_M_insert_equalIS0_IdiEEESt17_Rb_tree_iteratorIS2_EOT_@Base 2.8.0 - (optional=templinst|arch=armel armhf)_ZNSt8_Rb_treeIdSt4pairIKdiESt10_Select1stIS2_ESt4lessIdESaIS2_EE4findERS1_@Base 2.8.3 + (optional=templinst)_ZNSt8_Rb_treeIdSt4pairIKdiESt10_Select1stIS2_ESt4lessIdESaIS2_EE4findERS1_@Base 2.8.3 + (optional=templinst|arch=i386)_ZNSt8_Rb_treeIdSt4pairIKdiESt10_Select1stIS2_ESt4lessIdESaIS2_EE5eraseB5cxx11ESt17_Rb_tree_iteratorIS2_E@Base 2.14.4 (optional=templinst)_ZNSt8_Rb_treeIdSt4pairIKdiESt10_Select1stIS2_ESt4lessIdESaIS2_EE8_M_eraseEPSt13_Rb_tree_nodeIS2_E@Base 2.0.1 (optional=templinst)_ZNSt8_Rb_treeIiSt4pairIKidESt10_Select1stIS2_ESt4lessIiESaIS2_EE16_M_insert_uniqueIS0_IidEEES0_ISt17_Rb_tree_iteratorIS2_EbEOT_@Base 2.8.0 + (optional=templinst)_ZNSt8_Rb_treeIiSt4pairIKidESt10_Select1stIS2_ESt4lessIiESaIS2_EE4findERS1_@Base 2.14.4 (optional=templinst)_ZNSt8_Rb_treeIiSt4pairIKidESt10_Select1stIS2_ESt4lessIiESaIS2_EE5eraseERS1_@Base 2.0.1 (optional=templinst)_ZNSt8_Rb_treeIiSt4pairIKidESt10_Select1stIS2_ESt4lessIiESaIS2_EE8_M_eraseEPSt13_Rb_tree_nodeIS2_E@Base 2.0.1 _ZTI12TriDecorator@Base 2.0.1 diff --cc debian/libqgis-app2.14.10.symbols index 8020e21,d8f040f..68b7418 --- a/debian/libqgis-app2.14.10.symbols +++ b/debian/libqgis-app2.14.10.symbols @@@ -3142,9 -3114,8 +3163,9 @@@ libqgis_app.so.2.14.10 #PACKAGE# #MINVE (optional=templinst)_ZN5QHashIPKN13QFormInternal20QAbstractFormBuilderEPNS0_17QFormBuilderExtraEE13detach_helperEv@Base 2.14.0 (optional=templinst)_ZN5QHashIPKN13QFormInternal20QAbstractFormBuilderEPNS0_17QFormBuilderExtraEE13duplicateNodeEPN9QHashData4NodeEPv@Base 2.14.0 (optional=templinst)_ZN5QListI10QByteArrayE18detach_helper_growEii@Base 2.14.0 - (optional=templinst)_ZN5QListI10QByteArrayE4freeEPN9QListData4DataE@Base 2.14.0 + (optional=templinst|arch=amd64)_ZN5QListI10QByteArrayE4freeEPN9QListData4DataE@Base 2.14.10 (optional=templinst)_ZN5QListI10QByteArrayE6appendERKS0_@Base 2.14.0 + (optional=templinst)_ZN5QListI10QByteArrayE7reserveEi@Base 2.14.4 (optional=templinst)_ZN5QListI26FormBuilderSaveLayoutEntryE13detach_helperEi@Base 2.14.0 (optional=templinst)_ZN5QListI26FormBuilderSaveLayoutEntryE18detach_helper_growEii@Base 2.14.0 (optional=templinst)_ZN5QListI26FormBuilderSaveLayoutEntryE6appendERKS0_@Base 2.14.0 @@@ -3184,7 -3170,10 +3219,9 @@@ (optional=templinst)_ZN5QListIPN13QFormInternal11DomPropertyEE6appendERKS2_@Base 2.14.0 (optional=templinst)_ZN5QListIPN13QFormInternal11DomPropertyEEC1ERKS3_@Base 2.14.0 (optional=templinst)_ZN5QListIPN13QFormInternal11DomPropertyEEC2ERKS3_@Base 2.14.0 + (optional=templinst)_ZN5QListIPN13QFormInternal11DomPropertyEED1Ev@Base 2.14.10 + (optional=templinst)_ZN5QListIPN13QFormInternal11DomPropertyEED2Ev@Base 2.14.10 (optional=templinst|arch=alpha armel armhf mips mips64el mipsel s390x)_ZN5QListIPN13QFormInternal11DomPropertyEEaSERKS3_@Base 2.14.0 - (optional=templinst)_ZN5QListIPN13QFormInternal11DomResourceEE13detach_helperEi@Base 2.14.0 (optional=templinst)_ZN5QListIPN13QFormInternal11DomResourceEE18detach_helper_growEii@Base 2.14.0 (optional=templinst)_ZN5QListIPN13QFormInternal11DomResourceEE5clearEv@Base 2.14.0 (optional=templinst)_ZN5QListIPN13QFormInternal11DomResourceEE6appendERKS2_@Base 2.14.0 diff --cc debian/libqgis-gui2.14.10.symbols index 86f0fb3,4afcfe2..8515016 --- a/debian/libqgis-gui2.14.10.symbols +++ b/debian/libqgis-gui2.14.10.symbols @@@ -6524,9 -6117,8 +6544,9 @@@ libqgis_gui.so.2.14.10 #PACKAGE# #MINVE (optional=templinst)_ZN5QHashIPKN13QFormInternal20QAbstractFormBuilderEPNS0_17QFormBuilderExtraEE13detach_helperEv@Base 2.0.1 (optional=templinst)_ZN5QHashIPKN13QFormInternal20QAbstractFormBuilderEPNS0_17QFormBuilderExtraEE13duplicateNodeEPN9QHashData4NodeEPv@Base 2.0.1 (optional=templinst)_ZN5QListI10QByteArrayE18detach_helper_growEii@Base 2.0.1 - (optional=templinst)_ZN5QListI10QByteArrayE4freeEPN9QListData4DataE@Base 2.8.3 + (optional=templinst|arch=amd64)_ZN5QListI10QByteArrayE4freeEPN9QListData4DataE@Base 2.8.3 (optional=templinst)_ZN5QListI10QByteArrayE6appendERKS0_@Base 2.0.1 + (optional=templinst)_ZN5QListI10QByteArrayE7reserveEi@Base 2.14.4 (optional=templinst)_ZN5QListI26FormBuilderSaveLayoutEntryE13detach_helperEi@Base 2.0.1 (optional=templinst)_ZN5QListI26FormBuilderSaveLayoutEntryE18detach_helper_growEii@Base 2.0.1 (optional=templinst)_ZN5QListI26FormBuilderSaveLayoutEntryE6appendERKS0_@Base 2.0.1 @@@ -6568,7 -6175,10 +6602,9 @@@ (optional=templinst)_ZN5QListIPN13QFormInternal11DomPropertyEE6appendERKS2_@Base 2.0.1 (optional=templinst)_ZN5QListIPN13QFormInternal11DomPropertyEEC1ERKS3_@Base 2.0.1 (optional=templinst)_ZN5QListIPN13QFormInternal11DomPropertyEEC2ERKS3_@Base 2.0.1 + (optional=templinst|arch=!amd64)_ZN5QListIPN13QFormInternal11DomPropertyEED1Ev@Base 2.14.10 + (optional=templinst|arch=!amd64)_ZN5QListIPN13QFormInternal11DomPropertyEED2Ev@Base 2.14.10 (optional=templinst|arch=alpha armel armhf mips mips64el mipsel s390x)_ZN5QListIPN13QFormInternal11DomPropertyEEaSERKS3_@Base 2.8.3 - (optional=templinst)_ZN5QListIPN13QFormInternal11DomResourceEE13detach_helperEi@Base 2.8.3 (optional=templinst)_ZN5QListIPN13QFormInternal11DomResourceEE18detach_helper_growEii@Base 2.0.1 (optional=templinst)_ZN5QListIPN13QFormInternal11DomResourceEE5clearEv@Base 2.0.1 (optional=templinst)_ZN5QListIPN13QFormInternal11DomResourceEE6appendERKS2_@Base 2.0.1 diff --cc debian/libqgisgrass6-2.14.10.lintian-overrides index a14a303,1fec4a6..b7082ee --- a/debian/libqgisgrass6-2.14.10.lintian-overrides +++ b/debian/libqgisgrass6-2.14.10.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.9: hardening-no-fortify-functions * -libqgisgrass7-2.14.10: hardening-no-fortify-functions * ++libqgisgrass6-2.14.10: hardening-no-fortify-functions * diff --cc debian/libqgisgrass6-2.14.10.symbols index ae2cf47,9926eac..e027f0e --- a/debian/libqgisgrass6-2.14.10.symbols +++ b/debian/libqgisgrass6-2.14.10.symbols @@@ -1,5 -1,5 +1,5 @@@ # SymbolsHelper-Confirmed: 2.14.7 arm64 hppa kfreebsd-amd64 kfreebsd-i386 ppc64el - libqgisgrass6.so.2.14.9 #PACKAGE# #MINVER# -libqgisgrass7.so.2.14.10 #PACKAGE# #MINVER# ++libqgisgrass6.so.2.14.10 #PACKAGE# #MINVER# Vect_delete_line_function_pointer@Base 2.14.0 Vect_rewrite_line_function_pointer@Base 2.14.0 _Z23qStringComparisonHelperRK7QStringPKc@Base 2.8.4 diff --cc debian/libqgispython2.14.10.symbols index 6e5cba8,663619a..c2f236e --- a/debian/libqgispython2.14.10.symbols +++ b/debian/libqgispython2.14.10.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.9 #PACKAGE# #MINVER# + libqgispython.so.2.14.10 #PACKAGE# #MINVER# _ZTI14QgsPythonUtils@Base 2.0.1 _ZTS14QgsPythonUtils@Base 2.0.1 + _ZTV14QgsPythonUtils@Base 2.14.4 instance@Base 2.0.1 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/qgis.git _______________________________________________ Pkg-grass-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
