Bug#697219: unblock: gnome-menus/3.4.2-6

[Josselin Mouette <joss@debian.org>]

Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock

Hi, and happy new year to the release team.

Please unblock gnome-menus to work around a bug in menu-xdg that still 
fills the GNOME menus with Debian entries.


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.


unblock gnome-menus/3.4.2-6

Thanks,
-- 
 .''`.      Josselin Mouette
: :' :
`. `'
  `-

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;