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

[Bas Couwenberg]

The following commit has been merged in the master branch:
commit f723796e72a295e4c945184dafa81c964af6c2b2
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat Sep 28 21:37:05 2013 +0200

    Install QGIS app icon for all hicolor sizes and scalable.

diff --git a/debian/qgis-icon128x128.png b/debian/qgis-icon128x128.png
new file mode 100644
index 0000000..5133cfe
Binary files /dev/null and b/debian/qgis-icon128x128.png differ
diff --git a/images/icons/qgis-icon-16x16.png b/debian/qgis-icon16x16.png
similarity index 100%
copy from images/icons/qgis-icon-16x16.png
copy to debian/qgis-icon16x16.png
diff --git a/debian/qgis-icon192x192.png b/debian/qgis-icon192x192.png
new file mode 100644
index 0000000..c0d2b48
Binary files /dev/null and b/debian/qgis-icon192x192.png differ
diff --git a/debian/qgis-icon22x22.png b/debian/qgis-icon22x22.png
new file mode 100644
index 0000000..3fbe522
Binary files /dev/null and b/debian/qgis-icon22x22.png differ
diff --git a/debian/qgis-icon24x24.png b/debian/qgis-icon24x24.png
new file mode 100644
index 0000000..d3eda25
Binary files /dev/null and b/debian/qgis-icon24x24.png differ
diff --git a/debian/qgis-icon256x256.png b/debian/qgis-icon256x256.png
new file mode 100644
index 0000000..cab37ae
Binary files /dev/null and b/debian/qgis-icon256x256.png differ
diff --git a/debian/qgis-icon32x32.png b/debian/qgis-icon32x32.png
new file mode 100644
index 0000000..508c5b4
Binary files /dev/null and b/debian/qgis-icon32x32.png differ
diff --git a/debian/qgis-icon36x36.png b/debian/qgis-icon36x36.png
new file mode 100644
index 0000000..b14d04e
Binary files /dev/null and b/debian/qgis-icon36x36.png differ
diff --git a/debian/qgis-icon42x42.png b/debian/qgis-icon42x42.png
new file mode 100644
index 0000000..da219fa
Binary files /dev/null and b/debian/qgis-icon42x42.png differ
diff --git a/debian/qgis-icon48x48.png b/debian/qgis-icon48x48.png
new file mode 100644
index 0000000..50ded69
Binary files /dev/null and b/debian/qgis-icon48x48.png differ
diff --git a/images/icons/qgis-icon.png b/debian/qgis-icon512x512.png
similarity index 100%
copy from images/icons/qgis-icon.png
copy to debian/qgis-icon512x512.png
diff --git a/debian/qgis-icon64x64.png b/debian/qgis-icon64x64.png
new file mode 100644
index 0000000..99b4acc
Binary files /dev/null and b/debian/qgis-icon64x64.png differ
diff --git a/debian/qgis-icon72x72.png b/debian/qgis-icon72x72.png
new file mode 100644
index 0000000..09da6ed
Binary files /dev/null and b/debian/qgis-icon72x72.png differ
diff --git a/debian/qgis-icon80x80.png b/debian/qgis-icon80x80.png
new file mode 100644
index 0000000..95a5ca0
Binary files /dev/null and b/debian/qgis-icon80x80.png differ
diff --git a/debian/qgis-icon8x8.png b/debian/qgis-icon8x8.png
new file mode 100644
index 0000000..dea777f
Binary files /dev/null and b/debian/qgis-icon8x8.png differ
diff --git a/debian/qgis-icon96x96.png b/debian/qgis-icon96x96.png
new file mode 100644
index 0000000..40fc0a5
Binary files /dev/null and b/debian/qgis-icon96x96.png differ
diff --git a/debian/qgis.install b/debian/qgis.install
index 7589b14..d2be41f 100644
--- a/debian/qgis.install
+++ b/debian/qgis.install
@@ -16,5 +16,6 @@ usr/lib/qgis/plugins/libtopolplugin.so
 usr/lib/qgis/qgis_help
 usr/share/pixmaps/
 usr/share/applications/
-usr/share/mime/packages
+usr/share/mime/packages/
 usr/share/mimelnk/
+usr/share/icons/hicolor/
diff --git a/debian/rules b/debian/rules
index 28016b8..4ebf582 100755
--- a/debian/rules
+++ b/debian/rules
@@ -122,9 +122,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 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 ; \
+	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 desktop files
 	install -o root -g root -d $(CURDIR)/debian/tmp/usr/share/applications
 	install -o root -g root -m 644 $(CURDIR)/debian/qgis.desktop $(CURDIR)/debian/tmp/usr/share/applications
diff --git a/debian/source/include-binaries b/debian/source/include-binaries
new file mode 100644
index 0000000..59d7342
--- /dev/null
+++ b/debian/source/include-binaries
@@ -0,0 +1,16 @@
+debian/qgis-icon8x8.png
+debian/qgis-icon16x16.png
+debian/qgis-icon22x22.png
+debian/qgis-icon24x24.png
+debian/qgis-icon32x32.png
+debian/qgis-icon36x36.png
+debian/qgis-icon42x42.png
+debian/qgis-icon48x48.png
+debian/qgis-icon64x64.png
+debian/qgis-icon72x72.png
+debian/qgis-icon80x80.png
+debian/qgis-icon96x96.png
+debian/qgis-icon128x128.png
+debian/qgis-icon192x192.png
+debian/qgis-icon256x256.png
+debian/qgis-icon512x512.png

-- 
The Quantum GIS in Debian project