r37159 - in /desktop/experimental/gnome-menus/debian: control patches/01_default_prefix.patch patches/03_kde-legacydirs.patch patches/08_settings-menus.patch patches/09_games-menu.patch patches/11_science-menu.patch
sjoerd at users.alioth.debian.org
sjoerd at users.alioth.debian.org
Sat Mar 23 19:47:12 UTC 2013
Author: sjoerd
Date: Sat Mar 23 19:47:12 2013
New Revision: 37159
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=37159
Log:
more refreshing
Modified:
desktop/experimental/gnome-menus/debian/control
desktop/experimental/gnome-menus/debian/patches/01_default_prefix.patch
desktop/experimental/gnome-menus/debian/patches/03_kde-legacydirs.patch
desktop/experimental/gnome-menus/debian/patches/08_settings-menus.patch
desktop/experimental/gnome-menus/debian/patches/09_games-menu.patch
desktop/experimental/gnome-menus/debian/patches/11_science-menu.patch
Modified: desktop/experimental/gnome-menus/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-menus/debian/control?rev=37159&op=diff
==============================================================================
--- desktop/experimental/gnome-menus/debian/control [utf-8] (original)
+++ desktop/experimental/gnome-menus/debian/control [utf-8] Sat Mar 23 19:47:12 2013
@@ -2,6 +2,7 @@
#
# Modifications should be made to debian/control.in instead.
# This file is regenerated automatically in the clean target.
+
Source: gnome-menus
Section: gnome
Priority: optional
Modified: desktop/experimental/gnome-menus/debian/patches/01_default_prefix.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-menus/debian/patches/01_default_prefix.patch?rev=37159&op=diff
==============================================================================
--- desktop/experimental/gnome-menus/debian/patches/01_default_prefix.patch [utf-8] (original)
+++ desktop/experimental/gnome-menus/debian/patches/01_default_prefix.patch [utf-8] Sat Mar 23 19:47:12 2013
@@ -1,8 +1,6 @@
-diff --git a/libmenu/gmenu-tree.c b/libmenu/gmenu-tree.c
-index f580af0..68fc33b 100644
--- a/libmenu/gmenu-tree.c
+++ b/libmenu/gmenu-tree.c
-@@ -389,6 +389,16 @@ canonicalize_basename (GMenuTree *tree,
+@@ -391,6 +391,16 @@
}
}
@@ -19,23 +17,17 @@
static gboolean
gmenu_tree_canonicalize_path (GMenuTree *tree,
GError **error)
-@@ -411,13 +421,10 @@ gmenu_tree_canonicalize_path (GMenuTree *tree,
- {
+@@ -416,6 +426,9 @@
menu_file = tree->basename;
+ xdg_menu_prefix = g_getenv ("XDG_MENU_PREFIX");
-- if (strcmp (tree->basename, "applications.menu") == 0 &&
-- g_getenv ("XDG_MENU_PREFIX"))
-+ if (strcmp (tree->basename, "applications.menu") == 0)
++ if (xdg_menu_prefix == NULL)
++ xdg_menu_prefix = "gnome-";
++
+ if (xdg_menu_prefix != NULL)
{
- char *prefixed_basename;
-- prefixed_basename = g_strdup_printf ("%s%s",
-- g_getenv ("XDG_MENU_PREFIX"),
-- tree->basename);
-+ prefixed_basename = prefix_menu_name (tree->basename);
- canonicalize_basename (tree, prefixed_basename);
- g_free (prefixed_basename);
- }
-@@ -1875,13 +1882,10 @@ load_parent_merge_file (GMenuTree *tree,
+ gchar *prefixed_basename;
+@@ -2077,13 +2090,10 @@
found = FALSE;
menu_file = g_strconcat (menu_name, ".menu", NULL);
@@ -51,18 +43,3 @@
found = load_parent_merge_file_from_basename (tree, loaded_menu_files,
layout, prefixed_basename,
canonical_basedir);
-diff --git a/simple-editor/GMenuSimpleEditor/menutreemodel.py b/simple-editor/GMenuSimpleEditor/menutreemodel.py
-index 2eded47..94a2559 100644
---- a/simple-editor/GMenuSimpleEditor/menutreemodel.py
-+++ b/simple-editor/GMenuSimpleEditor/menutreemodel.py
-@@ -58,8 +58,8 @@ class MenuTreeModel (Gtk.TreeStore):
- menu_files = ["applications.menu"]
-
- for menu_file in menu_files:
-- if menu_file == "applications.menu" and os.environ.has_key ("XDG_MENU_PREFIX"):
-- menu_file = os.environ["XDG_MENU_PREFIX"] + menu_file
-+ if menu_file == "applications.menu":
-+ menu_file = os.environ.get("XDG_MENU_PREFIX", "gnome-") + menu_file
-
- tree = GObject.new (GMenu.Tree, menu_basename = menu_file, flags = GMenu.TreeFlags.INCLUDE_EXCLUDED|GMenu.TreeFlags.SORT_DISPLAY_NAME)
- tree.load_sync ()
Modified: desktop/experimental/gnome-menus/debian/patches/03_kde-legacydirs.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-menus/debian/patches/03_kde-legacydirs.patch?rev=37159&op=diff
==============================================================================
--- desktop/experimental/gnome-menus/debian/patches/03_kde-legacydirs.patch [utf-8] (original)
+++ desktop/experimental/gnome-menus/debian/patches/03_kde-legacydirs.patch [utf-8] Sat Mar 23 19:47:12 2013
@@ -1,7 +1,5 @@
-Index: gnome-menus-2.26.1/layout/applications.menu
-===================================================================
---- gnome-menus-2.26.1.orig/layout/gnome-applications.menu 2009-04-14 00:01:00.000000000 +0200
-+++ gnome-menus-2.26.1/layout/gnome-applications.menu 2009-06-17 22:54:29.254809753 +0200
+--- a/layout/gnome-applications.menu
++++ b/layout/gnome-applications.menu
@@ -7,7 +7,6 @@
<Directory>X-GNOME-Menu-Applications.directory</Directory>
Modified: desktop/experimental/gnome-menus/debian/patches/08_settings-menus.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-menus/debian/patches/08_settings-menus.patch?rev=37159&op=diff
==============================================================================
--- desktop/experimental/gnome-menus/debian/patches/08_settings-menus.patch [utf-8] (original)
+++ desktop/experimental/gnome-menus/debian/patches/08_settings-menus.patch [utf-8] Sat Mar 23 19:47:12 2013
@@ -1,9 +1,7 @@
-Index: gnome-menus-3.0.1/layout/applications.menu
-===================================================================
---- gnome-menus-3.0.1.orig/layout/gnome-applications.menu 2011-06-04 21:59:24.161265110 +0200
-+++ gnome-menus-3.0.1/layout/gnome-applications.menu 2011-06-04 22:28:28.905794724 +0200
-@@ -134,6 +134,34 @@
- <Not><Category>Settings</Category></Not>
+--- a/layout/gnome-applications.menu
++++ b/layout/gnome-applications.menu
+@@ -228,6 +228,34 @@
+ <Not><Filename>gnome-system-monitor.desktop</Filename></Not>
</And>
</Include>
+ <Menu>
@@ -36,4 +34,4 @@
+ </Menu>
</Menu> <!-- End System Tools -->
- <!-- Other -->
+ <!-- System Settings -->
Modified: desktop/experimental/gnome-menus/debian/patches/09_games-menu.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-menus/debian/patches/09_games-menu.patch?rev=37159&op=diff
==============================================================================
--- desktop/experimental/gnome-menus/debian/patches/09_games-menu.patch [utf-8] (original)
+++ desktop/experimental/gnome-menus/debian/patches/09_games-menu.patch [utf-8] Sat Mar 23 19:47:12 2013
@@ -1,8 +1,6 @@
-Index: gnome-menus-3.0.1/layout/applications.menu
-===================================================================
---- gnome-menus-3.0.1.orig/layout/gnome-applications.menu 2011-06-04 22:02:02.974041506 +0200
-+++ gnome-menus-3.0.1/layout/gnome-applications.menu 2011-06-04 22:13:31.753408768 +0200
-@@ -76,8 +76,107 @@
+--- a/layout/gnome-applications.menu
++++ b/layout/gnome-applications.menu
+@@ -99,8 +99,107 @@
<Include>
<And>
<Category>Game</Category>
@@ -112,11 +110,11 @@
</Menu> <!-- End Games -->
<!-- Graphics -->
-@@ -132,6 +231,7 @@
+@@ -223,6 +322,7 @@
<And>
<Category>System</Category>
<Not><Category>Settings</Category></Not>
-+ <Not><Category>Game</Category></Not>
- </And>
- </Include>
- <Menu>
++ <Not><Category>Game</Category></Not>
+ <Not><Filename>baobab.desktop</Filename></Not>
+ <Not><Filename>gnome-system-log.desktop</Filename></Not>
+ <Not><Filename>gnome-system-monitor.desktop</Filename></Not>
Modified: desktop/experimental/gnome-menus/debian/patches/11_science-menu.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-menus/debian/patches/11_science-menu.patch?rev=37159&op=diff
==============================================================================
--- desktop/experimental/gnome-menus/debian/patches/11_science-menu.patch [utf-8] (original)
+++ desktop/experimental/gnome-menus/debian/patches/11_science-menu.patch [utf-8] Sat Mar 23 19:47:12 2013
@@ -1,8 +1,6 @@
-Index: gnome-menus-2.24.2/layout/applications.menu
-===================================================================
---- gnome-menus-2.24.2.orig/layout/gnome-applications.menu 2008-12-26 17:08:38.587592137 +0100
-+++ gnome-menus-2.24.2/layout/gnome-applications.menu 2008-12-26 17:10:25.727590587 +0100
-@@ -65,10 +65,23 @@
+--- a/layout/gnome-applications.menu
++++ b/layout/gnome-applications.menu
+@@ -88,10 +88,23 @@
<Include>
<And>
<Category>Education</Category>
@@ -26,20 +24,16 @@
<!-- Games -->
<Menu>
<Name>Games</Name>
-Index: gnome-menus-2.24.2/desktop-directories/Education.directory.in
-===================================================================
---- gnome-menus-2.24.2.orig/desktop-directories/Education.directory.in 2008-11-25 14:01:14.000000000 +0100
-+++ gnome-menus-2.24.2/desktop-directories/Education.directory.in 2008-12-26 17:10:25.731589699 +0100
+--- a/desktop-directories/Education.directory.in
++++ b/desktop-directories/Education.directory.in
@@ -1,4 +1,4 @@
[Desktop Entry]
_Name=Education
-Icon=applications-science
+Icon=applications-accessories
Type=Directory
-Index: gnome-menus-2.24.2/desktop-directories/Utility.directory.in
-===================================================================
---- gnome-menus-2.24.2.orig/desktop-directories/Utility.directory.in 2008-12-26 17:10:52.531587812 +0100
-+++ gnome-menus-2.24.2/desktop-directories/Utility.directory.in 2008-12-26 17:11:01.619588523 +0100
+--- a/desktop-directories/Utility.directory.in
++++ b/desktop-directories/Utility.directory.in
@@ -1,5 +1,5 @@
[Desktop Entry]
_Name=Accessories
More information about the pkg-gnome-commits
mailing list