[merkaartor] 04/05: Add patch to fix desktop Keywords syntax.

[Sebastiaan Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository merkaartor.

commit 9657c13324c1488e53b5c959bb45981975317e1f
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sun Nov 1 16:53:12 2015 +0100

    Add patch to fix desktop Keywords syntax.
---
 debian/changelog                             |  1 +
 debian/patches/desktop-keywords-syntax.patch | 16 ++++++++++++++++
 debian/patches/series                        |  1 +
 3 files changed, 18 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index d6987f5..9e9d097 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ merkaartor (0.18.2-3) UNRELEASED; urgency=medium
   * Add upstream metadata.
   * Add patch to fix libgps22 compatibility.
   * Use upstream patch for quazip-qt5 linking.
+  * Add patch to fix desktop Keywords syntax.
 
  -- Bas Couwenberg <sebastic at debian.org>  Sun, 01 Nov 2015 12:33:20 +0100
 
diff --git a/debian/patches/desktop-keywords-syntax.patch b/debian/patches/desktop-keywords-syntax.patch
new file mode 100644
index 0000000..3bf8d8f
--- /dev/null
+++ b/debian/patches/desktop-keywords-syntax.patch
@@ -0,0 +1,16 @@
+Description: Fix desktop file syntax for Keywords list
+ desktop-file-validate reported this error:
+ .
+ src/merkaartor.desktop: hint: value "Education;Geography;Network;Qt;" for key "Categories" in group "Desktop Entry" contains more than one main category; application might appear more than once in the application menu
+ src/merkaartor.desktop: error: value "OSM;GIS;Map;Geo" for locale string list key "Keywords" in group "Desktop Entry" does not have a semicolon (';') as trailing character
+Author: Bas Couwenberg <sebastic at debian.org>
+Forwarded: https://github.com/openstreetmap/merkaartor/pull/78
+
+--- a/src/merkaartor.desktop
++++ b/src/merkaartor.desktop
+@@ -10,4 +10,4 @@ Exec=merkaartor
+ Terminal=false
+ StartupNotify=false
+ Categories=Education;Geography;Network;Qt;
+-Keywords=OSM;GIS;Map;Geo
++Keywords=OSM;GIS;Map;Geo;
diff --git a/debian/patches/series b/debian/patches/series
index 862a14d..107c704 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,3 +9,4 @@ hardening-buildflags.patch
 desktop-keywords.patch
 qmake-config-nostrip.patch
 libgps22.patch
+desktop-keywords-syntax.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/merkaartor.git