[QGIS Commit] r9894 - in trunk/qgis/debian: . mime mime/application

svn_qgis at osgeo.org svn_qgis at osgeo.org
Tue Dec 23 14:43:47 EST 2008


Author: jef
Date: 2008-12-23 14:43:47 -0500 (Tue, 23 Dec 2008)
New Revision: 9894

Added:
   trunk/qgis/debian/mime/
   trunk/qgis/debian/mime/application/
   trunk/qgis/debian/mime/application/x-adobe-mif.desktop
   trunk/qgis/debian/mime/application/x-esri-crs.desktop
   trunk/qgis/debian/mime/application/x-esri-shape.desktop
   trunk/qgis/debian/mime/application/x-mapinfo-mif.desktop
   trunk/qgis/debian/mime/application/x-qgis-layer-settings.desktop
   trunk/qgis/debian/mime/application/x-qgis-project.desktop
   trunk/qgis/debian/mime/application/x-raster-aig.desktop
   trunk/qgis/debian/mime/application/x-raster-ecw.desktop
   trunk/qgis/debian/mime/application/x-raster-mrsid.desktop
   trunk/qgis/debian/qgis.desktop
   trunk/qgis/debian/qgis.xml
Modified:
   trunk/qgis/debian/changelog
   trunk/qgis/debian/control
   trunk/qgis/debian/qgis-plugin-grass.postrm
   trunk/qgis/debian/qgis-plugin-grass.preinst
   trunk/qgis/debian/qgis.install
   trunk/qgis/debian/qgis.mime
Log:
update debian packaging

Modified: trunk/qgis/debian/changelog
===================================================================
--- trunk/qgis/debian/changelog	2008-12-23 19:40:19 UTC (rev 9893)
+++ trunk/qgis/debian/changelog	2008-12-23 19:43:47 UTC (rev 9894)
@@ -1,3 +1,14 @@
+qgis (1.0.0) experimental; urgency=low
+ 
+  * new upstream release
+  * update qgis.mime
+  * add qgis.desktop and qgis.xml 
+  * add mime types for KDE
+  * don't ignore errors in preinst and postrm
+  * run ldconfig in postrm
+
+ -- Jürgen E. Fischer <jef at norbit.de>  Tue, 23 Dec 2008 20:42:21 +0100
+
 qgis (1.0preview18) experimental; urgency=low
 
   * add suggestion for gpsbabel

Modified: trunk/qgis/debian/control
===================================================================
--- trunk/qgis/debian/control	2008-12-23 19:40:19 UTC (rev 9893)
+++ trunk/qgis/debian/control	2008-12-23 19:43:47 UTC (rev 9894)
@@ -22,7 +22,7 @@
 Conflicts: uim-qt3
 Description: Geographic Information System (GIS)
  A Geographic Information System (GIS) manages, analyzes, and displays
- databases of geographic information. Quantum GIS (QGIS) supports shapefile
+ databases of geographic information. Quantum GIS (QGIS) supports shape file
  viewing and editing, spatial data storage with PostgreSQL/PostGIS, projection
  on-the-fly, map composition, and a number of other features via a plugin
  interface. QGIS also supports display of various georeferenced raster and

Added: trunk/qgis/debian/mime/application/x-adobe-mif.desktop
===================================================================
--- trunk/qgis/debian/mime/application/x-adobe-mif.desktop	                        (rev 0)
+++ trunk/qgis/debian/mime/application/x-adobe-mif.desktop	2008-12-23 19:43:47 UTC (rev 9894)
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Type=MimeType
+MimeType=application/x-adobe-mif
+Hidden=false
+Comment=Adobe FrameMaker MIF file
+Patterns=*.mif;
+X-KDE-PatternsAccuracy=51
+X-KDE-IsAlso=application/x-mif

