Skip to content
Permalink
Browse files
Merge remote-tracking branch 'upstream/master' into sip-annotated
  • Loading branch information
doublebyte1 committed Apr 30, 2017
2 parents 59bf146 + 4ae22ac commit a26a6efe38abcd7417f1d09388b48616b774a830
Showing with 8,067 additions and 5,187 deletions.
  1. +0 −3 .ci/travis/macos/blacklist.txt
  2. +3 −3 BUGS
  3. +12 −13 INSTALL
  4. +4 −4 NEWS
  5. +2 −2 README.md
  6. +2 −1 debian/control.in
  7. +0 −1 debian/rules
  8. +2 −2 debian/upstream/metadata
  9. +12 −13 doc/INSTALL.html
  10. +1 −1 doc/index.dox
  11. +5 −5 doc/linux.t2t
  12. +6 −6 doc/news.html
  13. +1 −1 doc/news.t2t
  14. +4 −6 doc/osx.t2t
  15. +11 −2 mac/app.info.plist.in
  16. +0 −23 python/auto_sip.blacklist
  17. +11 −11 python/core/annotations/qgsannotationmanager.sip
  18. +2 −2 python/core/annotations/qgshtmlannotation.sip
  19. +2 −2 python/core/annotations/qgssvgannotation.sip
  20. +2 −2 python/core/annotations/qgstextannotation.sip
  21. +449 −316 python/core/geometry/qgsabstractgeometry.sip
  22. +31 −31 python/core/geometry/qgsbox3d.sip
  23. +5 −5 python/core/geometry/qgscircle.sip
  24. +96 −72 python/core/geometry/qgscircularstring.sip
  25. +109 −54 python/core/geometry/qgscompoundcurve.sip
  26. +129 −82 python/core/geometry/qgscurve.sip
  27. +137 −75 python/core/geometry/qgscurvepolygon.sip
  28. +14 −14 python/core/geometry/qgsellipse.sip
  29. +1,171 −758 python/core/geometry/qgsgeometry.sip
  30. +114 −64 python/core/geometry/qgsgeometrycollection.sip
  31. +169 −54 python/core/geometry/qgsgeometryengine.sip
  32. +297 −24 python/core/geometry/qgsgeometryutils.sip
  33. +187 −101 python/core/geometry/qgslinestring.sip
  34. +49 −20 python/core/geometry/qgsmulticurve.sip
  35. +48 −16 python/core/geometry/qgsmultilinestring.sip
  36. +43 −13 python/core/geometry/qgsmultipoint.sip
  37. +48 −16 python/core/geometry/qgsmultipolygon.sip
  38. +41 −15 python/core/geometry/qgsmultisurface.sip
  39. +301 −254 python/core/geometry/qgspointv2.sip
  40. +60 −28 python/core/geometry/qgspolygon.sip
  41. +9 −9 python/core/geometry/qgsrectangle.sip
  42. +33 −4 python/core/geometry/qgssurface.sip
  43. +315 −27 python/core/geometry/qgstriangle.sip
  44. +40 −5 python/core/geometry/qgswkbptr.sip
  45. +176 −105 python/core/geometry/qgswkbtypes.sip
  46. +13 −13 python/core/layertree/qgslayertree.sip
  47. +3 −7 python/core/layertree/qgslayertreemodel.sip
  48. +4 −4 python/core/layertree/qgslayertreemodellegendnode.sip
  49. +1 −1 python/core/layertree/qgslayertreenode.sip
  50. +9 −9 python/core/processing/qgsprocessingalgorithm.sip
  51. +7 −7 python/core/processing/qgsprocessingcontext.sip
  52. +13 −13 python/core/processing/qgsprocessingfeedback.sip
  53. +18 −18 python/core/processing/qgsprocessingprovider.sip
  54. +5 −5 python/core/processing/qgsprocessingregistry.sip
  55. +8 −8 python/core/processing/qgsprocessingutils.sip
  56. +1 −1 python/core/qgsaction.sip
  57. +8 −8 python/core/qgsaggregatecalculator.sip
  58. +1 −1 python/core/qgsanimatedicon.sip
  59. +9 −9 python/core/qgsapplication.sip
  60. +4 −4 python/core/qgsattributetableconfig.sip
  61. +2 −2 python/core/qgsbrowsermodel.sip
  62. +40 −43 python/core/qgscolorramp.sip
  63. +4 −4 python/core/qgscolorscheme.sip
  64. +11 −11 python/core/qgscolorschemeregistry.sip
  65. +19 −19 python/core/qgscoordinatereferencesystem.sip
  66. +10 −10 python/core/qgscoordinatetransform.sip
  67. +0 −3 python/core/qgsdataprovider.sip
  68. +0 −10 python/core/qgsdatasourceuri.sip
  69. +6 −6 python/core/qgsdatetimestatisticalsummary.sip
  70. +37 −37 python/core/qgsdistancearea.sip
  71. +2 −2 python/core/qgsellipsoidutils.sip
  72. +23 −23 python/core/qgsfeature.sip
  73. +2 −2 python/core/qgsfeaturesink.sip
  74. +6 −6 python/core/qgsfeaturestore.sip
  75. +6 −6 python/core/qgsfeedback.sip
  76. +12 −16 python/core/qgsfieldmodel.sip
  77. +2 −2 python/core/qgsfieldproxymodel.sip
  78. +82 −85 python/core/qgsmaplayer.sip
  79. +8 −12 python/core/qgsmaplayermodel.sip
  80. +2 −2 python/core/qgsmaplayerproxymodel.sip
  81. +53 −53 python/core/qgspropertytransformer.sip
  82. +7 −7 python/core/qgsrelation.sip
  83. +1,102 −807 python/core/qgstextrenderer.sip
  84. +59 −67 python/core/qgsvectorlayer.sip
  85. +1 −1 python/core/raster/qgsrasterfilewritertask.sip
  86. +74 −74 python/core/scalebar/qgsscalebarsettings.sip
  87. +2 −2 python/core/scalebar/qgsticksscalebarrenderer.sip
  88. +12 −12 python/gui/qgscheckablecombobox.sip
  89. +42 −42 python/gui/qgscolorbutton.sip
  90. +32 −32 python/gui/qgscolorrampbutton.sip
  91. +10 −10 python/gui/qgsdockwidget.sip
  92. +1 −1 python/gui/qgsexternalresourcewidget.sip
  93. +5 −5 python/gui/qgsfieldcombobox.sip
  94. +2 −2 python/gui/qgsfieldexpressionwidget.sip
  95. +5 −11 python/gui/qgsidentifymenu.sip
  96. +10 −10 python/gui/qgsmaplayercombobox.sip
  97. +4 −7 python/gui/qgsoptionswidgetfactory.sip
  98. +0 −1 python/gui/qgsscalewidget.sip
  99. +58 −5 python/gui/qgsvertexmarker.sip
  100. +5 −5 python/gui/symbology-ng/characterwidget.sip
  101. +2 −2 python/plugins/MetaSearch/metadata.txt
  102. +1 −1 python/plugins/MetaSearch/resources/connections-default.xml
  103. +3 −0 python/plugins/processing/algs/gdal/rasterize.py
  104. +3 −0 python/plugins/processing/algs/gdal/rasterize_over.py
  105. +11 −1 python/plugins/processing/algs/gdal/warp.py
  106. +1 −1 python/plugins/processing/algs/grass7/Grass7Algorithm.py
  107. +8 −1 python/plugins/processing/algs/qgis/SinglePartsToMultiparts.py
  108. +1 −1 python/plugins/processing/metadata.txt
  109. +1 −1 python/plugins/processing/script/CreateScriptCollectionPluginAction.py
  110. +1 −1 python/plugins/processing/tests/GdalAlgorithmsTest.py
  111. +10 −11 python/plugins/processing/tests/testdata/custom/single_part_poly.gml
  112. +16 −11 python/plugins/processing/tests/testdata/expected/single_to_multi.gml
  113. +2 −2 python/plugins/processing/tests/testdata/qgis_algorithm_tests.yaml
  114. +5 −6 rpm/qgis.spec.template
  115. +183 −141 scripts/sipify.pl
  116. +3 −2 scripts/sipify_all.sh
  117. +5 −2 src/app/main.cpp
  118. +7 −5 src/app/nodetool/qgsnodetool.cpp
  119. +1 −1 src/app/nodetool/qgsnodetool.h
  120. +12 −7 src/app/qgisapp.cpp
  121. +1 −1 src/app/qgscrashdialog.cpp
  122. +2 −2 src/app/qgssnappingwidget.cpp
  123. +2 −2 src/app/qgswelcomepage.cpp
  124. +51 −9 src/core/geometry/qgsabstractgeometry.h
  125. +12 −8 src/core/geometry/qgscircularstring.h
  126. +11 −8 src/core/geometry/qgscompoundcurve.h
  127. +10 −9 src/core/geometry/qgscurve.h
  128. +14 −11 src/core/geometry/qgscurvepolygon.h
  129. +1 −1 src/core/geometry/qgsgeometry.cpp
  130. +198 −45 src/core/geometry/qgsgeometry.h
  131. +16 −10 src/core/geometry/qgsgeometrycollection.h
  132. +0 −1 src/core/geometry/qgsgeometryeditutils.h
  133. +15 −15 src/core/geometry/qgsgeometryengine.h
  134. +0 −1 src/core/geometry/qgsgeometryfactory.h
  135. +33 −26 src/core/geometry/qgsgeometryutils.h
  136. +0 −1 src/core/geometry/qgsgeos.h
  137. +14 −8 src/core/geometry/qgslinestring.h
  138. +5 −5 src/core/geometry/qgsmulticurve.h
  139. +4 −4 src/core/geometry/qgsmultilinestring.h
  140. +1 −1 src/core/geometry/qgsmultipoint.cpp
  141. +4 −4 src/core/geometry/qgsmultipoint.h
  142. +5 −5 src/core/geometry/qgsmultipolygon.h
  143. +4 −4 src/core/geometry/qgsmultisurface.h
  144. +25 −8 src/core/geometry/qgspointv2.h
  145. +7 −7 src/core/geometry/qgspolygon.h
  146. +2 −1 src/core/geometry/qgssurface.h
  147. +8 −7 src/core/geometry/qgstriangle.h
  148. +78 −46 src/core/geometry/qgswkbptr.h
  149. +1 −0 src/core/geometry/qgswkbtypes.h
  150. +2 −2 src/core/qgsdatasourceuri.h
  151. +2 −2 src/core/qgsexpression.cpp
  152. +1 −1 src/core/qgslabelingengine.cpp
  153. +2 −2 src/core/qgslogger.h
  154. +1 −1 src/core/qgsmaptopixel.cpp
  155. +1 −1 src/core/qgsmaptopixel.h
  156. +3 −3 src/core/qgspointlocator.cpp
  157. +2 −2 src/core/qgsproject.cpp
  158. +120 −4 src/core/qgstextrenderer.cpp
  159. +29 −4 src/core/qgstextrenderer.h
  160. +17 −0 src/core/qgstextrenderer_p.h
  161. +0 −2 src/core/qgsvectorlayer.h
  162. +1 −1 src/core/qgsvectorlayerdiagramprovider.cpp
  163. +1 −1 src/core/qgsvectorlayereditutils.h
  164. +1 −1 src/core/qgsvectorlayerimport.cpp
  165. +1 −1 src/core/qgsvectorlayerlabelprovider.cpp
  166. +2 −2 src/core/raster/qgscolorrampshader.cpp
  167. +1 −1 src/core/symbology-ng/qgsmarkersymbollayer.cpp
  168. +1 −1 src/core/symbology-ng/qgssymbollayerutils.cpp
  169. +10 −1 src/gui/effects/qgseffectstackpropertieswidget.cpp
  170. +1 −0 src/gui/qgscodeeditor.h
  171. +1 −1 src/gui/qgsrasterlayersaveasdialog.cpp
  172. +1 −1 src/gui/qgsrubberband.cpp
  173. +34 −1 src/gui/qgstextformatwidget.cpp
  174. +2 −0 src/gui/qgstextformatwidget.h
  175. +1 −1 src/gui/qgsvertexmarker.h
  176. +1 −1 src/plugins/grass/qgsgrassmoduleoptions.cpp
  177. +1 −1 src/providers/ogr/qgsogrprovider.cpp
  178. +3 −3 src/providers/postgres/qgspostgresconn.cpp
  179. +2 −2 src/providers/postgres/qgspostgresprovider.cpp
  180. +1 −1 src/providers/postgres/qgspostgresprovider.h
  181. +1 −1 src/providers/wfs/qgswfsprovider.cpp
  182. +2 −0 src/server/CMakeLists.txt
  183. +1 −0 src/server/qgis_map_serv.cpp
  184. +47 −0 src/server/qgsbufferserverrequest.cpp
  185. +61 −0 src/server/qgsbufferserverrequest.h
  186. +2 −29 src/server/qgsbufferserverresponse.cpp
  187. +1 −40 src/server/qgsbufferserverresponse.h
  188. +220 −0 src/server/qgsfcgiserverrequest.cpp
  189. +56 −0 src/server/qgsfcgiserverrequest.h
  190. +0 −199 src/server/qgsfcgiserverresponse.cpp
  191. +0 −35 src/server/qgsfcgiserverresponse.h
  192. +1 −0 src/server/qgsserver.cpp
  193. +496 −477 src/ui/qgstextformatwidgetbase.ui
  194. +2 −2 tests/bench/main.cpp
  195. +7 −0 tests/scripts/sipifyheader.expected.sip
  196. +11 −0 tests/scripts/sipifyheader.h
  197. +1 −1 tests/src/core/testqgsdistancearea.cpp
  198. +1 −1 tests/src/core/testqgsexpression.cpp
  199. +7 −7 tests/src/core/testqgsgeometry.cpp
  200. +1 −1 tests/src/core/testqgsgeometryutils.cpp
  201. +1 −1 tests/src/core/testqgsmaptopixelgeometrysimplifier.cpp
  202. +2 −2 tests/src/core/testqgsmarkerlinesymbol.cpp
  203. +1 −1 tests/src/core/testqgsrasterlayer.cpp
  204. +1 −1 tests/src/core/testqgsvectorfilewriter.cpp
  205. +1 −1 tests/src/python/test_provider_ogr_gpkg.py
  206. +3 −3 tests/src/python/test_provider_postgres.py
  207. +1 −1 tests/src/python/test_provider_wfs.py
  208. +25 −9 tests/src/python/test_qgsgeometry.py
  209. +17 −3 tests/src/python/test_qgsjsonutils.py
  210. +1 −1 tests/src/python/test_qgspallabeling_tests.py
  211. +8 −1 tests/src/python/test_qgstextformatwidget.py
  212. +26 −50 tests/src/python/test_qgstextrenderer.py
  213. BIN tests/testdata/control_images/text_renderer/background_effect/background_effect.png
  214. BIN tests/testdata/control_images/text_renderer/background_effect/background_effect_mask.png
  215. BIN ...ntrol_images/text_renderer/background_svg_buffer_mapunits/background_svg_buffer_mapunits_mask.png
  216. BIN .../testdata/control_images/text_renderer/background_svg_buffer_mm/background_svg_buffer_mm_mask.png
  217. BIN ...a/control_images/text_renderer/background_svg_buffer_pixels/background_svg_buffer_pixels_mask.png
  218. BIN ...control_images/text_renderer/background_svg_fixed_mapunits/background_svg_fixed_mapunits_mask.png
  219. BIN tests/testdata/control_images/text_renderer/background_svg_fixed_mm/background_svg_fixed_mm_mask.png
  220. BIN ...ata/control_images/text_renderer/background_svg_fixed_pixels/background_svg_fixed_pixels_mask.png
  221. BIN tests/testdata/control_images/text_renderer/text_buffer_effect/text_buffer_effect.png
  222. +1 −0 tests/testdata/geom_data.csv
