Skip to content

Commit f1d226f

Browse files
aleixpolnyalldawson
aleixpol
authored and
nyalldawson
committed
Roughly adapt packaging to the changes in the previous commit
1 parent 618c3ce commit f1d226f

File tree

3 files changed

+2
-73
lines changed

3 files changed

+2
-73
lines changed

‎debian/qgis.install

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ usr/lib/qgis/plugins/libevis.so
55
usr/lib/qgis/plugins/libofflineeditingplugin.so
66
usr/lib/qgis/plugins/libtopolplugin.so
77
usr/lib/qgis/plugins/libgeometrycheckerplugin.so
8-
usr/share/pixmaps/
98
usr/share/applications/
9+
usr/share/metainfo/
1010
usr/share/mime/packages/
1111
usr/share/icons/hicolor/

‎debian/rules

-35
Original file line numberDiff line numberDiff line change
@@ -288,41 +288,6 @@ override_dh_auto_install:
288288
# Don't ship srs.db, automatically updated in postinst with crssync
289289
mv $(CURDIR)/debian/tmp/usr/share/qgis/resources/srs.db $(CURDIR)/debian/tmp/usr/share/qgis/resources/srs-template.db
290290

291-
# Install menu pixmap
292-
install -o root -g root -d $(CURDIR)/debian/tmp/usr/share/pixmaps
293-
install -o root -g root -m 644 $(CURDIR)/images/icons/qgis_icon.svg $(CURDIR)/debian/tmp/usr/share/pixmaps/qgis.svg
294-
install -o root -g root -m 644 $(CURDIR)/images/icons/qgis-icon-512x512.png $(CURDIR)/debian/tmp/usr/share/pixmaps/qgis.png
295-
install -o root -g root -m 644 $(CURDIR)/images/icons/qgis-mime-icon.png $(CURDIR)/debian/tmp/usr/share/pixmaps/qgis-mime.png
296-
297-
# Install MIME type icon
298-
for size in 8x8 16x16 22x22 24x24 32x32 36x36 42x42 48x48 64x64 72x72 80x80 96x96 128x128; do \
299-
install -o root -g root -d $(CURDIR)/debian/tmp/usr/share/icons/hicolor/$${size}/mimetypes ; \
300-
install -o root -g root -m 644 $(CURDIR)/debian/icons/qgis-mime-icon$${size}.png $(CURDIR)/debian/tmp/usr/share/icons/hicolor/$${size}/mimetypes/qgis-mime.png ; \
301-
done
302-
303-
# Install QGIS file formats icons
304-
for file_type in qgs qlr qml qpt; do \
305-
for size in 8x8 16x16 22x22 24x24 32x32 36x36 42x42 48x48 64x64 72x72 80x80 96x96 128x128 192x192 256x256 512x512; do \
306-
install -o root -g root -d $(CURDIR)/debian/tmp/usr/share/icons/hicolor/$${size}/mimetypes ; \
307-
install -o root -g root -m 644 \
308-
$(CURDIR)/debian/icons/qgis-$${file_type}$${size}.png \
309-
$(CURDIR)/debian/tmp/usr/share/icons/hicolor/$${size}/mimetypes/qgis-$${file_type}.png ; \
310-
done ; \
311-
done
312-
313-
# Install application icon
314-
for size in 8x8 16x16 22x22 24x24 32x32 36x36 42x42 48x48 64x64 72x72 80x80 96x96 128x128 192x192 256x256 512x512; do \
315-
install -o root -g root -d $(CURDIR)/debian/tmp/usr/share/icons/hicolor/$${size}/apps ; \
316-
install -o root -g root -m 644 $(CURDIR)/debian/icons/qgis-icon$${size}.png $(CURDIR)/debian/tmp/usr/share/icons/hicolor/$${size}/apps/qgis.png ; \
317-
done
318-
319-
install -o root -g root -d $(CURDIR)/debian/tmp/usr/share/icons/hicolor/scalable/apps
320-
install -o root -g root -m 644 $(CURDIR)/images/icons/qgis_icon.svg $(CURDIR)/debian/tmp/usr/share/icons/hicolor/scalable/apps/qgis.svg
321-
322-
# Install desktop files
323-
install -o root -g root -d $(CURDIR)/debian/tmp/usr/share/applications
324-
install -o root -g root -m 644 $(CURDIR)/debian/qgis.desktop $(CURDIR)/debian/tmp/usr/share/applications
325-
326291
# Mime info
327292
install -o root -g root -d $(CURDIR)/debian/tmp/usr/share/mime/packages
328293
install -o root -g root -m 644 $(CURDIR)/debian/qgis.xml $(CURDIR)/debian/tmp/usr/share/mime/packages

