Skip to content
Permalink
Browse files

Merge branch 'master' of https://github.com/qgis/QGIS into processing…

…_parameters_refactoring

Conflicts:
	python/plugins/processing/gui/ExtentSelectionPanel.py
  • Loading branch information
volaya committed Oct 10, 2016
2 parents 9b75746 + 3b1dfa7 commit fba87f79f38a941b81652d62d27bcc0cf3a3d4e2
Showing with 2,551 additions and 850 deletions.
  1. +2 −0 ci/travis/linux/install.sh
  2. +1 −1 ci/travis/linux/script.sh
  3. +2 −2 debian/changelog
  4. +1 −0 debian/compat
  5. +0 −2 debian/compat.in
  6. +51 −43 debian/control
  7. +7 −9 debian/control.in
  8. +14 −8 debian/rules
  9. +8 −1 doc/CMakeLists.txt
  10. +13 −0 doc/api_break.dox
  11. +1 −1 mac/app.info.plist.in
  12. +1 −1 mac/browser.info.plist.in
  13. +18 −13 ms-windows/osgeo4w/package-nightly.cmd
  14. +12 −12 ms-windows/osgeo4w/package.cmd
  15. +17 −17 ms-windows/plugins.nsh
  16. +3 −3 ms-windows/python_plugins.nsh
  17. +1 −1 python/core/auth/qgsauthmanager.sip
  18. +17 −0 python/core/composer/qgscomposeritemcommand.sip
  19. +5 −1 python/core/composer/qgscomposermultiframecommand.sip
  20. +1 −1 python/core/qgsapplication.sip
  21. +1 −1 python/core/qgsdatadefined.sip
  22. +12 −12 python/core/qgsexpression.sip
  23. +1 −1 python/core/qgsexpressioncontext.sip
  24. +10 −0 python/core/qgsexpressionfieldbuffer.sip
  25. +6 −6 python/core/qgspallabeling.sip
  26. +15 −0 python/core/qgsrelation.sip
  27. +10 −0 python/core/qgsrelationmanager.sip
  28. +9 −0 python/core/qgsvectordataprovider.sip
  29. +1 −1 python/core/symbology-ng/qgs25drenderer.sip
  30. +1 −1 python/core/symbology-ng/qgscategorizedsymbolrenderer.sip
  31. +1 −1 python/core/symbology-ng/qgsgraduatedsymbolrenderer.sip
  32. +1 −1 python/core/symbology-ng/qgsheatmaprenderer.sip
  33. +1 −1 python/core/symbology-ng/qgsinvertedpolygonrenderer.sip
  34. +1 −1 python/core/symbology-ng/qgsnullsymbolrenderer.sip
  35. +1 −1 python/core/symbology-ng/qgspointclusterrenderer.sip
  36. +1 −1 python/core/symbology-ng/qgspointdisplacementrenderer.sip
  37. +1 −1 python/core/symbology-ng/qgspointdistancerenderer.sip
  38. +1 −3 python/core/symbology-ng/qgsrenderer.sip
  39. +1 −1 python/core/symbology-ng/qgsrulebasedrenderer.sip
  40. +1 −1 python/core/symbology-ng/qgssinglesymbolrenderer.sip
  41. +27 −6 python/gui/qgspanelwidgetstack.sip
  42. +6 −2 python/plugins/GdalTools/tools/doRasterize.py
  43. +2 −2 python/plugins/MetaSearch/pavement.py
  44. +1 −1 python/plugins/processing/algs/gdal/warp.py
  45. +1 −1 python/plugins/processing/algs/otb/maintenance/README
  46. +10 −1 python/plugins/processing/gui/TestTools.py
  47. +2 −1 python/plugins/processing/tools/postgis.py
  48. +3 −14 python/plugins/processing/tools/vector.py
  49. +1 −1 resources/context_help/HeatmapGui
  50. +1 −1 resources/context_help/PythonConsole
  51. +1 −1 scripts/mkuidefaults.py
  52. +1 −1 src/analysis/CMakeLists.txt
  53. +1 −1 src/analysis/network/CMakeLists.txt
  54. +2 −0 src/app/CMakeLists.txt
  55. +14 −12 src/app/composer/qgscomposer.cpp
  56. +4 −1 src/app/composer/qgscomposer.h
  57. +3 −2 src/app/composer/qgscomposerarrowwidget.cpp
  58. +5 −4 src/app/composer/qgscomposerattributetablewidget.cpp
  59. +1 −0 src/app/composer/qgscomposerhtmlwidget.cpp
  60. +52 −39 src/app/composer/qgscomposeritemwidget.cpp
  61. +66 −11 src/app/composer/qgscomposeritemwidget.h
  62. +2 −1 src/app/composer/qgscomposerlabelwidget.cpp
  63. +3 −2 src/app/composer/qgscomposerlegendwidget.cpp
  64. +137 −43 src/app/composer/qgscomposermapwidget.cpp
  65. +7 −0 src/app/composer/qgscomposermapwidget.h
  66. +3 −2 src/app/composer/qgscomposerpicturewidget.cpp
  67. +1 −0 src/app/composer/qgscomposerpolygonwidget.cpp
  68. +1 −0 src/app/composer/qgscomposerpolylinewidget.cpp
  69. +6 −4 src/app/composer/qgscomposerscalebarwidget.cpp
  70. +26 −11 src/app/composer/qgscomposershapewidget.cpp
  71. +2 −0 src/app/composer/qgscomposershapewidget.h
  72. +1 −1 src/app/gps/qwtpolar-0.1/qwt_polar_plot.cpp
  73. +1 −1 src/app/gps/qwtpolar-1.0/qwt_polar_plot.cpp
  74. +1 −1 src/app/gps/qwtpolar-1.1.1/qwt_polar_plot.cpp
  75. +3 −3 src/app/qgisapp.cpp
  76. +61 −0 src/app/qgsdiscoverrelationsdlg.cpp
  77. +53 −0 src/app/qgsdiscoverrelationsdlg.h
  78. +10 −12 src/app/qgslayerstylingwidget.cpp
  79. +15 −1 src/app/qgsrelationmanagerdialog.cpp
  80. +1 −0 src/app/qgsrelationmanagerdialog.h
  81. +1 −1 src/browser/main.cpp
  82. +1 −1 src/core/CMakeLists.txt
  83. +1 −1 src/core/auth/qgsauthmanager.h
  84. +17 −0 src/core/composer/qgscomposeritemcommand.h
  85. +5 −1 src/core/composer/qgscomposermultiframecommand.h
  86. +3 −4 src/core/dxf/qgsdxfexport.cpp
  87. +2 −2 src/core/qgsaggregatecalculator.cpp
  88. +2 −5 src/core/qgsapplication.cpp
  89. +1 −1 src/core/qgsapplication.h
  90. +1 −1 src/core/qgsdatadefined.cpp
  91. +1 −1 src/core/qgsdatadefined.h
  92. +1 −1 src/core/qgsdatadefined_p.h
  93. +225 −77 src/core/qgsexpression.cpp
  94. +24 −136 src/core/qgsexpression.h
  95. +6 −1 src/core/qgsexpressioncontext.h
  96. +5 −0 src/core/qgsexpressionfieldbuffer.cpp
  97. +10 −0 src/core/qgsexpressionfieldbuffer.h
  98. +22 −1 src/core/qgsfeaturerequest.cpp
  99. +3 −0 src/core/qgsfeaturerequest.h
  100. +77 −8 src/core/qgsogcutils.cpp
  101. +1 −1 src/core/qgsogrutils.cpp
  102. +2 −2 src/core/qgspallabeling.cpp
  103. +4 −4 src/core/qgspallabeling.h
  104. +12 −0 src/core/qgsprojectproperty.cpp
  105. +4 −8 src/core/qgsprojectproperty.h
  106. +15 −0 src/core/qgsrelation.cpp
  107. +17 −0 src/core/qgsrelation.h
  108. +26 −0 src/core/qgsrelationmanager.cpp
  109. +10 −0 src/core/qgsrelationmanager.h
  110. +3 −3 src/core/qgsrulebasedlabeling.cpp
  111. +2 −2 src/core/qgsrulebasedlabeling.h
  112. +5 −0 src/core/qgsvectordataprovider.cpp
  113. +10 −0 src/core/qgsvectordataprovider.h
  114. +4 −4 src/core/qgsvectorfilewriter.cpp
  115. +35 −4 src/core/qgsvectorlayer.cpp
  116. +3 −7 src/core/qgsvectorlayerdiagramprovider.cpp
  117. +1 −1 src/core/qgsvectorlayerdiagramprovider.h
  118. +6 −6 src/core/qgsvectorlayerlabelprovider.cpp
  119. +1 −1 src/core/qgsvectorlayerlabelprovider.h
  120. +2 −2 src/core/qgsvectorlayerrenderer.cpp
  121. +3 −3 src/core/qgsvectorlayerrenderer.h
  122. +2 −2 src/core/symbology-ng/qgs25drenderer.cpp
  123. +1 −1 src/core/symbology-ng/qgs25drenderer.h
  124. +3 −3 src/core/symbology-ng/qgscategorizedsymbolrenderer.cpp
  125. +1 −1 src/core/symbology-ng/qgscategorizedsymbolrenderer.h
  126. +1 −1 src/core/symbology-ng/qgsgeometrygeneratorsymbollayer.cpp
  127. +3 −3 src/core/symbology-ng/qgsgraduatedsymbolrenderer.cpp
  128. +1 −1 src/core/symbology-ng/qgsgraduatedsymbolrenderer.h
  129. +3 −3 src/core/symbology-ng/qgsheatmaprenderer.cpp
  130. +1 −1 src/core/symbology-ng/qgsheatmaprenderer.h
  131. +2 −2 src/core/symbology-ng/qgsinvertedpolygonrenderer.cpp
  132. +1 −1 src/core/symbology-ng/qgsinvertedpolygonrenderer.h
  133. +2 −2 src/core/symbology-ng/qgsnullsymbolrenderer.cpp
  134. +1 −1 src/core/symbology-ng/qgsnullsymbolrenderer.h
  135. +3 −3 src/core/symbology-ng/qgspointclusterrenderer.cpp
  136. +1 −1 src/core/symbology-ng/qgspointclusterrenderer.h
  137. +3 −3 src/core/symbology-ng/qgspointdisplacementrenderer.cpp
  138. +1 −1 src/core/symbology-ng/qgspointdisplacementrenderer.h
  139. +3 −3 src/core/symbology-ng/qgspointdistancerenderer.cpp
  140. +1 −1 src/core/symbology-ng/qgspointdistancerenderer.h
  141. +1 −2 src/core/symbology-ng/qgsrenderer.h
  142. +3 −4 src/core/symbology-ng/qgsrulebasedrenderer.cpp
  143. +1 −1 src/core/symbology-ng/qgsrulebasedrenderer.h
  144. +4 −3 src/core/symbology-ng/qgssinglesymbolrenderer.cpp
  145. +1 −1 src/core/symbology-ng/qgssinglesymbolrenderer.h
  146. +37 −17 src/core/symbology-ng/qgssymbol.cpp
  147. +3 −3 src/core/symbology-ng/qgssymbollayer.cpp
  148. +1 −1 src/gui/CMakeLists.txt
  149. +2 −2 src/gui/editorwidgets/qgsrelationreferencewidget.cpp
  150. +5 −3 src/gui/qgsencodingfiledialog.cpp
  151. +3 −3 src/gui/qgsencodingfiledialog.h
  152. +3 −0 src/gui/qgsexpressionlineedit.cpp
  153. +22 −10 src/gui/qgsexpressionlineedit.h
  154. +31 −6 src/gui/qgspanelwidgetstack.cpp
  155. +30 −6 src/gui/qgspanelwidgetstack.h
  156. +1 −1 src/gui/symbology-ng/qgssizescalewidget.cpp
  157. +1 −1 src/helpviewer/main.cpp
  158. +1 −1 src/plugins/dxf2shp_converter/dxflib/src/dl_entities.h
  159. +3 −1 src/plugins/globe/globe_plugin.cpp
  160. +1 −1 src/plugins/grass/qgsgrasseditrenderer.cpp
  161. +1 −1 src/plugins/grass/qgsgrasseditrenderer.h
  162. +1 −1 src/providers/gdal/qgsgdalprovider.cpp
  163. +1 −1 src/providers/grass/CMakeLists.txt
  164. +7 −43 src/providers/memory/qgsmemoryprovider.cpp
  165. +8 −3 src/providers/ogr/qgsogrfeatureiterator.cpp
  166. +21 −1 src/providers/ogr/qgsogrprovider.cpp
  167. +1 −1 src/providers/oracle/qgsoracletablecache.h
  168. +79 −0 src/providers/postgres/qgspostgresprovider.cpp
  169. +7 −0 src/providers/postgres/qgspostgresprovider.h
  170. +75 −0 src/providers/spatialite/qgsspatialiteprovider.cpp
  171. +7 −0 src/providers/spatialite/qgsspatialiteprovider.h
  172. +2 −2 src/providers/wfs/qgswfscapabilities.cpp
  173. +1 −1 src/providers/wfs/qgswfscapabilities.h
  174. +3 −1 src/providers/wfs/qgswfsdataitems.cpp
  175. +6 −1 src/providers/wfs/qgswfsfeatureiterator.cpp
  176. +10 −1 src/providers/wfs/qgswfsprovider.cpp
  177. +3 −1 src/providers/wfs/qgswfssourceselect.cpp
  178. +3 −1 src/providers/wfs/qgswfsutils.cpp
  179. +2 −2 src/python/qgspythonutilsimpl.cpp
  180. +4 −2 src/server/qgsserver.cpp
  181. +11 −2 src/server/qgsserverprojectparser.cpp
  182. +117 −0 src/ui/qgsdiscoverrelationsdlgbase.ui
  183. +11 −0 src/ui/qgsrelationmanagerdialogbase.ui
  184. +1 −1 tests/bench/main.cpp
  185. +5 −5 tests/src/core/testqgsdatadefined.cpp
  186. +2 −2 tests/src/core/testqgsexpression.cpp
  187. +2 −2 tests/src/core/testqgslabelingengine.cpp
  188. +191 −39 tests/src/core/testqgsogcutils.cpp
  189. +1 −0 tests/src/python/CMakeLists.txt
  190. +24 −0 tests/src/python/test_provider_memory.py
  191. +19 −0 tests/src/python/test_provider_ogr.py
  192. +101 −0 tests/src/python/test_provider_shapefile.py
  193. +36 −1 tests/src/python/test_provider_spatialite.py
  194. +27 −1 tests/src/python/test_provider_wfs.py
  195. +1 −1 tests/src/python/test_qgsappstartup.py
  196. +2 −1 tests/src/python/test_qgsexpression.py
  197. +165 −0 tests/src/python/test_qgspanelwidgetstack.py
  198. +32 −7 tests/src/python/test_qgsrelationeditwidget.py
  199. +10 −0 tests/src/python/test_qgsvectorlayer.py
  200. 0 tests/testdata/test_plugin_path/QGIS/{QGIS2.ini → QGIS3.ini}
  201. 0 tests/testdata/test_plugin_path/qgis.org/{QGIS2.ini → QGIS3.ini}