Added: trunk/qgis/debian/mime/application/x-esri-crs.desktop
===================================================================
--- trunk/qgis/debian/mime/application/x-esri-crs.desktop	                        (rev 0)
+++ trunk/qgis/debian/mime/application/x-esri-crs.desktop	2008-12-23 19:43:47 UTC (rev 9894)
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Type=MimeType
+MimeType=application/x-esri-crs
+Hidden=false
+Comment=ESRI coordinate reference system
+Comment[de]=ESRI-Koordinatenreferenzsystem
+Patterns=*.prj;

Added: trunk/qgis/debian/mime/application/x-esri-shape.desktop
===================================================================
--- trunk/qgis/debian/mime/application/x-esri-shape.desktop	                        (rev 0)
+++ trunk/qgis/debian/mime/application/x-esri-shape.desktop	2008-12-23 19:43:47 UTC (rev 9894)
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Type=MimeType
+MimeType=application/x-esri-shape
+Hidden=false
+Comment=ESRI shape file
+Comment[de]=ESRI-Shapedatei
+Patterns=*.shp;*.shx;

Added: trunk/qgis/debian/mime/application/x-mapinfo-mif.desktop
===================================================================
--- trunk/qgis/debian/mime/application/x-mapinfo-mif.desktop	                        (rev 0)
+++ trunk/qgis/debian/mime/application/x-mapinfo-mif.desktop	2008-12-23 19:43:47 UTC (rev 9894)
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Type=MimeType
+MimeType=application/x-mapinfo-mif
+Hidden=false
+Comment=MapInfo file
+Comment[de]=MapInfo-Datei
+Patterns=*.mif;
+X-KDE-PatternsAccuracy=60

Added: trunk/qgis/debian/mime/application/x-qgis-layer-settings.desktop
===================================================================
--- trunk/qgis/debian/mime/application/x-qgis-layer-settings.desktop	                        (rev 0)
+++ trunk/qgis/debian/mime/application/x-qgis-layer-settings.desktop	2008-12-23 19:43:47 UTC (rev 9894)
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Type=MimeType
+MimeType=application/x-qgis-layer-settings
+Hidden=false
+Comment=Quantum GIS layer settings
+Comment[de]=Quantum GIS Layer Einstellungen
+Patterns=*.qml;

Added: trunk/qgis/debian/mime/application/x-qgis-project.desktop
===================================================================
--- trunk/qgis/debian/mime/application/x-qgis-project.desktop	                        (rev 0)
+++ trunk/qgis/debian/mime/application/x-qgis-project.desktop	2008-12-23 19:43:47 UTC (rev 9894)
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Type=MimeType
+MimeType=application/x-qgis-project
+Hidden=false
+Comment=Quantum GIS Project
+Comment[de]=Quantum GIS-Projekt
+Patterns=*.qgs;
+X-KDE-IsAlso=application/x-qgis

Added: trunk/qgis/debian/mime/application/x-raster-aig.desktop
===================================================================
--- trunk/qgis/debian/mime/application/x-raster-aig.desktop	                        (rev 0)
+++ trunk/qgis/debian/mime/application/x-raster-aig.desktop	2008-12-23 19:43:47 UTC (rev 9894)
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Type=MimeType
+MimeType=application/x-raster-aig
+Hidden=false
+Comment=AIG raster data
+Comment[de]=AIG-Rasterdaten
+Patterns=*.aig;

Added: trunk/qgis/debian/mime/application/x-raster-ecw.desktop
===================================================================
--- trunk/qgis/debian/mime/application/x-raster-ecw.desktop	                        (rev 0)
+++ trunk/qgis/debian/mime/application/x-raster-ecw.desktop	2008-12-23 19:43:47 UTC (rev 9894)
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Type=MimeType
+MimeType=application/x-raster-ecw
+Hidden=false
+Comment=ECW raster data
+Comment[de]=ECW-Rasterdaten
+Patterns=*.ecw;

Added: trunk/qgis/debian/mime/application/x-raster-mrsid.desktop
===================================================================
--- trunk/qgis/debian/mime/application/x-raster-mrsid.desktop	                        (rev 0)
+++ trunk/qgis/debian/mime/application/x-raster-mrsid.desktop	2008-12-23 19:43:47 UTC (rev 9894)
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Type=MimeType
+MimeType=application/x-raster-mrsid
+Hidden=false
+Comment=MrSID raster data
+Comment[de]=MrSID-Rasterdaten
+Patterns=*.sid;

