update desktop integration in debian package

git-svn-id: http://svn.osgeo.org/qgis/trunk@10073 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Jan 31, 2009 · 02735f6 · 02735f6
1 parent 9e67c9d
commit 02735f6
Show file tree

Hide file tree

Showing 12 changed files with 31 additions and 2 deletions.
diff --git a/debian/changelog b/debian/changelog
@@ -1,6 +1,7 @@
 qgis (1.0.0-1) experimental; urgency=low
 
   * gridmaker plugin removed from package
+  * updated mime support
 
  -- Jürgen E. Fischer <jef@norbit.de>  Sat, 31 Jan 2009 17:21:47 +0100
 

diff --git a/debian/mime/application/x-esri-crs.desktop b/debian/mime/application/x-esri-crs.desktop
@@ -3,5 +3,6 @@ Type=MimeType
 MimeType=application/x-esri-crs
 Hidden=false
 Comment=ESRI coordinate reference system
-Comment[de]=ESRI-Koordinatenreferenzsystem
+Comment[de]=ESRI-Koordinatenbezugssystem
+Icon=qgis-mime-icon
 Patterns=*.prj;
diff --git a/debian/mime/application/x-esri-shape.desktop b/debian/mime/application/x-esri-shape.desktop
@@ -4,4 +4,5 @@ MimeType=application/x-esri-shape
 Hidden=false
 Comment=ESRI shape file
 Comment[de]=ESRI-Shapedatei
+Icon=qgis-mime-icon
 Patterns=*.shp;*.shx;
diff --git a/debian/mime/application/x-mapinfo-mif.desktop b/debian/mime/application/x-mapinfo-mif.desktop
@@ -5,4 +5,5 @@ Hidden=false
 Comment=MapInfo file
 Comment[de]=MapInfo-Datei
 Patterns=*.mif;
+Icon=qgis-mime-icon
 X-KDE-PatternsAccuracy=60
diff --git a/debian/mime/application/x-qgis-layer-settings.desktop b/debian/mime/application/x-qgis-layer-settings.desktop
@@ -4,4 +4,5 @@ MimeType=application/x-qgis-layer-settings
 Hidden=false
 Comment=Quantum GIS layer settings
 Comment[de]=Quantum GIS Layer Einstellungen
+Icon=qgis-mime-icon
 Patterns=*.qml;
diff --git a/debian/mime/application/x-qgis-project.desktop b/debian/mime/application/x-qgis-project.desktop
@@ -5,4 +5,5 @@ Hidden=false
 Comment=Quantum GIS Project
 Comment[de]=Quantum GIS-Projekt
 Patterns=*.qgs;
+Icon=qgis-mime-icon
 X-KDE-IsAlso=application/x-qgis
diff --git a/debian/mime/application/x-raster-aig.desktop b/debian/mime/application/x-raster-aig.desktop
@@ -4,4 +4,5 @@ MimeType=application/x-raster-aig
 Hidden=false
 Comment=AIG raster data
 Comment[de]=AIG-Rasterdaten
+Icon=qgis-mime-icon
 Patterns=*.aig;
diff --git a/debian/mime/application/x-raster-ecw.desktop b/debian/mime/application/x-raster-ecw.desktop
@@ -4,4 +4,5 @@ MimeType=application/x-raster-ecw
 Hidden=false
 Comment=ECW raster data
 Comment[de]=ECW-Rasterdaten
+Icon=qgis-mime-icon
 Patterns=*.ecw;
diff --git a/debian/mime/application/x-raster-mrsid.desktop b/debian/mime/application/x-raster-mrsid.desktop
@@ -4,4 +4,5 @@ MimeType=application/x-raster-mrsid
 Hidden=false
 Comment=MrSID raster data
 Comment[de]=MrSID-Rasterdaten
+Icon=qgis-mime-icon
 Patterns=*.sid;
diff --git a/debian/qgis.install b/debian/qgis.install
@@ -43,3 +43,5 @@ usr/lib/qgis/libcoordinatecaptureplugin.so
 ../mime/application/x-qgis-project.desktop usr/share/mimelnk/application
 ../mime/application/x-raster-mrsid.desktop usr/share/mimelnk/application
 ../mime/application/x-qgis-layer-settings.desktop usr/share/mimelnk/application