@@ -42,6 +42,8 @@ cmake \
-DCMAKE_PREFIX_PATH=/home/travis/osgeo4travis \
-DWITH_STAGED_PLUGINS=ON \
-DWITH_GRASS=ON \
-DWITH_GRASS7=ON \
-DGRASS_PREFIX7=/home/travis/osgeo4travis/grass-7.0.4 \
-DSUPPRESS_QT_WARNINGS=ON \
-DENABLE_MODELTEST=ON \
-DENABLE_PGTEST=ON \
@@ -21,5 +21,5 @@ export CCACHE_TEMPDIR=/tmp

DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"

xvfb-run ctest -V -E "qgis_openstreetmaptest|qgis_wcsprovidertest|PyQgsWFSProviderGUI|qgis_ziplayertest|qgis_ogcutilstest|$(cat ${DIR}/blacklist.txt | paste -sd '|' -)" -S ./qgis-test-travis.ctest --output-on-failure
xvfb-run ctest -V -E "qgis_openstreetmaptest|qgis_wcsprovidertest|PyQgsWFSProviderGUI|qgis_ziplayertest|$(cat ${DIR}/blacklist.txt | paste -sd '|' -)" -S ./qgis-test-travis.ctest --output-on-failure
# xvfb-run ctest -V -E "qgis_openstreetmaptest|qgis_wcsprovidertest" -S ./qgis-test-travis.ctest --output-on-failure
@@ -1,9 +1,9 @@
qgis (2.99.0) UNRELEASED; urgency=medium