Modified: trunk/qgis/debian/qgis-plugin-grass.postrm
===================================================================
--- trunk/qgis/debian/qgis-plugin-grass.postrm	2008-12-23 19:40:19 UTC (rev 9893)
+++ trunk/qgis/debian/qgis-plugin-grass.postrm	2008-12-23 19:43:47 UTC (rev 9894)
@@ -1,5 +1,10 @@
 #!/bin/sh
 
+set -e
+
 if [ "$1" = "remove" ]; then
 	dpkg-divert --package qgis-plugin-grass --remove --rename --divert /usr/bin/qgis.bin /usr/bin/qgis
+	ldconfig
 fi
+
+exit 0

Modified: trunk/qgis/debian/qgis-plugin-grass.preinst
===================================================================
--- trunk/qgis/debian/qgis-plugin-grass.preinst	2008-12-23 19:40:19 UTC (rev 9893)
+++ trunk/qgis/debian/qgis-plugin-grass.preinst	2008-12-23 19:43:47 UTC (rev 9894)
@@ -1,5 +1,9 @@
 #!/bin/sh
 
+set -e
+
 if [ "$1" = "install" -o "$1" = "upgrade" ]; then
 	dpkg-divert --package qgis-plugin-grass --add --rename --divert /usr/bin/qgis.bin /usr/bin/qgis
 fi
+
+exit 0

Added: trunk/qgis/debian/qgis.desktop
===================================================================
--- trunk/qgis/debian/qgis.desktop	                        (rev 0)
+++ trunk/qgis/debian/qgis.desktop	2008-12-23 19:43:47 UTC (rev 9894)
@@ -0,0 +1,14 @@
+[Desktop Entry]
+Type=Application
+Name=Quantum GIS
+Version=1.0
+GenericName=Geographical Information System
+GenericName[de]=Geographisches Informationssystem
+Icon=qgis-icon
+TryExec=/usr/bin/qgis
+Exec=/usr/bin/qgis %F
+Encoding=UTF-8
+Terminal=false
+StartupNotify=false
+Categories=Qt;Science;GIS;OSGeo;
+MimeType=application/x-qgis-project;image/tiff;image/jpeg;image/jp2;application/x-raster-aig;application/x-raster-ecw;application/x-raster-mrsid;application/x-mapinfo-mif;application/x-esri-shape;

Modified: trunk/qgis/debian/qgis.install
===================================================================
--- trunk/qgis/debian/qgis.install	2008-12-23 19:40:19 UTC (rev 9893)
+++ trunk/qgis/debian/qgis.install	2008-12-23 19:43:47 UTC (rev 9894)
@@ -34,3 +34,14 @@
 usr/lib/qgis/libinterpolationplugin.so 
 usr/lib/qgis/libogrconverterplugin.so
 usr/lib/qgis/libcoordinatecaptureplugin.so
+../qgis.desktop usr/share/applications
+../qgis.xml usr/share/mime/packages
+../mime/application/x-esri-shape.desktop usr/share/mimelnk/application
+../mime/application/x-mapinfo-mif.desktop usr/share/mimelnk/application
+../mime/application/x-esri-crs.desktop usr/share/mimelnk/application
+../mime/application/x-raster-ecw.desktop usr/share/mimelnk/application
+../mime/application/x-adobe-mif.desktop usr/share/mimelnk/application
+../mime/application/x-raster-aig.desktop usr/share/mimelnk/application
+../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

