r36503 - in /desktop/unstable/gnome-menus/debian: changelog patches/02_kill_debian_menu.patch patches/series

[joss at users.alioth.debian.org]

Author: joss
Date: Wed Jan  2 20:20:31 2013
New Revision: 36503

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=36503
Log:
02_kill_debian_menu.patch: new patch. Completely remove Debian menu 
entries by discarding them at the parsing stage. This should work 
around bug #696530 in menu-xdg.

Added:
    desktop/unstable/gnome-menus/debian/patches/02_kill_debian_menu.patch
Modified:
    desktop/unstable/gnome-menus/debian/changelog
    desktop/unstable/gnome-menus/debian/patches/series

Modified: desktop/unstable/gnome-menus/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-menus/debian/changelog?rev=36503&op=diff
==============================================================================
--- desktop/unstable/gnome-menus/debian/changelog [utf-8] (original)
+++ desktop/unstable/gnome-menus/debian/changelog [utf-8] Wed Jan  2 20:20:31 2013
@@ -1,3 +1,11 @@
+gnome-menus (3.4.2-6) unstable; urgency=low
+
+  * 02_kill_debian_menu.patch: new patch. Completely remove Debian menu 
+    entries by discarding them at the parsing stage. This should work 
+    around bug #696530 in menu-xdg.
+
+ -- Josselin Mouette <joss at debian.org>  Wed, 02 Jan 2013 21:12:12 +0100
+
 gnome-menus (3.4.2-5) unstable; urgency=low
 
   * gnome-menus-blacklist: patch from Fabian Greffrath to handle 

Added: desktop/unstable/gnome-menus/debian/patches/02_kill_debian_menu.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-menus/debian/patches/02_kill_debian_menu.patch?rev=36503&op=file
==============================================================================
--- desktop/unstable/gnome-menus/debian/patches/02_kill_debian_menu.patch (added)
+++ desktop/unstable/gnome-menus/debian/patches/02_kill_debian_menu.patch [utf-8] Wed Jan  2 20:20:31 2013
@@ -1,0 +1,13 @@
+Index: gnome-menus-3.4.2/libmenu/desktop-entries.c
+===================================================================
+--- gnome-menus-3.4.2.orig/libmenu/desktop-entries.c	2011-10-24 13:48:12.000000000 +0200
++++ gnome-menus-3.4.2/libmenu/desktop-entries.c	2013-01-02 21:11:23.617525227 +0100
+@@ -250,6 +250,8 @@ desktop_entry_load_directory (DesktopEnt
+ static gboolean
+ desktop_entry_load (DesktopEntry *entry)
+ {
++  if (strstr (entry->path, "/menu-xdg/"))
++    return FALSE;
+   if (entry->type == DESKTOP_ENTRY_DESKTOP)
+     {
+       DesktopEntryDesktop *entry_desktop = (DesktopEntryDesktop*)entry;

Modified: desktop/unstable/gnome-menus/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-menus/debian/patches/series?rev=36503&op=diff
==============================================================================
--- desktop/unstable/gnome-menus/debian/patches/series [utf-8] (original)
+++ desktop/unstable/gnome-menus/debian/patches/series [utf-8] Wed Jan  2 20:20:31 2013
@@ -1,4 +1,5 @@
 01_default_prefix.patch
+02_kill_debian_menu.patch
 03_kde-legacydirs.patch
 08_settings-menus.patch
 09_games-menu.patch