* New development version 2.999 after branch of 2.16
* move to qt5/python3
* move to qt5/python3/ninja

-- Jürgen E. Fischer <jef@norbit.de> Fri, 08 Jul 2016 14:12:36 +0200
-- Jürgen E. Fischer <jef@norbit.de> Thu, 06 Oct 2016 13:30:42 +0200

qgis (2.16.0) unstable; urgency=medium

@@ -0,0 +1 @@
9

This file was deleted.

@@ -6,35 +6,41 @@ Priority: optional
Build-Depends:
bison,
cmake (>= 2.8),
debhelper (>= 7),
debhelper (>= 9),
dh-python,
flex,
grass-dev,
libexpat1-dev,
libfcgi-dev,
libgdal1-dev | libgdal-dev,
libgdal-dev (>= 1.11),
libgsl-dev,
libgeos-dev (>= 3.0.0),
libgsl0-dev,
libpq-dev,
libproj-dev,
qtbase5-dev,
libqca-qt5-2-dev,
libqwt-qt5-dev,
libspatialite-dev,
libsqlite3-dev,
libspatialindex-dev,
qtbase5-dev, qttools5-dev-tools, qttools5-dev, qtscript5-dev, qtpositioning5-dev,
libqt5svg5-dev, libqt5xmlpatterns5-dev, libqt5webkit5-dev, libqt5opengl5-dev, libqt5sql5-sqlite, libqt5scintilla2-dev,
libqwt-qt5-dev, libqca-qt5-2-dev, libqca-qt5-2-plugins,
python3-dev, python3-all-dev, python3-sip, python3-sip-dev,
pyqt5-dev-tools, pyqt5-dev, pyqt5.qsci-dev,
python3-pyqt5, python3-pyqt5.qsci, python3-pyqt5.qtsql, python3-pyqt5.qtsvg,
python3-gdal,
python3-nose2, python3-yaml, python3-mock, python3-psycopg2, python3-future, python3-termcolor,
pkg-config,
pyqt5-dev,
python3-dev,
python3-all-dev,
python3-sip,
python3-sip-dev,
python3-pyqt5,
git,
txt2tags,
doxygen
doxygen,
gdal-bin,
spawn-fcgi, lighttpd, poppler-utils,
graphviz,
xvfb, xauth,
xfonts-base, xfonts-100dpi, xfonts-75dpi, xfonts-scalable,
libosgearth-dev,
locales, ca-certificates, ninja-build
Build-Conflicts: libqgis-dev, qgis-dev
Standards-Version: 3.8.4
XS-Python-Version: current
Standards-Version: 3.9.7
Vcs-Browser: https://github.com/qgis/QGIS/
Vcs-Git: https://github.com/qgis/QGIS.git
Homepage: http://qgis.org/
@@ -64,28 +70,30 @@ Description: Geographic Information System (GIS)
Package: qgis-common
Architecture: all
Depends:
${misc:Depends}
libjs-jquery,
libjs-leaflet,
${misc:Depends}
Description: QGIS - architecture-independent data
QGIS is a Geographic Information System (GIS) which manages, analyzes and
display databases of geographic information.
.
This package contains architecture-independent supporting data files for use
with QGIS.