@@ -15,9 +15,7 @@ qgis_composerrotationtest
qgis_composerscalebartest
qgis_composerutilstest
qgis_composertablev2test
qgis_distanceareatest
qgis_diagramtest
qgis_expressiontest
qgis_fontmarkertest
qgis_labelingenginetest
qgis_legendrenderertest
@@ -30,7 +28,6 @@ PyQgsAtlasComposition
PyQgsComposerLegend
PyQgsComposerMapGrid
PyQgsDistanceArea
PyQgsJSONUtils
PyQgsPalLabelingBase
PyQgsPalLabelingPlacement
PyQgsPalLabelingComposer
6 BUGS
@@ -3,11 +3,11 @@

If you find a bug in QGIS, you can search for it

http://hub.qgis.org/search/index/quantum-gis/issues
https://issues.qgis.org/projects/qgis/search?issues=1

If you can't find an exisitng ticket, report it using the QGIS ticket/bug database at:
If you can't find an existing ticket, report it using the QGIS ticket/bug database at:

http://hub.qgis.org/projects/quantum-gis/issues/new
https://issues.qgis.org/projects/qgis/issues/new


Some hints about when you should file a bug:
25 INSTALL
@@ -1,10 +1,10 @@
QGIS
Building QGIS from source - step by step
Thursday April 20, 2017
Sunday April 30, 2017


