Skip to content

Commit aeec6df

Browse files
sebasticjef-n
sebastic
authored and
jef-n
committedFeb 25, 2019
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.
·
ltr-3_40final-3_8_0
1 parent a3e3742 commit aeec6df

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+900
-873
lines changed
 

‎debian/control

Lines changed: 162 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -5,58 +5,103 @@ Section: science
55
Priority: optional
66
Build-Depends:
77
bison,
8+
ca-certificates,
89
cmake (>= 2.8),
910
debhelper (>= 9),
1011
dh-python,
1112
flex,
13+
gdal-bin,
1214
grass-dev,
1315
libexiv2-dev,
1416
libexpat1-dev,
1517
libfcgi-dev,
1618
libgdal-dev (>= 1.11),
17-
libgsl-dev,
1819
libgeos-dev (>= 3.0.0),
20+
libgsl-dev,
21+
libosgearth-dev,
1922
libpq-dev,
2023
libproj-dev,
24+
libqca-qt5-2-dev,
25+
libqca-qt5-2-plugins,
26+
libqscintilla2-qt5-dev,
27+
libqt5opengl5-dev,
28+
libqt5serialport5-dev,
29+
libqt5sql5-sqlite,
30+
libqt5svg5-dev,
31+
libqt5webkit5-dev,
32+
libqt5xmlpatterns5-dev,
33+
libqwt-qt5-dev,
34+
libspatialindex-dev,
2135
libspatialite-dev,
2236
libsqlite3-dev,
23-
libspatialindex-dev,
24-
qtbase5-dev, qttools5-dev-tools, qttools5-dev, qtpositioning5-dev,
25-
libqt5svg5-dev, libqt5webkit5-dev, libqt5opengl5-dev, libqt5sql5-sqlite, libqt5scintilla2-dev,
26-
libqwt-qt5-dev, libqca-qt5-2-dev, libqca-qt5-2-plugins,
27-
python3-dev, python3-all-dev, python3-sip, python3-sip-dev,
28-
pyqt5-dev-tools, pyqt5-dev, pyqt5.qsci-dev,
29-
python3-pyqt5, python3-pyqt5.qsci, python3-pyqt5.qtsql, python3-pyqt5.qtsvg,
30-
python3-gdal,
31-
python3-nose2, python3-yaml, python3-mock, python3-psycopg2, python3-future, python3-termcolor,
37+
libsqlite3-mod-spatialite,
38+
libzip-dev,
39+
ninja-build,
40+
ocl-icd-opencl-dev,
41+
opencl-headers,
3242
pkg-config,
43+
pyqt5-dev-tools,
44+
pyqt5-dev,
45+
pyqt5.qsci-dev,
46+
python3-all-dev,
47+
python3-dev,
48+
python3-future,
49+
python3-gdal,
50+
python3-mock,
51+
python3-nose2,
52+
python3-owslib,
53+
python3-psycopg2,
54+
python3-pyqt5,
55+
python3-pyqt5.qsci,
56+
python3-pyqt5.qtsql,
57+
python3-pyqt5.qtsvg,
58+
python3-sip-dev,
59+
python3-sip,
60+
python3-termcolor,
61+
python3-yaml,
62+
qt3d5-dev,
63+
qt3d-assimpsceneimport-plugin,
64+
qt3d-defaultgeometryloader-plugin,
65+
qt3d-gltfsceneio-plugin,
66+
qt3d-scene2d-plugin,
67+
qt5keychain-dev,
68+
qtbase5-dev,
69+
qtbase5-private-dev,
70+
qtpositioning5-dev,
71+
qttools5-dev-tools,
72+
qttools5-dev,
3373
git,
34-
txt2tags,
3574
doxygen,
36-
gdal-bin,
37-
spawn-fcgi, lighttpd, poppler-utils,
3875
graphviz,
39-
xvfb, xauth,
40-
xfonts-base, xfonts-100dpi, xfonts-75dpi, xfonts-scalable,
41-
libosgearth-dev,
42-
locales, ca-certificates, ninja-build
43-
Build-Conflicts: libqgis-dev, qgis-dev
76+
txt2tags,
77+
xvfb,
78+
xauth,
79+
xfonts-base,
80+
xfonts-100dpi,
81+
xfonts-75dpi,
82+
xfonts-scalable,
83+
spawn-fcgi,
84+
poppler-utils,
85+
lighttpd,
86+
locales
87+
Build-Conflicts:
88+
libqgis-dev,
89+
qgis-dev
4490
Standards-Version: 3.9.7
4591
Vcs-Browser: https://github.com/qgis/QGIS/
4692
Vcs-Git: https://github.com/qgis/QGIS.git
47-
Homepage: http://qgis.org/
93+
Homepage: https://qgis.org/
4894

