[SCM] qgis branch, master, updated. upstream/2.0.1-13448-gc357263

Bas Couwenberg sebastic at xs4all.nl
Sun Sep 29 15:14:55 UTC 2013 

The following commit has been merged in the master branch:
commit 7017cb7790ebbac875fdcfe9e16e8fc357578388
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sun Sep 29 15:36:53 2013 +0200

    Don't use '-icon' in filename.

diff --git a/debian/mime/application/x-esri-crs.desktop b/debian/mime/application/x-esri-crs.desktop
index 7587ca7..7c8778d 100644
--- a/debian/mime/application/x-esri-crs.desktop
+++ b/debian/mime/application/x-esri-crs.desktop
@@ -4,5 +4,5 @@ MimeType=application/x-esri-crs
 Hidden=false
 Comment=ESRI coordinate reference system
 Comment[de]=ESRI-Koordinatenbezugssystem
-Icon=qgis-mime-icon
+Icon=qgis-mime
 Patterns=*.prj;
diff --git a/debian/mime/application/x-esri-shape.desktop b/debian/mime/application/x-esri-shape.desktop
index ec66259..9888eeb 100644
--- a/debian/mime/application/x-esri-shape.desktop
+++ b/debian/mime/application/x-esri-shape.desktop
@@ -4,5 +4,5 @@ MimeType=application/x-esri-shape
 Hidden=false
 Comment=ESRI shape file
 Comment[de]=ESRI-Shapedatei
-Icon=qgis-mime-icon
+Icon=qgis-mime
 Patterns=*.shp;*.shx;
diff --git a/debian/mime/application/x-mapinfo-mif.desktop b/debian/mime/application/x-mapinfo-mif.desktop
index 80cc9cb..96d824d 100644
--- a/debian/mime/application/x-mapinfo-mif.desktop
+++ b/debian/mime/application/x-mapinfo-mif.desktop
@@ -5,5 +5,5 @@ Hidden=false
 Comment=MapInfo file
 Comment[de]=MapInfo-Datei
 Patterns=*.mif;
-Icon=qgis-mime-icon
+Icon=qgis-mime
 X-KDE-PatternsAccuracy=60
diff --git a/debian/mime/application/x-qgis-layer-settings.desktop b/debian/mime/application/x-qgis-layer-settings.desktop
index dc2f30a..9bfe821 100644
--- a/debian/mime/application/x-qgis-layer-settings.desktop
+++ b/debian/mime/application/x-qgis-layer-settings.desktop
@@ -4,5 +4,5 @@ MimeType=application/x-qgis-layer-settings
 Hidden=false
 Comment=QGIS layer settings
 Comment[de]=QGIS Layer Einstellungen
-Icon=qgis-mime-icon
+Icon=qgis-mime
 Patterns=*.qml;
diff --git a/debian/mime/application/x-qgis-project.desktop b/debian/mime/application/x-qgis-project.desktop
index c5946e4..05aa74e 100644
--- a/debian/mime/application/x-qgis-project.desktop
+++ b/debian/mime/application/x-qgis-project.desktop
@@ -5,5 +5,5 @@ Hidden=false
 Comment=QGIS Project
 Comment[de]=QGIS-Projekt
 Patterns=*.qgs;
-Icon=qgis-mime-icon
+Icon=qgis-mime
 X-KDE-IsAlso=application/x-qgis
diff --git a/debian/mime/application/x-raster-aig.desktop b/debian/mime/application/x-raster-aig.desktop
index 9fbb9cc..888f55c 100644
--- a/debian/mime/application/x-raster-aig.desktop
+++ b/debian/mime/application/x-raster-aig.desktop
@@ -4,5 +4,5 @@ MimeType=application/x-raster-aig
 Hidden=false
 Comment=AIG raster data
 Comment[de]=AIG-Rasterdaten
-Icon=qgis-mime-icon
+Icon=qgis-mime
 Patterns=*.aig;
diff --git a/debian/mime/application/x-raster-ecw.desktop b/debian/mime/application/x-raster-ecw.desktop
index 7be0dc9..9bea266 100644
--- a/debian/mime/application/x-raster-ecw.desktop
+++ b/debian/mime/application/x-raster-ecw.desktop
@@ -4,5 +4,5 @@ MimeType=application/x-raster-ecw
 Hidden=false
 Comment=ECW raster data
 Comment[de]=ECW-Rasterdaten
-Icon=qgis-mime-icon
+Icon=qgis-mime
 Patterns=*.ecw;
diff --git a/debian/mime/application/x-raster-mrsid.desktop b/debian/mime/application/x-raster-mrsid.desktop
index 17455ca..32a2afb 100644
--- a/debian/mime/application/x-raster-mrsid.desktop
+++ b/debian/mime/application/x-raster-mrsid.desktop
@@ -4,5 +4,5 @@ MimeType=application/x-raster-mrsid
 Hidden=false
 Comment=MrSID raster data
 Comment[de]=MrSID-Rasterdaten
-Icon=qgis-mime-icon
+Icon=qgis-mime
 Patterns=*.sid;