Modified: trunk/qgis/debian/qgis.mime
===================================================================
--- trunk/qgis/debian/qgis.mime	2008-12-23 19:40:19 UTC (rev 9893)
+++ trunk/qgis/debian/qgis.mime	2008-12-23 19:43:47 UTC (rev 9894)
@@ -1,7 +1,8 @@
-application/shp; qgis '%s'; edit=qgis '%s'; test=test "$DISPLAY" != ""; priority=2
-application/mif; qgis '%s'; edit=qgis '%s'; test=test "$DISPLAY" != ""; priority=2
-application/jpg; qgis '%s'; edit=qgis '%s'; test=test "$DISPLAY" != ""; priority=2
-application/tif; qgis '%s'; edit=qgis '%s'; test=test "$DISPLAY" != ""; priority=2
-application/aig; qgis '%s'; edit=qgis '%s'; test=test "$DISPLAY" != ""; priority=2
-application/ecw; qgis '%s'; edit=qgis '%s'; test=test "$DISPLAY" != ""; priority=2
-application/sid; qgis '%s'; edit=qgis '%s'; test=test "$DISPLAY" != ""; priority=2
+image/tif; qgis '%s'; description="TIFF Image"; test=test -n "$DISPLAY"; nametemplate=%s.tif; priority=2
+image/jpg; qgis '%s'; description="JPEG Image"; test=test -n "$DISPLAY"; nametemplate=%s.jpg; priority=2
+image/jp2; qgis '%s'; description="JPEP 2000 Image"; test=test -n "$DISPLAY"; nametempalte=%s.jp2; priority=2
+application/aig; qgis '%s'; description="AIG raster data"; test=test -n "$DISPLAY"; nametemplate=%s.aig; priority=2
+application/ecw; qgis '%s'; description="ECW raster data"; test=test -n "$DISPLAY"; nametemplate=%s.ecw; priority=2
+application/sid; qgis '%s'; description="MrSID raster data"; test=test -n "$DISPLAY"; nametemplate=%s.sid; priority=2
+application/mif; qgis '%s'; description="MapInfo file"; test=test -n "$DISPLAY"; nametemplate=%s.mif; priority=2
+application/x-qgis; qgis '%s'; description="Quantum GIS Project"; test=test -n "$DISPLAY"; nametemplate=%s.qgs

