[SCM] ffdiaporama/master: Drop fix-desktop-files.patch. Applied upstream.

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

The following commit has been merged in the master branch:
commit c144751d0f2cf145af164daa7824da5f808780ca
Author: Fabrice Coutadeur <coutadeurf at gmail.com>
Date:   Mon Nov 26 21:15:59 2012 +0100

    Drop fix-desktop-files.patch. Applied upstream.

diff --git a/debian/patches/fix-desktop-files.patch b/debian/patches/fix-desktop-files.patch
deleted file mode 100644
index c81a949..0000000
--- a/debian/patches/fix-desktop-files.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-Description: Fix .desktop file to make it compliant
- Get rid of the useless Encoding tag and fix the Categories one
-Author: Fabrice Coutadeur <coutadeurf at gmail.com>
----
- ffDiaporama.desktop      |    3 +--
- ffDiaporamalocal.desktop |    3 +--
- ffDiaporamaopt.desktop   |    3 +--
- 3 files changed, 3 insertions(+), 6 deletions(-)
-
---- ffdiaporama.orig/ffDiaporama.desktop
-+++ ffdiaporama/ffDiaporama.desktop
-@@ -1,6 +1,5 @@
- [Desktop Entry]
- Version=1.0
--Encoding=UTF-8
- Name=Movie creator ffDiaporama
- Name[fr]=Créateur de film ffDiaporama
- Name[it]=Movie creator ffDiaporama
-@@ -22,4 +21,4 @@ Type=Application
- Path=/usr/share/ffDiaporama
- Exec=/usr/bin/ffDiaporama %F
- MimeType=application/ffDiaporama;
--Categories=GNOME;AudioVideo;Qt;KDE;AudioVideo;
-+Categories=GTK;GNOME;Qt;KDE;AudioVideo;
---- ffdiaporama.orig/ffDiaporamalocal.desktop
-+++ ffdiaporama/ffDiaporamalocal.desktop
-@@ -1,6 +1,5 @@
- [Desktop Entry]
- Version=1.0
--Encoding=UTF-8
- Name=Movie creator ffDiaporama (local)
- Name[fr]=Créateur de film ffDiaporama (local)
- Name[it]=Movie creator ffDiaporama (local)
-@@ -22,4 +21,4 @@ Type=Application
- Path=/usr/local/share/ffDiaporama
- Exec=/usr/local/bin/ffDiaporama %F
- MimeType=application/ffDiaporama;
--Categories=GNOME;AudioVideo;Qt;KDE;AudioVideo;
-+Categories=GTK;GNOME;Qt;KDE;AudioVideo;
---- ffdiaporama.orig/ffDiaporamaopt.desktop
-+++ ffdiaporama/ffDiaporamaopt.desktop
-@@ -1,6 +1,5 @@
- [Desktop Entry]
- Version=1.0
--Encoding=UTF-8
- Name=Movie creator ffDiaporama (opt)
- Name[fr]=Créateur de film ffDiaporama (opt)
- Name[it]=Movie creator ffDiaporama (opt)
-@@ -22,4 +21,4 @@ Type=Application
- Path=/opt/share/ffDiaporama
- Exec=/opt/bin/ffDiaporama %F
- MimeType=application/ffDiaporama;
--Categories=GNOME;AudioVideo;Qt;KDE;AudioVideo;
-+Categories=GTK;GNOME;Qt;KDE;AudioVideo;
diff --git a/debian/patches/series b/debian/patches/series
index e49f162..38e661d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 fix_hardening_flags.patch
-fix-desktop-files.patch
 fix-ftbfs-libav-0.7.patch

-- 
ffdiaporama packaging