Last Updated: Thursday April 20, 2017
Last Change : Thursday April 20, 2017
Last Updated: Sunday April 30, 2017
Last Change : Sunday April 30, 2017


1. Introduction
@@ -181,11 +181,11 @@ Now update your local sources database:
===============================

|| Distribution | install command for packages |
| stretch | ``apt-get install bison ca-certificates cmake dh-python doxygen flex gdal-bin git graphviz grass-dev libexpat1-dev libfcgi-dev libgdal-dev libgeos-dev libgsl-dev libpq-dev libproj-dev libqca-qt5-2-dev libqca-qt5-2-plugins libqt5opengl5-dev libqt5scintilla2-dev libqt5sql5-sqlite libqt5svg5-dev libqt5webkit5-dev libqt5xmlpatterns5-dev libqwt-qt5-dev libspatialindex-dev libspatialite-dev libsqlite3-dev lighttpd locales ninja-build pkg-config poppler-utils pyqt5-dev pyqt5-dev-tools pyqt5.qsci-dev python3-all-dev python3-dev python3-future python3-gdal python3-mock python3-nose2 python3-psycopg2 python3-pyqt5 python3-pyqt5.qsci python3-pyqt5.qtsql python3-pyqt5.qtsvg python3-sip python3-sip-dev python3-termcolor python3-yaml qt5keychain-dev qtbase5-dev qtpositioning5-dev qtscript5-dev qttools5-dev qttools5-dev-tools spawn-fcgi txt2tags xauth xfonts-100dpi xfonts-75dpi xfonts-base xfonts-scalable xvfb cmake-curses-gui`` |
| xenial | ``apt-get install bison ca-certificates cmake dh-python doxygen flex gdal-bin git graphviz grass-dev libexpat1-dev libfcgi-dev libgdal-dev libgeos-dev libgsl-dev libpq-dev libproj-dev libqca-qt5-2-dev libqca-qt5-2-plugins libqt5opengl5-dev libqt5scintilla2-dev libqt5sql5-sqlite libqt5svg5-dev libqt5webkit5-dev libqt5xmlpatterns5-dev libqwt-qt5-dev libspatialindex-dev libspatialite-dev libsqlite3-dev lighttpd locales ninja-build pkg-config poppler-utils pyqt5-dev pyqt5-dev-tools pyqt5.qsci-dev python3-all-dev python3-dev python3-future python3-gdal python3-mock python3-nose2 python3-psycopg2 python3-pyqt5 python3-pyqt5.qsci python3-pyqt5.qtsql python3-pyqt5.qtsvg python3-sip python3-sip-dev python3-termcolor python3-yaml qt5keychain-dev qtbase5-dev qtpositioning5-dev qtscript5-dev qttools5-dev qttools5-dev-tools spawn-fcgi txt2tags xauth xfonts-100dpi xfonts-75dpi xfonts-base xfonts-scalable xvfb cmake-curses-gui`` |
| yakkety | ``apt-get install bison ca-certificates cmake dh-python doxygen flex gdal-bin git graphviz grass-dev libexpat1-dev libfcgi-dev libgdal-dev libgeos-dev libgsl-dev libpq-dev libproj-dev libqca-qt5-2-dev libqca-qt5-2-plugins libqt5opengl5-dev libqt5scintilla2-dev libqt5sql5-sqlite libqt5svg5-dev libqt5webkit5-dev libqt5xmlpatterns5-dev libqwt-qt5-dev libspatialindex-dev libspatialite-dev libsqlite3-dev lighttpd locales ninja-build pkg-config poppler-utils pyqt5-dev pyqt5-dev-tools pyqt5.qsci-dev python3-all-dev python3-dev python3-future python3-gdal python3-mock python3-nose2 python3-psycopg2 python3-pyqt5 python3-pyqt5.qsci python3-pyqt5.qtsql python3-pyqt5.qtsvg python3-sip python3-sip-dev python3-termcolor python3-yaml qt5keychain-dev qtbase5-dev qtpositioning5-dev qtscript5-dev qttools5-dev qttools5-dev-tools spawn-fcgi txt2tags xauth xfonts-100dpi xfonts-75dpi xfonts-base xfonts-scalable xvfb cmake-curses-gui`` |
| zesty | ``apt-get install bison ca-certificates cmake dh-python doxygen flex gdal-bin git graphviz grass-dev libexpat1-dev libfcgi-dev libgdal-dev libgeos-dev libgsl-dev libpq-dev libproj-dev libqca-qt5-2-dev libqca-qt5-2-plugins libqt5opengl5-dev libqt5scintilla2-dev libqt5sql5-sqlite libqt5svg5-dev libqt5webkit5-dev libqt5xmlpatterns5-dev libqwt-qt5-dev libspatialindex-dev libspatialite-dev libsqlite3-dev lighttpd locales ninja-build pkg-config poppler-utils pyqt5-dev pyqt5-dev-tools pyqt5.qsci-dev python3-all-dev python3-dev python3-future python3-gdal python3-mock python3-nose2 python3-psycopg2 python3-pyqt5 python3-pyqt5.qsci python3-pyqt5.qtsql python3-pyqt5.qtsvg python3-sip python3-sip-dev python3-termcolor python3-yaml qt5keychain-dev qtbase5-dev qtpositioning5-dev qtscript5-dev qttools5-dev qttools5-dev-tools spawn-fcgi txt2tags xauth xfonts-100dpi xfonts-75dpi xfonts-base xfonts-scalable xvfb cmake-curses-gui`` |
| sid | ``apt-get install bison ca-certificates cmake dh-python doxygen flex gdal-bin git graphviz grass-dev libexpat1-dev libfcgi-dev libgdal-dev libgeos-dev libgsl-dev libosgearth-dev libpq-dev libproj-dev libqca-qt5-2-dev libqca-qt5-2-plugins libqt5opengl5-dev libqt5scintilla2-dev libqt5sql5-sqlite libqt5svg5-dev libqt5webkit5-dev libqt5xmlpatterns5-dev libqwt-qt5-dev libspatialindex-dev libspatialite-dev libsqlite3-dev lighttpd locales ninja-build pkg-config poppler-utils pyqt5-dev pyqt5-dev-tools pyqt5.qsci-dev python3-all-dev python3-dev python3-future python3-gdal python3-mock python3-nose2 python3-psycopg2 python3-pyqt5 python3-pyqt5.qsci python3-pyqt5.qtsql python3-pyqt5.qtsvg python3-sip python3-sip-dev python3-termcolor python3-yaml qt5keychain-dev qtbase5-dev qtpositioning5-dev qtscript5-dev qttools5-dev qttools5-dev-tools spawn-fcgi txt2tags xauth xfonts-100dpi xfonts-75dpi xfonts-base xfonts-scalable xvfb cmake-curses-gui`` |
| stretch | ``apt-get install bison ca-certificates cmake dh-python doxygen flex gdal-bin git graphviz grass-dev libexpat1-dev libfcgi-dev libgdal-dev libgeos-dev libgsl-dev libpq-dev libproj-dev libqca-qt5-2-dev libqca-qt5-2-plugins libqt5opengl5-dev libqt5scintilla2-dev libqt5sql5-sqlite libqt5svg5-dev libqt5webkit5-dev libqt5xmlpatterns5-dev libqwt-qt5-dev libspatialindex-dev libspatialite-dev libsqlite3-dev libsqlite3-mod-spatialite lighttpd locales ninja-build pkg-config poppler-utils pyqt5-dev pyqt5-dev-tools pyqt5.qsci-dev python3-all-dev python3-dev python3-future python3-gdal python3-mock python3-nose2 python3-psycopg2 python3-pyqt5 python3-pyqt5.qsci python3-pyqt5.qtsql python3-pyqt5.qtsvg python3-sip python3-sip-dev python3-termcolor python3-yaml qt5keychain-dev qtbase5-dev qtpositioning5-dev qtscript5-dev qttools5-dev qttools5-dev-tools spawn-fcgi txt2tags xauth xfonts-100dpi xfonts-75dpi xfonts-base xfonts-scalable xvfb cmake-curses-gui`` |
| xenial | ``apt-get install bison ca-certificates cmake dh-python doxygen flex gdal-bin git graphviz grass-dev libexpat1-dev libfcgi-dev libgdal-dev libgeos-dev libgsl-dev libpq-dev libproj-dev libqca-qt5-2-dev libqca-qt5-2-plugins libqt5opengl5-dev libqt5scintilla2-dev libqt5sql5-sqlite libqt5svg5-dev libqt5webkit5-dev libqt5xmlpatterns5-dev libqwt-qt5-dev libspatialindex-dev libspatialite-dev libsqlite3-dev libsqlite3-mod-spatialite lighttpd locales ninja-build pkg-config poppler-utils pyqt5-dev pyqt5-dev-tools pyqt5.qsci-dev python3-all-dev python3-dev python3-future python3-gdal python3-mock python3-nose2 python3-psycopg2 python3-pyqt5 python3-pyqt5.qsci python3-pyqt5.qtsql python3-pyqt5.qtsvg python3-sip python3-sip-dev python3-termcolor python3-yaml qt5keychain-dev qtbase5-dev qtpositioning5-dev qtscript5-dev qttools5-dev qttools5-dev-tools spawn-fcgi txt2tags xauth xfonts-100dpi xfonts-75dpi xfonts-base xfonts-scalable xvfb cmake-curses-gui`` |
| yakkety | ``apt-get install bison ca-certificates cmake dh-python doxygen flex gdal-bin git graphviz grass-dev libexpat1-dev libfcgi-dev libgdal-dev libgeos-dev libgsl-dev libpq-dev libproj-dev libqca-qt5-2-dev libqca-qt5-2-plugins libqt5opengl5-dev libqt5scintilla2-dev libqt5sql5-sqlite libqt5svg5-dev libqt5webkit5-dev libqt5xmlpatterns5-dev libqwt-qt5-dev libspatialindex-dev libspatialite-dev libsqlite3-dev libsqlite3-mod-spatialite lighttpd locales ninja-build pkg-config poppler-utils pyqt5-dev pyqt5-dev-tools pyqt5.qsci-dev python3-all-dev python3-dev python3-future python3-gdal python3-mock python3-nose2 python3-psycopg2 python3-pyqt5 python3-pyqt5.qsci python3-pyqt5.qtsql python3-pyqt5.qtsvg python3-sip python3-sip-dev python3-termcolor python3-yaml qt5keychain-dev qtbase5-dev qtpositioning5-dev qtscript5-dev qttools5-dev qttools5-dev-tools spawn-fcgi txt2tags xauth xfonts-100dpi xfonts-75dpi xfonts-base xfonts-scalable xvfb cmake-curses-gui`` |
| zesty | ``apt-get install bison ca-certificates cmake dh-python doxygen flex gdal-bin git graphviz grass-dev libexpat1-dev libfcgi-dev libgdal-dev libgeos-dev libgsl-dev libpq-dev libproj-dev libqca-qt5-2-dev libqca-qt5-2-plugins libqt5opengl5-dev libqt5scintilla2-dev libqt5sql5-sqlite libqt5svg5-dev libqt5webkit5-dev libqt5xmlpatterns5-dev libqwt-qt5-dev libspatialindex-dev libspatialite-dev libsqlite3-dev libsqlite3-mod-spatialite lighttpd locales ninja-build pkg-config poppler-utils pyqt5-dev pyqt5-dev-tools pyqt5.qsci-dev python3-all-dev python3-dev python3-future python3-gdal python3-mock python3-nose2 python3-psycopg2 python3-pyqt5 python3-pyqt5.qsci python3-pyqt5.qtsql python3-pyqt5.qtsvg python3-sip python3-sip-dev python3-termcolor python3-yaml qt5keychain-dev qtbase5-dev qtpositioning5-dev qtscript5-dev qttools5-dev qttools5-dev-tools spawn-fcgi txt2tags xauth xfonts-100dpi xfonts-75dpi xfonts-base xfonts-scalable xvfb cmake-curses-gui`` |
| sid | ``apt-get install bison ca-certificates cmake dh-python doxygen flex gdal-bin git graphviz grass-dev libexpat1-dev libfcgi-dev libgdal-dev libgeos-dev libgsl-dev libosgearth-dev libpq-dev libproj-dev libqca-qt5-2-dev libqca-qt5-2-plugins libqt5opengl5-dev libqt5scintilla2-dev libqt5sql5-sqlite libqt5svg5-dev libqt5webkit5-dev libqt5xmlpatterns5-dev libqwt-qt5-dev libspatialindex-dev libspatialite-dev libsqlite3-dev libsqlite3-mod-spatialite lighttpd locales ninja-build pkg-config poppler-utils pyqt5-dev pyqt5-dev-tools pyqt5.qsci-dev python3-all-dev python3-dev python3-future python3-gdal python3-mock python3-nose2 python3-psycopg2 python3-pyqt5 python3-pyqt5.qsci python3-pyqt5.qtsql python3-pyqt5.qtsvg python3-sip python3-sip-dev python3-termcolor python3-yaml qt5keychain-dev qtbase5-dev qtpositioning5-dev qtscript5-dev qttools5-dev qttools5-dev-tools spawn-fcgi txt2tags xauth xfonts-100dpi xfonts-75dpi xfonts-base xfonts-scalable xvfb cmake-curses-gui`` |

