[SCM] gmerlin/master: more consistent .desktop files (remove .png suffix)

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

The following commit has been merged in the master branch:
commit b41aec67c86057f341c6b9c4eb2bf2e1fbda670f
Author: IOhannes m zmölnig <zmoelnig at iem.at>
Date:   Tue Jan 11 15:11:18 2011 +0100

    more consistent .desktop files (remove .png suffix)

diff --git a/debian/patches/desktop_files.patch b/debian/patches/desktop_files.patch
new file mode 100644
index 0000000..46e0bda
--- /dev/null
+++ b/debian/patches/desktop_files.patch
@@ -0,0 +1,55 @@
+Description: Update desktop files as per Freedesktop.org's spec.
+ Remove 'Encoding' keys since they are deprecated.
+ Consistently remove '.png' suffix in 'Icon' key
+Origin: Debian
+---
+ apps/recorder/gmerlin-recorder.desktop     |    1 -
+ apps/transcoder/gmerlin-transcoder.desktop |    1 -
+ apps/visualizer/gmerlin-visualizer.desktop |    1 -
+ 3 files changed, 3 deletions(-)
+
+--- gmerlin.orig/apps/transcoder/gmerlin-transcoder.desktop
++++ gmerlin/apps/transcoder/gmerlin-transcoder.desktop
+@@ -1,11 +1,10 @@
+ [Desktop Entry]
+-Encoding=UTF-8
+ Name=Gmerlin transcoder
+ Name[de]=Gmerlin transcoder
+ Comment=Gmerlin multimedia transcoder
+ Comment[de]=Gmerlin multimedia transcoder
+ Exec=gmerlin_transcoder
+-Icon=gmerlin-transcoder.png
++Icon=gmerlin-transcoder
+ Type=Application
+ Categories=Application;AudioVideo;
+ 
+--- gmerlin.orig/apps/visualizer/gmerlin-visualizer.desktop
++++ gmerlin/apps/visualizer/gmerlin-visualizer.desktop
+@@ -1,11 +1,10 @@
+ [Desktop Entry]
+-Encoding=UTF-8
+ Name=Gmerlin visualizer
+ Name[de]=Gmerlin visualisierer
+ Comment=Run visualization plugins
+ Comment[de]=Visualisierungs Plugins laufen lassen
+ Exec=gmerlin_visualizer
+-Icon=gmerlin-visualizer.png
++Icon=gmerlin-visualizer
+ Type=Application
+ Categories=Application;AudioVideo;
+ 
+--- gmerlin.orig/apps/recorder/gmerlin-recorder.desktop
++++ gmerlin/apps/recorder/gmerlin-recorder.desktop
+@@ -1,11 +1,10 @@
+ [Desktop Entry]
+-Encoding=UTF-8
+ Name=Gmerlin recorder
+ Name[de]=Gmerlin recorder
+ Comment=Audio/video recorder
+ Comment[de]=Audio/video recorder
+ Exec=gmerlin_recorder
+-Icon=gmerlin-recorder.png
++Icon=gmerlin-recorder
+ Type=Application
+ Categories=Application;AudioVideo;
+ 
diff --git a/debian/patches/remove_desktop_encoding_key.patch b/debian/patches/remove_desktop_encoding_key.patch
deleted file mode 100644
index d9bf433..0000000
--- a/debian/patches/remove_desktop_encoding_key.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Description: Update desktop files as per Freedesktop.org's spec.
- Remove 'Encoding' keys since they are deprecated.
-Origin: Debian
----
- apps/recorder/gmerlin-recorder.desktop     |    1 -
- apps/transcoder/gmerlin-transcoder.desktop |    1 -
- apps/visualizer/gmerlin-visualizer.desktop |    1 -
- 3 files changed, 3 deletions(-)
-
---- gmerlin.orig/apps/transcoder/gmerlin-transcoder.desktop
-+++ gmerlin/apps/transcoder/gmerlin-transcoder.desktop
-@@ -1,5 +1,4 @@
- [Desktop Entry]
--Encoding=UTF-8
- Name=Gmerlin transcoder
- Name[de]=Gmerlin transcoder
- Comment=Gmerlin multimedia transcoder
---- gmerlin.orig/apps/visualizer/gmerlin-visualizer.desktop
-+++ gmerlin/apps/visualizer/gmerlin-visualizer.desktop
-@@ -1,5 +1,4 @@
- [Desktop Entry]
--Encoding=UTF-8
- Name=Gmerlin visualizer
- Name[de]=Gmerlin visualisierer
- Comment=Run visualization plugins
---- gmerlin.orig/apps/recorder/gmerlin-recorder.desktop
-+++ gmerlin/apps/recorder/gmerlin-recorder.desktop
-@@ -1,5 +1,4 @@
- [Desktop Entry]
--Encoding=UTF-8
- Name=Gmerlin recorder
- Name[de]=Gmerlin recorder
- Comment=Audio/video recorder
diff --git a/debian/patches/series b/debian/patches/series
index ea14f08..9f54233 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,4 @@
-remove_desktop_encoding_key.patch
+desktop_files.patch
 fix_manpages.patch
 replace_bg_sem_h.patch
 png_set_gray.patch

-- 
gmerlin packaging