debian packaging updates (squashed pull request #9254)

1b1e60d Use libqscintilla2-qt5-dev instead of virtual package.
dd5003e Use "-noawait" variant for qgis-crssync trigger.
d0e156e Remove obsolete diversions in qgis.preinst, but don't rename.
25a677e Update watch file to use HTTPS.
7ca6a99 Update registration URL in upstream metadata.
789d4fb Don't recommend liblwgeom-dev, it shouldn't be used by other projects.
7d38440 Update packaging for Python 3.
bb0017c Remove documentation outside /usr/share/doc from non-doc packages.
cd7f1fd Fix FTBFS when building only arch:any packages (with -B).
03e4d0b Add -DNDEBUG flag for non-debug builds.
c6cb002 Include percentage of started edges in ninja output.
f86761e Set -j & -v ninja options based on DEB_BUILD_OPTIONS.
3b07a54 Use pkg-info.mk variables instead of dpkg-parsechangelog output.
5e18a74 Align paths in links file to improve readability.
2bd52f3 Don't use libjs-jquery for Doxygen docs.
3b9e875 Simplify python-qgis.install with common path to match all files.
96d5f20 Don't rely on QT_PLUGINS_DIR placeholder in template files.
74c3750 Update copyright file.
1b596f5 Don't rely on QGIS_ABI placeholder in template files.
aaabb94 Simplify lintian overrides.
38fad4d Don't rely on GRASSVER placeholder in template files.
9c772d1 Override dh_gencontrol to set GRASS ABI dependency with substvars.
8b9c14b Reorder paths in install files.
c518e14 Reorder (build) dependencies & remove duplicates.

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