[SCM] Google Gadgets packaging branch, master, updated. debian/0.11.2-4-4-g298f18d

[Pino Toscano]

The following commit has been merged in the master branch:
commit 298f18deec2a53225036a3a1a8d8046bcd97c14d
Author: Pino Toscano <pino at debian.org>
Date:   Tue Sep 6 19:12:37 2011 +0200

    add patch fix_desktop.patch to remove the deprecated Encoding keys from .desktop files
---
 debian/changelog                 |    2 ++
 debian/patches/fix_desktop.patch |   30 ++++++++++++++++++++++++++++++
 debian/patches/series            |    1 +
 3 files changed, 33 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4f3febc..ad583b0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ google-gadgets (0.11.2-5) unstable; urgency=low
   * Add patches nm09.patch and nm-mobile-devtypes.patch from the upstream
     bug tracker, to fix (and improve) compatibility with Network Manager
     0.9. (Closes: #640392)
+  * Add patch fix_desktop.patch to remove the deprecated Encoding keys from
+    .desktop files.
 
  -- Pino Toscano <pino at debian.org>  Tue, 06 Sep 2011 17:52:07 +0200
 
diff --git a/debian/patches/fix_desktop.patch b/debian/patches/fix_desktop.patch
new file mode 100644
index 0000000..86d1cbe
--- /dev/null
+++ b/debian/patches/fix_desktop.patch
@@ -0,0 +1,30 @@
+Author: Pino Toscano <pino at debian.org>
+Description: Fix the .desktop files
+ Remove the Encoding keys, deprecated.
+Last-Update: 2011-09-06
+Forwarded: no
+
+--- a/gadgets/designer/ggl-designer.desktop.in
++++ b/gadgets/designer/ggl-designer.desktop.in
+@@ -1,5 +1,4 @@
+ [Desktop Entry]
+-Encoding=UTF-8
+ _Name=GADGET_DESIGNER_NAME
+ _Comment=GADGET_DESIGNER_COMMENT
+ TryExec=@bindir@/ggl-gtk
+--- a/hosts/gtk/ggl-gtk.desktop.in
++++ b/hosts/gtk/ggl-gtk.desktop.in
+@@ -1,5 +1,4 @@
+ [Desktop Entry]
+-Encoding=UTF-8
+ _Name=HOST_GTK_DESKTOP_NAME
+ _Comment=HOST_GTK_DESKTOP_COMMENT
+ TryExec=@bindir@/ggl-gtk
+--- a/hosts/qt/ggl-qt.desktop.in
++++ b/hosts/qt/ggl-qt.desktop.in
+@@ -1,5 +1,4 @@
+ [Desktop Entry]
+-Encoding=UTF-8
+ _Name=HOST_QT_DESKTOP_NAME
+ _Comment=HOST_QT_DESKTOP_COMMENT
+ TryExec=@bindir@/ggl-qt
diff --git a/debian/patches/series b/debian/patches/series
index 9186c43..a65fc7b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,5 +3,6 @@
 03_GRE_Version.patch
 04_hurd.patch
 05_hurd_pthread.patch
+fix_desktop.patch
 nm09.patch
 nm-mobile-devtypes.patch

-- 
Google Gadgets packaging