Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Various Debian packaging improvements for 3.7 #9254

Closed
wants to merge 24 commits into from
Closed

Various Debian packaging improvements for 3.7 #9254

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

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Reorder (build) dependencies & remove duplicates. 
Sorting helps to find duplicates and missing dependencies.
  • Loading branch information
@sebastic
sebastic committed Feb 24, 2019
commit c518e14d1b02c24cd24bf52655d5661007750a29
213 changes: 151 additions & 62 deletions debian/control
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,46 +5,92 @@ 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,
libqt5opengl5-dev,
libqt5scintilla2-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
Expand All @@ -55,8 +101,7 @@ Depends:
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)
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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,
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
Expand All @@ -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}
Expand Down Expand Up @@ -256,9 +337,9 @@ Depends:
qgis (= ${binary:Version}),
qgis-plugin-grass-common (= ${source:Version}),
qgis-provider-grass (= ${binary:Version}),
grass-core,
${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.
Expand All @@ -283,27 +364,33 @@ Package: python-qgis
Architecture: any
Section: python
Depends:
python3-pyqt5,
python3-pyqt5.qtsql,
python3-sip,
python-qgis-common (= ${source:Version}),
python3-psycopg2,
python3-pyqt5.qsci,
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,
${shlibs:Depends},
${python:Depends},
${misc:Depends},
${shlibs:Depends},
${sip:Depends}
${misc:Depends},
Provides: ${python:Provides}
Recommends: liblwgeom-dev
Description: Python bindings to QGIS
Expand All @@ -315,13 +402,15 @@ Description: Python bindings to QGIS
Package: python-qgis-common
Architecture: all
Section: python
Provides: ${python:Provides}
Depends:
gdal-bin,
python-gdal,
python3-gdal,
python3-matplotlib,
libqgis-customwidgets,
libqgis-customwidgets (>= ${source:Version}),
${python:Depends},
${misc:Depends}
Provides: ${python:Provides}
XB-Python-Version: ${python:Versions}
Description: Python bindings to QGIS - architecture-independent files
QGIS is a Geographic Information System (GIS) which manages, analyzes and
Expand All @@ -335,7 +424,8 @@ Architecture: any
Pre-Depends: ${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)
Expand Down Expand Up @@ -385,4 +475,3 @@ Description: QGIS API documentation
display databases of geographic information.
.
This package contains the QGIS API documentation.

Loading