(extracted from the control.in file in debian/)

@@ -1784,7 +1784,6 @@ In a Terminal cd to the qgis source folder previously downloaded, then:
cd build
cmake -D CMAKE_INSTALL_PREFIX=~/Applications \
-D CMAKE_BUILD_TYPE=MINSIZEREL -D ENABLE_TESTS=FALSE \
-D WITH_PYSPATIALITE=FALSE \
-D SPATIALINDEX_LIBRARY=/usr/local/lib/libspatialindex.dylib \
-D SPATIALINDEX_INCLUDE_DIR=/usr/local/include/spatialindex \
-D QWT_LIBRARY=/usr/local/qwt-6.0.2/lib/libqwt.dylib \
@@ -1897,13 +1896,13 @@ to the QGIS application. Assuming you installed QGIS in your home folder:
If you installed in /Applications, adjust the path accordingly and prefix the
whole command with 'sudo '.

QGIS Mapserver
QGIS Server

See the QGIS Mapserver wiki page at:
See the QGIS Server documentation page at:

http://hub.qgis.org/projects/quantum-gis/wiki/QGIS_Server_Tutorial
http://docs.qgis.org/2.18/en/docs/user_manual/working_with_ogc/ogc_server_support.html

for instructions on setting up Apache fastcgi and testing Mapserver, including
for instructions on setting up Apache fastcgi and testing qgis server, including
installing the mod-fastcgi that is missing on Lion.


