[oolite] 07/15: Merge two patches improving desktop file.

[Nicolas Boulenguez]

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

nicobou-guest pushed a commit to branch master
in repository oolite.

commit ba1e93b85c43a2624fa2b0294ed446b3345c2ad4
Author: Nicolas Boulenguez <nicolas.boulenguez at free.fr>
Date:   Wed Jul 27 17:32:32 2016 +0200

    Merge two patches improving desktop file.
---
 debian/patches/add_keywords_to_desktop_file.diff | 18 ------------------
 debian/patches/fix-desktop-file.diff             | 15 +++++++++++----
 debian/patches/series                            |  1 -
 3 files changed, 11 insertions(+), 23 deletions(-)

diff --git a/debian/patches/add_keywords_to_desktop_file.diff b/debian/patches/add_keywords_to_desktop_file.diff
deleted file mode 100644
index 52a00fb..0000000
--- a/debian/patches/add_keywords_to_desktop_file.diff
+++ /dev/null
@@ -1,18 +0,0 @@
-Author: Nicolas Boulenguez <nicolas at debian.org>
-Description: new Keywords field in desktop file.
- Desktop specification version 1.0 allows specifying Keywords that
- improves the ability to find apps by typing in related words. GNOME
- Shell, Unity, and Software Center currently support Keywords. Also,
- GNOME Shell 3.6 no longer uses the "Comment" field for searching so
- the discoverability since GNOME 3.4 will likely regress a bit until
- developers add keywords to their .desktop files.
-Forwarded: Michael Werle <micha at michaelwerle.com>
-
---- a/installers/FreeDesktop/oolite.desktop
-+++ b/installers/FreeDesktop/oolite.desktop
-@@ -6,3 +6,5 @@
- Terminal=false
- Type=Application
- Categories=Game;Simulation;
-+Version=1.0
-+Keywords=Elite;space;3d;trade;fight;OpenGL;
diff --git a/debian/patches/fix-desktop-file.diff b/debian/patches/fix-desktop-file.diff
index 17e7b30..1818f87 100644
--- a/debian/patches/fix-desktop-file.diff
+++ b/debian/patches/fix-desktop-file.diff
@@ -1,14 +1,21 @@
-Description: add StrategyGame category to desktop file
+Description: add Version, Keywords and StrategyGame category to desktop file
 Author: Petter Reinholdtsen <pere at hungry.com>
+Author: Nicolas Boulenguez <nicolas at debian.org>
 Bug-Debian: https://bugs.debian.org/825680
+ Desktop specification version 1.0 allows specifying Keywords that
+ improves the ability to find apps by typing in related words. GNOME
+ Shell, Unity, and Software Center currently support Keywords. Also,
+ GNOME Shell 3.6 no longer uses the "Comment" field for searching so
+ the discoverability since GNOME 3.4 will likely regress a bit until
+ developers add keywords to their .desktop files.
 
 --- a/installers/FreeDesktop/oolite.desktop
 +++ b/installers/FreeDesktop/oolite.desktop
-@@ -5,6 +5,6 @@
+@@ -5,4 +5,6 @@
  Icon=oolite-icon
  Terminal=false
  Type=Application
 -Categories=Game;Simulation;
 +Categories=Game;Simulation;StrategyGame
- Version=1.0
- Keywords=Elite;space;3d;trade;fight;OpenGL;
++Version=1.0
++Keywords=Elite;space;3d;trade;fight;OpenGL;
diff --git a/debian/patches/series b/debian/patches/series
index 07ee38f..1c607c3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1,6 @@
 use_byte_order_of_sys_param.patch
 debian_version_of_libmozjs.diff
 generate_planet_data.diff
-add_keywords_to_desktop_file.diff
 secure-format-log-string.diff
 # gnustep_app_builder.diff
 avoid_date_cpp_macro.diff

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