[SCM] qgis branch, master, updated. upstream/2.0.1-13470-g18c64cd

[Bas Couwenberg]

The following commit has been merged in the master branch:
commit a2815b7e6c1abb762a40fc231023325025915f61
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat Jan 18 03:23:01 2014 +0100

    Add patch to use local qgis icon.

diff --git a/debian/patches/series b/debian/patches/series
index 1851bd8..f713d5a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -25,3 +25,4 @@ ogr-only-call-repack-when-closing-a-data-provider.patch
 remove-google-adsense.patch
 python-env.patch
 wms-c-don-t-crash-if-tile-matrix-set-isn-t-available.patch
+use-local-icon.patch
diff --git a/debian/patches/use-local-icon.patch b/debian/patches/use-local-icon.patch
new file mode 100644
index 0000000..6af3157
--- /dev/null
+++ b/debian/patches/use-local-icon.patch
@@ -0,0 +1,14 @@
+Description: Use the local icon file instead of linking to one online.
+Author: Bas Couwenberg <sebastic at xs4all.nl>
+Last-Update: 2014-01-18
+--- a/doc/index.dox
++++ b/doc/index.dox
+@@ -5,7 +5,7 @@
+ /*! \mainpage QGIS
+ 
+ \section index_intro Introduction
+-\htmlonly<img src="http://hub.qgis.org/projects/quantum-gis/repository/revisions/master/entry/images/icons/qgis-icon-60x60.png" alt="QGIS"
++\htmlonly<img src="../../images/icons/qgis-icon-60x60.png" alt="QGIS"
+ align="left"><a href="http://qgis.org">QGIS</a>\endhtmlonly\latexonly
+ QGIS \endlatexonly  is a user friendly Open Source Geographic
+ Information System (GIS) that runs on Linux, Unix, Mac OSX, and Windows. QGIS

-- 
The Quantum GIS in Debian project