Skip to content

Commit de8f540

Browse files
jef-njef-n
committed
backport debian packaging updates
cherry picked from aeec6df & 206cc96 & c748aac & 41e0c01
1 parent 24ccb08 commit de8f540

Some content is hidden

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

50 files changed

+920
-928
lines changed

‎debian/control

+161-74
Large diffs are not rendered by default.

‎debian/control.in

+160-133
Large diffs are not rendered by default.

‎debian/copyright

+467-598
Large diffs are not rendered by default.

‎debian/libqgis-3d{QGIS_ABI}.install

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
usr/lib/libqgis_3d.so.{QGIS_ABI}
1+
usr/lib/libqgis_3d.so.*

‎debian/libqgis-analysis{QGIS_ABI}.install

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
usr/lib/libqgis_analysis.so.{QGIS_ABI}
1+
usr/lib/libqgis_analysis.so.*

‎debian/libqgis-analysis{QGIS_ABI}.lintian-overrides

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
libqgis-analysis{QGIS_ABI}: no-symbols-control-file
2-
libqgis-analysis{QGIS_ABI}: shlib-calls-exit
1+
no-symbols-control-file *
2+
shlib-calls-exit *

‎debian/libqgis-app{QGIS_ABI}.install

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
usr/lib/libqgis_app.so.{QGIS_ABI}
1+
usr/lib/libqgis_app.so.*

‎debian/libqgis-app{QGIS_ABI}.lintian-overrides

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
libqgis-app{QGIS_ABI}: no-symbols-control-file usr/lib/libqgis_app.so.{QGIS_ABI}
1+
no-symbols-control-file *

‎debian/libqgis-core{QGIS_ABI}.install

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
usr/lib/libqgis_core.so.{QGIS_ABI}
1+
usr/lib/libqgis_core.so.*

‎debian/libqgis-core{QGIS_ABI}.lintian-overrides

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
libqgis-core{QGIS_ABI}: shlib-calls-exit usr/lib/libqgis_core.so.{QGIS_ABI}
2-
libqgis-core{QGIS_ABI}: no-symbols-control-file usr/lib/libqgis_core.so.{QGIS_ABI}
1+
shlib-calls-exit *
2+
no-symbols-control-file *

