diff -Nru mate-menu-5.7.0/data/mate-menu.glade mate-menu-5.7.1/data/mate-menu.glade --- mate-menu-5.7.0/data/mate-menu.glade 2016-04-07 16:48:02.000000000 +0000 +++ mate-menu-5.7.1/data/mate-menu.glade 2016-04-13 11:46:25.000000000 +0000 @@ -6,7 +6,7 @@ False 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 False - toolbar + dock True True False diff -Nru mate-menu-5.7.0/debian/changelog mate-menu-5.7.1/debian/changelog --- mate-menu-5.7.0/debian/changelog 2016-04-08 08:21:21.000000000 +0000 +++ mate-menu-5.7.1/debian/changelog 2016-04-14 11:38:31.000000000 +0000 @@ -1,3 +1,15 @@ +mate-menu (5.7.1-1) unstable; urgency=medium + + [ Martin Wimpress ] + * New upstream release. + - 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) + + -- Mike Gabriel Thu, 14 Apr 2016 13:38:02 +0200 + mate-menu (5.7.0-1) unstable; urgency=medium [ Martin Wimpress ] diff -Nru mate-menu-5.7.0/lib/mate-menu-config.py mate-menu-5.7.1/lib/mate-menu-config.py --- mate-menu-5.7.0/lib/mate-menu-config.py 2016-04-07 16:48:02.000000000 +0000 +++ mate-menu-5.7.1/lib/mate-menu-config.py 2016-04-13 11:46:25.000000000 +0000 @@ -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 -Nru mate-menu-5.7.0/lib/mate-menu.py mate-menu-5.7.1/lib/mate-menu.py --- mate-menu-5.7.0/lib/mate-menu.py 2016-04-07 16:48:02.000000000 +0000 +++ mate-menu-5.7.1/lib/mate-menu.py 2016-04-13 11:46:25.000000000 +0000 @@ -2,7 +2,7 @@ # -*- coding: utf-8 -*- # Copyright (C) 2007-2014 Clement Lefebvre -# Copyright (C) 2015 Martin Wimpress +# Copyright (C) 2015-2016 Martin Wimpress # # 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 -Nru mate-menu-5.7.0/mate_menu/plugins/system_management.py mate-menu-5.7.1/mate_menu/plugins/system_management.py --- mate-menu-5.7.0/mate_menu/plugins/system_management.py 2016-04-07 16:48:02.000000000 +0000 +++ mate-menu-5.7.1/mate_menu/plugins/system_management.py 2016-04-13 11:46:25.000000000 +0000 @@ -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 )