‎rpm/qgis.spec.template

+1-37
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
# Force the python interpreter to python3:
1010
# brp-python-bytecompile is unable to identify
11-
# the proper required version of python for
11+
# the proper required version of python for
1212
# py files located under /usr/share/qgis/python/plugins
1313
%global __python %{__python3}
1414

@@ -219,46 +219,11 @@ make %{?_smp_mflags}
219219
#export LD_LIBRARY_PATH=%{_builddir}%{name}-%{version}/output/%{_lib}
220220
make install DESTDIR=%{buildroot}
221221

222-
# Install desktop file without connecting proprietary file types
223-
desktop-file-install \
224-
--vendor="fedora" \
225-
--remove-mime-type="application/x-raster-ecw" \
226-
--remove-mime-type="application/x-raster-mrsid" \
227-
--dir=%{buildroot}%{_datadir}/applications \
228-
debian/qgis.desktop
229-
230222
# Install MIME type definitions
231223
install -d %{buildroot}%{_datadir}/mime/packages
232224
install -pm0644 %{SOURCE5} \
233225
%{buildroot}%{_datadir}/mime/packages/%{name}.xml
234226

235-
# Install application and MIME icons
236-
for size in 8x8 16x16 22x22 24x24 32x32 36x36 42x42 48x48 64x64 72x72 80x80 96x96 128x128 192x192 256x256 512x512; do
237-
install -pd %{buildroot}%{_datadir}/icons/hicolor/$size/apps
238-
install -pm0644 debian/icons/%{name}-icon${size}.png %{buildroot}%{_datadir}/icons/hicolor/${size}/apps/%{name}.png
239-
done
240-
241-
for ext in qgs qlr qml qpt; do
242-
for size in 8x8 16x16 22x22 24x24 32x32 36x36 42x42 48x48 64x64 72x72 80x80 96x96 128x128 192x192 256x256 512x512; do
243-
install -pd %{buildroot}%{_datadir}/icons/hicolor/$size/apps
244-
install -pm0644 debian/icons/%{name}-${ext}${size}.png %{buildroot}%{_datadir}/icons/hicolor/${size}/apps/%{name}-${ext}.png
245-
done
246-
done
247-
248-
for size in 8x8 16x16 22x22 24x24 32x32 36x36 42x42 48x48 64x64 72x72 80x80 96x96 128x128 192x192 256x256 512x512; do
249-
install -pd %{buildroot}%{_datadir}/icons/hicolor/$size/mimetypes
250-
install -pm0644 debian/icons/qgis-mime-icon${size}.png %{buildroot}%{_datadir}/icons/hicolor/${size}/mimetypes/qgis-mime.png
251-
done
252-
253-
install -pd %{buildroot}%{_datadir}/pixmaps
254-
install -pd %{buildroot}%{_datadir}/icons/hicolor/scalable/apps
255-
256-
install -pm0644 images/icons/%{name}-icon-512x512.png %{buildroot}%{_datadir}/pixmaps/%{name}.png
257-
install -pm0644 images/icons/%{name}_icon.svg %{buildroot}%{_datadir}/pixmaps/%{name}.svg
258-
install -pm0644 images/icons/%{name}_icon.svg %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
259-
install -pm0644 images/icons/%{name}-mime-icon.png %{buildroot}%{_datadir}/pixmaps/%{name}-mime.png
260-
install -pm0644 images/icons/%{name}_mime_icon.svg %{buildroot}%{_datadir}/pixmaps/%{name}-mime.png
261-
262227
# Install basic QGIS Mapserver configuration for Apache
263228
install -pd %{buildroot}%{_sysconfdir}/httpd/conf.d
264229
install -pm0644 %{SOURCE2} \
@@ -320,7 +285,6 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
320285
%dir %{_datadir}/%{name}/
321286
%{_datadir}/mime/packages/qgis.xml
322287
%{_datadir}/metainfo/org.qgis.qgis.appdata.xml
323-
%{_datadir}/pixmaps/
324288
%{_datadir}/icons/hicolor/*/apps/*
325289
%{_datadir}/icons/hicolor/*/mimetypes/*
326290
%{_datadir}/applications/*%{name}.desktop

0 commit comments

Comments
 (0)