[qgis] 01/08: Merge tag 'debian/2.14.9+dfsg-1.exp1' into experimental

Bas Couwenberg sebastic at debian.org
Fri Dec 16 15:08:01 UTC 2016


This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch experimental
in repository qgis.

commit 3fa4f117b62ba2a6c1bab123754a3e82a9e21520
Merge: 21b188e 3f69546
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Nov 25 18:34:14 2016 +0100

    Merge tag 'debian/2.14.9+dfsg-1.exp1' into experimental
    
    Conflicts:
    	debian/changelog

 CMakeLists.txt                                     |   2 +-
 ChangeLog                                          | 285 +++++++++++++++++++++
 ci/travis/linux/qt4/script.sh                      |   2 +-
 debian/changelog                                   |  14 +
 debian/control                                     |  50 ++--
 debian/copyright                                   |   2 +-
 ...14.8.install => libqgis-analysis2.14.9.install} |   0
 ...14.8.symbols => libqgis-analysis2.14.9.symbols} |   6 +-
 ...app2.14.8.install => libqgis-app2.14.9.install} |   0
 ...app2.14.8.symbols => libqgis-app2.14.9.symbols} |   7 +-
 ...re2.14.8.install => libqgis-core2.14.9.install} |   0
 ...re2.14.8.symbols => libqgis-core2.14.9.symbols} |  44 ++--
 ...gui2.14.8.install => libqgis-gui2.14.9.install} |   0
 ...gui2.14.8.symbols => libqgis-gui2.14.9.symbols} |  35 ++-
 ...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 => libqgisgrass7-2.14.9.install} |   0
 ...ides => libqgisgrass7-2.14.9.lintian-overrides} |   2 +-
 ...2.14.8.symbols => libqgisgrass7-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, 2748 insertions(+), 355 deletions(-)

diff --cc debian/changelog
index 6dbea06,f93cc95..0f85fab
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,17 +1,24 @@@
+ 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-2~exp1) experimental; urgency=medium
 +
 +  * Update symbols for other architectures.
 +  * Update dependencies & paths for GRASS 7.2.
 +
 + -- Bas Couwenberg <sebastic at debian.org>  Fri, 28 Oct 2016 16:49:30 +0200
 +
  qgis (2.14.8+dfsg-1) unstable; urgency=medium
  
    * Update symbols for other architectures.

-- 
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