Also install MIME type icon in hicolor theme.

Additionally the Shared MIME-info configuration is updated to reference the icon by name (without extension) like the desktop files.
qgis · Oct 22, 2015 · fd6bec4 · fd6bec4
1 parent b730fa0
commit fd6bec4
Show file tree

Hide file tree

Showing 15 changed files with 17 additions and 11 deletions.
diff --git a/debian/qgis-mime-icon128x128.png b/debian/qgis-mime-icon128x128.png
diff --git a/debian/qgis-mime-icon16x16.png b/debian/qgis-mime-icon16x16.png
diff --git a/debian/qgis-mime-icon22x22.png b/debian/qgis-mime-icon22x22.png
diff --git a/debian/qgis-mime-icon24x24.png b/debian/qgis-mime-icon24x24.png
diff --git a/debian/qgis-mime-icon32x32.png b/debian/qgis-mime-icon32x32.png
diff --git a/debian/qgis-mime-icon36x36.png b/debian/qgis-mime-icon36x36.png
diff --git a/debian/qgis-mime-icon42x42.png b/debian/qgis-mime-icon42x42.png
diff --git a/debian/qgis-mime-icon48x48.png b/debian/qgis-mime-icon48x48.png
diff --git a/debian/qgis-mime-icon64x64.png b/debian/qgis-mime-icon64x64.png
diff --git a/debian/qgis-mime-icon72x72.png b/debian/qgis-mime-icon72x72.png
diff --git a/debian/qgis-mime-icon80x80.png b/debian/qgis-mime-icon80x80.png
diff --git a/debian/qgis-mime-icon8x8.png b/debian/qgis-mime-icon8x8.png
diff --git a/debian/qgis-mime-icon96x96.png b/debian/qgis-mime-icon96x96.png
diff --git a/debian/qgis.xml b/debian/qgis.xml
@@ -6,7 +6,7 @@
     <comment xml:lang="de">QGIS-Projekt</comment>
     <sub-class-of type="application/xml"/>
     <alias type="application/x-qgis"/>
-    <icon name="qgis-mime.png"/>
+    <icon name="qgis-mime"/>
     <magic priority="50">
       <match type="string" offset="0" value="&lt;!DOCTYPE qgis">
         <match type="string" offset="0:256" value="&lt;qgis projectname"/>
@@ -19,7 +19,7 @@
     <comment>QGIS layer settings</comment>
     <comment xml:lang="de">QGIS Layer Einstellungen</comment>
     <sub-class-of type="application/xml"/>
-    <icon name="qgis-mime.png"/>
+    <icon name="qgis-mime"/>
     <magic priority="50">
       <match type="string" offset="0" value="&lt;!DOCTYPE qgis">
         <match type="string" offset="0:256" value="&lt;qgis version"/>
@@ -31,7 +31,7 @@
   <mime-type type="application/x-esri-shape">
     <comment>ESRI shape file</comment>
     <comment xml:lang="de">ESRI-Shapedatei</comment>
-    <icon name="qgis-mime.png"/>
+    <icon name="qgis-mime"/>
     <magic priority="100">
       <match type="big32" offset="0" value="9994">
         <match type="big32" offset="4" value="0">
@@ -54,7 +54,7 @@
   <mime-type type="application/x-esri-crs">
     <comment>ESRI coordinate reference system</comment>
     <comment xml:lang="de">ESRI-Koordinatenreferenzsystem</comment>
-    <icon name="qgis-mime.png"/>
+    <icon name="qgis-mime"/>
     <magic>
       <match type="string" offset="0" value="GEOGCS["/>
       <match type="string" offset="0" value="PROJCS["/>
@@ -66,7 +66,7 @@
   <mime-type type="image/tiff">
     <comment>TIFF raster data</comment>
     <comment xml:lang="de">TIFF-Rasterdaten</comment>
-    <icon name="qgis-mime.png"/>
+    <icon name="qgis-mime"/>
     <magic priority="50">
       <match type="string" offset="0" value="MM">
         <match type="little16" offset="2" value="42"/>
@@ -82,7 +82,7 @@
   <mime-type type="image/jpeg">
     <comment>JPEG raster data</comment>
     <comment xml:lang="de">JPEG-Rasterdaten</comment>
-    <icon name="qgis-mime.png"/>
+    <icon name="qgis-mime"/>
     <magic priority="50">
        <match type="big16" offset="0" value="65496"/>
     </magic>
@@ -93,7 +93,7 @@
   <mime-type type="image/jp2">
     <comment>JPEG2000 raster data</comment>
     <comment xml:lang="de">JPEG2000-Rasterdaten</comment>
-    <icon name="qgis-mime.png"/>
+    <icon name="qgis-mime"/>
     <magic priority="50">
       <match type="little32" offset="0" value="12">
         <match type="string" offset="8" value="jP">
@@ -118,28 +118,28 @@
   <mime-type type="application/x-raster-aig">
     <comment>AIG raster data</comment>
     <comment xml:lang="de">AIG-Rasterdaten</comment>
-    <icon name="qgis-mime.png"/>
+    <icon name="qgis-mime"/>
     <glob pattern="*.aig"/>
   </mime-type>
 
   <mime-type type="application/x-raster-ecw">
     <comment>ECW raster data</comment>
     <comment xml:lang="de">ECW-Rasterdaten</comment>
-    <icon name="qgis-mime.png"/>
+    <icon name="qgis-mime"/>
     <glob pattern="*.ecw"/>
   </mime-type>
 
   <mime-type type="application/x-raster-mrsid">
     <comment>MrSID raster data</comment>
     <comment xml:lang="de">MrSID-Rasterdaten</comment>
-    <icon name="qgis-mime.png"/>
+    <icon name="qgis-mime"/>
     <glob pattern="*.sid"/>
   </mime-type>
 
   <mime-type type="application/x-mapinfo-mif">
     <comment>MapInfo file</comment>
     <comment xml:lang="de">MapInfo-Datei</comment>
-    <icon name="qgis-mime.png"/>
+    <icon name="qgis-mime"/>
     <magic priority="51">
       <match type="string" offset="0" value="VERSION">
         <match type="string" offset="0:512" value="COLUMNS"/>

diff --git a/debian/rules b/debian/rules
@@ -230,6 +230,12 @@ override_dh_auto_install:
 	install -o root -g root -m 644 $(CURDIR)/images/icons/qbrowser-icon.png $(CURDIR)/debian/tmp/usr/share/pixmaps/qbrowser.png
 	install -o root -g root -m 644 $(CURDIR)/images/icons/qgis-mime-icon.png $(CURDIR)/debian/tmp/usr/share/pixmaps/qgis-mime.png
 
+	# Install MIME type icon
+	for size in 8x8 16x16 22x22 24x24 32x32 36x36 42x42 48x48 64x64 72x72 80x80 96x96 128x128; do \
+		install -o root -g root -d $(CURDIR)/debian/tmp/usr/share/icons/hicolor/$${size}/mimetypes ; \
+		install -o root -g root -m 644 $(CURDIR)/debian/qgis-mime-icon$${size}.png $(CURDIR)/debian/tmp/usr/share/icons/hicolor/$${size}/mimetypes/qgis-mime.png ; \
+	done
+
 	# Install application icon
 	for size in 8x8 16x16 22x22 24x24 32x32 36x36 42x42 48x48 64x64 72x72 80x80 96x96 128x128 192x192 256x256 512x512; do \
 		install -o root -g root -d $(CURDIR)/debian/tmp/usr/share/icons/hicolor/$${size}/apps ; \