Package: libqgis-app3.0.0
Package: libqgis-app2.99.0
Architecture: any
Section: libs
Depends:
${shlibs:Depends},
${misc:Depends}
Replaces: libqgis{QGIS_ABI}
Replaces: libqgis2.99.0
Description: QGIS - shared app library
QGIS is a Geographic Information System (GIS) which manages, analyzes and
display databases of geographic information.
.
This package contains the shared app library.

Package: libqgis-core3.0.0
Package: libqgis-core2.99.0
Architecture: any
Section: libs
Depends:
@@ -97,7 +105,7 @@ Description: QGIS - shared core library
.
This package contains the shared core library.

Package: libqgis-gui3.0.0
Package: libqgis-gui2.99.0
Architecture: any
Section: libs
Depends:
@@ -109,7 +117,7 @@ Description: QGIS - shared gui library
.
This package contains the shared gui library.

Package: libqgis-analysis3.0.0
Package: libqgis-analysis2.99.0
Architecture: any
Section: libs
Depends:
@@ -121,7 +129,7 @@ Description: QGIS - shared analysis library
.
This package contains the shared analysis library.

Package: libqgis-networkanalysis3.0.0
Package: libqgis-networkanalysis2.99.0
Architecture: any
Section: libs
Depends:
@@ -133,7 +141,7 @@ Description: QGIS - shared network analysis library
.
This package contains the shared network analysis library.