4995
Package: qgis
5096
Architecture: any
5197
Depends:
5298
${shlibs:Depends},
5399
${misc:Depends},
54-
python-qgis (= ${binary:Version}),
100+
python3-qgis (= ${binary:Version}),
55101
qgis-providers (= ${binary:Version}),
56102
qgis-common (= ${source:Version})
57103
Recommends:
58-
qgis-plugin-grass,
59-
python-qgis
104+
qgis-plugin-grass
60105
Suggests: gpsbabel
61106
Conflicts: uim-qt3
62107
Description: Geographic Information System (GIS)
@@ -81,6 +126,34 @@ Description: QGIS - architecture-independent data
81126
This package contains architecture-independent supporting data files for use
82127
with QGIS.
83128

129+
Package: libqgis-3d2.99.0
130+
Architecture: any
131+
Section: libs
132+
Depends:
133+
qt3d-assimpsceneimport-plugin,
134+
qt3d-defaultgeometryloader-plugin,
135+
qt3d-gltfsceneio-plugin,
136+
qt3d-scene2d-plugin,
137+
${shlibs:Depends},
138+
${misc:Depends}
139+
Description: QGIS - shared 3d library
140+
QGIS is a Geographic Information System (GIS) which manages, analyzes and
141+
display databases of geographic information.
142+
.
143+
This package contains the shared 3d library.
144+
145+
Package: libqgis-analysis2.99.0
146+
Architecture: any
147+
Section: libs
148+
Depends:
149+
${shlibs:Depends},
150+
${misc:Depends}
151+
Description: QGIS - shared analysis library
152+
QGIS is a Geographic Information System (GIS) which manages, analyzes and
153+
display databases of geographic information.
154+
.
155+
This package contains the shared analysis library.
156+
84157
Package: libqgis-app2.99.0
85158
Architecture: any
86159
Section: libs
@@ -118,17 +191,29 @@ Description: QGIS - shared gui library
118191
.
119192
This package contains the shared gui library.
120193

121-
Package: libqgis-analysis2.99.0
194+
Package: libqgis-native2.99.0
122195
Architecture: any
123196
Section: libs
124197
Depends:
125198
${shlibs:Depends},
126199
${misc:Depends}
127-
Description: QGIS - shared analysis library
200+
Description: QGIS - shared native gui library
128201
QGIS is a Geographic Information System (GIS) which manages, analyzes and
129202
display databases of geographic information.
130203
.
131-
This package contains the shared analysis library.
204+
This package contains the shared native gui library.
205+
206+
Package: libqgis-server2.99.0
207+
Architecture: any
208+
Section: libs
209+
Depends:
210+
${shlibs:Depends},
211+
${misc:Depends}
212+
Description: QGIS - shared server library
213+
QGIS is a Geographic Information System (GIS) which manages, analyzes and
214+
display databases of geographic information.
215+
.
216+
This package contains the shared server library.
132217

133218
Package: libqgisgrass7-2.99.0
134219
Architecture: any
@@ -167,17 +252,6 @@ Description: QGIS custom widgets for Qt Designer
167252
.
168253
This package contains a library to use specific QGIS widgets in Qt Designer.
169254

