Hello community, here is the log from the commit of package mate-menu for openSUSE:Factory checked in at 2016-04-30 23:31:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mate-menu (Old) and /work/SRC/openSUSE:Factory/.mate-menu.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mate-menu" Changes: -------- --- /work/SRC/openSUSE:Factory/mate-menu/mate-menu.changes 2016-04-15 19:11:11.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.mate-menu.new/mate-menu.changes 2016-04-30 23:31:31.000000000 +0200 @@ -1,0 +2,11 @@ +Thu Apr 28 06:45:38 UTC 2016 - [email protected] + +- Update to version 5.7.1: + * Fix configuring a custom heading colour (lp#1560332). + * Display the Software Boutique as package manager if it is + available (lp#1568170). + * Ensure the menu is always drawn over existing windows + (lp#1569563) +- Rebase 0001-xterm-no-symlink-dep.patch, 0002-yast2-software.patch. + +------------------------------------------------------------------- Old: ---- mate-menu-5.7.0.tar.gz New: ---- mate-menu-5.7.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mate-menu.spec ++++++ --- /var/tmp/diff_new_pack.9NSZz7/_old 2016-04-30 23:31:32.000000000 +0200 +++ /var/tmp/diff_new_pack.9NSZz7/_new 2016-04-30 23:31:32.000000000 +0200 @@ -17,9 +17,9 @@ %define _name mate_menu -%define _rev 77ef996a35b8 +%define _rev 6b637f9272b2 Name: mate-menu -Version: 5.7.0 +Version: 5.7.1 Release: 0 Summary: Advanced MATE menu License: GPL-2.0+ @@ -32,7 +32,7 @@ Patch1: 0002-yast2-software.patch BuildRequires: gobject-introspection-devel BuildRequires: intltool -BuildRequires: python >= 2.4 +BuildRequires: python >= 2.7 BuildRequires: python-distutils-extra BuildRequires: python-setuptools BuildRequires: update-desktop-files ++++++ 0001-xterm-no-symlink-dep.patch ++++++ --- /var/tmp/diff_new_pack.9NSZz7/_old 2016-04-30 23:31:32.000000000 +0200 +++ /var/tmp/diff_new_pack.9NSZz7/_new 2016-04-30 23:31:32.000000000 +0200 @@ -1,7 +1,6 @@ -diff -aur a/mate_menu/easybuttons.py b/mate_menu/easybuttons.py --- a/mate_menu/easybuttons.py +++ b/mate_menu/easybuttons.py -@@ -399,9 +399,11 @@ +@@ -399,9 +399,11 @@ class ApplicationLauncher( easyButton ): def execute( self, *args ): if self.appExec: if self.useTerminal: @@ -14,10 +13,9 @@ Execute(cmd, self.appPath) else: Execute(self.appExec, self.appPath) -diff -aur a/mate_menu/plugins/system_management.py b/mate_menu/plugins/system_management.py --- a/mate_menu/plugins/system_management.py +++ b/mate_menu/plugins/system_management.py -@@ -169,8 +169,10 @@ class pluginclass( object ): +@@ -166,8 +166,10 @@ class pluginclass( object ): Button4 = easyButton( "terminal", self.iconsize, [_("Terminal")], -1, -1 ) if os.path.exists("/usr/bin/mate-terminal"): Button4.connect( "clicked", self.ButtonClicked, "mate-terminal" ) ++++++ 0002-yast2-software.patch ++++++ --- /var/tmp/diff_new_pack.9NSZz7/_old 2016-04-30 23:31:32.000000000 +0200 +++ /var/tmp/diff_new_pack.9NSZz7/_new 2016-04-30 23:31:32.000000000 +0200 @@ -1,29 +1,27 @@ --- a/mate_menu/plugins/system_management.py +++ b/mate_menu/plugins/system_management.py -@@ -142,18 +142,15 @@ class pluginclass( object ): +@@ -142,15 +142,16 @@ class pluginclass( object ): def do_standard_items( self ): if ( self.showPackageManager == True ): -- if os.path.exists("/usr/bin/software-center") or \ -- os.path.exists("/usr/bin/synaptic-pkexec") or \ -- os.path.exists("/usr/share/applications/ubuntu-mate-software.desktop"): -- if os.path.exists("/usr/bin/synaptic-pkexec"): -- Button2 = easyButton("synaptic", self.iconsize, [_("Package Manager")], -1, -1 ) -- Button2.connect( "clicked", self.ButtonClicked, "/usr/bin/synaptic-pkexec" ) -- elif os.path.exists("/usr/bin/software-center"): -- Button2 = easyButton("softwarecenter", self.iconsize, [_("Package Manager")], -1, -1 ) -- Button2.connect( "clicked", self.ButtonClicked, "/usr/bin/software-center" ) -- elif os.path.exists("/usr/share/applications/ubuntu-mate-software.desktop"): -+ if os.path.exists("/usr/bin/gpk-application") or \ -+ os.path.exists("/sbin/yast2") or \ +- if os.path.exists("/usr/bin/synaptic-pkexec"): +- Button2 = easyButton("synaptic", self.iconsize, [_("Package Manager")], -1, -1 ) +- Button2.connect( "clicked", self.ButtonClicked, "/usr/bin/synaptic-pkexec" ) +- elif os.path.exists("/usr/bin/software-center"): +- Button2 = easyButton("softwarecenter", self.iconsize, [_("Package Manager")], -1, -1 ) +- Button2.connect( "clicked", self.ButtonClicked, "/usr/bin/software-center" ) +- elif os.path.exists("/usr/share/applications/ubuntu-mate-software.desktop"): ++ if os.path.exists("/sbin/yast2") or \ + os.path.exists("/usr/share/applications/YaST2/sw_single.desktop"): -+ if os.path.exists("/sbin/yast2") and os.path.exists("/usr/share/applications/YaST2/sw_single.desktop"): -+ Button2 = easyButton("yast-sw_single", self.iconsize, [_("YaST2 Software Manager")], -1, -1) -+ Button2.connect("clicked", self.ButtonClicked, "xdg-su -c '/sbin/yast2 sw_single'") -+ elif os.path.exists("/usr/bin/gpk-application"): - Button2 = easyButton("system-software-install", self.iconsize, [_("Package Manager")], -1, -1 ) -- Button2.connect("clicked", self.ButtonClicked, "/usr/bin/ubuntu-mate-welcome --software-only") -+ Button2.connect("clicked", self.ButtonClicked, "/usr/bin/gpk-application") - Button2.show() - self.systemBtnHolder.pack_start( Button2, False, False, 0 ) - self.mateMenuWin.setTooltip( Button2, _("Install, remove and upgrade software packages") ) ++ Button2 = easyButton("yast-sw_single", self.iconsize, [_("YaST2 Software Manager")], -1, -1 ) ++ Button2.connect("clicked", self.ButtonClicked, "xdg-su -c '/sbin/yast2 sw_single'") ++ elif os.path.exists("/usr/bin/gnome-software"): ++ Button2 = easyButton("org.gnome.Software", self.iconsize, [_("Software Centre")], -1, -1 ) ++ Button2.connect("clicked", self.ButtonClicked, "/usr/bin/gnome-software") ++ elif os.path.exists("/usr/bin/gpk-application"): + Button2 = easyButton("system-software-install", self.iconsize, [_("Package Manager")], -1, -1 ) +- Button2.connect("clicked", self.ButtonClicked, "/usr/bin/ubuntu-mate-welcome --software-only") ++ Button2.connect("clicked", self.ButtonClicked, "/usr/bin/gpk-application") + Button2.show() + self.systemBtnHolder.pack_start( Button2, False, False, 0 ) + self.mateMenuWin.setTooltip( Button2, _("Install, remove and upgrade software packages") ) ++++++ mate-menu-5.7.0.tar.gz -> mate-menu-5.7.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ubuntu-mate-mate-menu-77ef996a35b8/data/mate-menu.glade new/ubuntu-mate-mate-menu-6b637f9272b2/data/mate-menu.glade --- old/ubuntu-mate-mate-menu-77ef996a35b8/data/mate-menu.glade 2016-04-07 18:48:02.000000000 +0200 +++ new/ubuntu-mate-mate-menu-6b637f9272b2/data/mate-menu.glade 2016-04-13 13:46:25.000000000 +0200 @@ -6,7 +6,7 @@ <property name="can_focus">False</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK</property> <property name="resizable">False</property> - <property name="type_hint">toolbar</property> + <property name="type_hint">dock</property> <property name="skip_taskbar_hint">True</property> <property name="skip_pager_hint">True</property> <property name="decorated">False</property> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ubuntu-mate-mate-menu-77ef996a35b8/lib/mate-menu-config.py new/ubuntu-mate-mate-menu-6b637f9272b2/lib/mate-menu-config.py --- old/ubuntu-mate-mate-menu-77ef996a35b8/lib/mate-menu-config.py 2016-04-07 18:48:02.000000000 +0200 +++ new/ubuntu-mate-mate-menu-6b637f9272b2/lib/mate-menu-config.py 2016-04-13 13:46:25.000000000 +0200 @@ -400,10 +400,10 @@ def getHeadingColor( self ): try: - color = self.borderColor.get_color() + color = self.headingColor.get_color() except TypeError: color = Gdk.Color(0, 0, 0) - self.borderColor.get_color(color) + self.headingColor.get_color(color) return self.gdkColorToString( color ) def gdkColorToString( self, gdkColor ): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ubuntu-mate-mate-menu-77ef996a35b8/lib/mate-menu.py new/ubuntu-mate-mate-menu-6b637f9272b2/lib/mate-menu.py --- old/ubuntu-mate-mate-menu-77ef996a35b8/lib/mate-menu.py 2016-04-07 18:48:02.000000000 +0200 +++ new/ubuntu-mate-mate-menu-6b637f9272b2/lib/mate-menu.py 2016-04-13 13:46:25.000000000 +0200 @@ -2,7 +2,7 @@ # -*- coding: utf-8 -*- # Copyright (C) 2007-2014 Clement Lefebvre <[email protected]> -# Copyright (C) 2015 Martin Wimpress <[email protected]> +# Copyright (C) 2015-2016 Martin Wimpress <[email protected]> # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -19,7 +19,7 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -__VERSION__='5.7.0' +__VERSION__='5.7.1' import ctypes import gc diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ubuntu-mate-mate-menu-77ef996a35b8/mate_menu/plugins/system_management.py new/ubuntu-mate-mate-menu-6b637f9272b2/mate_menu/plugins/system_management.py --- old/ubuntu-mate-mate-menu-77ef996a35b8/mate_menu/plugins/system_management.py 2016-04-07 18:48:02.000000000 +0200 +++ new/ubuntu-mate-mate-menu-6b637f9272b2/mate_menu/plugins/system_management.py 2016-04-13 13:46:25.000000000 +0200 @@ -142,21 +142,18 @@ def do_standard_items( self ): if ( self.showPackageManager == True ): - if os.path.exists("/usr/bin/software-center") or \ - os.path.exists("/usr/bin/synaptic-pkexec") or \ - os.path.exists("/usr/share/applications/ubuntu-mate-software.desktop"): - if os.path.exists("/usr/bin/synaptic-pkexec"): - Button2 = easyButton("synaptic", self.iconsize, [_("Package Manager")], -1, -1 ) - Button2.connect( "clicked", self.ButtonClicked, "/usr/bin/synaptic-pkexec" ) - elif os.path.exists("/usr/bin/software-center"): - Button2 = easyButton("softwarecenter", self.iconsize, [_("Package Manager")], -1, -1 ) - Button2.connect( "clicked", self.ButtonClicked, "/usr/bin/software-center" ) - elif os.path.exists("/usr/share/applications/ubuntu-mate-software.desktop"): - Button2 = easyButton("system-software-install", self.iconsize, [_("Package Manager")], -1, -1 ) - Button2.connect("clicked", self.ButtonClicked, "/usr/bin/ubuntu-mate-welcome --software-only") - Button2.show() - self.systemBtnHolder.pack_start( Button2, False, False, 0 ) - self.mateMenuWin.setTooltip( Button2, _("Install, remove and upgrade software packages") ) + if os.path.exists("/usr/bin/synaptic-pkexec"): + Button2 = easyButton("synaptic", self.iconsize, [_("Package Manager")], -1, -1 ) + Button2.connect( "clicked", self.ButtonClicked, "/usr/bin/synaptic-pkexec" ) + elif os.path.exists("/usr/bin/software-center"): + Button2 = easyButton("softwarecenter", self.iconsize, [_("Package Manager")], -1, -1 ) + Button2.connect( "clicked", self.ButtonClicked, "/usr/bin/software-center" ) + elif os.path.exists("/usr/share/applications/ubuntu-mate-software.desktop"): + Button2 = easyButton("system-software-install", self.iconsize, [_("Package Manager")], -1, -1 ) + Button2.connect("clicked", self.ButtonClicked, "/usr/bin/ubuntu-mate-welcome --software-only") + Button2.show() + self.systemBtnHolder.pack_start( Button2, False, False, 0 ) + self.mateMenuWin.setTooltip( Button2, _("Install, remove and upgrade software packages") ) if ( self.showControlCenter == True ): Button3 = easyButton( "gtk-preferences", self.iconsize, [_("Control Center")], -1, -1 )
