r25148 - in /desktop/unstable/gnome-menus/debian: changelog patches/06_menus_rename.patch

[joss at users.alioth.debian.org]

Author: joss
Date: Sat Sep 18 08:08:31 2010
New Revision: 25148

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=25148
Log:
* New upstream translation and bugfix release.
* 06_menus_rename.patch: refreshed. Note that upstream uses a 
  different fix but it relies on an environment variable 
  (XDG_MENU_PREFIX) and only applies to applications.menu.

Modified:
    desktop/unstable/gnome-menus/debian/changelog
    desktop/unstable/gnome-menus/debian/patches/06_menus_rename.patch

Modified: desktop/unstable/gnome-menus/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-menus/debian/changelog?rev=25148&op=diff
==============================================================================
--- desktop/unstable/gnome-menus/debian/changelog [utf-8] (original)
+++ desktop/unstable/gnome-menus/debian/changelog [utf-8] Sat Sep 18 08:08:31 2010
@@ -1,3 +1,12 @@
+gnome-menus (2.30.3-1) unstable; urgency=low
+
+  * New upstream translation and bugfix release.
+  * 06_menus_rename.patch: refreshed. Note that upstream uses a 
+    different fix but it relies on an environment variable 
+    (XDG_MENU_PREFIX) and only applies to applications.menu.
+
+ -- Josselin Mouette <joss at debian.org>  Sat, 18 Sep 2010 10:08:06 +0200
+
 gnome-menus (2.30.2-1) unstable; urgency=low
 
   [ Emilio Pozuelo Monfort ]

Modified: desktop/unstable/gnome-menus/debian/patches/06_menus_rename.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-menus/debian/patches/06_menus_rename.patch?rev=25148&op=diff
==============================================================================
--- desktop/unstable/gnome-menus/debian/patches/06_menus_rename.patch [utf-8] (original)
+++ desktop/unstable/gnome-menus/debian/patches/06_menus_rename.patch [utf-8] Sat Sep 18 08:08:31 2010
@@ -1,7 +1,7 @@
-Index: gnome-menus-2.24.2/simple-editor/GMenuSimpleEditor/menutreemodel.py
+Index: gnome-menus-2.30.3/simple-editor/GMenuSimpleEditor/menutreemodel.py
 ===================================================================
---- gnome-menus-2.24.2.orig/simple-editor/GMenuSimpleEditor/menutreemodel.py	2008-11-25 14:01:14.000000000 +0100
-+++ gnome-menus-2.24.2/simple-editor/GMenuSimpleEditor/menutreemodel.py	2008-12-26 17:02:53.075589286 +0100
+--- gnome-menus-2.30.3.orig/simple-editor/GMenuSimpleEditor/menutreemodel.py	2010-06-30 12:38:34.000000000 +0200
++++ gnome-menus-2.30.3/simple-editor/GMenuSimpleEditor/menutreemodel.py	2010-09-18 10:04:09.264531938 +0200
 @@ -104,7 +104,7 @@ class MenuTreeModel (gtk.TreeStore):
          self.icon_theme = gtk.icon_theme_get_default ()
  
@@ -10,4 +10,4 @@
 +            menu_files = ["gnome-applications.menu", "gnome-settings.menu"]
  
          for menu_file in menu_files:
-             tree = gmenu.lookup_tree (menu_file, gmenu.FLAGS_INCLUDE_EXCLUDED)
+             if menu_file == "applications.menu" and os.environ.has_key ("XDG_MENU_PREFIX"):