Hello community, here is the log from the commit of package alacarte for openSUSE:Factory checked in at 2012-09-29 15:21:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/alacarte (Old) and /work/SRC/openSUSE:Factory/.alacarte.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "alacarte", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/alacarte/alacarte.changes 2012-06-18 17:29:42.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.alacarte.new/alacarte.changes 2012-09-29 15:21:29.000000000 +0200 @@ -1,0 +2,43 @@ +Thu Sep 6 20:45:18 UTC 2012 - [email protected] + +- Add alacarte-xdg-menu.patch: Use XDG_MENU_PREFIX when referencing + applications.menu (bnc#779098). + +------------------------------------------------------------------- +Thu Sep 6 19:41:01 UTC 2012 - [email protected] + +- Add alacarte-nohelp.patch: Do not show a help button or act on + F1 key: there is no help in alacarte at this moment (bnc#779062). + +------------------------------------------------------------------- +Tue Aug 7 10:06:02 UTC 2012 - [email protected] + +- Update to version 3.5.5: + + Fix the "Revert" button + + Updated translations. + +------------------------------------------------------------------- +Wed Jul 18 08:55:13 UTC 2012 - [email protected] + +- Update to version 3.5.4: + + Code cleanups + + Renamed the "Revert" button, hopefully to make it less + confusing + + Updated translations. + +------------------------------------------------------------------- +Wed Jun 27 18:59:01 UTC 2012 - [email protected] + +- Update to version 3.5.3: + + Bugs fixed: + - Code cleanups + - Don't fail when loading a non-existant icon + - Fix spurious crashes and asserts by removing the visible_tree + stuff + - Fix separator support (bgo#677343) + - Put back the top-level "Applications" section that was + accidentally removed (bgo#677420) + + Updated translations. +- Rebase alacarte-support-exo-desktop-item-edit.patch. + +------------------------------------------------------------------- Old: ---- alacarte-0.13.4.tar.xz New: ---- alacarte-3.5.5.tar.xz alacarte-nohelp.patch alacarte-xdg-menu.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ alacarte.spec ++++++ --- /var/tmp/diff_new_pack.iCcote/_old 2012-09-29 15:21:31.000000000 +0200 +++ /var/tmp/diff_new_pack.iCcote/_new 2012-09-29 15:21:31.000000000 +0200 @@ -17,17 +17,21 @@ Name: alacarte -Version: 0.13.4 +Version: 3.5.5 Release: 0 Url: http://www.realistanew.com/projects/alacarte Summary: Menu editor for GNOME License: LGPL-2.1+ Group: System/GUI/GNOME -Source: http://download.gnome.org/sources/alacarte/0.13/%{name}-%{version}.tar.xz +Source: http://download.gnome.org/sources/alacarte/3.5/%{name}-%{version}.tar.xz # PATCH-NEEDS-REBASE alacarte_system_edit_mode.patch [email protected] (was PATCH-FEATURE-OPENSUSE) Patch1: alacarte_system_edit_mode.patch # PATCH-FEATURE-UPSTREAM alacarte-support-exo-desktop-item-edit.patch bnc#728482 bgo#664114 [email protected] -- Add support for exo-desktop-item-edit as an alternative to gnome-desktop-item-edit Patch2: alacarte-support-exo-desktop-item-edit.patch +# PATCH-FIX-UPSTREAM alacarte-nohelp.patch bnc#779062 bgo#677332 [email protected] -- Do not show help button, as there is no help in alacarte +Patch3: alacarte-nohelp.patch +# PATCH-FIX-UPSTREAM alacarte-xdg-menu.patch bnc#779098 bgo#683535 [email protected] -- Use XDG_MENU_PREFIX when reading and writing users applications.menu +Patch4: alacarte-xdg-menu.patch BuildRequires: fdupes BuildRequires: glib2-devel # Needed for the typelib() dependency parser @@ -38,7 +42,7 @@ BuildRequires: python BuildRequires: translation-update-upstream BuildRequires: update-desktop-files -BuildRequires: pkgconfig(libgnome-menu-3.0) >= 3.2.0.1 +BuildRequires: pkgconfig(libgnome-menu-3.0) >= 3.5.3 BuildRequires: pkgconfig(pygobject-3.0) Requires: python-xml Recommends: %{name}-lang @@ -61,6 +65,8 @@ # again # %patch1 -p0 %patch2 -p1 +%patch3 -p1 +%patch4 -p1 %build # Patch is disabled ++++++ alacarte-nohelp.patch ++++++ Index: alacarte-3.5.5/Alacarte/MainWindow.py =================================================================== --- alacarte-3.5.5.orig/Alacarte/MainWindow.py +++ alacarte-3.5.5/Alacarte/MainWindow.py @@ -54,10 +54,6 @@ class MainWindow(object): self.tree.get_object('move_up_button').set_sensitive(False) self.tree.get_object('move_down_button').set_sensitive(False) self.tree.get_object('new_separator_button').set_sensitive(False) - accelgroup = Gtk.AccelGroup() - keyval, modifier = Gtk.accelerator_parse('F1') - accelgroup.connect(keyval, modifier, Gtk.AccelFlags.VISIBLE, self.on_help_button_clicked) - self.tree.get_object('mainwindow').add_accel_group(accelgroup) def run(self): self.loadMenus() Index: alacarte-3.5.5/data/alacarte.ui =================================================================== --- alacarte-3.5.5.orig/data/alacarte.ui +++ alacarte-3.5.5/data/alacarte.ui @@ -68,18 +68,6 @@ <property name="visible">True</property> <property name="layout_style">GTK_BUTTONBOX_END</property> <child> - <object class="GtkButton" id="help_button"> - <property name="visible">True</property> - <property name="can_default">True</property> - <property name="can_focus">True</property> - <property name="label">gtk-help</property> - <property name="use_stock">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <signal handler="on_help_button_clicked" name="clicked"/> - </object> - </child> - <child> <object class="GtkButton" id="restore_button"> <property name="visible">True</property> <property name="tooltip-text" translatable="yes">Restore the default menu layout</property> @@ -392,7 +380,6 @@ </object> </child> <action-widgets> - <action-widget response="-11">help_button</action-widget> <action-widget response="0">restore_button</action-widget> <action-widget response="-7">close_button</action-widget> </action-widgets> ++++++ alacarte-support-exo-desktop-item-edit.patch ++++++ --- /var/tmp/diff_new_pack.iCcote/_old 2012-09-29 15:21:31.000000000 +0200 +++ /var/tmp/diff_new_pack.iCcote/_new 2012-09-29 15:21:31.000000000 +0200 @@ -1,16 +1,16 @@ -Index: alacarte-0.13.4/Alacarte/MainWindow.py +Index: alacarte-3.5.3/Alacarte/MainWindow.py =================================================================== ---- alacarte-0.13.4.orig/Alacarte/MainWindow.py -+++ alacarte-0.13.4/Alacarte/MainWindow.py -@@ -36,6 +36,7 @@ class MainWindow(object): +--- alacarte-3.5.3.orig/Alacarte/MainWindow.py ++++ alacarte-3.5.3/Alacarte/MainWindow.py +@@ -35,6 +35,7 @@ class MainWindow(object): + timer = None #hack to make editing menu properties work - allow_update = True edit_pool = [] + desktop_item_editor = util.getCommandPath(['gnome-desktop-item-edit', 'exo-desktop-item-edit']) def __init__(self, datadir, version): self.file_path = datadir -@@ -264,7 +265,7 @@ class MainWindow(object): +@@ -261,7 +262,7 @@ class MainWindow(object): else: parent = menus[iter][2] file_path = os.path.join(util.getUserDirectoryPath(), util.getUniqueFileId('alacarte-made', '.directory')) @@ -19,7 +19,7 @@ GObject.timeout_add(100, self.waitForNewMenuProcess, process, parent.get_menu_id(), file_path) def on_new_item_button_clicked(self, button): -@@ -277,7 +278,7 @@ class MainWindow(object): +@@ -274,7 +275,7 @@ class MainWindow(object): else: parent = menus[iter][2] file_path = os.path.join(util.getUserItemPath(), util.getUniqueFileId('alacarte-made', '.desktop')) @@ -28,7 +28,7 @@ GObject.timeout_add(100, self.waitForNewItemProcess, process, parent.get_menu_id(), file_path) def on_new_separator_button_clicked(self, button): -@@ -338,7 +339,7 @@ class MainWindow(object): +@@ -335,7 +336,7 @@ class MainWindow(object): if file_path not in self.edit_pool: self.edit_pool.append(file_path) @@ -37,11 +37,11 @@ GObject.timeout_add(100, self.waitForEditProcess, process, file_path) def on_menu_tree_cursor_changed(self, treeview): -Index: alacarte-0.13.4/Alacarte/util.py +Index: alacarte-3.5.3/Alacarte/util.py =================================================================== ---- alacarte-0.13.4.orig/Alacarte/util.py -+++ alacarte-0.13.4/Alacarte/util.py -@@ -107,6 +107,15 @@ def getUserDirectoryPath(): +--- alacarte-3.5.3.orig/Alacarte/util.py ++++ alacarte-3.5.3/Alacarte/util.py +@@ -110,6 +110,15 @@ def getUserDirectoryPath(): os.makedirs(menu_dir) return menu_dir ++++++ alacarte-xdg-menu.patch ++++++ Index: alacarte-3.5.5/Alacarte/MenuEditor.py =================================================================== --- alacarte-3.5.5.orig/Alacarte/MenuEditor.py +++ alacarte-3.5.5/Alacarte/MenuEditor.py @@ -23,7 +23,7 @@ from gi.repository import GMenu, GLib from Alacarte import util class MenuEditor(object): - def __init__(self, name='applications.menu'): + def __init__(self, name=os.environ['XDG_MENU_PREFIX'] + 'applications.menu'): self.name = name self.tree = GMenu.Tree.new(name, GMenu.TreeFlags.SHOW_EMPTY|GMenu.TreeFlags.INCLUDE_EXCLUDED|GMenu.TreeFlags.INCLUDE_NODISPLAY|GMenu.TreeFlags.SHOW_ALL_SEPARATORS|GMenu.TreeFlags.SORT_DISPLAY_NAME) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