‎debian/libqgis-customwidgets.install

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
usr/lib/*/qt?/plugins/designer/libqgis_customwidgets.so*

‎debian/libqgis-customwidgets.install.in

-1
This file was deleted.

‎debian/libqgis-customwidgets.lintian-overrides

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
libqgis-customwidgets: no-symbols-control-file
1+
no-symbols-control-file *

‎debian/libqgis-dev.install.in

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
usr/include/qgis/*
2+
#sid buster bionic cosmic#usr/lib/libqgis_3d.so
3+
usr/lib/libqgis_analysis.so
24
usr/lib/libqgis_app.so
35
usr/lib/libqgis_core.so
46
usr/lib/libqgis_gui.so
5-
usr/lib/libqgis_analysis.so
67
usr/lib/libqgis_native.so
78
usr/lib/libqgis_server.so
8-
usr/lib/libqgisgrass{GRASSVER}.so
9+
usr/lib/libqgisgrass?.so
910
usr/lib/libqgispython.so
1011
usr/share/qgis/FindQGIS.cmake
11-
#sid buster bionic cosmic#usr/lib/libqgis_3d.so

‎debian/libqgis-gui{QGIS_ABI}.install

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
usr/lib/libqgis_gui.so.{QGIS_ABI}
1+
usr/lib/libqgis_gui.so.*

‎debian/libqgis-gui{QGIS_ABI}.lintian-overrides

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
libqgis-gui{QGIS_ABI}: shlib-calls-exit usr/lib/libqgis_gui.so.{QGIS_ABI}
2-
libqgis-gui{QGIS_ABI}: no-symbols-control-file usr/lib/libqgis_gui.so.{QGIS_ABI}
1+
shlib-calls-exit *
2+
no-symbols-control-file *

‎debian/libqgis-native{QGIS_ABI}.install

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
usr/lib/libqgis_native.so.{QGIS_ABI}
1+
usr/lib/libqgis_native.so.*

‎debian/libqgis-server{QGIS_ABI}.install

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
usr/lib/libqgis_server.so.{QGIS_ABI}
1+
usr/lib/libqgis_server.so.*

‎debian/libqgis-server{QGIS_ABI}.lintian-overrides

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
libqgis-server{QGIS_ABI}: shlib-calls-exit usr/lib/libqgis_server.so.{QGIS_ABI}
2-
libqgis-server{QGIS_ABI}: no-symbols-control-file usr/lib/libqgis_server.so.{QGIS_ABI}
1+
shlib-calls-exit *
2+
no-symbols-control-file *

‎debian/libqgisgrass{GRASSVER_QGIS_ABI}.install

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
usr/lib/libqgisgrass{GRASSVER}.so.{QGIS_ABI}
1+
usr/lib/libqgisgrass?.so.*

‎debian/libqgisgrass{GRASSVER_QGIS_ABI}.lintian-overrides

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
libqgisgrass{GRASSVER}-{QGIS_ABI}: hardening-no-fortify-functions usr/lib/libqgisgrass{GRASSVER}.so.{QGIS_ABI}
2-
libqgisgrass{GRASSVER}-{QGIS_ABI}: no-symbols-control-file usr/lib/libqgisgrass{GRASSVER}.so.{QGIS_ABI}
1+
hardening-no-fortify-functions *
2+
no-symbols-control-file *

‎debian/libqgispython{QGIS_ABI}.lintian-overrides

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
libqgispython{QGIS_ABI}: no-symbols-control-file
1+
no-symbols-control-file *

‎debian/python-qgis.install.in

-8
This file was deleted.

‎debian/python-qgis.lintian-overrides.in

-1
This file was deleted.

‎debian/python-qgis-common.install renamed to ‎debian/python3-qgis-common.install

+6-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1-
usr/share/qgis/python/*
1+
usr/lib/python*/*-packages/PyQt?/uic/widget-plugins/qgis_customwidgets.py
2+
usr/lib/python*/*-packages/qgis/*.py
3+
usr/lib/python*/*-packages/qgis/PyQt/*
24
usr/lib/python*/*-packages/qgis/processing/*
35
usr/lib/python*/*-packages/qgis/testing/*
4-
usr/lib/python*/*-packages/PyQt?/uic/widget-plugins/qgis_customwidgets.py
6+
usr/lib/python*/*-packages/qgis/core/additions/*
7+
usr/lib/python*/*-packages/qgis/core/contextmanagers.py
8+
usr/share/qgis/python/*

‎debian/python3-qgis.install

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
usr/lib/python*/*-packages/qgis/3d/__init__.py
2+
usr/lib/python*/*-packages/qgis/_3d.so
3+
usr/lib/python*/*-packages/qgis/_analysis.so
4+
usr/lib/python*/*-packages/qgis/_core.so
5+
usr/lib/python*/*-packages/qgis/_gui.so
6+
usr/lib/python*/*-packages/qgis/_server.so
7+
usr/lib/python*/*-packages/qgis/analysis/__init__.py
8+
usr/lib/python*/*-packages/qgis/core/__init__.py
9+
usr/lib/python*/*-packages/qgis/gui/__init__.py
10+
usr/lib/python*/*-packages/qgis/server/__init__.py

‎debian/python3-qgis.lintian-overrides

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
hardening-no-fortify-functions *

‎debian/qgis-api-doc.links

-1
This file was deleted.

‎debian/qgis-common.install

+4-4
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@ usr/share/qgis/doc/nohelp.html
1515
usr/share/qgis/doc/style.css
1616
usr/share/qgis/i18n/*
1717
usr/share/qgis/images/*
18-
usr/share/qgis/resources/spatialite.db
19-
usr/share/qgis/resources/palettes/*
20-
usr/share/qgis/resources/themes/*
18+
usr/share/qgis/resources/2to3migration.txt
2119
usr/share/qgis/resources/data/*
2220
usr/share/qgis/resources/metadata-ISO/*
2321
usr/share/qgis/resources/opencl_programs/*
24-
usr/share/qgis/resources/2to3migration.txt
22+
usr/share/qgis/resources/palettes/*
2523
usr/share/qgis/resources/qgis_global_settings.ini
24+
usr/share/qgis/resources/spatialite.db
25+
usr/share/qgis/resources/themes/*

‎debian/qgis-common.links

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
usr/share/common-licenses/GPL-2 usr/share/qgis/doc/LICENSE
1+
usr/share/common-licenses/GPL-2 usr/share/qgis/doc/LICENSE
22
usr/share/javascript/jquery/jquery.js usr/share/qgis/doc/jquery-min.js
3-
usr/share/javascript/leaflet usr/share/qgis/doc/leaflet
3+
usr/share/javascript/leaflet usr/share/qgis/doc/leaflet

‎debian/qgis-common.lintian-overrides

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
qgis-common: package-contains-broken-symlink usr/share/qgis/doc/LICENSE ../../common-licenses/GPL-2
2-
qgis-common: package-contains-broken-symlink usr/share/qgis/doc/leaflet ../../javascript/leaflet
1+
package-contains-broken-symlink usr/share/qgis/doc/LICENSE ../../common-licenses/GPL-2
2+
package-contains-broken-symlink usr/share/qgis/doc/leaflet ../../javascript/leaflet

‎debian/qgis-oracle-provider.install

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
usr/lib/qgis/plugins/liboracleprovider.so
2+
usr/lib/*/qt?/plugins/sqldrivers/libqsqlocispatial.so

‎debian/qgis-oracle-provider.install.in

-2
This file was deleted.

‎debian/qgis-plugin-globe-common.install

-1
This file was deleted.

‎debian/qgis-plugin-globe-common.links

-1
This file was deleted.

‎debian/qgis-plugin-globe-common.lintian-overrides

-1
This file was deleted.

‎debian/qgis-plugin-globe.install

-1
This file was deleted.