Added: trunk/qgis/debian/qgis.xml
===================================================================
--- trunk/qgis/debian/qgis.xml	                        (rev 0)
+++ trunk/qgis/debian/qgis.xml	2008-12-23 19:43:47 UTC (rev 9894)
@@ -0,0 +1,152 @@
+<?xml version="1.0"?>
+<mime-info xmlns='http://www.freedesktop.org/standards/shared-mime-info'>
+
+  <mime-type type="application/x-qgis-project">
+    <comment>Quantum GIS Project</comment>
+    <comment xml:lang="de">Quantum GIS-Projekt</comment>
+    <sub-class-of type="application/xml"/>
+    <alias type="application/x-qgis"/>
+    <magic priority="50">
+      <match type="string" offset="0" value="&lt;!DOCTYPE qgis">
+        <match type="string" offset="0:256" value="&lt;qgis projectname"/>
+      </match>
+    </magic>
+    <glob pattern="*.qgs"/>
+  </mime-type>
+
+  <mime-type type="application/x-qgis-layer-settings">
+    <comment>Quantum GIS layer settings</comment>
+    <comment xml:lang="de">Quantum GIS Layer Einstellungen</comment>
+    <sub-class-of type="application/xml"/>
+    <magic priority="50">
+      <match type="string" offset="0" value="&lt;!DOCTYPE qgis">
+        <match type="string" offset="0:256" value="&lt;qgis version"/>
+      </match>
+    </magic>
+    <glob pattern="*.qml"/>
+  </mime-type>
+
+  <mime-type type="application/x-esri-shape">
+    <comment>ESRI shape file</comment>
+    <comment xml:lang="de">ESRI-Shapedatei</comment>
+    <magic priority="100">
+      <match type="big32" offset="0" value="9994">
+        <match type="big32" offset="4" value="0">
+          <match type="big32" offset="8" value="0">
+            <match type="big32" offset="12" value="0">
+              <match type="big32" offset="16" value="0">
+                <match type="big32" offset="20" value="0">
+                  <match type="big32" offset="28" value="1000"/>
+		</match>
+              </match>
+	    </match>
+	  </match>
+	</match>
+      </match>
+    </magic>
+    <glob pattern="*.shp"/>
+    <glob pattern="*.shx"/>
+  </mime-type>
+
+  <mime-type type="application/x-esri-crs">
+    <comment>ESRI coordinate reference system</comment>
+    <comment xml:lang="de">ESRI-Koordinatenreferenzsystem</comment>
+    <magic>
+      <match type="string" offset="0" value="GEOGCS["/>
+      <match type="string" offset="0" value="PROJCS["/>
+      <match type="string" offset="0" value="LOCAL_CS["/>
+    </magic>
+    <glob pattern="*.prj"/>
+  </mime-type>
+
+  <mime-type type="image/tiff">
+    <comment>TIFF raster data</comment>
+    <comment xml:lang="de">TIFF-Rasterdaten</comment>
+    <magic priority="50">
+      <match type="string" offset="0" value="MM">
+        <match type="little16" offset="2" value="42"/>
+      </match>
+      <match type="string" offset="0" value="MM">
+        <match type="big16" offset="2" value="42"/>
+      </match>
+    </magic>
+    <glob pattern="*.tiff"/>
+    <glob pattern="*.tif"/>
+  </mime-type>
+
+  <mime-type type="image/jpeg">
+    <comment>JPEG raster data</comment>
+    <comment xml:lang="de">JPEG-Rasterdaten</comment>
+    <magic priority="50">
+       <match type="big16" offset="0" value="65496"/>
+    </magic>
+    <glob pattern="*.jpeg"/>
+    <glob pattern="*.jpg"/>
+  </mime-type>
+
+  <mime-type type="image/jp2">
+    <comment>JPEG2000 raster data</comment>
+    <comment xml:lang="de">JPEG2000-Rasterdaten</comment>
+    <magic priority="50">
+      <match type="little32" offset="0" value="12">
+        <match type="string" offset="8" value="jP">
+          <match type="byte" offset="10" value="32">
+            <match type="byte" offset="11" value="32">
+              <match type="byte" offset="12" value="13">
+                <match type="byte" offset="13" value="10">
+                  <match type="byte" offset="14" value="135">
+                    <match type="byte" offset="13" value="10"/>
+		  </match>
+                </match>
+              </match>
+            </match>
+          </match>
+        </match>
+      </match>
+    </magic>
+    <glob pattern="*.jp2"/>
+    <glob pattern="*.j2k"/>
+  </mime-type>
+
+  <mime-type type="application/x-raster-aig">
+    <comment>AIG raster data</comment>
+    <comment xml:lang="de">AIG-Rasterdaten</comment>
+    <glob pattern="*.aig"/>
+  </mime-type>
+
+  <mime-type type="application/x-raster-ecw">
+    <comment>ECW raster data</comment>
+    <comment xml:lang="de">ECW-Rasterdaten</comment>
+    <glob pattern="*.ecw"/>
+  </mime-type>
+
+  <mime-type type="application/x-raster-mrsid">
+    <comment>MrSID raster data</comment>
+    <comment xml:lang="de">MrSID-Rasterdaten</comment>
+    <glob pattern="*.sid"/>
+  </mime-type>
+
+  <mime-type type="application/x-mapinfo-mif">
+    <comment>MapInfo file</comment>
+    <comment xml:lang="de">MapInfo-Datei</comment>
+    <magic priority="51">
+      <match type="string" offset="0" value="VERSION">
+        <match type="string" offset="0:512" value="COLUMNS"/>
+          <match type="string" offset="0:512" value="DATA">
+        </match>
+      </match>
+    </magic>
+    <glob weight="60" pattern="*.mif"/>
+  </mime-type>
+
+  <!-- .mif is just not good enough -->
+  <mime-type type="application/x-adobe-mif">
+    <alias type="application/x-mif"/>
+    <comment>Adobe FrameMaker MIF file</comment>
+    <magic priority="100">
+      <match type="string" offset="0" value="&lt;MIFFile"/>
+    </magic>
+    <glob weight="51" pattern="*.mif"/>
+  </mime-type>
+
+</mime-info>



More information about the QGIS-commit mailing list