+usr/share/pixmaps/qgis-mime-icon.png
+usr/share/pixmaps/qgis-mime-icon.png usr/share/icons/crystalsvg/128x128/mimetypes
diff --git a/debian/qgis.xml b/debian/qgis.xml
@@ -6,6 +6,7 @@
     <comment xml:lang="de">Quantum GIS-Projekt</comment>
     <sub-class-of type="application/xml"/>
     <alias type="application/x-qgis"/>
+    <icon name="qgis-mime-icon.png"/>
     <magic priority="50">
       <match type="string" offset="0" value="&lt;!DOCTYPE qgis">
         <match type="string" offset="0:256" value="&lt;qgis projectname"/>
@@ -18,6 +19,7 @@
     <comment>Quantum GIS layer settings</comment>
     <comment xml:lang="de">Quantum GIS Layer Einstellungen</comment>
     <sub-class-of type="application/xml"/>
+    <icon name="qgis-mime-icon.png"/>
     <magic priority="50">
       <match type="string" offset="0" value="&lt;!DOCTYPE qgis">
         <match type="string" offset="0:256" value="&lt;qgis version"/>
@@ -29,6 +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-icon.png"/>
     <magic priority="100">
       <match type="big32" offset="0" value="9994">
         <match type="big32" offset="4" value="0">
@@ -51,6 +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-icon.png"/>
     <magic>
       <match type="string" offset="0" value="GEOGCS["/>
       <match type="string" offset="0" value="PROJCS["/>
@@ -62,6 +66,7 @@
   <mime-type type="image/tiff">
     <comment>TIFF raster data</comment>
     <comment xml:lang="de">TIFF-Rasterdaten</comment>
+    <icon name="qgis-mime-icon.png"/>
     <magic priority="50">
       <match type="string" offset="0" value="MM">
         <match type="little16" offset="2" value="42"/>
@@ -77,6 +82,7 @@
   <mime-type type="image/jpeg">
     <comment>JPEG raster data</comment>
     <comment xml:lang="de">JPEG-Rasterdaten</comment>
+    <icon name="qgis-mime-icon.png"/>
     <magic priority="50">
        <match type="big16" offset="0" value="65496"/>
     </magic>
@@ -87,6 +93,7 @@
   <mime-type type="image/jp2">
     <comment>JPEG2000 raster data</comment>
     <comment xml:lang="de">JPEG2000-Rasterdaten</comment>
+    <icon name="qgis-mime-icon.png"/>
     <magic priority="50">
       <match type="little32" offset="0" value="12">
         <match type="string" offset="8" value="jP">
@@ -111,24 +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-icon.png"/>
     <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-icon.png"/>
     <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-icon.png"/>
     <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-icon.png"/>
     <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
@@ -35,6 +35,12 @@ ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
 	MAKEFLAGS += VERBOSE=YES
 endif
 
+ifneq (,$(findstring profile,$(DEB_BUILD_OPTIONS)))
+	CFLAGS += -pg
+	CXXFLAGS += -pg
+	LDFLAGS += -pg
+endif
+
 debian/build/CMakeCache.txt: CMakeLists.txt
 	dh_testdir
 	# Add here commands to configure the package.
@@ -79,7 +85,8 @@ install: build
 
 	# Install menu pixmap
 	install -o root -g root -d $(CURDIR)/debian/tmp/usr/share/pixmaps
-	install -o root -g root -m 644 $(CURDIR)/debian/qgis-icon.xpm $(CURDIR)/debian/tmp/usr/share/pixmaps/qgis-icon.xpm
+	install -o root -g root -m 644 $(CURDIR)/images/icons/qgis-icon.png $(CURDIR)/debian/tmp/usr/share/pixmaps
+	install -o root -g root -m 644 $(CURDIR)/images/icons/qgis-mime-icon.png $(CURDIR)/debian/tmp/usr/share/pixmaps
 
 # Build architecture-independent files here.
 binary-indep: build install