Package: libqgisgrass3.0.0
Package: libqgisgrass7-2.99.0
Architecture: any
Section: libs
Depends:
@@ -145,13 +153,13 @@ Description: QGIS - shared grass library
.
This package contains the shared grass library.

Package: libqgispython3.0.0
Package: libqgispython2.99.0
Architecture: any
Section: libs
Depends:
${shlibs:Depends},
${misc:Depends}
Replaces: libqgis3.0.0
Replaces: libqgis2.99.0
Description: QGIS - shared Python library
QGIS is a Geographic Information System (GIS) which manages, analyzes and
display databases of geographic information.
@@ -170,7 +178,7 @@ Description: QGIS custom widgets for Qt Designer
.
This package contains a library to use specific QGIS widgets in Qt Designer.

Package: libqgis-server{QGIS_ABI}
Package: libqgis-server2.99.0
Architecture: any
Depends:
${shlibs:Depends},
@@ -187,18 +195,18 @@ Section: libdevel
Depends:
grass-dev,
libexpat1-dev,
libgdal1-dev,
libgdal-dev (>= 1.11),
libgeos-dev (>= 3.0.0),
libgsl0-dev,
libgsl-dev,
libpq-dev,
libproj-dev,
libqgis-app3.0.0 (= ${binary:Version}),
libqgis-core3.0.0 (= ${binary:Version}),
libqgis-gui3.0.0 (= ${binary:Version}),
libqgis-analysis3.0.0 (= ${binary:Version}),
libqgis-networkanalysis3.0.0 (= ${binary:Version}),
libqgisgrass7.0.4-3.0.0 (= ${binary:Version}),
libqgispython3.0.0 (= ${binary:Version}),
libqgis-app2.99.0 (= ${binary:Version}),
libqgis-core2.99.0 (= ${binary:Version}),
libqgis-gui2.99.0 (= ${binary:Version}),
libqgis-analysis2.99.0 (= ${binary:Version}),
libqgis-networkanalysis2.99.0 (= ${binary:Version}),
libqgisgrass7-2.99.0 (= ${binary:Version}),
libqgispython2.99.0 (= ${binary:Version}),
libsqlite3-dev,
qtbase5-dev, python3-pyqt5, qttools5-dev,
libqt5svg5-dev, pyqt5.qsci-dev,
@@ -229,13 +237,13 @@ Architecture: any
Section: debug
Priority: extra
Depends:
libqgis-app{QGIS_ABI} (= ${binary:Version}),
libqgis-core{QGIS_ABI} (= ${binary:Version}),
libqgis-gui{QGIS_ABI} (= ${binary:Version}),
libqgis-analysis{QGIS_ABI} (= ${binary:Version}),
libqgis-networkanalysis{QGIS_ABI} (= ${binary:Version}),
libqgisgrass{GRASSVER}-{QGIS_ABI} (= ${binary:Version}),
libqgispython{QGIS_ABI} (= ${binary:Version}),
libqgis-app2.99.0 (= ${binary:Version}),
libqgis-core2.99.0 (= ${binary:Version}),
libqgis-gui2.99.0 (= ${binary:Version}),
libqgis-analysis2.99.0 (= ${binary:Version}),
libqgis-networkanalysis2.99.0 (= ${binary:Version}),
libqgisgrass7-2.99.0 (= ${binary:Version}),
libqgispython2.99.0 (= ${binary:Version}),
${misc:Depends}
Suggests: gdb
Description: QGIS - debugging symbols
@@ -304,7 +312,7 @@ Depends:
python3-six,
python3-yaml,
python3-future,
libqgispython3.0.0,
libqgispython2.99.0,
${shlibs:Depends},
${python:Depends},
${misc:Depends},
@@ -6,14 +6,14 @@ Priority: optional
Build-Depends:
bison,
cmake (>= 2.8),
#sid stretch jessie trusty xenial# debhelper (>= 9),
#sid stretch jessie trusty xenial# dh-python,
debhelper (>= 9),
dh-python,
flex,
grass-dev,
libexpat1-dev,
libfcgi-dev,
#sid stretch jessie trusty xenial# libgdal-dev (>= 1.10.1-0~),
#jessie trusty# libgsl0-dev,
libgdal-dev (>= 1.11),
#trusty# libgsl0-dev,
#sid stretch xenial# libgsl-dev,
libgeos-dev (>= 3.0.0),
libpq-dev,
@@ -40,12 +40,10 @@ Build-Depends:
xfonts-base, xfonts-100dpi, xfonts-75dpi, xfonts-scalable,
#sid# libosgearth-dev,
#oracle# oracle-instantclient12.1-devel,
locales, ca-certificates
locales, ca-certificates, ninja-build
Build-Conflicts: libqgis-dev, qgis-dev
#sid stretch xenial#Standards-Version: 3.9.7
#jessie#Standards-Version: 3.9.6
#trusty#Standards-Version: 3.8.4
#sid stretch jessie#X-Python-Version: >= 2.7, << 2.8
#trusty xenial#XS-Python-Version: current
Vcs-Browser: https://github.com/qgis/QGIS/
Vcs-Git: https://github.com/qgis/QGIS.git
@@ -202,9 +200,9 @@ Section: libdevel
Depends:
grass-dev,
libexpat1-dev,
#sid stretch jessie trusty xenial# libgdal-dev (>= 1.10.1-0~),
libgdal-dev (>= 1.11),
libgeos-dev (>= 3.0.0),
#jessie trusty# libgsl0-dev,
#trusty# libgsl0-dev,
#sid stretch xenial# libgsl-dev,
libpq-dev,
libproj-dev,
@@ -36,16 +36,16 @@ endif