‎debian/qgis-plugin-grass.install

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
usr/lib/qgis/grass/bin/qgis.g.browser?
2+
usr/lib/qgis/plugins/libgrassplugin?.so

‎debian/qgis-plugin-grass.install.in

-2
This file was deleted.

‎debian/qgis-plugin-grass.lintian-overrides

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
qgis-plugin-grass: package-name-doesnt-match-sonames
2-
qgis-plugin-grass: no-symbols-control-file
1+
package-name-doesnt-match-sonames *
2+
no-symbols-control-file *

‎debian/qgis-provider-grass.install

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
usr/lib/qgis/grass/modules/qgis.d.rast?
2+
usr/lib/qgis/grass/modules/qgis.g.info?
3+
usr/lib/qgis/grass/modules/qgis.r.in?
4+
usr/lib/qgis/grass/modules/qgis.v.in?
5+
usr/lib/qgis/plugins/libgrassprovider?.so
6+
usr/lib/qgis/plugins/libgrassrasterprovider?.so

‎debian/qgis-provider-grass.install.in

-6
This file was deleted.

‎debian/qgis-provider-grass.lintian-overrides

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
qgis-provider-grass: package-name-doesnt-match-sonames
2-
qgis-provider-grass: no-symbols-control-file
1+
package-name-doesnt-match-sonames *
2+
no-symbols-control-file *

‎debian/qgis-providers.install.in

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,16 @@
11
usr/lib/qgis/crssync
2+
usr/lib/qgis/plugins/libarcgisfeatureserverprovider.so
3+
usr/lib/qgis/plugins/libarcgismapserverprovider.so
24
usr/lib/qgis/plugins/libbasicauthmethod.so
3-
usr/lib/qgis/plugins/libesritokenauthmethod.so
5+
usr/lib/qgis/plugins/libdb2provider.so
46
usr/lib/qgis/plugins/libdelimitedtextprovider.so
7+
usr/lib/qgis/plugins/libesritokenauthmethod.so
58
usr/lib/qgis/plugins/libgdalprovider.so
69
usr/lib/qgis/plugins/libgeonodeprovider.so
710
usr/lib/qgis/plugins/libgpxprovider.so
811
usr/lib/qgis/plugins/libidentcertauthmethod.so
12+
usr/lib/qgis/plugins/libmdalprovider.so
913
usr/lib/qgis/plugins/libmssqlprovider.so
10-
usr/lib/qgis/plugins/libdb2provider.so
1114
usr/lib/qgis/plugins/libogrprovider.so
1215
usr/lib/qgis/plugins/libowsprovider.so
1316
usr/lib/qgis/plugins/libpkcs12authmethod.so
@@ -18,7 +21,4 @@ usr/lib/qgis/plugins/libvirtuallayerprovider.so
1821
usr/lib/qgis/plugins/libwcsprovider.so
1922
usr/lib/qgis/plugins/libwfsprovider.so
2023
usr/lib/qgis/plugins/libwmsprovider.so
21-
usr/lib/qgis/plugins/libarcgismapserverprovider.so
22-
usr/lib/qgis/plugins/libarcgisfeatureserverprovider.so
23-
usr/lib/qgis/plugins/libmdalprovider.so
24-
#!xenial#{QT_PLUGINS_DIR}/sqldrivers/libqsqlspatialite.so
24+
#!xenial#usr/lib/*/qt?/plugins/sqldrivers/libqsqlspatialite.so

‎debian/qgis-providers.triggers

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
interest qgis-crssync
1+
interest-noawait qgis-crssync

‎debian/qgis.install

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
usr/lib/qgis/plugins/libgeorefplugin.so
2-
usr/lib/qgis/plugins/libgpsimporterplugin.so
31
usr/lib/qgis/plugins/libcoordinatecaptureplugin.so
42
usr/lib/qgis/plugins/libevis.so
5-
usr/lib/qgis/plugins/libofflineeditingplugin.so
6-
usr/lib/qgis/plugins/libtopolplugin.so
73
usr/lib/qgis/plugins/libgeometrycheckerplugin.so
4+
usr/lib/qgis/plugins/libgeorefplugin.so
5+
usr/lib/qgis/plugins/libgpsimporterplugin.so
86
usr/lib/qgis/plugins/liboauth2authmethod.so
7+
usr/lib/qgis/plugins/libofflineeditingplugin.so
8+
usr/lib/qgis/plugins/libtopolplugin.so
99
usr/share/applications/
1010
usr/share/metainfo/
1111
usr/share/mime/packages/

‎debian/qgis.preinst

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ if [ "$1" = "install" -o "$1" = "upgrade" ]; then
77
for i in /usr/bin/qgis /usr/bin/qbrowser; do
88
pkg=$(dpkg-divert --listpackage $i)
99
if [ -n "$pkg" -a "$pkg" = qgis-plugin-grass -o "$pkg" = qgis-provider-grass ]; then
10-
dpkg-divert --package $pkg --rename --remove $i
10+
dpkg-divert --package $pkg --remove $i
1111
fi
1212
done
1313
fi

0 commit comments

Comments
 (0)