[SCM] qgis branch, master, updated. upstream/2.0.1-13436-g7969474

[Bas Couwenberg]

The following commit has been merged in the master branch:
commit 15c29f8e598ffec00f4845681d05d7fe5c9d184e
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Sep 27 06:32:31 2013 +0200

    Install SVG icon for QGIS desktop files.

diff --git a/debian/changelog b/debian/changelog
index 67332d9..a1b8166 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ qgis (2.0.1-1) UNRELEASED; urgency=low
   * Drop 10_fix_gcc4.7_build.patch, no longer required.
   * Use canonical URLs for Vcs-* fields.
   * Don't run tests during build, requires network.
+  * Install SVG icon for QGIS desktop files. (closes: #676562)
 
  -- Bas Couwenberg <sebastic at xs4all.nl>  Fri, 27 Sep 2013 02:05:32 +0200
 
diff --git a/debian/qgis.install b/debian/qgis.install
index d57361e..7589b14 100644
--- a/debian/qgis.install
+++ b/debian/qgis.install
@@ -14,8 +14,7 @@ usr/lib/qgis/plugins/libzonalstatisticsplugin.so
 usr/lib/qgis/plugins/libheatmapplugin.so
 usr/lib/qgis/plugins/libtopolplugin.so
 usr/lib/qgis/qgis_help
-usr/share/pixmaps/qgis-icon.xpm
-usr/share/pixmaps/qgis-mime-icon.png
+usr/share/pixmaps/
 usr/share/applications/
 usr/share/mime/packages
 usr/share/mimelnk/
diff --git a/debian/rules b/debian/rules
index 3615414..12e7c24 100755
--- a/debian/rules
+++ b/debian/rules
@@ -107,7 +107,7 @@ 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.png $(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-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
 

-- 
The Quantum GIS in Debian project