From aeec6dfa8ef2248f7bd0ec555c1042dc1a6991b6 Mon Sep 17 00:00:00 2001 From: Bas Couwenberg Date: Sat, 23 Feb 2019 14:01:58 +0100 Subject: [PATCH] debian packaging updates (squashed pull request #9254) 1b1e60d2a5 Use libqscintilla2-qt5-dev instead of virtual package. dd5003e1e4 Use "-noawait" variant for qgis-crssync trigger. d0e156e44e Remove obsolete diversions in qgis.preinst, but don't rename. 25a677e1ff Update watch file to use HTTPS. 7ca6a995eb Update registration URL in upstream metadata. 789d4fb56b Don't recommend liblwgeom-dev, it shouldn't be used by other projects. 7d3844047a Update packaging for Python 3. bb0017c793 Remove documentation outside /usr/share/doc from non-doc packages. cd7f1fd9b4 Fix FTBFS when building only arch:any packages (with -B). 03e4d0b6e1 Add -DNDEBUG flag for non-debug builds. c6cb002fc9 Include percentage of started edges in ninja output. f86761e712 Set -j & -v ninja options based on DEB_BUILD_OPTIONS. 3b07a54606 Use pkg-info.mk variables instead of dpkg-parsechangelog output. 5e18a74d8d Align paths in links file to improve readability. 2bd52f39b0 Don't use libjs-jquery for Doxygen docs. 3b9e875bbf Simplify python-qgis.install with common path to match all files. 96d5f202a3 Don't rely on QT_PLUGINS_DIR placeholder in template files. 74c3750741 Update copyright file. 1b596f5c21 Don't rely on QGIS_ABI placeholder in template files. aaabb94e70 Simplify lintian overrides. 38fad4d44c Don't rely on GRASSVER placeholder in template files. 9c772d174f Override dh_gencontrol to set GRASS ABI dependency with substvars. 8b9c14ba76 Reorder paths in install files. c518e14d1b Reorder (build) dependencies & remove duplicates. --- debian/control | 235 ++-- debian/control.in | 279 +++-- debian/copyright | 1069 ++++++++--------- debian/libqgis-3d{QGIS_ABI}.install | 2 +- debian/libqgis-analysis{QGIS_ABI}.install | 2 +- ...bqgis-analysis{QGIS_ABI}.lintian-overrides | 4 +- debian/libqgis-app{QGIS_ABI}.install | 2 +- .../libqgis-app{QGIS_ABI}.lintian-overrides | 2 +- debian/libqgis-core{QGIS_ABI}.install | 2 +- .../libqgis-core{QGIS_ABI}.lintian-overrides | 4 +- debian/libqgis-customwidgets.install | 1 + debian/libqgis-customwidgets.install.in | 1 - .../libqgis-customwidgets.lintian-overrides | 2 +- debian/libqgis-dev.install.in | 6 +- debian/libqgis-gui{QGIS_ABI}.install | 2 +- .../libqgis-gui{QGIS_ABI}.lintian-overrides | 4 +- debian/libqgis-native{QGIS_ABI}.install | 2 +- debian/libqgis-server{QGIS_ABI}.install | 2 +- ...libqgis-server{QGIS_ABI}.lintian-overrides | 4 +- .../libqgisgrass{GRASSVER_QGIS_ABI}.install | 2 +- ...grass{GRASSVER_QGIS_ABI}.lintian-overrides | 4 +- .../libqgispython{QGIS_ABI}.lintian-overrides | 2 +- debian/python-qgis.install.in | 8 - debian/python-qgis.lintian-overrides.in | 1 - ...on.install => python3-qgis-common.install} | 0 debian/python3-qgis.install | 1 + debian/python3-qgis.lintian-overrides | 1 + debian/qgis-api-doc.links | 1 - debian/qgis-common.install | 8 +- debian/qgis-common.links | 4 +- debian/qgis-common.lintian-overrides | 4 +- debian/qgis-oracle-provider.install | 2 + debian/qgis-oracle-provider.install.in | 2 - ...qgis-plugin-globe-common.lintian-overrides | 2 +- debian/qgis-plugin-grass.install | 2 + debian/qgis-plugin-grass.install.in | 2 - debian/qgis-plugin-grass.lintian-overrides | 4 +- debian/qgis-provider-grass.install | 6 + debian/qgis-provider-grass.install.in | 6 - debian/qgis-provider-grass.lintian-overrides | 4 +- debian/qgis-providers.install.in | 12 +- debian/qgis-providers.triggers | 2 +- debian/qgis.install | 8 +- debian/qgis.preinst | 2 +- debian/rules | 71 +- debian/upstream/metadata | 2 +- debian/watch | 7 +- 47 files changed, 911 insertions(+), 884 deletions(-) create mode 100644 debian/libqgis-customwidgets.install delete mode 100644 debian/libqgis-customwidgets.install.in delete mode 100644 debian/python-qgis.install.in delete mode 100644 debian/python-qgis.lintian-overrides.in rename debian/{python-qgis-common.install => python3-qgis-common.install} (100%) create mode 100644 debian/python3-qgis.install create mode 100644 debian/python3-qgis.lintian-overrides delete mode 100644 debian/qgis-api-doc.links create mode 100644 debian/qgis-oracle-provider.install delete mode 100644 debian/qgis-oracle-provider.install.in create mode 100644 debian/qgis-plugin-grass.install delete mode 100644 debian/qgis-plugin-grass.install.in create mode 100644 debian/qgis-provider-grass.install delete mode 100644 debian/qgis-provider-grass.install.in diff --git a/debian/control b/debian/control index 8cd62a4e60a..b9899537cb5 100644 --- a/debian/control +++ b/debian/control @@ -5,58 +5,103 @@ Section: science Priority: optional Build-Depends: bison, + ca-certificates, cmake (>= 2.8), debhelper (>= 9), dh-python, flex, + gdal-bin, grass-dev, libexiv2-dev, libexpat1-dev, libfcgi-dev, libgdal-dev (>= 1.11), - libgsl-dev, libgeos-dev (>= 3.0.0), + libgsl-dev, + libosgearth-dev, libpq-dev, libproj-dev, + libqca-qt5-2-dev, + libqca-qt5-2-plugins, + libqscintilla2-qt5-dev, + libqt5opengl5-dev, + libqt5serialport5-dev, + libqt5sql5-sqlite, + libqt5svg5-dev, + libqt5webkit5-dev, + libqt5xmlpatterns5-dev, + libqwt-qt5-dev, + libspatialindex-dev, libspatialite-dev, libsqlite3-dev, - libspatialindex-dev, - qtbase5-dev, qttools5-dev-tools, qttools5-dev, qtpositioning5-dev, - libqt5svg5-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, + libsqlite3-mod-spatialite, + libzip-dev, + ninja-build, + ocl-icd-opencl-dev, + opencl-headers, pkg-config, + pyqt5-dev-tools, + pyqt5-dev, + pyqt5.qsci-dev, + python3-all-dev, + python3-dev, + python3-future, + python3-gdal, + python3-mock, + python3-nose2, + python3-owslib, + python3-psycopg2, + python3-pyqt5, + python3-pyqt5.qsci, + python3-pyqt5.qtsql, + python3-pyqt5.qtsvg, + python3-sip-dev, + python3-sip, + python3-termcolor, + python3-yaml, + qt3d5-dev, + qt3d-assimpsceneimport-plugin, + qt3d-defaultgeometryloader-plugin, + qt3d-gltfsceneio-plugin, + qt3d-scene2d-plugin, + qt5keychain-dev, + qtbase5-dev, + qtbase5-private-dev, + qtpositioning5-dev, + qttools5-dev-tools, + qttools5-dev, git, - txt2tags, 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 + txt2tags, + xvfb, + xauth, + xfonts-base, + xfonts-100dpi, + xfonts-75dpi, + xfonts-scalable, + spawn-fcgi, + poppler-utils, + lighttpd, + locales +Build-Conflicts: + libqgis-dev, + qgis-dev Standards-Version: 3.9.7 Vcs-Browser: https://github.com/qgis/QGIS/ Vcs-Git: https://github.com/qgis/QGIS.git -Homepage: http://qgis.org/ +Homepage: https://qgis.org/ Package: qgis Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, - python-qgis (= ${binary:Version}), + python3-qgis (= ${binary:Version}), qgis-providers (= ${binary:Version}), qgis-common (= ${source:Version}) Recommends: - qgis-plugin-grass, - python-qgis + qgis-plugin-grass Suggests: gpsbabel Conflicts: uim-qt3 Description: Geographic Information System (GIS) @@ -81,6 +126,34 @@ Description: QGIS - architecture-independent data This package contains architecture-independent supporting data files for use with QGIS. +Package: libqgis-3d2.99.0 +Architecture: any +Section: libs +Depends: + qt3d-assimpsceneimport-plugin, + qt3d-defaultgeometryloader-plugin, + qt3d-gltfsceneio-plugin, + qt3d-scene2d-plugin, + ${shlibs:Depends}, + ${misc:Depends} +Description: QGIS - shared 3d library + QGIS is a Geographic Information System (GIS) which manages, analyzes and + display databases of geographic information. + . + This package contains the shared 3d library. + +Package: libqgis-analysis2.99.0 +Architecture: any +Section: libs +Depends: + ${shlibs:Depends}, + ${misc:Depends} +Description: QGIS - shared analysis library + QGIS is a Geographic Information System (GIS) which manages, analyzes and + display databases of geographic information. + . + This package contains the shared analysis library. + Package: libqgis-app2.99.0 Architecture: any Section: libs @@ -118,17 +191,29 @@ Description: QGIS - shared gui library . This package contains the shared gui library. -Package: libqgis-analysis2.99.0 +Package: libqgis-native2.99.0 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} -Description: QGIS - shared analysis library +Description: QGIS - shared native gui library QGIS is a Geographic Information System (GIS) which manages, analyzes and display databases of geographic information. . - This package contains the shared analysis library. + This package contains the shared native gui library. + +Package: libqgis-server2.99.0 +Architecture: any +Section: libs +Depends: + ${shlibs:Depends}, + ${misc:Depends} +Description: QGIS - shared server library + QGIS is a Geographic Information System (GIS) which manages, analyzes and + display databases of geographic information. + . + This package contains the shared server library. Package: libqgisgrass7-2.99.0 Architecture: any @@ -167,17 +252,6 @@ Description: QGIS custom widgets for Qt Designer . This package contains a library to use specific QGIS widgets in Qt Designer. -Package: libqgis-server2.99.0 -Architecture: any -Depends: - ${shlibs:Depends}, - ${misc:Depends} -Description: QGIS - shared server library - QGIS is a Geographic Information System (GIS) which manages, analyzes and - display databases of geographic information. - . - This package contains the shared server library. - Package: libqgis-dev Architecture: any Section: libdevel @@ -190,26 +264,30 @@ Depends: libgsl-dev, libpq-dev, libproj-dev, + libqca-qt5-2-dev, + libqgis-3d2.99.0 (= ${binary:Version}), + libqgis-analysis2.99.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-native2.99.0 (= ${binary:Version}), + libqgis-server2.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, - libqca-qt5-2-dev, - python3-dev, - libqt5scintilla2-dev, + libqscintilla2-qt5-dev, + libqt5svg5-dev, libqt5webkit5-dev, - libqca-qt5-2-dev, libqwt-qt5-dev, - qtpositioning5-dev, + libsqlite3-dev, pyqt5-dev-tools, + pyqt5.qsci-dev, + python3-dev, python3-pyqt5, - python3-pyqt5.qtsql, python3-pyqt5.qsci, + python3-pyqt5.qtsql, + qtbase5-dev, + qtpositioning5-dev, + qttools5-dev, ${misc:Depends} Recommends: libqgis-customwidgets Provides: qgis-dev @@ -225,10 +303,13 @@ Architecture: any Section: debug Priority: extra Depends: + libqgis-3d2.99.0 (= ${binary:Version}), + libqgis-analysis2.99.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-native2.99.0 (= ${binary:Version}), + libqgis-server2.99.0 (= ${binary:Version}), libqgisgrass7-2.99.0 (= ${binary:Version}), libqgispython2.99.0 (= ${binary:Version}), ${misc:Depends} @@ -256,9 +337,10 @@ Depends: qgis (= ${binary:Version}), qgis-plugin-grass-common (= ${source:Version}), qgis-provider-grass (= ${binary:Version}), + grass-core, + ${grass:Depends}, ${shlibs:Depends}, - ${misc:Depends}, - grass-core + ${misc:Depends} Description: GRASS plugin for QGIS QGIS is a Geographic Information System (GIS) which manages, analyzes and display databases of geographic information. @@ -268,7 +350,7 @@ Description: GRASS plugin for QGIS Package: qgis-plugin-grass-common Architecture: all Depends: - ${python:Depends}, + ${python3:Depends}, ${misc:Depends} Breaks: qgis-common (<< 1.5) Replaces: qgis-common (<< 1.5) @@ -279,50 +361,56 @@ Description: GRASS plugin for QGIS - architecture-independent data This package contains architecture-independent supporting data files for use with the QGIS GRASS plugin. -Package: python-qgis +Package: python3-qgis Architecture: any Section: python Depends: - python3-pyqt5, - python3-pyqt5.qtsql, - python3-sip, - python-qgis-common (= ${source:Version}), - python3-psycopg2, - python3-pyqt5.qsci, + python3-qgis-common (= ${source:Version}), + libqgispython2.99.0, + libsqlite3-mod-spatialite, + python3-dateutil, + python3-future, python3-httplib2, python3-jinja2, python3-markupsafe, + python3-owslib, + python3-plotly, + python3-psycopg2, python3-pygments, + python3-pyproj, + python3-pyqt5, + python3-pyqt5.qsci, + python3-pyqt5.qtsql, + python3-pyqt5.qtsvg, + python3-pyqt5.qtwebkit, python3-requests, - python3-dateutil, - python3-tz, + python3-sip, python3-six, + python3-tz, python3-yaml, - python3-future, - libqgispython2.99.0, + ${python3:Depends}, ${shlibs:Depends}, - ${python:Depends}, + ${sip3:Depends} ${misc:Depends}, - ${sip:Depends} -Provides: ${python:Provides} -Recommends: liblwgeom-dev +Provides: ${python3:Provides} Description: Python bindings to QGIS QGIS is a Geographic Information System (GIS) which manages, analyzes and display databases of geographic information. . This package contains the files for the Python support. -Package: python-qgis-common +Package: python3-qgis-common Architecture: all Section: python -Provides: ${python:Provides} Depends: gdal-bin, + python-gdal, python3-gdal, python3-matplotlib, - libqgis-customwidgets, + libqgis-customwidgets (>= ${source:Version}), + ${python3:Depends}, ${misc:Depends} -XB-Python-Version: ${python:Versions} +Provides: ${python3:Provides} Description: Python bindings to QGIS - architecture-independent files QGIS is a Geographic Information System (GIS) which manages, analyzes and display databases of geographic information. @@ -332,10 +420,13 @@ Description: Python bindings to QGIS - architecture-independent files Package: qgis-providers Architecture: any -Pre-Depends: ${misc:Pre-Depends} +Pre-Depends: + dpkg (>= 1.16.1), + ${misc:Pre-Depends} Depends: qgis-providers-common (= ${source:Version}), - libqt5sql5-sqlite, libqca-qt5-2-plugins, + libqca-qt5-2-plugins, + libqt5sql5-sqlite, ${shlibs:Depends}, ${misc:Depends} Breaks: qgis (<= 1.6) @@ -376,7 +467,6 @@ Package: qgis-api-doc Architecture: all Section: doc Depends: - libjs-jquery, ${misc:Depends} Recommends: qt5-doc-html @@ -385,4 +475,3 @@ Description: QGIS API documentation display databases of geographic information. . This package contains the QGIS API documentation. - diff --git a/debian/control.in b/debian/control.in index 802e7c20a0a..0a7ea9eba71 100644 --- a/debian/control.in +++ b/debian/control.in @@ -5,65 +5,107 @@ Section: science Priority: optional Build-Depends: bison, + ca-certificates, cmake (>= 2.8), debhelper (>= 9), dh-python, flex, + gdal-bin, grass-dev, libexiv2-dev, libexpat1-dev, libfcgi-dev, libgdal-dev (>= 1.11), -#sid buster stretch xenial bionic cosmic# libgsl-dev, libgeos-dev (>= 3.0.0), +#sid buster stretch xenial bionic cosmic# libgsl-dev, +#sid buster bionic cosmic# libosgearth-dev, libpq-dev, libproj-dev, - libspatialite-dev, libsqlite3-mod-spatialite, - libsqlite3-dev, + libqca-qt5-2-dev, + libqca-qt5-2-plugins, + libqscintilla2-qt5-dev, + libqt5opengl5-dev, + libqt5serialport5-dev, + libqt5sql5-sqlite, + libqt5svg5-dev, + libqt5webkit5-dev, + libqt5xmlpatterns5-dev, + libqwt-qt5-dev, libspatialindex-dev, + libspatialite-dev, + libsqlite3-dev, + libsqlite3-mod-spatialite, libzip-dev, - libexiv2-dev, - qtbase5-dev, qttools5-dev-tools, qttools5-dev, qtpositioning5-dev, qt5keychain-dev, -#!xenial# qtbase5-private-dev, - libqt5svg5-dev, libqt5webkit5-dev, libqt5opengl5-dev, libqt5sql5-sqlite, libqt5serialport5-dev, libqt5scintilla2-dev, - libqwt-qt5-dev, libqca-qt5-2-dev, libqca-qt5-2-plugins, - opencl-headers, ocl-icd-opencl-dev, - 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, python3-owslib, + ninja-build, + ocl-icd-opencl-dev, + opencl-headers, +#oracle# oracle-instantclient12.1-basiclite, +#oracle# oracle-instantclient12.1-devel, pkg-config, + pyqt5-dev-tools, + pyqt5-dev, + pyqt5.qsci-dev, + python3-all-dev, + python3-dev, + python3-future, + python3-gdal, + python3-mock, + python3-nose2, + python3-owslib, + python3-psycopg2, + python3-pyqt5, + python3-pyqt5.qsci, + python3-pyqt5.qtsql, + python3-pyqt5.qtsvg, + python3-sip-dev, + python3-sip, + python3-termcolor, + python3-yaml, +#sid buster bionic cosmic# qt3d5-dev, +#sid buster bionic cosmic# qt3d-assimpsceneimport-plugin, +#sid buster bionic cosmic# qt3d-defaultgeometryloader-plugin, +#sid buster bionic cosmic# qt3d-gltfsceneio-plugin, +#sid buster bionic cosmic# qt3d-scene2d-plugin, + qt5keychain-dev, + qtbase5-dev, +#!xenial# qtbase5-private-dev, + qtpositioning5-dev, + qttools5-dev-tools, + qttools5-dev, + saga, git, - txt2tags, doxygen, - gdal-bin, saga, - spawn-fcgi, lighttpd, poppler-utils, graphviz, - xvfb, xauth, - xfonts-base, xfonts-100dpi, xfonts-75dpi, xfonts-scalable, -#sid buster bionic cosmic# libosgearth-dev, qt3d5-dev, qt3d-assimpsceneimport-plugin, qt3d-defaultgeometryloader-plugin, qt3d-gltfsceneio-plugin, qt3d-scene2d-plugin, -#oracle# oracle-instantclient12.1-devel, oracle-instantclient12.1-basiclite, - locales, ca-certificates, ninja-build -Build-Conflicts: libqgis-dev, qgis-dev + txt2tags, + xvfb, + xauth, + xfonts-base, + xfonts-100dpi, + xfonts-75dpi, + xfonts-scalable, + spawn-fcgi, + poppler-utils, + lighttpd, + locales +Build-Conflicts: + libqgis-dev, + qgis-dev #sid buster stretch xenial bionic cosmic#Standards-Version: 3.9.7 -# xenial bionic cosmic#XS-Python-Version: current Vcs-Browser: https://github.com/qgis/QGIS/ Vcs-Git: https://github.com/qgis/QGIS.git -Homepage: http://qgis.org/ +Homepage: https://qgis.org/ Package: qgis Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, - python-qgis (= ${binary:Version}), + python3-qgis (= ${binary:Version}), qgis-providers (= ${binary:Version}), qgis-common (= ${source:Version}) Recommends: #globe# qgis-plugin-globe, - qgis-plugin-grass, - python-qgis + qgis-plugin-grass Suggests: gpsbabel Conflicts: uim-qt3 Description: Geographic Information System (GIS) @@ -89,6 +131,34 @@ Description: QGIS - architecture-independent data This package contains architecture-independent supporting data files for use with QGIS. +#sid buster bionic cosmic#Package: libqgis-3d{QGIS_ABI} +#sid buster bionic cosmic#Architecture: any +#sid buster bionic cosmic#Section: libs +#sid buster bionic cosmic#Depends: +#sid buster bionic cosmic# qt3d-assimpsceneimport-plugin, +#sid buster bionic cosmic# qt3d-defaultgeometryloader-plugin, +#sid buster bionic cosmic# qt3d-gltfsceneio-plugin, +#sid buster bionic cosmic# qt3d-scene2d-plugin, +#sid buster bionic cosmic# ${shlibs:Depends}, +#sid buster bionic cosmic# ${misc:Depends} +#sid buster bionic cosmic#Description: QGIS - shared 3d library +#sid buster bionic cosmic# QGIS is a Geographic Information System (GIS) which manages, analyzes and +#sid buster bionic cosmic# display databases of geographic information. +#sid buster bionic cosmic# . +#sid buster bionic cosmic# This package contains the shared 3d library. +#sid buster bionic cosmic# +Package: libqgis-analysis{QGIS_ABI} +Architecture: any +Section: libs +Depends: + ${shlibs:Depends}, + ${misc:Depends} +Description: QGIS - shared analysis library + QGIS is a Geographic Information System (GIS) which manages, analyzes and + display databases of geographic information. + . + This package contains the shared analysis library. + Package: libqgis-app{QGIS_ABI} Architecture: any Section: libs @@ -126,18 +196,6 @@ Description: QGIS - shared gui library . This package contains the shared gui library. -Package: libqgis-analysis{QGIS_ABI} -Architecture: any -Section: libs -Depends: - ${shlibs:Depends}, - ${misc:Depends} -Description: QGIS - shared analysis library - QGIS is a Geographic Information System (GIS) which manages, analyzes and - display databases of geographic information. - . - This package contains the shared analysis library. - Package: libqgis-native{QGIS_ABI} Architecture: any Section: libs @@ -150,19 +208,18 @@ Description: QGIS - shared native gui library . This package contains the shared native gui library. -#sid buster bionic cosmic#Package: libqgis-3d{QGIS_ABI} -#sid buster bionic cosmic#Architecture: any -#sid buster bionic cosmic#Section: libs -#sid buster bionic cosmic#Depends: -#sid buster bionic cosmic# qt3d-assimpsceneimport-plugin, qt3d-defaultgeometryloader-plugin, qt3d-gltfsceneio-plugin, qt3d-scene2d-plugin, -#sid buster bionic cosmic# ${shlibs:Depends}, -#sid buster bionic cosmic# ${misc:Depends} -#sid buster bionic cosmic#Description: QGIS - shared 3d library -#sid buster bionic cosmic# QGIS is a Geographic Information System (GIS) which manages, analyzes and -#sid buster bionic cosmic# display databases of geographic information. -#sid buster bionic cosmic# . -#sid buster bionic cosmic# This package contains the shared 3d library. -#sid buster bionic cosmic# +Package: libqgis-server{QGIS_ABI} +Architecture: any +Section: libs +Depends: + ${shlibs:Depends}, + ${misc:Depends} +Description: QGIS - shared server library + QGIS is a Geographic Information System (GIS) which manages, analyzes and + display databases of geographic information. + . + This package contains the shared server library. + Package: libqgisgrass{GRASSVER}-{QGIS_ABI} Architecture: any Section: libs @@ -200,17 +257,6 @@ 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} -Architecture: any -Depends: - ${shlibs:Depends}, - ${misc:Depends} -Description: QGIS - shared server library - QGIS is a Geographic Information System (GIS) which manages, analyzes and - display databases of geographic information. - . - This package contains the shared server library. - Package: libqgis-dev Architecture: any Section: libdevel @@ -223,26 +269,30 @@ Depends: #sid buster stretch xenial bionic cosmic# libgsl-dev, libpq-dev, libproj-dev, + libqca-qt5-2-dev, +#sid buster bionic cosmic# libqgis-3d{QGIS_ABI} (= ${binary:Version}), + libqgis-analysis{QGIS_ABI} (= ${binary:Version}), 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-native{QGIS_ABI} (= ${binary:Version}), + libqgis-server{QGIS_ABI} (= ${binary:Version}), libqgisgrass{GRASSVER}-{QGIS_ABI} (= ${binary:Version}), libqgispython{QGIS_ABI} (= ${binary:Version}), - libsqlite3-dev, - qtbase5-dev, python3-pyqt5, qttools5-dev, - libqt5svg5-dev, pyqt5.qsci-dev, - libqca-qt5-2-dev, - python3-dev, - libqt5scintilla2-dev, + libqscintilla2-qt5-dev, + libqt5svg5-dev, libqt5webkit5-dev, - libqca-qt5-2-dev, libqwt-qt5-dev, - qtpositioning5-dev, + libsqlite3-dev, pyqt5-dev-tools, + pyqt5.qsci-dev, + python3-dev, python3-pyqt5, - python3-pyqt5.qtsql, python3-pyqt5.qsci, + python3-pyqt5.qtsql, + qtbase5-dev, + qtpositioning5-dev, + qttools5-dev, ${misc:Depends} Recommends: libqgis-customwidgets Provides: qgis-dev @@ -258,10 +308,13 @@ Architecture: any Section: debug Priority: extra Depends: +#sid buster bionic cosmic# libqgis-3d{QGIS_ABI} (= ${binary:Version}), + libqgis-analysis{QGIS_ABI} (= ${binary:Version}), 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-native{QGIS_ABI} (= ${binary:Version}), + libqgis-server{QGIS_ABI} (= ${binary:Version}), libqgisgrass{GRASSVER}-{QGIS_ABI} (= ${binary:Version}), libqgispython{QGIS_ABI} (= ${binary:Version}), ${misc:Depends} @@ -289,10 +342,10 @@ Depends: qgis (= ${binary:Version}), qgis-plugin-grass-common (= ${source:Version}), qgis-provider-grass (= ${binary:Version}), - ${shlibs:Depends}, - ${misc:Depends}, grass-core, - grass{GRASSABI} + ${grass:Depends}, + ${shlibs:Depends}, + ${misc:Depends} Description: GRASS plugin for QGIS QGIS is a Geographic Information System (GIS) which manages, analyzes and display databases of geographic information. @@ -302,7 +355,7 @@ Description: GRASS plugin for QGIS Package: qgis-plugin-grass-common Architecture: all Depends: - ${python:Depends}, + ${python3:Depends}, ${misc:Depends} Breaks: qgis-common (<< 1.5) Replaces: qgis-common (<< 1.5) @@ -339,58 +392,59 @@ Description: GRASS plugin for QGIS - architecture-independent data #globe# This package contains architecture-independent supporting data files for use #globe# with the QGIS GLOBE plugin. #globe# -Package: python-qgis +Package: python3-qgis Architecture: any Section: python Depends: - python3-pyqt5, - python3-pyqt5.qtsql, - python3-pyqt5.qtsvg, - python3-pyqt5.qtwebkit, - python3-sip, - python-qgis-common (= ${source:Version}), - python3-psycopg2, - python3-pyqt5.qsci, + python3-qgis-common (= ${source:Version}), + libqgispython{QGIS_ABI}, + libsqlite3-mod-spatialite, + python3-dateutil, + python3-future, python3-httplib2, python3-jinja2, python3-markupsafe, - python3-pygments, - python3-requests, - python3-dateutil, - python3-tz, - python3-six, - python3-yaml, - python3-future, - python3-plotly, - python3-pyproj, python3-owslib, - libsqlite3-mod-spatialite, - libqgispython{QGIS_ABI}, + python3-plotly, + python3-psycopg2, + python3-pygments, + python3-pyproj, + python3-pyqt5, + python3-pyqt5.qsci, + python3-pyqt5.qtsql, + python3-pyqt5.qtsvg, + python3-pyqt5.qtwebkit, + python3-requests, + python3-sip, + python3-six, + python3-tz, + python3-yaml, + ${python3:Depends}, ${shlibs:Depends}, - ${python:Depends}, + ${sip3:Depends} ${misc:Depends}, - ${sip:Depends} -Provides: ${python:Provides} -Recommends: liblwgeom-dev +Breaks: python-qgis (<= 3.7.0) +Replaces: python-qgis (<= 3.7.0) Description: Python bindings to QGIS QGIS is a Geographic Information System (GIS) which manages, analyzes and display databases of geographic information. . This package contains the files for the Python support. -Package: python-qgis-common +Package: python3-qgis-common Architecture: all Section: python -Provides: ${python:Provides} Depends: gdal-bin, python-gdal, python3-gdal, python3-matplotlib, - libqgis-customwidgets, + libqgis-customwidgets (>= ${source:Version}), + ${python3:Depends}, ${misc:Depends} +Breaks: python-qgis-common (<= 3.7.0) +Replaces: python-qgis-common (<= 3.7.0) Suggests: saga -XB-Python-Version: ${python:Versions} Description: Python bindings to QGIS - architecture-independent files QGIS is a Geographic Information System (GIS) which manages, analyzes and display databases of geographic information. @@ -400,10 +454,13 @@ Description: Python bindings to QGIS - architecture-independent files Package: qgis-providers Architecture: any -Pre-Depends: ${misc:Pre-Depends} +Pre-Depends: + dpkg (>= 1.16.1), + ${misc:Pre-Depends} Depends: qgis-providers-common (= ${source:Version}), - libqt5sql5-sqlite, libqca-qt5-2-plugins, + libqca-qt5-2-plugins, + libqt5sql5-sqlite, ${shlibs:Depends}, ${misc:Depends} Breaks: qgis (<= 1.6) @@ -444,7 +501,6 @@ Package: qgis-api-doc Architecture: all Section: doc Depends: - libjs-jquery, ${misc:Depends} Recommends: qt5-doc-html @@ -453,7 +509,7 @@ Description: QGIS API documentation display databases of geographic information. . This package contains the QGIS API documentation. - +#oracle# #oracle#Package: qgis-oracle-provider #oracle#Architecture: any #oracle#Depends: libaio1, ${shlibs:Depends}, ${misc:Depends} @@ -463,4 +519,3 @@ Description: QGIS API documentation #oracle# display databases of geographic information. #oracle# . #oracle# This package contains the QGIS oracle provider. -#oracle# diff --git a/debian/copyright b/debian/copyright index ec04bd8fc88..4129953ac4a 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,139 +1,266 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: QGIS Upstream-Contact: qgis-developer@lists.osgeo.org Source: https://github.com/qgis/QGIS Files: * -Copyright: Carl Anderson - Christoph Spoerri - Ivan Lucena - Jens Oberender - Leonardo Lami - Marco Pasetti - Masaru Hoshi - Mateusz Loskot - Tisham Dhar - Werner Macho +Copyright: + 1996, Matthias Ettrich 1997-1998, Lars Doelle - 2003, Denis Antipov - 2003-2004, Steve Halasz - 2004, Peter Brewer - 2004-2005, Gavin Macaulay - 2004-2005, Lars Luthman - 2004-2005, Mark Coletti - 2005, Brendan Morley + 2000, Stephan Kulow + 2004, Peter Brewer + 2004, Steve Halasz + 2004-2005, Gavin Macaulay + 2004-2005, Lars Luthman + 2004-2005, Mark Coletti + 2005, Brendan Morley 2006, Ionut Iosifescu Enescu - 2006-2007, Tom Elwertowski - 2007, Peter Ersts + 2006, Tom Elwertowski + 2007, Peter J. Ersts 2006-2008, Robert Knight 2007-2008, Matthew Perry - 2008, Alessandro Furieri - 2008, Paolo L. Scala, Barbara Rita Barricelli, Marco Padula - 2008, Stefan Ziegler - 2000, 2009, Richard Kostecky - 2008-2009, Maciej Sieczka - 2009, Andres Manz - 2009, Diego Moreira - 2009, Florian El Ahdab - 2009, Godofredo Contreras - 2009, Lorenzo Masini - 2009, Mathias Walker - 2009, Paolo Cavallini - 2009, Vita Cizek - 2002-2005, 2007, 2009-2010, Gary E.Sherman - 2009-2010, Manuel Massing + 2008, e_k + 2008, Sandro Furieri + 2000, 2009, Richard Kostecky + 2009, Florian El Ahdab + 2009, Godofredo Contreras Nava + 2009, Lorenzo "Il Rugginoso" Masini + 2009, Mathias Walker + 2009, Vita Cizek + 2002-2005, 2007, 2009-2010, Gary E. Sherman + 2009-2010, Manuel Massing 2010, Ivan Mincik - 2010, Jack R, Maxim Dubinin (GIS-Lab) - 2010, Jeremy Palmer - 2010, Michael Minn - 2010, NextGIS (http://nextgis.org) - 2010, Pirmin Kalberer - 2010, Sourcepole - 2008-2011, Carson J. Q. Farmer - 2009-2011, Sergey Yakushev - 2009, 2011, Luiz Motta + 2010, Jack R, Maxim Dubinin (GIS-Lab) + 2010, Jeremy Palmer + 2010, Michael Minn + 2010, NextGIS (http:nextgis.org) + 2010, Pirmin Kalberer + 2010, Sourcepole + 2010, Yakushev Sergey 2011, German Carrillo - 2011, SunilRajKiran-kCube - 2007, 2009, 2012, Magnus Homann - 2009-2012, Giuseppe Sucameli - 2010-2012, Marco Bernasocchi - 2012, Arunmozhi - 2012, Anita Graser - 2012, Australia Indonesia Facility for Disaster Reduction + 2011, Luiz Motta + 2011, SunilRajKiran-kCube + 2007, 2009, 2012, Magnus Homann + 2011-2012, Giuseppe Sucameli + 2012, Arunmozhi 2012, Carterix Geomatics - 2012, Etienne Tourigny - 2008, 2012, Horst Düster - 2003-2005, 2007-2013, Tim Sutton - 2008-2013, Borys Jurgiel - 2012-2013, Chris Crook - 2012-2013, Massimo Endrighi - 2012-2013, Salvatore Larosa - 2012-2013, Vinayan Parameswaran - 2013, Alvaro Huarte + 2012, Etienne Tourigny + 2012, Dr. Horst Düster + 2012, Vaclav Petras + 2002-2005, 2007-2013, Tim Sutton + 2008-2013, Borys Jurgiel + 2012-2013, Massimo Endrighi + 2012-2013, Piotr Pociask + 2012-2013, Salvatore Larosa + 2012-2013, Vinayan Parameswaran + 2013, Alvaro Huarte + 2013, Chris Crook 2013, Christian Surlykke - 2013, CS Systemes d'information (CS SI) - 2013, Daniel Vaz - 2013, Emilio Loi - 2013, Joshua Arnott - 2011-2012, 2014, Nathan Woodrow - 2011, 2014, Tamas Szekeres - 2012-2014, Piotr Pociask - 2011, 2013-2014, Bernhard Ströbl - 2013-2014, Martin Isenburg - 2014, Agresta S. Coop + 2013, CS Systemes d'information (CS SI) + 2013, Daniel Vaz + 2013, Emilio Loi + 2013, Joshua Arnott + 2011, 2014, Tamas Szekeres + 2012-2014, Larry Shaffer 2014, Angelos Tzotsos - 2014, Giovanni Allegri + 2014, Detlev Neumann 2014, Michael Douchin - 2014, Niccolo' Marchi - 2014, Radoslaw Guzinski - 2004-2006, 2009-2015, Radim Blazek - 2004-2015, Marco Hugentobler - 2009-2015, Alexander Bruy - 2012-2015, The QGIS Project - 2012-2015, Larry Shaffer - 2014-2015, Alessandro Pasotti - 2014-2015, Arnaud Morvan - 2014-2015, Boundless Spatial, Inc. - 2014-2015, Sandro Mani - 2014-2015, Sandro Santilli - 2014-2015, Tom Kralidis - 2014-2015, Vincent Mora - 2015, Etienne Trimaille - 2015, Giovanni Manghi - 2015, Karolina Alexiou - 2015, Loïc BARTOLETTI - 2015, Luigi Pirelli - 2015, Michael Kirk - 2015, Pedro Venancio - 2015, René-Luc Dhont - 2008, 2015, Stéphane Brunner - 2005, 2012, 2014-2016, Hugo Mercier - 2005-2016, Martin Dobias - 2008-2012, 2014-2016, Jürgen E. Fischer - 2012-2016, Denis Rouzaud - 2012-2016, Matthias Kuhn - 2012-2016, Victor Olaya - 2013-2016, Nyall Dawson - 2014-2016, Médéric RIBREUX + 2014, Nicklas Avén + 2014, Radoslaw Guzinski + 2004-2006, 2009-2013, 2015, Radim Blazek + 2015, Giovanni Manghi + 2015, Karolina Alexiou + 2015, Michael Kirk + 2015, Pedro Venancio + 2012, 2015, the GRASS Development Team + 2008, 2015-2016, Stéphane Brunner + 2010-2012, 2015-2016, Marco Bernasocchi + 2012-2016, Hugo Mercier + 2012-2016, Victor Olaya + 2016, Andrea Aime + 2016, David Adler + 2016, Monsanto Company, USA + 2004-2017, Marco Hugentobler + 2011-2012, 2014-2017, Nathan Woodrow + 2014, 2017, Tom Kralidis + 2014-2015, 2017, Boundless Spatial, Inc. USA + 2014-2017, Arnaud Morvan + 2014-2017, Sandro Mani + 2014-2017, Sandro Santilli + 2014-2017, Médéric Ribreux + 2016-2017, David Marteau + 2016-2017, OPENGIS.ch + 2016-2017, Patrick Valsecchi + 2017, Alexander Lisovenko + 2017, Bernhard Ströbl + 2017, Ismail Sunni + 2017, Jorge Gustavo Rocha + 2017, Martí Angelats i Ribera + 2017, Muhammad Yarjuna Rohmat + 2017, Vincent Mora + 2005-2018, Martin Dobias + 2008-2018, Jürgen E. Fischer + 2009, 2011-2014, 2016-2018, Alexander Bruy + 2012-2018, Denis Rouzaud + 2012-2018, Matthias Kuhn + 2012-2013, 2005, 2017-2018, René-Luc D'Hont + 2014-2018, Alessandro Pasotti + 2015, 2018, Luigi Pirelli + 2015-2018, Mathieu Pellerin + 2016, 2018, Even Rouault + 2016-2018, Paul Blottiere + 2017-2018, David Signer + 2017-2018, Etienne Trimaille + 2017-2018, Loïc Bartoletti + 2017-2018, Matteo Ghetta + 2017-2018, Peter Petrik + 2017-2018, Viktor Sklencar + 2018, Anita Graser + 2018, elpaso + 2012-2019, The QGIS Project + 2013-2019, Nyall Dawson License: GPL-2+ -Files: qgis.dtd -Copyright: disclaimed -License: public-domain - This DTD describes the maplayers and their symbology and - is used when saving/restoring a QGIS project. - This file is in the public domain - -Files: python/plugins/processing/modeler/ModelerArrowItem.py - src/app/qgssettingstree.cpp - src/app/qgssettingstree.h - src/app/qgsvariantdelegate.cpp - src/app/qgsvariantdelegate.h -Copyright: 2010-2011, Nokia Corporation and/or its subsidiary(-ies) - 2010, Riverbank Computing Limited +Files: cmake/* +Copyright: Jan Woetzel + 2004, Felix Woelk + 2006, Michael Larouche + 2007, Magnus Homann + 2007, Martin Dobias + 2007, Thomas Moenicke thomas.moenicke@kdemail.net + 2007-2008, Simon Edwards + 2008, Mateusz Loskot + 2009, Sandro Furieri + 2006-2010, Mathieu Malaterre + 2010, Marco Hugentobler + 2010, Tim Sutton + 2005-2011, Kitware, Inc. + 2009, 2011, Jürgen E. Fischer + 2012, The QGIS Project + 2010-2013, William Kyngesburye + 2011-2013, Pirmin Kalberer + 2012, 2014, 2016-2017, Larry Shaffer + 2017, Paul Blottiere + 2016-2018, Boundless Spatial + 2017-2018, Peter Petrik License: BSD-3-Clause +Files: cmake/modules/coverage/* +Copyright: 2012, Lars Bilke + 2013, Joakim Söderberg +License: BSL-1.0 + +Files: cmake/PythonCompile.py +Copyright: Simon Edwards +License: public-domain + PythonCompile.py was written by Simon Edwards, and is placed in the public + domain. The author hereby disclaims copyright to this source code. + +Files: external/astyle/* +Copyright: 2017-2018, Jim Pattee + Tal Davidson +Comment: Artistic Style is maintained and updated by Jim Pattee. + The original author was Tal Davidson, Israel. +License: LGPL-2.1+ + +Files: external/kdbush/* +Copyright: 2016, Vladimir Agafonkin +License: ISC + +Files: external/libdxfrw/* +Copyright: 2011-2015, José F. Soriano +License: GPL-2+ + +Files: external/libdxfrw/intern/rscodec.cpp + external/libdxfrw/intern/rscodec.h +Copyright: 2011-2014, José F. Soriano + 1991, Simon Rockliff +Comment: Reed-Solomon codec + Reed Solomon code lifted from encoder/decoder for Reed-Solomon written by + Simon Rockliff + . + Original code: + This program may be freely modified and/or given to whoever wants it. + A condition of such distribution is that the author's contribution be + acknowledged by his name being left in the comments heading the program, + however no responsibility is accepted for any financial or other loss which + may result from some unforseen errors or malfunctioning of the program + during use. + Simon Rockliff, 26th June 1991 +License: GPL-2+ + +Files: external/licensecheck/* +Copyright: 2007-2008, Adam D. Barratt + 2012, Francesco Poli +License: GPL-2+ + +Files: external/mdal/* +Copyright: 2018, Lutra Consulting Ltd. + 2018, Peter Petrik (zilolv at gmail dot com) +License: MIT + +Files: external/nmea/* +Copyright: Tim +License: LGPL-2+ + +Files: external/o2/* +Copyright: 2012, Akos Polster + 2014, ownCloud GmbH +License: BSD-2-Clause + +Files: external/o2/src/o0simplecrypt.h + external/o2/src/o2simplecrypt.cpp +Copyright: 2011, Andre Somers +License: BSD-3-Clause + +Files: external/opencl-clhpp/* +Copyright: 2008-2016, The Khronos Group Inc. +License: MIT-Khronos + +Files: external/poly2tri/* +Copyright: 2009-2010, Poly2Tri Contributors +License: BSD-3-Clause + +Files: external/qspatialite/* +Copyright: 2016, The Qt Company Ltd. +License: QT-Commercial or LGPL-3 or GPL-2 or GPL-3+ + +Files: external/qspatialite/smain.cpp + external/qspatialite/smain.h +Copyright: 2012, Digia Plc and/or its subsidiary(-ies). +License: QT-Commercial or LGPL-2.1 with Digia Qt LGPL Exception 1.1 or GPL-3 + +Files: external/qt3dextra-headers/* +Copyright: 2014-2017, Klaralvdalens Datakonsult AB (KDAB) + 2016, The Qt Company Ltd. + 2015, Lorenz Esch (TU Ilmenau) +License: QT-Commercial or LGPL-3 or GPL-2+ + +Files: external/qt3dextra-headers/Qt3DExtras/qextrudedtextgeometry.h + external/qt3dextra-headers/Qt3DExtras/qextrudedtextmesh.h + external/qt3dextra-headers/Qt3DExtras/qt3dwindow.h +Copyright: 2016-2017, Klaralvdalens Datakonsult AB (KDAB) +License: QT-Commercial or BSD-3-Clause + +Files: external/qwtpolar-1.1.1/* +Copyright: 2008, Uwe Rathmann +Comment: This library is free software; you can redistribute it and/or + modify it under the terms of the Qwt License, Version 1.0 +License: QWT-1.0 + +Files: external/wintoast/* +Copyright: 2016, Mohammed Boujemaoui Boulaghmoudi +License: MIT + +Files: images/themes/default/* +Copyright: 2011, Robert Szczepanek + Anita Graser +Comment: GIS icons by Robert Szczepanek is licensed under a Creative Commons + Attribution-Share Alike 3.0 Unported License. Feel free to use it in any GIS + software or for other purposes. I only ask you to let me know about that and + to include licence.txt file in your work. +License: CC-BY-SA-3.0 + Files: python/plugins/processing/algs/qgis/voronoi.py Copyright: 2012, Victor Olaya 1994, AT&T Bell Laboratories @@ -166,290 +293,18 @@ Comment: Voronoi diagram calculator/ Delaunay triangulator Steve Fortune's homepage: http://netlib.bell-labs.com/cm/cs/who/sjf/index.html License: GPL-2+ -Files: external/qwtpolar-1.1.1/* -Copyright: 2008, Uwe Rathmann -Comment: This library is free software; you can redistribute it and/or - modify it under the terms of the Qwt License, Version 1.0 -License: QWT-1.0 - -Files: src/app/qtmain_android.cpp -Copyright: 2009-2011, BogDan Vatra +Files: python/plugins/processing/modeler/ModelerArrowItem.py +Copyright: 2010, Nokia Corporation and/or its subsidiary(-ies). + 2010, Riverbank Computing Limited. License: BSD-3-Clause -Files: external/astyle/* -Copyright: Jim Pattee - Tal Davidson -Comment: Artistic Style is maintained and updated by Jim Pattee. - The original author was Tal Davidson, Israel. -License: LGPL-2.1+ - -Files: external/nmea/config.h - external/nmea/context.c - external/nmea/context.h - external/nmea/gmath.c - external/nmea/gmath.h - external/nmea/info.c - external/nmea/info.h - external/nmea/nmeatime.h - external/nmea/parse.c - external/nmea/parse.h - external/nmea/parser.h - external/nmea/sentence.c - external/nmea/sentence.h - external/nmea/time.c - external/nmea/tok.c - external/nmea/tok.h - external/nmea/units.h -Copyright: Tim -License: LGPL-2+ - -Files: src/core/pal/* -Copyright: 2008, Maxence Laurent, MIS-TIC, HEIG-VD -License: GPL-3+ - -Files: src/core/pal/costcalculator.cpp - src/core/pal/costcalculator.h -Copyright: 2009, Martin Dobias -License: GPL-2+ - -Files: src/core/pal/rtree.hpp +Files: qgis.dtd Copyright: disclaimed -Comment: from http://www.superliminal.com/ - . - AUTORS - - 1983 Original algorithm and test code by Antonin Guttman and Michael Stonebraker, UC Berkely - - 1994 ANCI C ported from original test code by Melinda Green - melinda@superliminal.com - - 1995 Sphere volume fix for degeneracy problem submitted by Paul Brook - - 2004 Templated C++ port by Greg Douglas - - 2008 Portability issues fixed by Maxence Laurent -License: public-domain - LICENSE : Entirely free for all uses. Enjoy! - This File is in the public domain - -Files: src/core/symbology/qgscolorbrewerpalette.cpp -Copyright: 2002, Cynthia Brewer, Mark Harrower, and The Pennsylvania State University - 2009, by Martin Dobias -License: Apache-2.0 and GPL-2+ - -Files: src/gui/raster/qwt5_histogram_item.h -Copyright: 1997, Josef Wilgen - 2002, Uwe Rathmann -License: QWT-1.0 - -Files: src/gui/symbology/characterwidget.cpp - src/gui/symbology/characterwidget.h -Copyright: 2009, Nokia Corporation and/or its subsidiary(-ies) -License: QT-Commercial or LGPL-2.1 with Digia Qt LGPL Exception 1.1 or GPL-3 - -Files: src/plugins/evis/* -Copyright: 2007, American Museum of Natural History -License: LGPL-2+ - -Files: src/plugins/grass/qtermwidget/BlockArray.* -Copyright: 2000, Stephan Kulow - 2008, e_k -License: GPL-2+ - -Files: src/plugins/grass/qtermwidget/Emulation.cpp -Copyright: 1996, Matthias Ettrich - 1997-1998, Lars Doelle - 2007, Robert Knight - 2008, e_k -License: GPL-2+ - -Files: src/plugins/grass/qtermwidget/kprocess.cpp - src/plugins/grass/qtermwidget/kprocess.h - src/plugins/grass/qtermwidget/kptydevice.cpp - src/plugins/grass/qtermwidget/kptydevice.h - src/plugins/grass/qtermwidget/kptyprocess.cpp - src/plugins/grass/qtermwidget/kptyprocess.h -Copyright: 1997, Christian Czezakte - 2007, Oswald Buddenhagen - 2008, e_k - 2010, KDE e.V. -License: LGPL-2+ - -Files: src/plugins/grass/qtermwidget/konsole_wcwidth.* -Copyright: 2011, Markus Kuhn License: public-domain + This DTD describes the maplayers and their symbology and + is used when saving/restoring a QGIS project. This file is in the public domain -Files: src/plugins/grass/qtermwidget/kpty.cpp - src/plugins/grass/qtermwidget/kpty.h - src/plugins/grass/qtermwidget/kpty_p.h -Copyright: 2002, Waldo Bastian - 2002-2003, 2007, Oswald Buddenhagen - 2008, e_k -License: LGPL-2+ - -Files: src/plugins/grass/qtermwidget/qtermwidget.cpp - src/plugins/grass/qtermwidget/qtermwidget.h -Copyright: 2008, e_k - 2009, Lorenzo "Il Rugginoso" Masini -License: LGPL-2+ - -Files: src/plugins/grass/qtermwidget/TerminalCharacterDecoder.cpp - src/plugins/grass/qtermwidget/TerminalCharacterDecoder.h -Copyright: 2006-2007, Robert Knight - 2008, e_k -License: LGPL-2+ - -Files: src/providers/oracle/ocispatial/main.cpp - src/providers/oracle/ocispatial/qsql_ocispatial.cpp -Copyright: 2012, Digia Plc and/or its subsidiary(-ies) - 2012-2013, Juergen E. Fischer -License: QT-Commercial or LGPL-2.1 with Digia Qt LGPL Exception 1.1 or GPL-3 - -Files: src/providers/oracle/ocispatial/qsql_ocispatial.h - src/providers/oracle/ocispatial/qsqlcachedresult_p.h - external/qspatialite/qsql_spatialite.cpp - external/qspatialite/qsql_spatialite.h - external/qspatialite/qsqlcachedresult_p.h - external/qspatialite/smain.cpp -Copyright: 2012, Digia Plc and/or its subsidiary(-ies) -License: QT-Commercial or LGPL-2.1 with Digia Qt LGPL Exception 1.1 or GPL-3 - -Files: tests/qt_modeltest/modeltest.cpp - tests/qt_modeltest/modeltest.h - tests/qt_modeltest/tst_modeltest.cpp -Copyright: 2011, Nokia Corporation and/or its subsidiary(-ies) -License: QT-Commercial or LGPL-2.1 with Digia Qt LGPL Exception 1.1 or GPL-3 - -Files: tests/qt_modeltest/dynamictreemodel.cpp - tests/qt_modeltest/dynamictreemodel.h -Copyright: 2009, Stephen Kelly -License: QT-Commercial or LGPL-2.1 with Digia Qt LGPL Exception 1.1 or GPL-3 - -Files: tests/testdata/cpt-city/gmt/* -Copyright: 2004, 2010, Paul Wessel, SOEST - 2004, 2010, Andreas Trawoeger - 2004, 2010, Walter Smith, NOAA -License: GPL-2+ - -Files: cmake/Bison.cmake - cmake/FindExpat.cmake - cmake/FindGRASS.cmake - cmake/FindPostgres.cmake - cmake/FindProj.cmake - cmake/FindSqlite3.cmake - cmake/Flex.cmake -Copyright: 2007, Martin Dobias -License: BSD-3-Clause - -Files: cmake/FindFcgi.cmake -Copyright: 2010, Marco Hugentobler -License: BSD-3-Clause - -Files: cmake/FindGDAL.cmake -Copyright: 2007, Magnus Homann -License: BSD-3-Clause - -Files: cmake/FindGEOS.cmake -Copyright: 2008, Mateusz Loskot -Comment: based on FindGDAL.cmake by Magnus Homann -License: BSD-3-Clause - -Files: cmake/FindGSL.cmake -Copyright: 2004, Felix Woelk - Jan Woetzel -License: BSD-3-Clause - -Files: cmake/FindIconv.cmake -Copyright: 2009, Juergen E. Fischer -License: BSD-3-Clause - -Files: cmake/FindOSGEARTH.cmake -Copyright: 2011-2013, Pirmin Kalberer - 2011, Jürgen E. Fischer - 2013, William Kyngesburye -License: BSD-3-Clause - -Files: cmake/FindLibPython.py - cmake/FindPyQt4.cmake - cmake/FindPyQt4.py - cmake/FindPyQt5.cmake - cmake/FindPyQt5.py - cmake/FindPythonLibrary.cmake - cmake/FindSIP.cmake - cmake/FindSIP.py - cmake/PythonMacros.cmake - cmake/SIPMacros.cmake -Copyright: 2007-2008, Simon Edwards -License: BSD-3-Clause - -Files: cmake/FindQCA.cmake -Copyright: 2006, Michael Larouche - 2014, Larry Shaffer -License: BSD-3-Clause - -Files: cmake/FindQextserialport.cmake - cmake/FindQwtPolar.cmake - cmake/Txt2Tags.cmake -Copyright: 2011, Jürgen E. Fischer -License: BSD-3-Clause - -Files: cmake/FindQGIS.cmake -Copyright: Tim Sutton -License: BSD-3-Clause - -Files: cmake/FindQsci.cmake - cmake/QsciAPI.cmake -Copyright: 2012, Larry Shaffer -License: BSD-3-Clause - -Files: cmake/FindQsci.py -Copyright: 2012, Larry Shaffer - 2012, The QGIS Project -License: BSD-3-Clause - -Files: cmake/FindQScintilla.cmake -Copyright: 2007, Thomas Moenicke thomas.moenicke@kdemail.net -License: BSD-3-Clause - -Files: cmake/FindQwt.cmake -Copyright: 2010, Tim Sutton -License: BSD-3-Clause - -Files: cmake/FindSpatiaLite.cmake -Copyright: 2009, Sandro Furieri -License: BSD-3-Clause - -Files: cmake/MacBundleMacros.cmake -Copyright: 2010-2013, William Kyngesburye - 2012, Larry Shaffer -License: BSD-3-Clause - -Files: cmake/MacPlistMacros.cmake -Copyright: 2011, William Kyngesburye -License: BSD-3-Clause - -Files: cmake/PythonCompile.py -Copyright: Simon Edwards -License: public-domain - PythonCompile.py was written by Simon Edwards, and is placed in the public - domain. The author hereby disclaims copyright to this source code. - -Files: cmake/PyQtMacros.cmake -Copyright: 2009, Juergen E. Fischer -License: BSD-3-Clause - -Files: cmake/QCAMacros.cmake -Copyright: 2014, Larry Shaffer -License: BSD-3-Clause - -Files: cmake/UsePythonTest.cmake -Copyright: 2006-2010, Mathieu Malaterre -License: BSD-3-Clause - -Files: images/themes/default/* -Copyright: 2011, Robert Szczepanek - Anita Graser -Comment: GIS icons by Robert Szczepanek is licensed under a Creative Commons - Attribution-Share Alike 3.0 Unported License. Feel free to use it in any GIS - software or for other purposes. I only ask you to let me know about that and - to include licence.txt file in your work. -License: CC-BY-SA-3.0 - Files: resources/cpt-city-qgis-min/bhw/* Copyright: 2011, Blackheartedworf (http://blackheartedwolf.deviantart.com/) License: CC-BY-3.0 @@ -516,7 +371,7 @@ License: ElvenSword this situation.) . * Do not remove my name on it (preview). I saw some Turkish and - Russian forum sites delete artists names though, and they put + Russian forum sites delete artists names though, and they puting their own cursed crappy logos on the previews. It is not sharing. It is ... . @@ -887,6 +742,136 @@ Files: resources/cpt-city-qgis-min/wkp/tubs/* Copyright: 2012, TUBS License: CC-BY-SA-3.0 +Files: src/app/qgssettingstree.cpp + src/app/qgssettingstree.h + src/app/qgsvariantdelegate.cpp + src/app/qgsvariantdelegate.h +Copyright: 2011, Nokia Corporation and/or its subsidiary(-ies). +License: BSD-3-Clause + +Files: src/app/qtmain_android.cpp +Copyright: 2009-2011, BogDan Vatra +License: BSD-3-Clause + +Files: src/auth/oauth2/qjsonwrapper/* +Copyright: 2014, Uwe L. Korn +License: MIT + +Files: src/core/pal/* +Copyright: 2008, Maxence Laurent, MIS-TIC, HEIG-VD +License: GPL-3+ + +Files: src/core/pal/costcalculator.cpp + src/core/pal/costcalculator.h +Copyright: 2009, Martin Dobias +License: GPL-2+ + +Files: src/core/pal/rtree.hpp +Copyright: disclaimed +Comment: from http://www.superliminal.com/ + . + AUTHORS + - 1983 Original algorithm and test code by Antonin Guttman and Michael Stonebraker, UC Berkely + - 1994 ANCI C ported from original test code by Melinda Green - melinda@superliminal.com + - 1995 Sphere volume fix for degeneracy problem submitted by Paul Brook + - 2004 Templated C++ port by Greg Douglas + - 2008 Portability issues fixed by Maxence Laurent +License: public-domain + LICENSE : Entirely free for all uses. Enjoy! + This File is in the public domain + +Files: src/core/symbology/qgscolorbrewerpalette.cpp +Copyright: 2002, Cynthia Brewer, Mark Harrower, and The Pennsylvania State University + 2009, by Martin Dobias +License: Apache-2.0 and GPL-2+ + +Files: src/gui/auth/qgsauthsslimportdialog.cpp + src/gui/auth/qgsauthsslimportdialog.h +Copyright: 2015, Boundless Spatial, Inc. USA + 2014, Digia Plc and/or its subsidiary(-ies) +Comment: Portions of this code were derived from the following... + qt-everywhere-opensource-src-4.8.6/examples/network/ + securesocketclient/certificateinfo.h (and .cpp) + . + Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). + Contact: http://www.qt-project.org/legal + . + License: BSD-3-Clause +License: GPL-2+ + +Files: src/gui/symbology/characterwidget.cpp + src/gui/symbology/characterwidget.h +Copyright: 2009, Nokia Corporation and/or its subsidiary(-ies). +License: QT-Commercial or LGPL-2.1 with Digia Qt LGPL Exception 1.1 or GPL-3 + +Files: src/native/mac/cocoainitializer.h +Copyright: 2008, Remko Troncon +License: BSD-3-Clause + +Files: src/plugins/evis/* +Copyright: 2007, American Museum of Natural History +License: LGPL-2+ + +Files: src/plugins/globe/featuresource/qgsglobefeatureoptions.h +Copyright: osgEarth +License: LGPL-2+ + +Files: src/plugins/grass/qtermwidget/konsole_wcwidth.* +Copyright: 2011, Markus Kuhn +License: public-domain + This file is in the public domain + +Files: src/plugins/grass/qtermwidget/kprocess.cpp + src/plugins/grass/qtermwidget/kprocess.h + src/plugins/grass/qtermwidget/kpty.cpp + src/plugins/grass/qtermwidget/kpty.h + src/plugins/grass/qtermwidget/kpty_p.h + src/plugins/grass/qtermwidget/kptydevice.cpp + src/plugins/grass/qtermwidget/kptydevice.h + src/plugins/grass/qtermwidget/kptyprocess.cpp + src/plugins/grass/qtermwidget/kptyprocess.h + src/plugins/grass/qtermwidget/qtermwidget.cpp + src/plugins/grass/qtermwidget/qtermwidget.h + src/plugins/grass/qtermwidget/TerminalCharacterDecoder.cpp + src/plugins/grass/qtermwidget/TerminalCharacterDecoder.h +Copyright: 2002, Waldo Bastian + 2002-2003, 2007, Oswald Buddenhagen + 2008, e_k + 2010, KDE e.V. +License: LGPL-2+ + +Files: src/providers/oracle/ocispatial/main.cpp + src/providers/oracle/ocispatial/main.h + src/providers/oracle/ocispatial/qsql_ocispatial.cpp + src/providers/oracle/ocispatial/qsql_ocispatial.h +Copyright: 2012, Digia Plc and/or its subsidiary(-ies). +License: QT-Commercial or LGPL-2.1 with Digia Qt LGPL Exception 1.1 or GPL-3 + +Files: src/providers/oracle/ocispatial/wkbptr.h +Copyright: 2012, Jürgen E. Fischer +License: LGPL-2.1+ + +Files: tests/qt_modeltest/dynamictreemodel.cpp + tests/qt_modeltest/dynamictreemodel.h +Copyright: 2009, Stephen Kelly +License: QT-Commercial or LGPL-2.1 with Digia Qt LGPL Exception 1.1 or GPL-3 + +Files: tests/qt_modeltest/modeltest.cpp + tests/qt_modeltest/modeltest.h + tests/qt_modeltest/tst_modeltest.cpp +Copyright: 2011, Nokia Corporation and/or its subsidiary(-ies). +License: QT-Commercial or LGPL-2.1 with Digia Qt LGPL Exception 1.1 or GPL-3 + +Files: tests/testdata/bootstrap.css +Copyright: 2012, Twitter, Inc +License: Apache-2.0 + +Files: tests/testdata/cpt-city/gmt/* +Copyright: 2004, 2010, Paul Wessel, SOEST + 2004, 2010, Andreas Trawoeger + 2004, 2010, Walter Smith, NOAA +License: GPL-2+ + License: Apache-2.0 Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -993,6 +978,29 @@ License: BSD-3-Clause (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +License: BSL-1.0 + Permission is hereby granted, free of charge, to any person or organization + obtaining a copy of the software and accompanying documentation covered by + this license (the "Software") to use, reproduce, display, distribute, + execute, and transmit the Software, and to prepare derivative works of the + Software, and to permit third-parties to whom the Software is furnished to + do so, all subject to the following: + . + The copyright notices in the Software and this entire statement, including + the above license grant, this restriction and the following disclaimer, + must be included in all copies of the Software, in whole or in part, and + all derivative works of the Software, unless such copies or derivative + works are solely in the form of machine-executable object code generated by + a source language processor. + . + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT + SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE + FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, + ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + DEALINGS IN THE SOFTWARE. + License: CC-BY-3.0 Creative Commons Attribution 3.0 Unported . @@ -1707,18 +1715,22 @@ License: CC-BY-SA-3.0 . Creative Commons may be contacted at http://creativecommons.org/. -License: dxflib-Commercial-License - Licensees holding valid dxflib Professional Edition licenses may use - this file in accordance with the dxflib Commercial License - Agreement provided with the Software. +License: GPL-2 + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License version 2 as + published by the Free Software Foundation. . - This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE - WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. . - See http://www.ribbonsoft.com for further details. + You should have received a copy of the GNU General Public License + along with this package; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA . - Contact info@ribbonsoft.com if any conditions of this licensing are - not clear to you. + On Debian systems, the complete text of the GNU General Public License + version 2 can be found in `/usr/share/common-licenses/GPL-2'. License: GPL-2+ This program is free software; you can redistribute it and/or @@ -1828,6 +1840,33 @@ License: LGPL-2.1 with Digia Qt LGPL Exception 1.1 Furthermore, you are not required to apply this additional permission to a modified version of the Library. +License: LGPL-3 + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License version 3 as published by the Free Software Foundation + . + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + . + On Debian systems, the full text of the GNU Lesser General Public + License version 3 can be found in the file + /usr/share/common-licenses/LGPL-3'. + +License: ISC + Permission to use, copy, modify, and/or distribute this software for any + purpose with or without fee is hereby granted, provided that the above + copyright notice and this permission notice appear in all copies. + . + THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + License: MIT Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation @@ -1849,6 +1888,31 @@ License: MIT OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +License: MIT-Khronos + Permission is hereby granted, free of charge, to any person obtaining a + copy of this software and/or associated documentation files (the + "Materials"), to deal in the Materials without restriction, including + without limitation the rights to use, copy, modify, merge, publish, + distribute, sublicense, and/or sell copies of the Materials, and to + permit persons to whom the Materials are furnished to do so, subject to + the following conditions: + . + The above copyright notice and this permission notice shall be included + in all copies or substantial portions of the Materials. + . + MODIFICATIONS TO THIS FILE MAY MEAN IT NO LONGER ACCURATELY REFLECTS + KHRONOS STANDARDS. THE UNMODIFIED, NORMATIVE VERSIONS OF KHRONOS + SPECIFICATIONS AND HEADER INFORMATION ARE LOCATED AT + https://www.khronos.org/registry/ + . + THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY + CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, + TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE + MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS. + License: Jim-Mossman-Attribution . Reservation of Ownership and Grant of Rights @@ -2101,182 +2165,6 @@ License: OPL-PSI-1.0 Licensing Framework section on The National Archives website. http://www.nationalarchives.gov.uk/information-management/uk-gov-licensing-framework.htm -License: Python-2.0 - PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2 - -------------------------------------------- - 1. This LICENSE AGREEMENT is between the Python Software Foundation ("PSF"), - and the Individual or Organization ("Licensee") accessing and otherwise using - this software ("Python") in source or binary form and its associated - documentation. - . - 2. Subject to the terms and conditions of this License Agreement, PSF hereby - grants Licensee a nonexclusive, royalty-free, world-wide license to reproduce, - analyze, test, perform and/or display publicly, prepare derivative works, - distribute, and otherwise use Python alone or in any derivative version, - provided, however, that PSF's License Agreement and PSF's notice of copyright, - i.e., "Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006 Python Software - Foundation; All Rights Reserved" are retained in Python alone or in any - derivative version prepared by Licensee. - . - 3. In the event Licensee prepares a derivative work that is based on or - incorporates Python or any part thereof, and wants to make the derivative work - available to others as provided herein, then Licensee hereby agrees to include - in any such work a brief summary of the changes made to Python. - . - 4. PSF is making Python available to Licensee on an "AS IS" basis. PSF MAKES - NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED. BY WAY OF EXAMPLE, BUT - NOT LIMITATION, PSF MAKES NO AND DISCLAIMS ANY REPRESENTATION OR WARRANTY OF - MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF - PYTHON WILL NOT INFRINGE ANY THIRD PARTY RIGHTS. - . - 5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON FOR ANY - INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS A RESULT OF - MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON, OR ANY DERIVATIVE THEREOF, - EVEN IF ADVISED OF THE POSSIBILITY THEREOF. - . - 6. This License Agreement will automatically terminate upon a material breach - of its terms and conditions. - . - 7. Nothing in this License Agreement shall be deemed to create any - relationship of agency, partnership, or joint venture between PSF and - Licensee. This License Agreement does not grant permission to use PSF - trademarks or trade name in a trademark sense to endorse or promote products - or services of Licensee, or any third party. - 8. By copying, installing or otherwise using Python, Licensee agrees to be - bound by the terms and conditions of this License Agreement. - . - BEOPEN.COM LICENSE AGREEMENT FOR PYTHON 2.0 - ------------------------------------------- - . - BEOPEN PYTHON OPEN SOURCE LICENSE AGREEMENT VERSION 1 - . - 1. This LICENSE AGREEMENT is between BeOpen.com ("BeOpen"), having an office - at 160 Saratoga Avenue, Santa Clara, CA 95051, and the Individual or - Organization ("Licensee") accessing and otherwise using this software in - source or binary form and its associated documentation ("the Software"). - . - 2. Subject to the terms and conditions of this BeOpen Python License - Agreement, BeOpen hereby grants Licensee a non-exclusive, royalty-free, - world-wide license to reproduce, analyze, test, perform and/or display - publicly, prepare derivative works, distribute, and otherwise use the Software - alone or in any derivative version, provided, however, that the BeOpen Python - License is retained in the Software, alone or in any derivative version - prepared by Licensee. - . - 3. BeOpen is making the Software available to Licensee on an "AS IS" basis. - BEOPEN MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED. BY WAY OF - EXAMPLE, BUT NOT LIMITATION, BEOPEN MAKES NO AND DISCLAIMS ANY REPRESENTATION - OR WARRANTY OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT - THE USE OF THE SOFTWARE WILL NOT INFRINGE ANY THIRD PARTY RIGHTS. - . - 4. BEOPEN SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF THE SOFTWARE - FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS A RESULT OF - USING, MODIFYING OR DISTRIBUTING THE SOFTWARE, OR ANY DERIVATIVE THEREOF, EVEN - IF ADVISED OF THE POSSIBILITY THEREOF. - . - 5. This License Agreement will automatically terminate upon a material breach - of its terms and conditions. - . - 6. This License Agreement shall be governed by and interpreted in all respects - by the law of the State of California, excluding conflict of law provisions. - Nothing in this License Agreement shall be deemed to create any relationship - of agency, partnership, or joint venture between BeOpen and Licensee. This - License Agreement does not grant permission to use BeOpen trademarks or trade - names in a trademark sense to endorse or promote products or services of - Licensee, or any third party. As an exception, the "BeOpen Python" logos - available at http://www.pythonlabs.com/logos.html may be used according to the - permissions granted on that web page. - . - 7. By copying, installing or otherwise using the software, Licensee agrees to - be bound by the terms and conditions of this License Agreement. - . - CNRI LICENSE AGREEMENT FOR PYTHON 1.6.1 - --------------------------------------- - 1. This LICENSE AGREEMENT is between the Corporation for National Research - Initiatives, having an office at 1895 Preston White Drive, Reston, VA 20191 - ("CNRI"), and the Individual or Organization ("Licensee") accessing and - otherwise using Python 1.6.1 software in source or binary form and its - associated documentation. - . - 2. Subject to the terms and conditions of this License Agreement, CNRI hereby - grants Licensee a nonexclusive, royalty-free, world-wide license to reproduce, - analyze, test, perform and/or display publicly, prepare derivative works, - distribute, and otherwise use Python 1.6.1 alone or in any derivative version, - provided, however, that CNRI's License Agreement and CNRI's notice of - copyright, i.e., "Copyright (c) 1995-2001 Corporation for National Research - Initiatives; All Rights Reserved" are retained in Python 1.6.1 alone or in any - derivative version prepared by Licensee. Alternately, in lieu of CNRI's - License Agreement, Licensee may substitute the following text (omitting the - quotes): "Python 1.6.1 is made available subject to the terms and conditions - in CNRI's License Agreement. This Agreement together with Python 1.6.1 may be - located on the Internet using the following unique, persistent identifier - (known as a handle): 1895.22/1013. This Agreement may also be obtained from a - proxy server on the Internet using the following URL: - http://hdl.handle.net/1895.22/1013". - . - 3. In the event Licensee prepares a derivative work that is based on or - incorporates Python 1.6.1 or any part thereof, and wants to make the - derivative work available to others as provided herein, then Licensee hereby - agrees to include in any such work a brief summary of the changes made to - Python 1.6.1. - . - 4. CNRI is making Python 1.6.1 available to Licensee on an "AS IS" basis. CNRI - MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED. BY WAY OF EXAMPLE, - BUT NOT LIMITATION, CNRI MAKES NO AND DISCLAIMS ANY REPRESENTATION OR WARRANTY - OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF - PYTHON 1.6.1 WILL NOT INFRINGE ANY THIRD PARTY RIGHTS. - . - 5. CNRI SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON 1.6.1 FOR - ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS A RESULT OF - MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON 1.6.1, OR ANY DERIVATIVE - THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF. - . - 6. This License Agreement will automatically terminate upon a material breach - of its terms and conditions. - . - 7. This License Agreement shall be governed by the federal intellectual - property law of the United States, including without limitation the federal - copyright law, and, to the extent such U.S. federal law does not apply, by the - law of the Commonwealth of Virginia, excluding Virginia's conflict of law - provisions. Notwithstanding the foregoing, with regard to derivative works - based on Python 1.6.1 that incorporate non-separable material that was - previously distributed under the GNU General Public License (GPL), the law of - the Commonwealth of Virginia shall govern this License Agreement only as to - issues arising under or with respect to Paragraphs 4, 5, and 7 of this License - Agreement. Nothing in this License Agreement shall be deemed to create any - relationship of agency, partnership, or joint venture between CNRI and - Licensee. This License Agreement does not grant permission to use CNRI - trademarks or trade name in a trademark sense to endorse or promote products - or services of Licensee, or any third party. - . - 8. By clicking on the "ACCEPT" button where indicated, or by copying, - installing or otherwise using Python 1.6.1, Licensee agrees to be bound by the - terms and conditions of this License Agreement. - . - ACCEPT - . - CWI LICENSE AGREEMENT FOR PYTHON 0.9.0 THROUGH 1.2 - -------------------------------------------------- - . - Copyright (c) 1991 - 1995, Stichting Mathematisch Centrum Amsterdam, The - Netherlands. All rights reserved. - . - Permission to use, copy, modify, and distribute this software and its - documentation for any purpose and without fee is hereby granted, provided that - the above copyright notice appear in all copies and that both that copyright - notice and this permission notice appear in supporting documentation, and that - the name of Stichting Mathematisch Centrum or CWI not be used in advertising - or publicity pertaining to distribution of the software without specific, - written prior permission. - . - STICHTING MATHEMATISCH CENTRUM DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS - SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN - NO EVENT SHALL STICHTING MATHEMATISCH CENTRUM BE LIABLE FOR ANY SPECIAL, - INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM - LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR - OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - PERFORMANCE OF THIS SOFTWARE. - License: QT-Commercial Commercial License Usage Licensees holding valid commercial Qt licenses may use this file in @@ -2318,22 +2206,3 @@ License: QWT-1.0 . [program/widget] is based in part on the work of the Qwt project (http://qwt.sf.net). - -License: Zlib - This software is provided 'as-is', without any express or implied warranty. In - no event will the authors be held liable for any damages arising from the use - of this software. - . - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it freely, - subject to the following restrictions: - . - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software in - a product, an acknowledgment in the product documentation would be - appreciated but is not required. - . - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - . - 3. This notice may not be removed or altered from any source distribution. diff --git a/debian/libqgis-3d{QGIS_ABI}.install b/debian/libqgis-3d{QGIS_ABI}.install index 1859a4f59c0..688e97112c1 100644 --- a/debian/libqgis-3d{QGIS_ABI}.install +++ b/debian/libqgis-3d{QGIS_ABI}.install @@ -1 +1 @@ -usr/lib/libqgis_3d.so.{QGIS_ABI} +usr/lib/libqgis_3d.so.* diff --git a/debian/libqgis-analysis{QGIS_ABI}.install b/debian/libqgis-analysis{QGIS_ABI}.install index 13057c02026..a09ac85e2cf 100644 --- a/debian/libqgis-analysis{QGIS_ABI}.install +++ b/debian/libqgis-analysis{QGIS_ABI}.install @@ -1 +1 @@ -usr/lib/libqgis_analysis.so.{QGIS_ABI} +usr/lib/libqgis_analysis.so.* diff --git a/debian/libqgis-analysis{QGIS_ABI}.lintian-overrides b/debian/libqgis-analysis{QGIS_ABI}.lintian-overrides index ead8655cd5d..59c6ba81cbc 100644 --- a/debian/libqgis-analysis{QGIS_ABI}.lintian-overrides +++ b/debian/libqgis-analysis{QGIS_ABI}.lintian-overrides @@ -1,2 +1,2 @@ -libqgis-analysis{QGIS_ABI}: no-symbols-control-file -libqgis-analysis{QGIS_ABI}: shlib-calls-exit +no-symbols-control-file * +shlib-calls-exit * diff --git a/debian/libqgis-app{QGIS_ABI}.install b/debian/libqgis-app{QGIS_ABI}.install index 230094d8888..cbe94811662 100644 --- a/debian/libqgis-app{QGIS_ABI}.install +++ b/debian/libqgis-app{QGIS_ABI}.install @@ -1 +1 @@ -usr/lib/libqgis_app.so.{QGIS_ABI} +usr/lib/libqgis_app.so.* diff --git a/debian/libqgis-app{QGIS_ABI}.lintian-overrides b/debian/libqgis-app{QGIS_ABI}.lintian-overrides index 63e8d5aa96e..237b71a70c3 100644 --- a/debian/libqgis-app{QGIS_ABI}.lintian-overrides +++ b/debian/libqgis-app{QGIS_ABI}.lintian-overrides @@ -1 +1 @@ -libqgis-app{QGIS_ABI}: no-symbols-control-file usr/lib/libqgis_app.so.{QGIS_ABI} +no-symbols-control-file * diff --git a/debian/libqgis-core{QGIS_ABI}.install b/debian/libqgis-core{QGIS_ABI}.install index 19d30879a56..fdecba8685c 100644 --- a/debian/libqgis-core{QGIS_ABI}.install +++ b/debian/libqgis-core{QGIS_ABI}.install @@ -1 +1 @@ -usr/lib/libqgis_core.so.{QGIS_ABI} +usr/lib/libqgis_core.so.* diff --git a/debian/libqgis-core{QGIS_ABI}.lintian-overrides b/debian/libqgis-core{QGIS_ABI}.lintian-overrides index 5adeb61bc54..9449cfe76d0 100644 --- a/debian/libqgis-core{QGIS_ABI}.lintian-overrides +++ b/debian/libqgis-core{QGIS_ABI}.lintian-overrides @@ -1,2 +1,2 @@ -libqgis-core{QGIS_ABI}: shlib-calls-exit usr/lib/libqgis_core.so.{QGIS_ABI} -libqgis-core{QGIS_ABI}: no-symbols-control-file usr/lib/libqgis_core.so.{QGIS_ABI} +shlib-calls-exit * +no-symbols-control-file * diff --git a/debian/libqgis-customwidgets.install b/debian/libqgis-customwidgets.install new file mode 100644 index 00000000000..395cc4aeb02 --- /dev/null +++ b/debian/libqgis-customwidgets.install @@ -0,0 +1 @@ +usr/lib/*/qt?/plugins/designer/libqgis_customwidgets.so* diff --git a/debian/libqgis-customwidgets.install.in b/debian/libqgis-customwidgets.install.in deleted file mode 100644 index f5b28169d2f..00000000000 --- a/debian/libqgis-customwidgets.install.in +++ /dev/null @@ -1 +0,0 @@ -{QT_PLUGINS_DIR}/designer/libqgis_customwidgets.so* diff --git a/debian/libqgis-customwidgets.lintian-overrides b/debian/libqgis-customwidgets.lintian-overrides index 7e6ce0861ce..237b71a70c3 100644 --- a/debian/libqgis-customwidgets.lintian-overrides +++ b/debian/libqgis-customwidgets.lintian-overrides @@ -1 +1 @@ -libqgis-customwidgets: no-symbols-control-file +no-symbols-control-file * diff --git a/debian/libqgis-dev.install.in b/debian/libqgis-dev.install.in index 98bca92da54..5f235546e9c 100644 --- a/debian/libqgis-dev.install.in +++ b/debian/libqgis-dev.install.in @@ -1,11 +1,11 @@ usr/include/qgis/* +#sid buster bionic cosmic#usr/lib/libqgis_3d.so +usr/lib/libqgis_analysis.so usr/lib/libqgis_app.so usr/lib/libqgis_core.so usr/lib/libqgis_gui.so -usr/lib/libqgis_analysis.so usr/lib/libqgis_native.so usr/lib/libqgis_server.so -usr/lib/libqgisgrass{GRASSVER}.so +usr/lib/libqgisgrass?.so usr/lib/libqgispython.so usr/share/qgis/FindQGIS.cmake -#sid buster bionic cosmic#usr/lib/libqgis_3d.so diff --git a/debian/libqgis-gui{QGIS_ABI}.install b/debian/libqgis-gui{QGIS_ABI}.install index f6568ae0704..60205a819d9 100644 --- a/debian/libqgis-gui{QGIS_ABI}.install +++ b/debian/libqgis-gui{QGIS_ABI}.install @@ -1 +1 @@ -usr/lib/libqgis_gui.so.{QGIS_ABI} +usr/lib/libqgis_gui.so.* diff --git a/debian/libqgis-gui{QGIS_ABI}.lintian-overrides b/debian/libqgis-gui{QGIS_ABI}.lintian-overrides index 5073b19b4a5..9449cfe76d0 100644 --- a/debian/libqgis-gui{QGIS_ABI}.lintian-overrides +++ b/debian/libqgis-gui{QGIS_ABI}.lintian-overrides @@ -1,2 +1,2 @@ -libqgis-gui{QGIS_ABI}: shlib-calls-exit usr/lib/libqgis_gui.so.{QGIS_ABI} -libqgis-gui{QGIS_ABI}: no-symbols-control-file usr/lib/libqgis_gui.so.{QGIS_ABI} +shlib-calls-exit * +no-symbols-control-file * diff --git a/debian/libqgis-native{QGIS_ABI}.install b/debian/libqgis-native{QGIS_ABI}.install index d5d022aa951..d9887f9852b 100644 --- a/debian/libqgis-native{QGIS_ABI}.install +++ b/debian/libqgis-native{QGIS_ABI}.install @@ -1 +1 @@ -usr/lib/libqgis_native.so.{QGIS_ABI} +usr/lib/libqgis_native.so.* diff --git a/debian/libqgis-server{QGIS_ABI}.install b/debian/libqgis-server{QGIS_ABI}.install index cf6a305bbd8..662fc2ddecb 100644 --- a/debian/libqgis-server{QGIS_ABI}.install +++ b/debian/libqgis-server{QGIS_ABI}.install @@ -1 +1 @@ -usr/lib/libqgis_server.so.{QGIS_ABI} +usr/lib/libqgis_server.so.* diff --git a/debian/libqgis-server{QGIS_ABI}.lintian-overrides b/debian/libqgis-server{QGIS_ABI}.lintian-overrides index 16e43c13f91..9449cfe76d0 100644 --- a/debian/libqgis-server{QGIS_ABI}.lintian-overrides +++ b/debian/libqgis-server{QGIS_ABI}.lintian-overrides @@ -1,2 +1,2 @@ -libqgis-server{QGIS_ABI}: shlib-calls-exit usr/lib/libqgis_server.so.{QGIS_ABI} -libqgis-server{QGIS_ABI}: no-symbols-control-file usr/lib/libqgis_server.so.{QGIS_ABI} +shlib-calls-exit * +no-symbols-control-file * diff --git a/debian/libqgisgrass{GRASSVER_QGIS_ABI}.install b/debian/libqgisgrass{GRASSVER_QGIS_ABI}.install index 6e6a2f1c0d2..b09ea24af45 100644 --- a/debian/libqgisgrass{GRASSVER_QGIS_ABI}.install +++ b/debian/libqgisgrass{GRASSVER_QGIS_ABI}.install @@ -1 +1 @@ -usr/lib/libqgisgrass{GRASSVER}.so.{QGIS_ABI} +usr/lib/libqgisgrass?.so.* diff --git a/debian/libqgisgrass{GRASSVER_QGIS_ABI}.lintian-overrides b/debian/libqgisgrass{GRASSVER_QGIS_ABI}.lintian-overrides index 298fe52ec0a..f77d1a1ac34 100644 --- a/debian/libqgisgrass{GRASSVER_QGIS_ABI}.lintian-overrides +++ b/debian/libqgisgrass{GRASSVER_QGIS_ABI}.lintian-overrides @@ -1,2 +1,2 @@ -libqgisgrass{GRASSVER}-{QGIS_ABI}: hardening-no-fortify-functions usr/lib/libqgisgrass{GRASSVER}.so.{QGIS_ABI} -libqgisgrass{GRASSVER}-{QGIS_ABI}: no-symbols-control-file usr/lib/libqgisgrass{GRASSVER}.so.{QGIS_ABI} +hardening-no-fortify-functions * +no-symbols-control-file * diff --git a/debian/libqgispython{QGIS_ABI}.lintian-overrides b/debian/libqgispython{QGIS_ABI}.lintian-overrides index 5804cab6d5c..237b71a70c3 100644 --- a/debian/libqgispython{QGIS_ABI}.lintian-overrides +++ b/debian/libqgispython{QGIS_ABI}.lintian-overrides @@ -1 +1 @@ -libqgispython{QGIS_ABI}: no-symbols-control-file +no-symbols-control-file * diff --git a/debian/python-qgis.install.in b/debian/python-qgis.install.in deleted file mode 100644 index a686cede057..00000000000 --- a/debian/python-qgis.install.in +++ /dev/null @@ -1,8 +0,0 @@ -usr/lib/python*/*-packages/qgis/*.py -usr/lib/python*/*-packages/qgis/*.so -usr/lib/python*/*-packages/qgis/core/* -usr/lib/python*/*-packages/qgis/gui/* -usr/lib/python*/*-packages/qgis/analysis/* -usr/lib/python*/*-packages/qgis/PyQt/* -usr/lib/python*/*-packages/qgis/server/* -#sid buster bionic cosmic#usr/lib/python*/*-packages/qgis/3d/* diff --git a/debian/python-qgis.lintian-overrides.in b/debian/python-qgis.lintian-overrides.in deleted file mode 100644 index df98f72f883..00000000000 --- a/debian/python-qgis.lintian-overrides.in +++ /dev/null @@ -1 +0,0 @@ -python-qgis: hardening-no-fortify-functions diff --git a/debian/python-qgis-common.install b/debian/python3-qgis-common.install similarity index 100% rename from debian/python-qgis-common.install rename to debian/python3-qgis-common.install diff --git a/debian/python3-qgis.install b/debian/python3-qgis.install new file mode 100644 index 00000000000..327df22f896 --- /dev/null +++ b/debian/python3-qgis.install @@ -0,0 +1 @@ +usr/lib/python*/*-packages/qgis/ diff --git a/debian/python3-qgis.lintian-overrides b/debian/python3-qgis.lintian-overrides new file mode 100644 index 00000000000..a2435037709 --- /dev/null +++ b/debian/python3-qgis.lintian-overrides @@ -0,0 +1 @@ +hardening-no-fortify-functions * diff --git a/debian/qgis-api-doc.links b/debian/qgis-api-doc.links deleted file mode 100644 index 42d4aa1cec7..00000000000 --- a/debian/qgis-api-doc.links +++ /dev/null @@ -1 +0,0 @@ -usr/share/javascript/jquery/jquery.js usr/share/qgis/doc/api/html/jquery.js diff --git a/debian/qgis-common.install b/debian/qgis-common.install index 5d94a4469fa..c635f6671c4 100644 --- a/debian/qgis-common.install +++ b/debian/qgis-common.install @@ -15,11 +15,11 @@ usr/share/qgis/doc/nohelp.html usr/share/qgis/doc/style.css usr/share/qgis/i18n/* usr/share/qgis/images/* -usr/share/qgis/resources/spatialite.db -usr/share/qgis/resources/palettes/* -usr/share/qgis/resources/themes/* +usr/share/qgis/resources/2to3migration.txt usr/share/qgis/resources/data/* usr/share/qgis/resources/metadata-ISO/* usr/share/qgis/resources/opencl_programs/* -usr/share/qgis/resources/2to3migration.txt +usr/share/qgis/resources/palettes/* usr/share/qgis/resources/qgis_global_settings.ini +usr/share/qgis/resources/spatialite.db +usr/share/qgis/resources/themes/* diff --git a/debian/qgis-common.links b/debian/qgis-common.links index 7914acbaac7..20c6816ca1b 100644 --- a/debian/qgis-common.links +++ b/debian/qgis-common.links @@ -1,3 +1,3 @@ -usr/share/common-licenses/GPL-2 usr/share/qgis/doc/LICENSE +usr/share/common-licenses/GPL-2 usr/share/qgis/doc/LICENSE usr/share/javascript/jquery/jquery.js usr/share/qgis/doc/jquery-min.js -usr/share/javascript/leaflet usr/share/qgis/doc/leaflet +usr/share/javascript/leaflet usr/share/qgis/doc/leaflet diff --git a/debian/qgis-common.lintian-overrides b/debian/qgis-common.lintian-overrides index 81bfc9cf191..ece9961edea 100644 --- a/debian/qgis-common.lintian-overrides +++ b/debian/qgis-common.lintian-overrides @@ -1,2 +1,2 @@ -qgis-common: package-contains-broken-symlink usr/share/qgis/doc/LICENSE ../../common-licenses/GPL-2 -qgis-common: package-contains-broken-symlink usr/share/qgis/doc/leaflet ../../javascript/leaflet +package-contains-broken-symlink usr/share/qgis/doc/LICENSE ../../common-licenses/GPL-2 +package-contains-broken-symlink usr/share/qgis/doc/leaflet ../../javascript/leaflet diff --git a/debian/qgis-oracle-provider.install b/debian/qgis-oracle-provider.install new file mode 100644 index 00000000000..5f418d90fde --- /dev/null +++ b/debian/qgis-oracle-provider.install @@ -0,0 +1,2 @@ +usr/lib/qgis/plugins/liboracleprovider.so +usr/lib/*/qt?/plugins/sqldrivers/libqsqlocispatial.so diff --git a/debian/qgis-oracle-provider.install.in b/debian/qgis-oracle-provider.install.in deleted file mode 100644 index 496dc659d2f..00000000000 --- a/debian/qgis-oracle-provider.install.in +++ /dev/null @@ -1,2 +0,0 @@ -usr/lib/qgis/plugins/liboracleprovider.so -{QT_PLUGINS_DIR}/sqldrivers/libqsqlocispatial.so diff --git a/debian/qgis-plugin-globe-common.lintian-overrides b/debian/qgis-plugin-globe-common.lintian-overrides index 6147c5316b9..e35c9cafdaa 100644 --- a/debian/qgis-plugin-globe-common.lintian-overrides +++ b/debian/qgis-plugin-globe-common.lintian-overrides @@ -1 +1 @@ -qgis-plugin-globe-common: package-contains-broken-symlink usr/share/qgis/globe/world.tif ../../osgearth/data/world.tif +package-contains-broken-symlink usr/share/qgis/globe/world.tif ../../osgearth/data/world.tif diff --git a/debian/qgis-plugin-grass.install b/debian/qgis-plugin-grass.install new file mode 100644 index 00000000000..9476195b051 --- /dev/null +++ b/debian/qgis-plugin-grass.install @@ -0,0 +1,2 @@ +usr/lib/qgis/grass/bin/qgis.g.browser? +usr/lib/qgis/plugins/libgrassplugin?.so diff --git a/debian/qgis-plugin-grass.install.in b/debian/qgis-plugin-grass.install.in deleted file mode 100644 index 4495df4aa35..00000000000 --- a/debian/qgis-plugin-grass.install.in +++ /dev/null @@ -1,2 +0,0 @@ -usr/lib/qgis/grass/bin/qgis.g.browser{GRASSVER} -usr/lib/qgis/plugins/libgrassplugin{GRASSVER}.so diff --git a/debian/qgis-plugin-grass.lintian-overrides b/debian/qgis-plugin-grass.lintian-overrides index d83044641c6..970046b533b 100644 --- a/debian/qgis-plugin-grass.lintian-overrides +++ b/debian/qgis-plugin-grass.lintian-overrides @@ -1,2 +1,2 @@ -qgis-plugin-grass: package-name-doesnt-match-sonames -qgis-plugin-grass: no-symbols-control-file +package-name-doesnt-match-sonames * +no-symbols-control-file * diff --git a/debian/qgis-provider-grass.install b/debian/qgis-provider-grass.install new file mode 100644 index 00000000000..f0f15a38887 --- /dev/null +++ b/debian/qgis-provider-grass.install @@ -0,0 +1,6 @@ +usr/lib/qgis/grass/modules/qgis.d.rast? +usr/lib/qgis/grass/modules/qgis.g.info? +usr/lib/qgis/grass/modules/qgis.r.in? +usr/lib/qgis/grass/modules/qgis.v.in? +usr/lib/qgis/plugins/libgrassprovider?.so +usr/lib/qgis/plugins/libgrassrasterprovider?.so diff --git a/debian/qgis-provider-grass.install.in b/debian/qgis-provider-grass.install.in deleted file mode 100644 index 634037be75a..00000000000 --- a/debian/qgis-provider-grass.install.in +++ /dev/null @@ -1,6 +0,0 @@ -usr/lib/qgis/grass/modules/qgis.d.rast{GRASSVER} -usr/lib/qgis/grass/modules/qgis.g.info{GRASSVER} -usr/lib/qgis/grass/modules/qgis.r.in{GRASSVER} -usr/lib/qgis/grass/modules/qgis.v.in{GRASSVER} -usr/lib/qgis/plugins/libgrassprovider{GRASSVER}.so -usr/lib/qgis/plugins/libgrassrasterprovider{GRASSVER}.so diff --git a/debian/qgis-provider-grass.lintian-overrides b/debian/qgis-provider-grass.lintian-overrides index 3177b41e628..970046b533b 100644 --- a/debian/qgis-provider-grass.lintian-overrides +++ b/debian/qgis-provider-grass.lintian-overrides @@ -1,2 +1,2 @@ -qgis-provider-grass: package-name-doesnt-match-sonames -qgis-provider-grass: no-symbols-control-file +package-name-doesnt-match-sonames * +no-symbols-control-file * diff --git a/debian/qgis-providers.install.in b/debian/qgis-providers.install.in index 2eadd59a748..9b3f315f1ea 100644 --- a/debian/qgis-providers.install.in +++ b/debian/qgis-providers.install.in @@ -1,13 +1,16 @@ usr/lib/qgis/crssync +usr/lib/qgis/plugins/libarcgisfeatureserverprovider.so +usr/lib/qgis/plugins/libarcgismapserverprovider.so usr/lib/qgis/plugins/libbasicauthmethod.so -usr/lib/qgis/plugins/libesritokenauthmethod.so +usr/lib/qgis/plugins/libdb2provider.so usr/lib/qgis/plugins/libdelimitedtextprovider.so +usr/lib/qgis/plugins/libesritokenauthmethod.so usr/lib/qgis/plugins/libgdalprovider.so usr/lib/qgis/plugins/libgeonodeprovider.so usr/lib/qgis/plugins/libgpxprovider.so usr/lib/qgis/plugins/libidentcertauthmethod.so +usr/lib/qgis/plugins/libmdalprovider.so usr/lib/qgis/plugins/libmssqlprovider.so -usr/lib/qgis/plugins/libdb2provider.so usr/lib/qgis/plugins/libogrprovider.so usr/lib/qgis/plugins/libowsprovider.so usr/lib/qgis/plugins/libpkcs12authmethod.so @@ -18,7 +21,4 @@ usr/lib/qgis/plugins/libvirtuallayerprovider.so usr/lib/qgis/plugins/libwcsprovider.so usr/lib/qgis/plugins/libwfsprovider.so usr/lib/qgis/plugins/libwmsprovider.so -usr/lib/qgis/plugins/libarcgismapserverprovider.so -usr/lib/qgis/plugins/libarcgisfeatureserverprovider.so -usr/lib/qgis/plugins/libmdalprovider.so -#!xenial#{QT_PLUGINS_DIR}/sqldrivers/libqsqlspatialite.so +#!xenial#usr/lib/*/qt?/plugins/sqldrivers/libqsqlspatialite.so diff --git a/debian/qgis-providers.triggers b/debian/qgis-providers.triggers index e9f59466382..5fb7d680bc2 100644 --- a/debian/qgis-providers.triggers +++ b/debian/qgis-providers.triggers @@ -1 +1 @@ -interest qgis-crssync +interest-noawait qgis-crssync diff --git a/debian/qgis.install b/debian/qgis.install index b87c7a989af..0d78bacb98e 100644 --- a/debian/qgis.install +++ b/debian/qgis.install @@ -1,11 +1,11 @@ -usr/lib/qgis/plugins/libgeorefplugin.so -usr/lib/qgis/plugins/libgpsimporterplugin.so usr/lib/qgis/plugins/libcoordinatecaptureplugin.so usr/lib/qgis/plugins/libevis.so +usr/lib/qgis/plugins/libgeometrycheckerplugin.so +usr/lib/qgis/plugins/libgeorefplugin.so +usr/lib/qgis/plugins/libgpsimporterplugin.so +usr/lib/qgis/plugins/liboauth2authmethod.so usr/lib/qgis/plugins/libofflineeditingplugin.so usr/lib/qgis/plugins/libtopolplugin.so -usr/lib/qgis/plugins/libgeometrycheckerplugin.so -usr/lib/qgis/plugins/liboauth2authmethod.so usr/share/applications/ usr/share/metainfo/ usr/share/mime/packages/ diff --git a/debian/qgis.preinst b/debian/qgis.preinst index eb81103a129..04d48449877 100644 --- a/debian/qgis.preinst +++ b/debian/qgis.preinst @@ -7,7 +7,7 @@ if [ "$1" = "install" -o "$1" = "upgrade" ]; then for i in /usr/bin/qgis /usr/bin/qbrowser; do pkg=$(dpkg-divert --listpackage $i) if [ -n "$pkg" -a "$pkg" = qgis-plugin-grass -o "$pkg" = qgis-provider-grass ]; then - dpkg-divert --package $pkg --rename --remove $i + dpkg-divert --package $pkg --remove $i fi done fi diff --git a/debian/rules b/debian/rules index 8038cf6bd46..ed15a10c6d2 100755 --- a/debian/rules +++ b/debian/rules @@ -10,6 +10,8 @@ export DH_OPTIONS # Enable hardening build flags export DEB_BUILD_MAINT_OPTIONS=hardening=+all +include /usr/share/dpkg/pkg-info.mk + # These are used for cross-compiling and for saving the configure script # from having to guess our platform (since we know it already) DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) @@ -18,13 +20,15 @@ DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH) DEB_BUILD_MULTIARCH ?= $(shell dpkg-architecture -qDEB_BUILD_MULTIARCH) DEB_TEST_TARGET ?= Experimental + QGIS_BUILDDIR ?= debian/build + export QT_SELECT=5 -QGIS_VERSION=$(shell dpkg-parsechangelog | sed -ne 's/^Version: \([0-9]\+:\)\?\([^+-]\+\).*$$/\2/p') +QGIS_VERSION=$(shell echo $(DEB_VERSION_UPSTREAM) | sed -e 's/\+.*//') ifeq (,$(DIST)) - DISTRIBUTION := $(shell dpkg-parsechangelog --format rfc822 | sed -ne "s/^Distribution: //p") + DISTRIBUTION := $(DEB_DISTRIBUTION) else DISTRIBUTION := $(DIST) endif @@ -42,12 +46,6 @@ endif DEB_BUILD_NAME ?= $(DISTRIBUTION)-$(DEB_BUILD_ARCH) -ifeq (,$(DISPLAY)) -TESTMAKE=xvfb-run -a -n 1 -s "-screen 0 1280x1024x24 -dpi 96" ninja -else -TESTMAKE=ninja -endif - QGIS_MAJOR=$(shell sed -ne 's/SET(CPACK_PACKAGE_VERSION_MAJOR "\([0-9]*\)")/\1/p' CMakeLists.txt) QGIS_MINOR=$(shell sed -ne 's/SET(CPACK_PACKAGE_VERSION_MINOR "\([0-9]*\)")/\1/p' CMakeLists.txt) QGIS_PATCH=$(shell sed -ne 's/SET(CPACK_PACKAGE_VERSION_PATCH "\([0-9]*\)")/\1/p' CMakeLists.txt) @@ -56,6 +54,25 @@ GRASS=grass$(subst .,,$(shell pkg-config --modversion grass|cut -d. -f1,2)) GRASSVER=$(subst .,,$(shell pkg-config --modversion grass|cut -d. -f1)) GRASSABI=$(subst .,,$(shell pkg-config --modversion grass|cut -d. -f1,2,3|sed -e 's/RC/-/')) +# Include percentage of started edges +export NINJA_STATUS=[%f/%t %p] + +ifeq (,$(filter terse,$(DEB_BUILD_OPTIONS))) + NINJA_OPTS += -v +endif + +ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) + NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) + MAKEFLAGS += -j$(NUMJOBS) + NINJA_OPTS += -j$(NUMJOBS) +endif + +ifeq (,$(DISPLAY)) +TESTMAKE=xvfb-run -a -n 1 -s "-screen 0 1280x1024x24 -dpi 96" ninja $(NINJA_OPTS) +else +TESTMAKE=ninja $(NINJA_OPTS) +endif + CMAKE_OPTS := \ -G Ninja \ -DBUILDNAME=$(DEB_BUILD_NAME) \ @@ -87,11 +104,6 @@ ifeq ($(GRASSVER),7) -DGRASS_PREFIX7=/usr/lib/$(GRASS) endif -ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) - NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) - MAKEFLAGS += -j$(NUMJOBS) -endif - ifneq ($(DISTRIBUTION),xenial) CMAKE_OPTS += -DWITH_QSPATIALITE=TRUE endif @@ -170,6 +182,10 @@ ifneq (,$(findstring profile,$(DEB_BUILD_OPTIONS))) LDFLAGS += -pg endif +ifeq (,$(findstring debug,$(DEB_BUILD_OPTIONS))) + CFLAGS += -DNDEBUG + CXXFLAGS += -DNDEBUG +endif # multi distribution support: # - remove lines with applicable excludes @@ -195,11 +211,9 @@ $(2): $(1) -e 's/#([^#]+ |)![^#]+( [^#]*|)#//g' \ -e '/^#/d' \ -e "s/\{DEB_BUILD_GNU_TYPE\}/$(DEB_BUILD_GNU_TYPE)/g" \ - -e "s#\{QT_PLUGINS_DIR\}#$(QT_PLUGINS_DIR)#g" \ -e "s/\{QGIS_ABI\}/$(QGIS_ABI)/g" \ -e "s/\{GRASS\}/$(GRASS)/g" \ -e "s/\{GRASSVER\}/$(GRASSVER)/g" \ - -e "s/\{GRASSABI\}/$(GRASSABI)/g" \ -e "s/\{GRASSVER_QGISABI\}/$(GRASSVER)-$(QGIS_ABI)/g" \ $$^ >$$@ @@ -228,18 +242,17 @@ override_dh_clean: cleantemplates override_dh_auto_configure: dh_auto_configure -- $(CMAKE_OPTS) -override_dh_auto_build-arch: +override_dh_auto_build: ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) - ninja -C $(QGIS_BUILDDIR) $(DEB_TEST_TARGET)Build || \ + ninja $(NINJA_OPTS) -C $(QGIS_BUILDDIR) $(DEB_TEST_TARGET)Build || \ cat $(QGIS_BUILDDIR)/Testing/Temporary/LastBuild_$$(head -1 $(QGIS_BUILDDIR)/Testing/TAG).log || \ - ninja -C $(QGIS_BUILDDIR) $(DEB_TEST_TARGET)Submit || \ + ninja $(NINJA_OPTS) -C $(QGIS_BUILDDIR) $(DEB_TEST_TARGET)Submit || \ false else - ninja -C $(QGIS_BUILDDIR) + ninja $(NINJA_OPTS) -C $(QGIS_BUILDDIR) endif -override_dh_auto_build-indep: - ninja -C $(QGIS_BUILDDIR) apidoc + ninja $(NINJA_OPTS) -C $(QGIS_BUILDDIR) apidoc override_dh_auto_test: test-stamp @@ -264,12 +277,10 @@ endif touch test-stamp override_dh_auto_install: - DESTDIR=$(CURDIR)/debian/tmp ninja -C $(QGIS_BUILDDIR) install + DESTDIR=$(CURDIR)/debian/tmp ninja $(NINJA_OPTS) -C $(QGIS_BUILDDIR) install # remove unwanted files $(RM) $(CURDIR)/debian/tmp/usr/share/qgis/doc/api/installdox - $(RM) $(CURDIR)/debian/tmp/usr/share/qgis/doc/api/html/jquery.js - $(RM) $(CURDIR)/debian/tmp/usr/share/qgis/doc/api/jquery.js # replace leaflet and jquery urls perl -i -p \ @@ -291,6 +302,13 @@ override_dh_auto_install: $(RM) $(CURDIR)/debian/tmp/usr/bin/qgis_bench $(RM) $(CURDIR)/debian/tmp/usr/share/qgis/resources/wcs-servers.json + # remove documentation outside usr/share/doc + $(RM) $(CURDIR)/debian/tmp/usr/share/qgis/python/plugins/db_manager/README + $(RM) $(CURDIR)/debian/tmp/usr/share/qgis/python/plugins/db_manager/TODO + + $(RM) $(CURDIR)/debian/tmp/usr/share/qgis/resources/cpt-city-qgis-min/README-qgis.txt + $(RM) $(CURDIR)/debian/tmp/usr/share/qgis/resources/cpt-city-qgis-min/README.txt + # Man pages are installed by dh_installman $(RM) $(CURDIR)/debian/tmp/usr/man/man1/qgis.1 @@ -329,11 +347,10 @@ override_dh_installman: override_dh_installmime: dh_installmime -pqgis - override_dh_python3: dh_python3 dh_python3 usr/share/qgis/grass/scripts - dh_sip -ppython-qgis + dh_sip3 -ppython3-qgis override_dh_compress: dh_compress --exclude=pdf @@ -355,3 +372,5 @@ endif override_dh_strip: dh_strip --dbg-package=qgis-dbg +override_dh_gencontrol: + dh_gencontrol -- -Vgrass:Depends="grass$(GRASSABI)" diff --git a/debian/upstream/metadata b/debian/upstream/metadata index 30048b90893..51c40519793 100644 --- a/debian/upstream/metadata +++ b/debian/upstream/metadata @@ -4,7 +4,7 @@ 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 -Registration: https://www2.osgeo.org/cgi-bin/ldap_create_user.py +Registration: https://id.osgeo.org/ldap/create Repository: https://github.com/qgis/QGIS.git Repository-Browse: https://github.com/qgis/QGIS Screenshots: https://qgis.org/en/site/about/screenshots.html diff --git a/debian/watch b/debian/watch index 917e0e3e264..6b7429dc2f9 100644 --- a/debian/watch +++ b/debian/watch @@ -1,3 +1,6 @@ version=3 -opts="dversionmangle=s/\+(debian|dfsg|ds|deb)\d*$//,uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha)\d*)$/$1~$2/" \ -http://qgis.org/downloads/ (?:.*/)?(?:rel|v|qgis)[\-\_](\d[\d\-\.]+)\.(?:tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz))) +opts=\ +dversionmangle=s/\+(debian|dfsg|ds|deb)\d*$//,\ +uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha)\d*)$/$1~$2/;s/RC/rc/ \ +https://qgis.org/downloads/ \ +(?:.*/)?(?:rel|v|qgis)[\-\_](\d[\d\-\.]+)\.(?:tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))