170-
Package: libqgis-server2.99.0
171-
Architecture: any
172-
Depends:
173-
${shlibs:Depends},
174-
${misc:Depends}
175-
Description: QGIS - shared server library
176-
QGIS is a Geographic Information System (GIS) which manages, analyzes and
177-
display databases of geographic information.
178-
.
179-
This package contains the shared server library.
180-
181255
Package: libqgis-dev
182256
Architecture: any
183257
Section: libdevel
@@ -190,26 +264,30 @@ Depends:
190264
libgsl-dev,
191265
libpq-dev,
192266
libproj-dev,
267+
libqca-qt5-2-dev,
268+
libqgis-3d2.99.0 (= ${binary:Version}),
269+
libqgis-analysis2.99.0 (= ${binary:Version}),
193270
libqgis-app2.99.0 (= ${binary:Version}),
194271
libqgis-core2.99.0 (= ${binary:Version}),
195272
libqgis-gui2.99.0 (= ${binary:Version}),
196-
libqgis-analysis2.99.0 (= ${binary:Version}),
273+
libqgis-native2.99.0 (= ${binary:Version}),
274+
libqgis-server2.99.0 (= ${binary:Version}),
197275
libqgisgrass7-2.99.0 (= ${binary:Version}),
198276
libqgispython2.99.0 (= ${binary:Version}),
199-
libsqlite3-dev,
200-
qtbase5-dev, python3-pyqt5, qttools5-dev,
201-
libqt5svg5-dev, pyqt5.qsci-dev,
202-
libqca-qt5-2-dev,
203-
python3-dev,
204-
libqt5scintilla2-dev,
277+
libqscintilla2-qt5-dev,
278+
libqt5svg5-dev,
205279
libqt5webkit5-dev,
206-
libqca-qt5-2-dev,
207280
libqwt-qt5-dev,
208-
qtpositioning5-dev,
281+
libsqlite3-dev,
209282
pyqt5-dev-tools,
283+
pyqt5.qsci-dev,
284+
python3-dev,
210285
python3-pyqt5,
211-
python3-pyqt5.qtsql,
212286
python3-pyqt5.qsci,
287+
python3-pyqt5.qtsql,
288+
qtbase5-dev,
289+
qtpositioning5-dev,
290+
qttools5-dev,
213291
${misc:Depends}
214292
Recommends: libqgis-customwidgets
215293
Provides: qgis-dev
@@ -225,10 +303,13 @@ Architecture: any
225303
Section: debug
226304
Priority: extra
227305
Depends:
306+
libqgis-3d2.99.0 (= ${binary:Version}),
307+
libqgis-analysis2.99.0 (= ${binary:Version}),
228308
libqgis-app2.99.0 (= ${binary:Version}),
229309
libqgis-core2.99.0 (= ${binary:Version}),
230310
libqgis-gui2.99.0 (= ${binary:Version}),
231-
libqgis-analysis2.99.0 (= ${binary:Version}),
311+
libqgis-native2.99.0 (= ${binary:Version}),
312+
libqgis-server2.99.0 (= ${binary:Version}),
232313
libqgisgrass7-2.99.0 (= ${binary:Version}),
233314
libqgispython2.99.0 (= ${binary:Version}),
234315
${misc:Depends}
@@ -256,9 +337,10 @@ Depends:
256337
qgis (= ${binary:Version}),
257338
qgis-plugin-grass-common (= ${source:Version}),
258339
qgis-provider-grass (= ${binary:Version}),
340+
grass-core,
341+
${grass:Depends},
259342
${shlibs:Depends},
260-
${misc:Depends},
261-
grass-core
343+
${misc:Depends}
262344
Description: GRASS plugin for QGIS
263345
QGIS is a Geographic Information System (GIS) which manages, analyzes and
264346
display databases of geographic information.
@@ -268,7 +350,7 @@ Description: GRASS plugin for QGIS
268350
Package: qgis-plugin-grass-common
269351
Architecture: all
270352
Depends:
271-
${python:Depends},
353+
${python3:Depends},
272354
${misc:Depends}
273355
Breaks: qgis-common (<< 1.5)
274356
Replaces: qgis-common (<< 1.5)
@@ -279,50 +361,56 @@ Description: GRASS plugin for QGIS - architecture-independent data
279361
This package contains architecture-independent supporting data files for use
280362
with the QGIS GRASS plugin.
281363