diff --git a/debian/qbrowser.desktop b/debian/qbrowser.desktop
index 3bcefc9..4dfbb37 100644
--- a/debian/qbrowser.desktop
+++ b/debian/qbrowser.desktop
@@ -47,7 +47,7 @@ GenericName[th]=ระบบสารสนเทศภูมิศาสตร
 GenericName[tr]=Coğrafi bilgi sistemi
 GenericName[uk]=Геоінформаційна система
 GenericName[uz]=Geografik axborot tizimi
-Icon=qgis-icon
+Icon=qgis
 TryExec=/usr/bin/qbrowser
 Exec=/usr/bin/qbrowser %F
 Terminal=false
diff --git a/debian/qgis.desktop b/debian/qgis.desktop
index d3e2926..ee04145 100644
--- a/debian/qgis.desktop
+++ b/debian/qgis.desktop
@@ -47,7 +47,7 @@ GenericName[th]=ระบบสารสนเทศภูมิศาสตร
 GenericName[tr]=Coğrafi bilgi sistemi
 GenericName[uk]=Геоінформаційна система
 GenericName[uz]=Geografik axborot tizimi
-Icon=qgis-icon
+Icon=qgis
 TryExec=/usr/bin/qgis
 Exec=/usr/bin/qgis %F
 Terminal=false
diff --git a/debian/qgis.menu b/debian/qgis.menu
index 0e68689..4ddc986 100644
--- a/debian/qgis.menu
+++ b/debian/qgis.menu
@@ -1,3 +1,3 @@
 ?package(qgis):needs="X11" section="Applications/Science/Geoscience"\
-  icon="/usr/share/pixmaps/qgis-icon.xpm" title="QGIS"\
+  icon="/usr/share/pixmaps/qgis.xpm" title="QGIS"\
   command="/usr/bin/qgis"
diff --git a/debian/qgis.xml b/debian/qgis.xml
index 46292bd..a9407f0 100644
--- 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-icon.png"/>
+    <icon name="qgis-mime.png"/>
     <magic priority="50">
       <match type="string" offset="0" value="<!DOCTYPE qgis">
         <match type="string" offset="0:256" value="<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-icon.png"/>
+    <icon name="qgis-mime.png"/>
     <magic priority="50">
       <match type="string" offset="0" value="<!DOCTYPE qgis">
         <match type="string" offset="0:256" value="<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-icon.png"/>
+    <icon name="qgis-mime.png"/>
     <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-icon.png"/>
+    <icon name="qgis-mime.png"/>
     <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-icon.png"/>
+    <icon name="qgis-mime.png"/>
     <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-icon.png"/>
+    <icon name="qgis-mime.png"/>
     <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-icon.png"/>
+    <icon name="qgis-mime.png"/>
     <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-icon.png"/>
+    <icon name="qgis-mime.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"/>
+    <icon name="qgis-mime.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"/>
+    <icon name="qgis-mime.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"/>
+    <icon name="qgis-mime.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
index 4ebf582..42eeac8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -121,19 +121,19 @@ override_dh_auto_install:
 
 	# Install menu pixmap
 	install -o root -g root -d $(CURDIR)/debian/tmp/usr/share/pixmaps
-	install -o root -g root -m 644 $(CURDIR)/images/icons/qgis_icon.svg $(CURDIR)/debian/tmp/usr/share/pixmaps/qgis-icon.svg
-	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
-	install -o root -g root -m 644 $(CURDIR)/debian/qgis-icon.xpm $(CURDIR)/debian/tmp/usr/share/pixmaps
+	install -o root -g root -m 644 $(CURDIR)/images/icons/qgis_icon.svg $(CURDIR)/debian/tmp/usr/share/pixmaps/qgis.svg
+	install -o root -g root -m 644 $(CURDIR)/images/icons/qgis-icon.png $(CURDIR)/debian/tmp/usr/share/pixmaps/qgis.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 -o root -g root -m 644 $(CURDIR)/debian/qgis-icon.xpm $(CURDIR)/debian/tmp/usr/share/pixmaps/qgis.xpm
 
 	# 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 ; \
-		install -o root -g root -m 644 $(CURDIR)/debian/qgis-icon$${size}.png $(CURDIR)/debian/tmp/usr/share/icons/hicolor/$${size}/apps/qgis-icon.png ; \
+		install -o root -g root -m 644 $(CURDIR)/debian/qgis-icon$${size}.png $(CURDIR)/debian/tmp/usr/share/icons/hicolor/$${size}/apps/qgis.png ; \
 	done
 	
 	install -o root -g root -d $(CURDIR)/debian/tmp/usr/share/icons/scalable/apps
-	install -o root -g root -m 644 $(CURDIR)/images/icons/qgis_icon.svg $(CURDIR)/debian/tmp/usr/share/icons/scalable/apps/qgis-icon.svg
+	install -o root -g root -m 644 $(CURDIR)/images/icons/qgis_icon.svg $(CURDIR)/debian/tmp/usr/share/icons/scalable/apps/qgis.svg
 
 	# Install desktop files
 	install -o root -g root -d $(CURDIR)/debian/tmp/usr/share/applications

-- 
The Quantum GIS in Debian project

More information about the Pkg-grass-devel mailing list