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

[Bas Couwenberg]

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

    Add Keywords for desktop files.

diff --git a/debian/changelog b/debian/changelog
index 96f3900..95640bc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,7 @@ qgis (2.0.1-1) UNRELEASED; urgency=low
   * Add lintian overrides for binaries-have-file-conflict false positive.
   * Add patch to fix 'an other' typo.
   * Add patch to fix 'allows to' typo.
+  * Add Keywords for desktop files.
 
  -- Bas Couwenberg <sebastic at xs4all.nl>  Fri, 27 Sep 2013 02:05:32 +0200
 
diff --git a/debian/qbrowser.desktop b/debian/qbrowser.desktop
index f9e6727..ccd1fee 100644
--- a/debian/qbrowser.desktop
+++ b/debian/qbrowser.desktop
@@ -53,3 +53,4 @@ Exec=/usr/bin/qbrowser %F
 Terminal=false
 StartupNotify=false
 Categories=Qt;Education;Science;Geography;
+Keywords:map;globe;postgis;wms;wfs;ogc;osgeo
diff --git a/debian/qgis.desktop b/debian/qgis.desktop
index 7a6d7fc..d3e2926 100644
--- a/debian/qgis.desktop
+++ b/debian/qgis.desktop
@@ -54,3 +54,4 @@ Terminal=false
 StartupNotify=false
 Categories=Qt;Education;Science;Geography;
 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;
+Keywords=map;globe;postgis;wms;wfs;ogc;osgeo

-- 
The Quantum GIS in Debian project