282-
Package: python-qgis
364+
Package: python3-qgis
283365
Architecture: any
284366
Section: python
285367
Depends:
286-
python3-pyqt5,
287-
python3-pyqt5.qtsql,
288-
python3-sip,
289-
python-qgis-common (= ${source:Version}),
290-
python3-psycopg2,
291-
python3-pyqt5.qsci,
368+
python3-qgis-common (= ${source:Version}),
369+
libqgispython2.99.0,
370+
libsqlite3-mod-spatialite,
371+
python3-dateutil,
372+
python3-future,
292373
python3-httplib2,
293374
python3-jinja2,
294375
python3-markupsafe,
376+
python3-owslib,
377+
python3-plotly,
378+
python3-psycopg2,
295379
python3-pygments,
380+
python3-pyproj,
381+
python3-pyqt5,
382+
python3-pyqt5.qsci,
383+
python3-pyqt5.qtsql,
384+
python3-pyqt5.qtsvg,
385+
python3-pyqt5.qtwebkit,
296386
python3-requests,
297-
python3-dateutil,
298-
python3-tz,
387+
python3-sip,
299388
python3-six,
389+
python3-tz,
300390
python3-yaml,
301-
python3-future,
302-
libqgispython2.99.0,
391+
${python3:Depends},
303392
${shlibs:Depends},
304-
${python:Depends},
393+
${sip3:Depends}
305394
${misc:Depends},
306-
${sip:Depends}
307-
Provides: ${python:Provides}
308-
Recommends: liblwgeom-dev
395+
Provides: ${python3:Provides}
309396
Description: Python bindings to QGIS
310397
QGIS is a Geographic Information System (GIS) which manages, analyzes and
311398
display databases of geographic information.
312399
.
313400
This package contains the files for the Python support.
314401

315-
Package: python-qgis-common
402+
Package: python3-qgis-common
316403
Architecture: all
317404
Section: python
318-
Provides: ${python:Provides}
319405
Depends:
320406
gdal-bin,
407+
python-gdal,
321408
python3-gdal,
322409
python3-matplotlib,
323-
libqgis-customwidgets,
410+
libqgis-customwidgets (>= ${source:Version}),
411+
${python3:Depends},
324412
${misc:Depends}
325-
XB-Python-Version: ${python:Versions}
413+
Provides: ${python3:Provides}
326414
Description: Python bindings to QGIS - architecture-independent files
327415
QGIS is a Geographic Information System (GIS) which manages, analyzes and
328416
display databases of geographic information.
@@ -332,10 +420,13 @@ Description: Python bindings to QGIS - architecture-independent files
332420

333421
Package: qgis-providers
334422
Architecture: any
335-
Pre-Depends: ${misc:Pre-Depends}
423+
Pre-Depends:
424+
dpkg (>= 1.16.1),
425+
${misc:Pre-Depends}
336426
Depends:
337427
qgis-providers-common (= ${source:Version}),
338-
libqt5sql5-sqlite, libqca-qt5-2-plugins,
428+
libqca-qt5-2-plugins,
429+
libqt5sql5-sqlite,
339430
${shlibs:Depends},
340431
${misc:Depends}
341432
Breaks: qgis (<= 1.6)
@@ -376,7 +467,6 @@ Package: qgis-api-doc
376467
Architecture: all
377468
Section: doc
378469
Depends:
379-
libjs-jquery,
380470
${misc:Depends}
381471
Recommends:
382472
qt5-doc-html
@@ -385,4 +475,3 @@ Description: QGIS API documentation
385475
display databases of geographic information.
386476
.
387477
This package contains the QGIS API documentation.
388-

‎debian/control.in

Lines changed: 158 additions & 103 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)
Please sign in to comment.