[SCM] gmerlin/master: adjusted remove_desktop_encoding_key.patch to new upstream

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

The following commit has been merged in the master branch:
commit 692d8ec0195020e5576739263b2d72f6ed6649a5
Author: IOhannes m zmölnig <zmoelnig at iem.at>
Date:   Mon Jan 10 12:04:54 2011 +0100

    adjusted remove_desktop_encoding_key.patch to new upstream

diff --git a/debian/patches/remove_desktop_encoding_key.patch b/debian/patches/remove_desktop_encoding_key.patch
index 337fe21..f3285fc 100644
--- a/debian/patches/remove_desktop_encoding_key.patch
+++ b/debian/patches/remove_desktop_encoding_key.patch
@@ -1,53 +1,3 @@
-Index: gmerlin-0.4.3/apps/alsamixer/gmerlin-alsamixer.desktop
-===================================================================
---- gmerlin-0.4.3.orig/apps/alsamixer/gmerlin-alsamixer.desktop	2010-02-26 08:34:36.000000000 -0600
-+++ gmerlin-0.4.3/apps/alsamixer/gmerlin-alsamixer.desktop	2010-03-20 11:38:42.000000000 -0500
-@@ -1,5 +1,4 @@
- [Desktop Entry]
--Encoding=UTF-8
- Name=Gmerlin mixer
- Name[de]=Gmerlin mixer
- Comment=Alsa mixer
-Index: gmerlin-0.4.3/apps/camelot/gmerlin-camelot.desktop
-===================================================================
---- gmerlin-0.4.3.orig/apps/camelot/gmerlin-camelot.desktop	2010-02-26 08:34:38.000000000 -0600
-+++ gmerlin-0.4.3/apps/camelot/gmerlin-camelot.desktop	2010-03-20 11:38:42.000000000 -0500
-@@ -1,5 +1,4 @@
- [Desktop Entry]
--Encoding=UTF-8
- Name=Camelot
- Name[de]=Camelot
- Comment=Gmerlin webcam application
-Index: gmerlin-0.4.3/apps/kbd/gmerlin-kbd.desktop
-===================================================================
---- gmerlin-0.4.3.orig/apps/kbd/gmerlin-kbd.desktop	2010-02-26 08:34:38.000000000 -0600
-+++ gmerlin-0.4.3/apps/kbd/gmerlin-kbd.desktop	2010-03-20 11:38:42.000000000 -0500
-@@ -1,5 +1,4 @@
- [Desktop Entry]
--Encoding=UTF-8
- Name=Gmerlin KBD
- Name[de]=Gmerlin KBD
- Comment=Configure the Gmerlin keyboard daemon
-Index: gmerlin-0.4.3/apps/player/gmerlin-player.desktop
-===================================================================
---- gmerlin-0.4.3.orig/apps/player/gmerlin-player.desktop	2010-02-26 08:34:38.000000000 -0600
-+++ gmerlin-0.4.3/apps/player/gmerlin-player.desktop	2010-03-20 11:38:42.000000000 -0500
-@@ -1,5 +1,4 @@
- [Desktop Entry]
--Encoding=UTF-8
- Name=Gmerlin player
- Name[de]=Gmerlin player
- Comment=Multiformat mediaplayer
-Index: gmerlin-0.4.3/apps/plugincfg/gmerlin-plugincfg.desktop
-===================================================================
---- gmerlin-0.4.3.orig/apps/plugincfg/gmerlin-plugincfg.desktop	2010-02-26 08:34:38.000000000 -0600
-+++ gmerlin-0.4.3/apps/plugincfg/gmerlin-plugincfg.desktop	2010-03-20 11:38:42.000000000 -0500
-@@ -1,5 +1,4 @@
- [Desktop Entry]
--Encoding=UTF-8
- Name=Gmerlin plugin configurator
- Name[de]=Gmerlin plugin configurator
- Comment=Configure gmerlin plugins
 Index: gmerlin-0.4.3/apps/transcoder/gmerlin-transcoder.desktop
 ===================================================================
 --- gmerlin-0.4.3.orig/apps/transcoder/gmerlin-transcoder.desktop	2010-02-26 08:34:38.000000000 -0600

-- 
gmerlin packaging