r35276 - in /packages/unstable/alacarte/debian: changelog patches/50-git_editable_top_level_menus patches/series

[laney at users.alioth.debian.org]

Author: laney
Date: Tue Jun  5 21:51:56 2012
New Revision: 35276

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=35276
Log:
debian/patches/50-git_editable_top_level_menus: Cherry-pick upstream patch
to allow top-level menus to be edited once more. (Closes: #676136)

Added:
    packages/unstable/alacarte/debian/patches/50-git_editable_top_level_menus
Modified:
    packages/unstable/alacarte/debian/changelog
    packages/unstable/alacarte/debian/patches/series

Modified: packages/unstable/alacarte/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/alacarte/debian/changelog?rev=35276&op=diff
==============================================================================
--- packages/unstable/alacarte/debian/changelog [utf-8] (original)
+++ packages/unstable/alacarte/debian/changelog [utf-8] Tue Jun  5 21:51:56 2012
@@ -3,6 +3,8 @@
   * debian/patches/40_xdg_menu_prefix: Edit
     ~/.config/menus/gnome-applications.menu instead of applications.menu
     (Closes: #676137)
+  * debian/patches/50-git_editable_top_level_menus: Cherry-pick upstream patch
+    to allow top-level menus to be edited once more. (Closes: #676136)
 
  -- Iain Lane <laney at debian.org>  Tue, 05 Jun 2012 22:28:44 +0100
 

Added: packages/unstable/alacarte/debian/patches/50-git_editable_top_level_menus
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/alacarte/debian/patches/50-git_editable_top_level_menus?rev=35276&op=file
==============================================================================
--- packages/unstable/alacarte/debian/patches/50-git_editable_top_level_menus (added)
+++ packages/unstable/alacarte/debian/patches/50-git_editable_top_level_menus [utf-8] Tue Jun  5 21:51:56 2012
@@ -1,0 +1,24 @@
+Description: MenuEditor: Put back the top-level "Applications" menu
+Author: Jasper St. Pierre <jstpierre at mecheye.net>
+Bug: https://bugzilla.gnome.org/show_bug.cgi?id=677420
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=676136
+Origin: upstream, commit:eeb19696e948c61f11405564fa9d2d91a1fe31cf
+
+---
+Index: alacarte-0.13.4/Alacarte/MenuEditor.py
+===================================================================
+--- alacarte-0.13.4.orig/Alacarte/MenuEditor.py	2012-06-05 22:36:08.265703366 +0100
++++ alacarte-0.13.4/Alacarte/MenuEditor.py	2012-06-05 22:36:08.277703365 +0100
+@@ -107,9 +107,10 @@
+             pass
+         self.save()
+ 
+-    def getMenus(self, parent=None):
++    def getMenus(self, parent):
+         if parent is None:
+-            parent = self.applications.tree.get_root_directory()
++            yield (self.applications.tree.get_root_directory(), True)
++            return
+ 
+         item_iter = parent.iter()
+         item_type = item_iter.next()

Modified: packages/unstable/alacarte/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/alacarte/debian/patches/series?rev=35276&op=diff
==============================================================================
--- packages/unstable/alacarte/debian/patches/series [utf-8] (original)
+++ packages/unstable/alacarte/debian/patches/series [utf-8] Tue Jun  5 21:51:56 2012
@@ -1,3 +1,4 @@
 03-bind_textdomain_codeset.patch
 30-python_private_dir.patch
 40-xdg-menu-prefix
+50-git_editable_top_level_menus