QT_PLUGINS_DIR = usr/lib/$(DEB_BUILD_MULTIARCH)/qt5/plugins

ifneq ($(DISTRIBUTION),$(findstring $(DISTRIBUTION),"stretch xenial"))
ifneq ($(DISTRIBUTION),$(findstring $(DISTRIBUTION),"trusty stretch xenial"))
DISTRIBUTION := sid
endif

DEB_BUILD_NAME ?= $(DISTRIBUTION)-$(DEB_BUILD_ARCH)

ifeq (,$(DISPLAY))
TESTMAKE=xvfb-run -a -n 1 -s "-screen 0 1280x1024x24 -dpi 96" $(MAKE)
TESTMAKE=xvfb-run -a -n 1 -s "-screen 0 1280x1024x24 -dpi 96" ninja
else
TESTMAKE=$(MAKE)
TESTMAKE=ninja
endif

QGIS_MAJOR=$(shell sed -ne 's/SET(CPACK_PACKAGE_VERSION_MAJOR "\([0-9]*\)")/\1/p' CMakeLists.txt)
@@ -56,6 +56,7 @@ GRASS=grass$(subst .,,$(shell pkg-config --modversion grass|cut -d. -f1,2))
GRASSVER=$(subst .,,$(shell pkg-config --modversion grass|cut -d. -f1))