8 NEWS
@@ -1,6 +1,6 @@
QGIS News
Change history for the QGIS Project
Tuesday March 14, 2017
Saturday April 29, 2017


------------------------------------------------------------------------
@@ -39,8 +39,8 @@ Tuesday March 14, 2017
------------------------------------------------------------------------


Last Updated: Tuesday March 14, 2017
Last Change : Sunday March 12, 2017
Last Updated: Saturday April 29, 2017
Last Change : Saturday April 29, 2017


1. What's new in Version 2.16 'Nødebo'?
@@ -539,7 +539,7 @@ key new features.
a simple key lookup, no more index lookup and attribute maps.
Note: Most plugins written for QGIS < 1.x will need to be
ported to work correctly in QGIS 2.x. Please consult
http://hub.qgis.org/wiki/quantum-gis/Python_plugin_API_changes_from_18_to_20
https://github.com/qgis/QGIS/wiki/Python_plugin_API_changes_from_18_to_20
for more details.
- The raster data provider system has been completely overhauled. One of
the best new features stemming from this work is the ability to 'Layer ->
@@ -56,7 +56,7 @@ installation document in qgis/doc/index.html. The installation document is
also available as PDF in the same directory.

## Help us
Please submit bug reports using the [QGIS bug tracker](https://hub.qgis.org/).
Please submit bug reports using the [QGIS bug tracker](https://issues.qgis.org/).
When reporting a bug, either login or, if you don't have a qgis trac, provide
an email address where we can request additional information.

@@ -74,6 +74,6 @@ QGIS is on GitHub at https://github.com/qgis/QGIS. If you wish to contribute
patches you can [fork the project](https://help.github.com/forking/), make your changes, commit to your
repository, and then [issue a pull request](http://help.github.com/pull-requests/). The development team can then
review your contribution and commit it upstream as appropriate.
If you commit a new feature, add [FEATURE] to your commit message AND give a clear description of the new feature. A webhook will automatically create an issue on the QGIS-Documentation repo to tell people to write about it.
If you commit a new feature, add [FEATURE] to your commit message AND give a clear description of the new feature. A webhook will automatically create an issue on the QGIS-Documentation repo to tell people to write documentation about it.

If you are not a developer, there are many other possibilities which do not require programming skills to help QGIS to evolve. Check our [project homepage for more information](http://qgis.org/en/site/getinvolved/index.html).
@@ -17,7 +17,7 @@ Build-Depends:
libgeos-dev (>= 3.0.0),
libpq-dev,
libproj-dev,
libspatialite-dev,
libspatialite-dev, libsqlite3-mod-spatialite,
libsqlite3-dev,
libspatialindex-dev,
qtbase5-dev, qttools5-dev-tools, qttools5-dev, qtscript5-dev, qtpositioning5-dev, qt5keychain-dev,
@@ -331,6 +331,7 @@ Depends:
python3-plotly,
python3-pyproj,
python3-owslib,
libsqlite3-mod-spatialite,
libqgispython{QGIS_ABI},
${shlibs:Depends},
${python:Depends},
@@ -72,7 +72,6 @@ CMAKE_OPTS := \
-DWITH_SERVER_PLUGINS=TRUE \
-DWITH_QWTPOLAR=FALSE \
-DWITH_QSPATIALITE=TRUE \
-DWITH_PYSPATIALITE=TRUE \
-DQT_PLUGINS_DIR=$(QT_PLUGINS_DIR) \
-DPYTHON_LIBRARY=$(shell python3-config --ldflags | sed -e 's\#-L\(.*\) -L/usr/lib -l\([^ ]*\) .*$$\#\1/lib\2.so\#') \
-DDOXYGEN_ON_DEMAND=TRUE
@@ -1,6 +1,6 @@
---
Bug-Database: https://hub.qgis.org/projects/quantum-gis/issues
Bug-Submit: https://hub.qgis.org/projects/quantum-gis/issues/new
Bug-Database: https://issues.qgis.org/projects/qgis/issues
Bug-Submit: https://issues.qgis.org/projects/qgis/issues/new
Contact: qgis-developer@lists.osgeo.org
Donation: https://qgis.org/en/site/getinvolved/donations.html
Name: QGIS

0 comments on commit a26a6ef

Please sign in to comment.