[SCM] flumotion/master: Added Keywords to .desktop entry

[zmoelnig-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit a85564e9b0bff46c833e7c410b41e084e3475897
Author: IOhannes m zmölnig <zmoelnig at iem.at>
Date:   Fri Jan 31 17:02:44 2014 +0100

    Added Keywords to .desktop entry

diff --git a/debian/patches/desktop-encoding-key.patch b/debian/patches/desktop-file.patch
similarity index 53%
rename from debian/patches/desktop-encoding-key.patch
rename to debian/patches/desktop-file.patch
index 6adaec0..e7af6a9 100644
--- a/debian/patches/desktop-encoding-key.patch
+++ b/debian/patches/desktop-file.patch
@@ -1,5 +1,6 @@
 Author: IOhannes m zmölnig
-Description: lintian-fix for desktop-entry-contains-encoding-key
+Description: lintian-fix for desktop-entry
+ desktop-entry should contain "Encoding" and "Keywords" keys
 --- flumotion.orig/data/flumotion-admin.desktop.in
 +++ flumotion/data/flumotion-admin.desktop.in
 @@ -1,5 +1,4 @@
@@ -8,3 +9,8 @@ Description: lintian-fix for desktop-entry-contains-encoding-key
  Name=Flumotion Streaming Server Administration
  GenericName=Streaming Server Administration
  Comment=Manage the Flumotion Streaming Server
+@@ -8,3 +7,4 @@
+ Type=Application
+ Icon=flumotion.png
+ Categories=GNOME;GTK;AudioVideo;Player;X-Ximian-Main;X-Red-Hat-Base;
++Keywords=Audio;Video;Server;Broadcast;Streaming;
diff --git a/debian/patches/series b/debian/patches/series
index 19420fc..6739a12 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,4 @@
 preserve-umask.patch
-desktop-encoding-key.patch
+desktop-file.patch
 manpage-fixes.patch
 fix_autoreconf.patch

-- 
flumotion packaging