CMAKE_OPTS := \
-G Ninja \
-DBUILDNAME=$(DEB_BUILD_NAME) \
-DCMAKE_VERBOSE_MAKEFILE=1 \
-DCMAKE_INSTALL_PREFIX=/usr \
@@ -84,7 +85,8 @@ CMAKE_OPTS := \
-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\#')
-DPYTHON_LIBRARY=$(shell python3-config --ldflags | sed -e 's\#-L\(.*\) -L/usr/lib -l\([^ ]*\) .*$$\#\1/lib\2.so\#') \
-DDOXYGEN_ON_DEMAND=TRUE

ifneq ($(SHA),)
CMAKE_OPTS += -DSHA=$(SHA)
@@ -136,7 +138,7 @@ endif
-DORACLE_INCLUDEDIR=$(ORACLE_INCLUDEDIR)
endif

ifneq (,$(findstring $(DISTRIBUTION),"sid stretch jessie"))
ifneq (,$(findstring $(DISTRIBUTION),"sid stretch"))
CMAKE_OPTS += -DSPATIALINDEX_LIBRARY=/usr/lib/$(DEB_BUILD_MULTIARCH)/libspatialindex.so
endif

@@ -154,12 +156,10 @@ else
CMAKE_OPTS += -DENABLE_TESTS=TRUE
endif

ifneq (,$(findstring $(DISTRIBUTION),"jessie stretch trusty sid"))
CPPFLAGS := $(shell dpkg-buildflags --get CPPFLAGS)
CFLAGS := $(shell dpkg-buildflags --get CFLAGS) $(CPPFLAGS)
CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS) $(CPPFLAGS)
LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS)
endif

ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
INSTALL_PROGRAM += -s
@@ -236,6 +236,12 @@ override_dh_clean: cleantemplates
override_dh_auto_configure:
dh_auto_configure -- $(CMAKE_OPTS)

override_dh_auto_build-arch:
ninja -C $(QGIS_BUILDDIR)

override_dh_auto_build-indep:
ninja -C $(QGIS_BUILDDIR) apidoc

override_dh_auto_test: test-stamp

test-stamp:
@@ -254,7 +260,7 @@ endif
touch test-stamp

override_dh_auto_install:
dh_auto_install
DESTDIR=$(CURDIR)/debian/tmp ninja -C $(QGIS_BUILDDIR) install

# remove unwanted files
$(RM) $(CURDIR)/debian/tmp/usr/share/qgis/doc/api/installdox
@@ -103,7 +103,14 @@ IF(WITH_APIDOC)
STRING(REPLACE ";" " " DOXYGEN_INPUT "${DOXYGEN_INPUT}")

CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/cmake_templates/Doxyfile.in ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile @ONLY)
ADD_CUSTOM_TARGET(apidoc ALL DEPENDS ${QHP_FILES})

SET (DOXYGEN_ON_DEMAND FALSE CACHE BOOL "Determines whether the QGIS API doxygen documentation should be build on demand only")

IF(DOXYGEN_ON_DEMAND)
ADD_CUSTOM_TARGET(apidoc DEPENDS ${QHP_FILES})
ELSE(DOXYGEN_ON_DEMAND)
ADD_CUSTOM_TARGET(apidoc ALL DEPENDS ${QHP_FILES})
ENDIF(DOXYGEN_ON_DEMAND)
ADD_CUSTOM_COMMAND(
OUTPUT ${QHP_FILES}
DEPENDS ${DOXYGEN_FILES}

0 comments on commit fba87f7

Please sign in to comment.
You can’t perform that action at this time.