raveit65 pushed to mintmenu (f22). "update to 5.6.2 release"
notifications at fedoraproject.org
notifications at fedoraproject.org
Tue Mar 31 17:30:53 UTC 2015
>From 5d9c16a04b16c46f9b98c89f02b6f644b8e21f80 Mon Sep 17 00:00:00 2001
From: raveit65 <chat-to-me at raveit.de>
Date: Tue, 31 Mar 2015 19:24:58 +0200
Subject: update to 5.6.2 release
diff --git a/.gitignore b/.gitignore
index d0a7619..568834f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,5 @@
/mint-translations_2014.05.25.tar.gz
/mintmenu_5.6.0.tar.gz
/mint-translations_2014.10.31.tar.gz
+/mintmenu_5.6.2.tar.gz
+/mint-translations_2015.02.25.tar.gz
diff --git a/mintmenu.spec b/mintmenu.spec
index 56a0bab..8dfb05c 100644
--- a/mintmenu.spec
+++ b/mintmenu.spec
@@ -1,7 +1,7 @@
%global _internal_version 9e8c4d9
Name: mintmenu
-Version: 5.6.0
+Version: 5.6.2
Release: 1%{?dist}
#Release: 0.1.git%{_internal_version}1%{?dist}
Summary: Advanced Menu for the MATE Desktop
@@ -22,7 +22,7 @@ URL: http://packages.linuxmint.com
#Source0: http://raveit65.fedorapeople.org/Mate/git-upstream/%{name}-%{version}.git%{_internal_version}.tar.gz
Source0: http://packages.linuxmint.com/pool/main/m/mintmenu/%{name}_%{version}.tar.gz
-Source1: http://packages.linuxmint.com/pool/main/m/mint-translations/mint-translations_2014.10.31.tar.gz
+Source1: http://packages.linuxmint.com/pool/main/m/mint-translations/mint-translations_2015.02.25.tar.gz
Source2: mintmenu-mate.png
Source3: mintmenu-icon.png
Source4: mintmenu-icon.svg
@@ -64,6 +64,8 @@ Patch14: mintmenu_gksu-to-beesu.patch
Patch15: mintmenu_remove_uninstall-entry.patch
BuildRequires: python2-devel
+# for creating mint-translations
+BuildRequires: gettext
Requires: python
Requires: python-configobj
@@ -109,9 +111,13 @@ tar -xf %{SOURCE1}
%build
#pure python
+# build mint-translations
+cd mint-translations-2015.02.25
+make %{?_smp_mflags} V=1
+cd ..
%install
-find mint-translations-2014.10.31/ -not -name 'mintmenu.mo' -type f -exec rm -f {} ';'
+find mint-translations-2015.02.25/ -not -name 'mintmenu.mo' -type f -exec rm -f {} ';'
install -d -p %{buildroot}%{_bindir}/
install -m 755 -p usr/bin/mintmenu %{buildroot}%{_bindir}/mintmenu
@@ -171,7 +177,7 @@ rm -rf %{buildroot}%{_datadir}/glib-2.0/schemas/com.linuxmint.mintmenu.gschema.x
rm -rf %{buildroot}%{_datadir}/mate-panel/applets/org.mate.panel.MintMenuApplet.mate-panel-applet.datadir
# install mint translations and MATE icons
-cp -r mint-translations-2014.10.31/usr/share/linuxmint/* %{buildroot}%{_datadir}/
+cp -r mint-translations-2015.02.25/usr/share/linuxmint/* %{buildroot}%{_datadir}/
cp -f %{SOURCE2} %{buildroot}%{_datadir}/linuxmint/mintMenu/visualisation-logo.png
cp -f %{SOURCE3} %{buildroot}%{_datadir}/linuxmint/mintMenu/icon.png
cp -f %{SOURCE4} %{buildroot}%{_datadir}/linuxmint/mintMenu/icon.svg
@@ -211,6 +217,9 @@ fi
%changelog
+* Tue Mar 31 2015 Wolfgang Ulbrich <chat-to-me at raveit.de> - 5.6.2-1
+- update to 5.6.2 release
+
* Sun Nov 09 2014 Wolfgang Ulbrich <chat-to-me at raveit.de> - 5.6.0-1
- update to 5.6.0
diff --git a/mintmenu_change-search-path-for-fedora.patch b/mintmenu_change-search-path-for-fedora.patch
index dd735e8..6bcf032 100644
--- a/mintmenu_change-search-path-for-fedora.patch
+++ b/mintmenu_change-search-path-for-fedora.patch
@@ -1,35 +1,35 @@
-diff -upr mintmenu-5.2.9-orig/usr/lib/linuxmint/mintMenu/plugins/applications.py mintmenu-5.2.9/usr/lib/linuxmint/mintMenu/plugins/applications.py
---- mintmenu-5.2.9-orig/usr/lib/linuxmint/mintMenu/plugins/applications.py 2012-03-22 14:05:01.000000000 +0100
-+++ mintmenu-5.2.9/usr/lib/linuxmint/mintMenu/plugins/applications.py 2012-03-26 16:26:50.378656269 +0200
-@@ -1098,19 +1098,19 @@ class pluginclass( object ):
+diff -upr mintmenu-orig/usr/lib/linuxmint/mintMenu/plugins/applications.py mintmenu/usr/lib/linuxmint/mintMenu/plugins/applications.py
+--- mintmenu-orig/usr/lib/linuxmint/mintMenu/plugins/applications.py 2015-03-31 12:44:25.689333000 +0200
++++ mintmenu/usr/lib/linuxmint/mintMenu/plugins/applications.py 2015-03-31 12:53:58.261920658 +0200
+@@ -1156,19 +1156,19 @@ class pluginclass( object ):
def search_mint_tutorials(self, widget):
text = self.searchEntry.get_text()
text = text.replace(" ", "%20")
- os.system("xdg-open \"http://community.linuxmint.com/index.php/tutorial/search/0/" + text + "\" &")
-+ os.system("xdg-open \"http://forums.fedoraforum.org/forumdisplay.php?f=12/" "\" &")
++ os.system("xdg-open \"http://forums.fedoraforum.org/index.php" "\" &")
self.mintMenuWin.hide()
def search_mint_ideas(self, widget):
text = self.searchEntry.get_text()
text = text.replace(" ", "%20")
- os.system("xdg-open \"http://community.linuxmint.com/index.php/idea/search/0/" + text + "\" &")
-+ os.system("xdg-open \"http://forums.mate-desktop.org/viewforum.php?f=17&sid=b75e3dfd7ba31f51079801f9a1c37ae5/ \" &")
++ os.system("xdg-open \"http://forums.mate-desktop.org/index.php \" &")
self.mintMenuWin.hide()
def search_mint_users(self, widget):
text = self.searchEntry.get_text()
text = text.replace(" ", "%20")
- os.system("xdg-open \"http://community.linuxmint.com/index.php/user/search/0/" + text + "\" &")
-+ os.system("xdg-open \"http://fedorapeople.org/ \" &")
++ os.system("xdg-open \"http://fedorapeople.org/ \" &")
self.mintMenuWin.hide()
def search_mint_hardware(self, widget):
-@@ -1122,7 +1122,7 @@ class pluginclass( object ):
+@@ -1180,7 +1180,7 @@ class pluginclass( object ):
def search_mint_software(self, widget):
text = self.searchEntry.get_text()
text = text.replace(" ", "%20")
- os.system("xdg-open \"http://community.linuxmint.com/index.php/software/search/0/" + text + "\" &")
-+ os.system("mate-open \"http://koji.fedoraproject.org/koji/search?match=glob&type=package&terms=" + text + "\" &")
++ os.system("mate-open \"http://koji.fedoraproject.org/koji/search?match=glob&type=package&terms=" + text + "\" &")
self.mintMenuWin.hide()
-
+ def add_to_desktop(self, widget, desktopEntry):
diff --git a/mintmenu_datadir.patch b/mintmenu_datadir.patch
index 589b433..a8cbb2c 100644
--- a/mintmenu_datadir.patch
+++ b/mintmenu_datadir.patch
@@ -1,6 +1,6 @@
diff -upr mintmenu-orig/usr/lib/linuxmint/mintMenu/mintMenuConfig.py mintmenu/usr/lib/linuxmint/mintMenu/mintMenuConfig.py
---- mintmenu-orig/usr/lib/linuxmint/mintMenu/mintMenuConfig.py 2013-11-30 10:55:54.434730000 +0100
-+++ mintmenu/usr/lib/linuxmint/mintMenu/mintMenuConfig.py 2013-11-30 10:59:00.864609047 +0100
+--- mintmenu-orig/usr/lib/linuxmint/mintMenu/mintMenuConfig.py 2015-03-31 12:29:11.280580000 +0200
++++ mintmenu/usr/lib/linuxmint/mintMenu/mintMenuConfig.py 2015-03-31 12:32:02.446219799 +0200
@@ -40,7 +40,7 @@ class mintMenuConfig( object ):
#i18n
@@ -10,7 +10,7 @@ diff -upr mintmenu-orig/usr/lib/linuxmint/mintMenu/mintMenuConfig.py mintmenu/us
self.builder.get_object("startWithFavorites").set_label(_("Always start with favorites pane"))
self.builder.get_object("showButtonIcon").set_label(_("Show button icon"))
-@@ -416,7 +416,7 @@ class mintMenuConfig( object ):
+@@ -418,7 +418,7 @@ class mintMenuConfig( object ):
newPlaceDialog = self.builder.get_object( "editPlaceDialog" )
folderChooserDialog = self.builder.get_object( "fileChooserDialog" )
newPlaceDialog.set_transient_for(self.mainWindow)
@@ -19,7 +19,7 @@ diff -upr mintmenu-orig/usr/lib/linuxmint/mintMenu/mintMenuConfig.py mintmenu/us
newPlaceDialog.set_title(self.newPlaceDialogTitle)
folderChooserDialog.set_title(self.folderChooserDialogTitle)
newPlaceDialog.set_default_response(Gtk.ResponseType.OK)
-@@ -447,7 +447,7 @@ class mintMenuConfig( object ):
+@@ -449,7 +449,7 @@ class mintMenuConfig( object ):
editPlaceDialog = self.builder.get_object( "editPlaceDialog" )
folderChooserDialog = self.builder.get_object( "fileChooserDialog" )
editPlaceDialog.set_transient_for(self.mainWindow)
@@ -29,9 +29,9 @@ diff -upr mintmenu-orig/usr/lib/linuxmint/mintMenu/mintMenuConfig.py mintmenu/us
folderChooserDialog.set_title(self.folderChooserDialogTitle)
editPlaceDialog.set_default_response(Gtk.ResponseType.OK)
diff -upr mintmenu-orig/usr/lib/linuxmint/mintMenu/mintMenu.py mintmenu/usr/lib/linuxmint/mintMenu/mintMenu.py
---- mintmenu-orig/usr/lib/linuxmint/mintMenu/mintMenu.py 2013-11-25 14:50:18.000000000 +0100
-+++ mintmenu/usr/lib/linuxmint/mintMenu/mintMenu.py 2013-11-30 10:59:53.562139715 +0100
-@@ -72,7 +72,7 @@ class MainWindow( object ):
+--- mintmenu-orig/usr/lib/linuxmint/mintMenu/mintMenu.py 2015-02-24 14:19:23.000000000 +0100
++++ mintmenu/usr/lib/linuxmint/mintMenu/mintMenu.py 2015-03-31 12:32:53.006703278 +0200
+@@ -69,7 +69,7 @@ class MainWindow( object ):
self.detect_desktop_environment()
@@ -40,7 +40,7 @@ diff -upr mintmenu-orig/usr/lib/linuxmint/mintMenu/mintMenu.py mintmenu/usr/lib/
self.toggle = toggleButton
# Load UI file and extract widgets
-@@ -741,7 +741,7 @@ class MenuWin( object ):
+@@ -716,7 +716,7 @@ class MenuWin( object ):
about = Gtk.AboutDialog()
about.set_name("mintMenu")
import commands
@@ -49,7 +49,7 @@ diff -upr mintmenu-orig/usr/lib/linuxmint/mintMenu/mintMenu.py mintmenu/usr/lib/
about.set_version(version)
try:
h = open('/usr/share/common-licenses/GPL','r')
-@@ -757,7 +757,7 @@ class MenuWin( object ):
+@@ -732,7 +732,7 @@ class MenuWin( object ):
# about.set_authors( ["Clement Lefebvre <clem at linuxmint.com>", "Lars-Peter Clausen <lars at laprican.de>"] )
about.set_translator_credits(("translator-credits") )
#about.set_copyright( _("Based on USP from S.Chanderbally") )
@@ -59,9 +59,9 @@ diff -upr mintmenu-orig/usr/lib/linuxmint/mintMenu/mintMenu.py mintmenu/usr/lib/
about.show()
diff -upr mintmenu-orig/usr/lib/linuxmint/mintMenu/plugins/applications.py mintmenu/usr/lib/linuxmint/mintMenu/plugins/applications.py
---- mintmenu-orig/usr/lib/linuxmint/mintMenu/plugins/applications.py 2013-11-30 10:55:54.430730000 +0100
-+++ mintmenu/usr/lib/linuxmint/mintMenu/plugins/applications.py 2013-11-30 11:03:32.948345999 +0100
-@@ -346,7 +346,7 @@ class pluginclass( object ):
+--- mintmenu-orig/usr/lib/linuxmint/mintMenu/plugins/applications.py 2015-03-31 12:29:11.276579000 +0200
++++ mintmenu/usr/lib/linuxmint/mintMenu/plugins/applications.py 2015-03-31 12:35:44.547340784 +0200
+@@ -343,7 +343,7 @@ class pluginclass( object ):
# def refresh_apt_cache(self):
# if self.useAPT:
# os.system("mkdir -p %s/.linuxmint/mintMenu/" % home)
@@ -70,7 +70,7 @@ diff -upr mintmenu-orig/usr/lib/linuxmint/mintMenu/plugins/applications.py mintm
def get_panel(self):
panelsettings = Gio.Settings.new("org.mate.panel")
-@@ -624,14 +624,14 @@ class pluginclass( object ):
+@@ -636,14 +636,14 @@ class pluginclass( object ):
suggestionButton = SuggestionButton(Gtk.STOCK_ADD, self.iconSize, "")
suggestionButton.connect("clicked", self.search_google)
suggestionButton.set_text(_("Search Google for %s") % text)
@@ -87,7 +87,7 @@ diff -upr mintmenu-orig/usr/lib/linuxmint/mintMenu/plugins/applications.py mintm
self.applicationsBox.add(suggestionButton)
self.suggestions.append(suggestionButton)
-@@ -648,7 +648,7 @@ class pluginclass( object ):
+@@ -659,7 +659,7 @@ class pluginclass( object ):
suggestionButton = SuggestionButton(Gtk.STOCK_ADD, self.iconSize, "")
suggestionButton.connect("clicked", self.search_dictionary)
suggestionButton.set_text(_("Lookup %s in Dictionary") % text)
@@ -96,7 +96,7 @@ diff -upr mintmenu-orig/usr/lib/linuxmint/mintMenu/plugins/applications.py mintm
self.applicationsBox.add(suggestionButton)
self.suggestions.append(suggestionButton)
-@@ -830,7 +830,7 @@ class pluginclass( object ):
+@@ -838,7 +838,7 @@ class pluginclass( object ):
else:
shownList.append(i)
showns = True
@@ -105,7 +105,7 @@ diff -upr mintmenu-orig/usr/lib/linuxmint/mintMenu/plugins/applications.py mintm
if len(text) >= 3:
if self.current_suggestion is not None and self.current_suggestion in text:
# We're restricting our search...
-@@ -1045,14 +1045,14 @@ class pluginclass( object ):
+@@ -1051,14 +1051,14 @@ class pluginclass( object ):
menuItem = Gtk.ImageMenuItem(_("Search Google"))
img = Gtk.Image()
@@ -122,7 +122,7 @@ diff -upr mintmenu-orig/usr/lib/linuxmint/mintMenu/plugins/applications.py mintm
menuItem.set_image(img)
menuItem.connect("activate", self.search_wikipedia)
menu.append(menuItem)
-@@ -1062,7 +1062,7 @@ class pluginclass( object ):
+@@ -1068,7 +1068,7 @@ class pluginclass( object ):
menuItem = Gtk.ImageMenuItem(_("Lookup Dictionary"))
img = Gtk.Image()
@@ -131,7 +131,7 @@ diff -upr mintmenu-orig/usr/lib/linuxmint/mintMenu/plugins/applications.py mintm
menuItem.set_image(img)
menuItem.connect("activate", self.search_dictionary)
menu.append(menuItem)
-@@ -1079,35 +1079,35 @@ class pluginclass( object ):
+@@ -1085,35 +1085,35 @@ class pluginclass( object ):
menuItem = Gtk.ImageMenuItem(_("Find Software"))
img = Gtk.Image()
@@ -172,17 +172,8 @@ diff -upr mintmenu-orig/usr/lib/linuxmint/mintMenu/plugins/applications.py mintm
menuItem.set_image(img)
menuItem.connect("activate", self.search_mint_users)
menu.append(menuItem)
-@@ -1182,7 +1182,7 @@ class pluginclass( object ):
+@@ -1409,7 +1409,7 @@ class pluginclass( object ):
try:
- # Determine where the Desktop folder is (could be localized)
- import sys, commands
-- sys.path.append('/usr/lib/linuxmint/common')
-+ sys.path.append('/usr/share/linuxmint/common')
- from configobj import ConfigObj
- config = ConfigObj(home + "/.config/user-dirs.dirs")
- desktopDir = home + "/Desktop"
-@@ -1422,7 +1422,7 @@ class pluginclass( object ):
- from user import home
if (not os.path.exists(home + "/.linuxmint/mintMenu/applications.list")):
os.system("mkdir -p " + home + "/.linuxmint/mintMenu/applications")
- os.system("cp /usr/lib/linuxmint/mintMenu/applications.list " + home + "/.linuxmint/mintMenu/applications.list")
@@ -191,9 +182,9 @@ diff -upr mintmenu-orig/usr/lib/linuxmint/mintMenu/plugins/applications.py mintm
applicationsFile = open ( os.path.join( os.path.expanduser( "~" ), ".linuxmint", "mintMenu", "applications.list" ), "r" )
applicationsList = applicationsFile.readlines()
diff -upr mintmenu-orig/usr/lib/linuxmint/mintMenu/plugins/easybuttons.py mintmenu/usr/lib/linuxmint/mintMenu/plugins/easybuttons.py
---- mintmenu-orig/usr/lib/linuxmint/mintMenu/plugins/easybuttons.py 2013-11-25 16:59:08.000000000 +0100
-+++ mintmenu/usr/lib/linuxmint/mintMenu/plugins/easybuttons.py 2013-11-30 11:04:11.507733488 +0100
-@@ -389,7 +389,7 @@ class ApplicationLauncher( easyButton ):
+--- mintmenu-orig/usr/lib/linuxmint/mintMenu/plugins/easybuttons.py 2014-09-30 13:19:50.000000000 +0200
++++ mintmenu/usr/lib/linuxmint/mintMenu/plugins/easybuttons.py 2015-03-31 12:36:42.501893066 +0200
+@@ -387,7 +387,7 @@ class ApplicationLauncher( easyButton ):
Execute(self.appExec, self.appPath)
def uninstall (self, *args ):
@@ -203,8 +194,8 @@ diff -upr mintmenu-orig/usr/lib/linuxmint/mintMenu/plugins/easybuttons.py mintme
# IconTheme changed, setup new icons for button and drag 'n drop
def iconChanged( self ):
diff -upr mintmenu-orig/usr/lib/linuxmint/mintMenu/plugins/places.py mintmenu/usr/lib/linuxmint/mintMenu/plugins/places.py
---- mintmenu-orig/usr/lib/linuxmint/mintMenu/plugins/places.py 2013-11-25 13:42:43.000000000 +0100
-+++ mintmenu/usr/lib/linuxmint/mintMenu/plugins/places.py 2013-11-30 11:04:44.568065714 +0100
+--- mintmenu-orig/usr/lib/linuxmint/mintMenu/plugins/places.py 2015-02-24 14:19:56.000000000 +0100
++++ mintmenu/usr/lib/linuxmint/mintMenu/plugins/places.py 2015-03-31 12:36:40.477873786 +0200
@@ -177,7 +177,7 @@ class pluginclass( object ):
desktopDir = home + "/Desktop"
try:
@@ -215,16 +206,16 @@ diff -upr mintmenu-orig/usr/lib/linuxmint/mintMenu/plugins/places.py mintmenu/us
config = ConfigObj(home + "/.config/user-dirs.dirs")
tmpdesktopDir = config['XDG_DESKTOP_DIR']
diff -upr mintmenu-orig/usr/share/dbus-1/services/org.mate.panel.applet.MintMenuAppletFactory.service mintmenu/usr/share/dbus-1/services/org.mate.panel.applet.MintMenuAppletFactory.service
---- mintmenu-orig/usr/share/dbus-1/services/org.mate.panel.applet.MintMenuAppletFactory.service 2013-08-16 03:21:05.000000000 +0200
-+++ mintmenu/usr/share/dbus-1/services/org.mate.panel.applet.MintMenuAppletFactory.service 2013-11-30 11:05:35.835580905 +0100
+--- mintmenu-orig/usr/share/dbus-1/services/org.mate.panel.applet.MintMenuAppletFactory.service 2014-09-30 13:19:50.000000000 +0200
++++ mintmenu/usr/share/dbus-1/services/org.mate.panel.applet.MintMenuAppletFactory.service 2015-03-31 12:37:23.653284944 +0200
@@ -1,3 +1,3 @@
[D-BUS Service]
Name=org.mate.panel.applet.MintMenuAppletFactory
-Exec=/usr/lib/linuxmint/mintMenu/mintMenu.py
+Exec=/usr/share/linuxmint/mintMenu/mintMenu.py
diff -upr mintmenu-orig/usr/share/glib-2.0/schemas/com.linuxmint.mintmenu.gschema.xml mintmenu/usr/share/glib-2.0/schemas/com.linuxmint.mintmenu.gschema.xml
---- mintmenu-orig/usr/share/glib-2.0/schemas/com.linuxmint.mintmenu.gschema.xml 2013-11-30 10:55:54.434730000 +0100
-+++ mintmenu/usr/share/glib-2.0/schemas/com.linuxmint.mintmenu.gschema.xml 2013-11-30 11:06:08.189906033 +0100
+--- mintmenu-orig/usr/share/glib-2.0/schemas/com.linuxmint.mintmenu.gschema.xml 2015-03-31 12:29:11.281580000 +0200
++++ mintmenu/usr/share/glib-2.0/schemas/com.linuxmint.mintmenu.gschema.xml 2015-03-31 12:37:58.661618145 +0200
@@ -69,7 +69,7 @@
</key>
@@ -235,8 +226,8 @@ diff -upr mintmenu-orig/usr/share/glib-2.0/schemas/com.linuxmint.mintmenu.gschem
<description></description>
</key>
diff -upr mintmenu-orig/usr/share/mate-panel/applets/org.mate.panel.MintMenuApplet.mate-panel-applet mintmenu/usr/share/mate-panel/applets/org.mate.panel.MintMenuApplet.mate-panel-applet
---- mintmenu-orig/usr/share/mate-panel/applets/org.mate.panel.MintMenuApplet.mate-panel-applet 2013-08-16 03:21:05.000000000 +0200
-+++ mintmenu/usr/share/mate-panel/applets/org.mate.panel.MintMenuApplet.mate-panel-applet 2013-11-30 11:06:55.240378841 +0100
+--- mintmenu-orig/usr/share/mate-panel/applets/org.mate.panel.MintMenuApplet.mate-panel-applet 2014-03-18 12:50:00.000000000 +0100
++++ mintmenu/usr/share/mate-panel/applets/org.mate.panel.MintMenuApplet.mate-panel-applet 2015-03-31 12:38:35.341967088 +0200
@@ -1,13 +1,13 @@
[Applet Factory]
Id=MintMenuAppletFactory
diff --git a/mintmenu_default-apps.patch b/mintmenu_default-apps.patch
index e549e8e..2a6327e 100644
--- a/mintmenu_default-apps.patch
+++ b/mintmenu_default-apps.patch
@@ -1,16 +1,17 @@
diff -upr mintmenu-orig/usr/lib/linuxmint/mintMenu/applications.list mintmenu/usr/lib/linuxmint/mintMenu/applications.list
---- mintmenu-orig/usr/lib/linuxmint/mintMenu/applications.list 2012-06-28 14:11:28.000000000 +0200
-+++ mintmenu/usr/lib/linuxmint/mintMenu/applications.list 2012-10-28 02:52:04.345549855 +0100
-@@ -2,13 +2,12 @@ location:/usr/share/applications/firefox
+--- mintmenu-orig/usr/lib/linuxmint/mintMenu/applications.list 2015-02-26 19:35:00.000000000 +0100
++++ mintmenu/usr/lib/linuxmint/mintMenu/applications.list 2015-03-31 13:11:27.796121082 +0200
+@@ -2,18 +2,19 @@ location:/usr/share/applications/firefox
location:/usr/share/applications/thunderbird.desktop
location:/usr/share/applications/pidgin.desktop
location:/usr/share/applications/banshee.desktop
-+location:/usr/share/applications/claws-mail.desktop
-+location:/usr/share/applications/evolution.desktop
-+location:/usr/share/applications/xchat.desktop
+++location:/usr/share/applications/claws-mail.desktop
+++location:/usr/share/applications/evolution.desktop
+++location:/usr/share/applications/xchat.desktop
separator
- location:/usr/share/applications/mate-calc.desktop
--location:/usr/share/applications/gcalctool.desktop
+-location:/usr/share/applications/gnome-calculator.desktop
++location:/usr/share/applications/mate-calc.desktop
+ location:/usr/share/applications/gcalctool.desktop
location:/usr/share/applications/pluma.desktop
-location:/usr/share/applications/gedit.desktop
-location:/usr/share/applications/mate-terminal.desktop
@@ -18,9 +19,10 @@ diff -upr mintmenu-orig/usr/lib/linuxmint/mintMenu/applications.list mintmenu/us
location:/usr/share/applications/mate-volume-control.desktop
location:/usr/share/applications/xfce4-mixer.desktop
separator
-@@ -16,3 +15,5 @@ location:/usr/share/applications/display
+ location:/usr/share/applications/mate-display-properties.desktop
location:/usr/share/applications/xfce-display-settings.desktop
location:/usr/share/applications/mate-system-monitor.desktop
+-location:/usr/share/applications/gnome-system-monitor.desktop
location:/usr/share/applications/xfce4-taskmanager.desktop
+location:/usr/share/applications/dconf-editor.desktop
-+location:/usr/share/applications/matepalimpsest.desktop
++location:/usr/share/applications/mate-disk.desktop
diff --git a/mintmenu_remove-apt-cache.patch b/mintmenu_remove-apt-cache.patch
index 9e75bc1..e7b12f3 100644
--- a/mintmenu_remove-apt-cache.patch
+++ b/mintmenu_remove-apt-cache.patch
@@ -1,6 +1,6 @@
diff -upr mintmenu-orig/usr/lib/linuxmint/mintMenu/mintMenuConfig.glade mintmenu/usr/lib/linuxmint/mintMenu/mintMenuConfig.glade
---- mintmenu-orig/usr/lib/linuxmint/mintMenu/mintMenuConfig.glade 2014-03-18 12:50:00.000000000 +0100
-+++ mintmenu/usr/lib/linuxmint/mintMenu/mintMenuConfig.glade 2014-04-27 09:26:06.992361693 +0200
+--- mintmenu-orig/usr/lib/linuxmint/mintMenu/mintMenuConfig.glade 2014-11-27 13:21:50.000000000 +0100
++++ mintmenu/usr/lib/linuxmint/mintMenu/mintMenuConfig.glade 2015-03-31 12:01:34.505031236 +0200
@@ -1128,25 +1128,6 @@
</packing>
</child>
@@ -28,8 +28,8 @@ diff -upr mintmenu-orig/usr/lib/linuxmint/mintMenu/mintMenuConfig.glade mintmenu
<property name="label" translatable="yes">Remember the last category or search</property>
<property name="visible">True</property>
diff -upr mintmenu-orig/usr/lib/linuxmint/mintMenu/mintMenuConfig.py mintmenu/usr/lib/linuxmint/mintMenu/mintMenuConfig.py
---- mintmenu-orig/usr/lib/linuxmint/mintMenu/mintMenuConfig.py 2014-04-01 15:11:19.000000000 +0200
-+++ mintmenu/usr/lib/linuxmint/mintMenu/mintMenuConfig.py 2014-04-27 09:29:02.121072161 +0200
+--- mintmenu-orig/usr/lib/linuxmint/mintMenu/mintMenuConfig.py 2014-11-27 13:21:50.000000000 +0100
++++ mintmenu/usr/lib/linuxmint/mintMenu/mintMenuConfig.py 2015-03-31 12:04:08.485460732 +0200
@@ -54,7 +54,6 @@ class mintMenuConfig( object ):
self.builder.get_object("showCategoryIcons").set_label(_("Show category icons"))
self.builder.get_object("hover").set_label(_("Hover"))
@@ -38,7 +38,7 @@ diff -upr mintmenu-orig/usr/lib/linuxmint/mintMenu/mintMenuConfig.py mintmenu/us
self.builder.get_object("swapGeneric").set_label(_("Swap name and generic name"))
self.builder.get_object("label11").set_text(_("Border width:"))
-@@ -117,7 +116,6 @@ class mintMenuConfig( object ):
+@@ -118,7 +117,6 @@ class mintMenuConfig( object ):
self.startWithFavorites = self.builder.get_object( "startWithFavorites" )
self.showAppComments = self.builder.get_object( "showAppComments" )
@@ -46,7 +46,7 @@ diff -upr mintmenu-orig/usr/lib/linuxmint/mintMenu/mintMenuConfig.py mintmenu/us
self.showCategoryIcons = self.builder.get_object( "showCategoryIcons" )
self.showRecentPlugin = self.builder.get_object( "showRecentPlugin" )
self.showApplicationsPlugin = self.builder.get_object( "showApplicationsPlugin" )
-@@ -201,7 +199,6 @@ class mintMenuConfig( object ):
+@@ -202,7 +200,6 @@ class mintMenuConfig( object ):
self.bindGSettingsValueToWidget( self.settings, "bool", "start-with-favorites", self.startWithFavorites, "toggled", self.startWithFavorites.set_active, self.startWithFavorites.get_active )
self.bindGSettingsValueToWidget( self.settingsApplications, "bool", "show-application-comments", self.showAppComments, "toggled", self.showAppComments.set_active, self.showAppComments.get_active )
@@ -55,8 +55,8 @@ diff -upr mintmenu-orig/usr/lib/linuxmint/mintMenu/mintMenuConfig.py mintmenu/us
self.bindGSettingsValueToWidget( self.settingsApplications, "bool", "categories-mouse-over", self.hover, "toggled", self.hover.set_active, self.hover.get_active )
self.bindGSettingsValueToWidget( self.settingsApplications, "bool", "swap-generic-name", self.swapGeneric, "toggled", self.swapGeneric.set_active, self.swapGeneric.get_active )
diff -upr mintmenu-orig/usr/lib/linuxmint/mintMenu/plugins/applications.py mintmenu/usr/lib/linuxmint/mintMenu/plugins/applications.py
---- mintmenu-orig/usr/lib/linuxmint/mintMenu/plugins/applications.py 2014-04-14 13:45:17.000000000 +0200
-+++ mintmenu/usr/lib/linuxmint/mintMenu/plugins/applications.py 2014-04-27 09:42:42.867195716 +0200
+--- mintmenu-orig/usr/lib/linuxmint/mintMenu/plugins/applications.py 2015-02-24 14:19:23.000000000 +0100
++++ mintmenu/usr/lib/linuxmint/mintMenu/plugins/applications.py 2015-03-31 12:16:10.779169622 +0200
@@ -292,7 +292,7 @@ class pluginclass( object ):
self.settings.notifyAdd( "swap-generic-name", self.changeSwapGenericName )
self.settings.notifyAdd( "show-category-icons", self.changeShowCategoryIcons )
@@ -131,7 +131,7 @@ diff -upr mintmenu-orig/usr/lib/linuxmint/mintMenu/plugins/applications.py mintm
# save old config - this is necessary because the app will notified when it sets the default values and you don't want the to reload itself several times
oldcategories_mouse_over = self.categories_mouse_over
-@@ -502,7 +502,7 @@ class pluginclass( object ):
+@@ -506,7 +506,7 @@ class pluginclass( object ):
self.showcategoryicons = self.settings.get( "bool", "show-category-icons")
self.categoryhoverdelay = self.settings.get( "int", "category-hover-delay")
self.showapplicationcomments = self.settings.get( "bool", "show-application-comments")
@@ -140,7 +140,7 @@ diff -upr mintmenu-orig/usr/lib/linuxmint/mintMenu/plugins/applications.py mintm
self.rememberFilter = self.settings.get( "bool", "remember-filter")
self.lastActiveTab = self.settings.get( "int", "last-active-tab")
-@@ -674,76 +674,76 @@ class pluginclass( object ):
+@@ -678,76 +678,76 @@ class pluginclass( object ):
#self.applicationsBox.add(self.last_separator)
#self.suggestions.append(self.last_separator)
@@ -187,33 +187,6 @@ diff -upr mintmenu-orig/usr/lib/linuxmint/mintMenu/plugins/applications.py mintm
- num_pkg_found+=1
- else:
- print "Invalid status code: " + status
--
-- found_packages.extend(found_in_name)
-- found_packages.extend(found_elsewhere)
-- if keyword == self.searchEntry.get_text() and len(found_packages) > 0:
-- last_separator = Gtk.EventBox()
-- last_separator.add(Gtk.HSeparator())
-- last_separator.set_visible_window(False)
-- last_separator.set_size_request(-1, 20)
-- last_separator.type = "separator"
-- last_separator.show_all()
-- self.applicationsBox.add(last_separator)
-- self.suggestions.append(last_separator)
-- #Reduce the number of results to 10 max... it takes a HUGE amount of time to add the GTK box in the menu otherwise..
-- if len(found_packages) > 10:
-- found_packages = found_packages[:10]
-- for pkg in found_packages:
-- name = pkg.name
-- for word in keywords:
-- if word != "":
-- name = name.replace(word, "<b>%s</b>" % word);
-- suggestionButton = SuggestionButton(Gtk.STOCK_ADD, self.iconSize, "")
-- suggestionButton.connect("clicked", self.apturl_install, pkg.name)
-- suggestionButton.set_text(_("Install package '%s'") % name)
-- suggestionButton.set_tooltip_text("%s\n\n%s\n\n%s" % (pkg.name, pkg.summary, pkg.description))
-- suggestionButton.set_icon_size(self.iconSize)
-- self.applicationsBox.add(suggestionButton)
-- self.suggestions.append(suggestionButton)
+# def add_apt_filter_results(self, keyword):
+# try:
+# # Wait to see if the keyword has changed.. before doing anything
@@ -257,7 +230,33 @@ diff -upr mintmenu-orig/usr/lib/linuxmint/mintMenu/plugins/applications.py mintm
+# num_pkg_found+=1
+# else:
+# print "Invalid status code: " + status
-+#
+
+- found_packages.extend(found_in_name)
+- found_packages.extend(found_elsewhere)
+- if keyword == self.searchEntry.get_text() and len(found_packages) > 0:
+- last_separator = Gtk.EventBox()
+- last_separator.add(Gtk.HSeparator())
+- last_separator.set_visible_window(False)
+- last_separator.set_size_request(-1, 20)
+- last_separator.type = "separator"
+- last_separator.show_all()
+- self.applicationsBox.add(last_separator)
+- self.suggestions.append(last_separator)
+- #Reduce the number of results to 10 max... it takes a HUGE amount of time to add the GTK box in the menu otherwise..
+- if len(found_packages) > 10:
+- found_packages = found_packages[:10]
+- for pkg in found_packages:
+- name = pkg.name
+- for word in keywords:
+- if word != "":
+- name = name.replace(word, "<b>%s</b>" % word);
+- suggestionButton = SuggestionButton(Gtk.STOCK_ADD, self.iconSize, "")
+- suggestionButton.connect("clicked", self.apturl_install, pkg.name)
+- suggestionButton.set_text(_("Install package '%s'") % name)
+- suggestionButton.set_tooltip_text("%s\n\n%s\n\n%s" % (pkg.name, pkg.summary, pkg.description))
+- suggestionButton.set_icon_size(self.iconSize)
+- self.applicationsBox.add(suggestionButton)
+- self.suggestions.append(suggestionButton)
+# found_packages.extend(found_in_name)
+# found_packages.extend(found_elsewhere)
+# if keyword == self.searchEntry.get_text() and len(found_packages) > 0:
@@ -287,7 +286,7 @@ diff -upr mintmenu-orig/usr/lib/linuxmint/mintMenu/plugins/applications.py mintm
#if cache != self.current_results:
# self.current_results.append(pkg)
-@@ -755,55 +755,55 @@ class pluginclass( object ):
+@@ -759,55 +759,55 @@ class pluginclass( object ):
# finally:
# gtk.gdk.threads_leave()
@@ -312,29 +311,6 @@ diff -upr mintmenu-orig/usr/lib/linuxmint/mintMenu/plugins/applications.py mintm
- some_not_found = True
- if some_found and not some_not_found:
- found_packages.append(pkg)
--
-- if len(found_packages) > 0:
-- last_separator = Gtk.EventBox()
-- last_separator.add(Gtk.HSeparator())
-- last_separator.set_visible_window(False)
-- last_separator.set_size_request(-1, 20)
-- last_separator.type = "separator"
-- last_separator.show_all()
-- self.applicationsBox.add(last_separator)
-- self.suggestions.append(last_separator)
--
-- for pkg in found_packages:
-- name = pkg.name
-- for word in keywords:
-- if word != "":
-- name = name.replace(word, "<b>%s</b>" % word);
-- suggestionButton = SuggestionButton(Gtk.STOCK_ADD, self.iconSize, "")
-- suggestionButton.connect("clicked", self.apturl_install, pkg.name)
-- suggestionButton.set_text(_("Install package '%s'") % name)
-- suggestionButton.set_tooltip_text("%s\n\n%s\n\n%s" % (pkg.name, pkg.summary.capitalize(), pkg.description))
-- suggestionButton.set_icon_size(self.iconSize)
-- self.applicationsBox.add(suggestionButton)
-- self.suggestions.append(suggestionButton)
+# def add_apt_filter_results_sync(self, cache, keyword):
+# try:
+# found_packages = []
@@ -350,17 +326,38 @@ diff -upr mintmenu-orig/usr/lib/linuxmint/mintMenu/plugins/applications.py mintm
+# some_not_found = True
+# if some_found and not some_not_found:
+# found_packages.append(pkg)
-+#
+
+- if len(found_packages) > 0:
+- last_separator = Gtk.EventBox()
+- last_separator.add(Gtk.HSeparator())
+- last_separator.set_visible_window(False)
+- last_separator.set_size_request(-1, 20)
+- last_separator.type = "separator"
+- last_separator.show_all()
+- self.applicationsBox.add(last_separator)
+- self.suggestions.append(last_separator)
+# if len(found_packages) > 0:
-+# last_separator = Gtk.EventBox()
-+# last_separator.add(Gtk.HSeparator())
-+# last_separator.set_visible_window(False)
-+# last_separator.set_size_request(-1, 20)
-+# last_separator.type = "separator"
-+# last_separator.show_all()
-+# self.applicationsBox.add(last_separator)
-+# self.suggestions.append(last_separator)
-+#
++# last_separator = Gtk.EventBox()
++# last_separator.add(Gtk.HSeparator())
++# last_separator.set_visible_window(False)
++# last_separator.set_size_request(-1, 20)
++# last_separator.type = "separator"
++# last_separator.show_all()
++# self.applicationsBox.add(last_separator)
++# self.suggestions.append(last_separator)
+
+- for pkg in found_packages:
+- name = pkg.name
+- for word in keywords:
+- if word != "":
+- name = name.replace(word, "<b>%s</b>" % word);
+- suggestionButton = SuggestionButton(Gtk.STOCK_ADD, self.iconSize, "")
+- suggestionButton.connect("clicked", self.apturl_install, pkg.name)
+- suggestionButton.set_text(_("Install package '%s'") % name)
+- suggestionButton.set_tooltip_text("%s\n\n%s\n\n%s" % (pkg.name, pkg.summary.capitalize(), pkg.description))
+- suggestionButton.set_icon_size(self.iconSize)
+- self.applicationsBox.add(suggestionButton)
+- self.suggestions.append(suggestionButton)
+# for pkg in found_packages:
+# name = pkg.name
+# for word in keywords:
@@ -385,7 +382,7 @@ diff -upr mintmenu-orig/usr/lib/linuxmint/mintMenu/plugins/applications.py mintm
def Filter( self, widget, category = None ):
self.filterTimer = None
-@@ -843,11 +843,11 @@ class pluginclass( object ):
+@@ -846,11 +846,11 @@ class pluginclass( object ):
#if (len(self.current_results) > 0):
#self.add_apt_filter_results_sync(self.current_results, text)
#else:
@@ -401,7 +398,7 @@ diff -upr mintmenu-orig/usr/lib/linuxmint/mintMenu/plugins/applications.py mintm
else:
diff -upr mintmenu-orig/usr/share/glib-2.0/schemas/com.linuxmint.mintmenu.gschema.xml mintmenu/usr/share/glib-2.0/schemas/com.linuxmint.mintmenu.gschema.xml
--- mintmenu-orig/usr/share/glib-2.0/schemas/com.linuxmint.mintmenu.gschema.xml 2014-03-18 12:50:00.000000000 +0100
-+++ mintmenu/usr/share/glib-2.0/schemas/com.linuxmint.mintmenu.gschema.xml 2014-04-27 09:44:11.819074004 +0200
++++ mintmenu/usr/share/glib-2.0/schemas/com.linuxmint.mintmenu.gschema.xml 2015-03-31 12:17:23.547845748 +0200
@@ -266,12 +266,6 @@
<description></description>
</key>
diff --git a/sources b/sources
index f584ea3..80d5c86 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-0e64efeacf40603babcaa163a5ab34bf mintmenu_5.6.0.tar.gz
-f8a5f54bedeb6084da22ee687c289d02 mint-translations_2014.10.31.tar.gz
+646f92a3011a0cd0831dd33c8710c755 mintmenu_5.6.2.tar.gz
+fb69f014698e0f69613927e72fbccebf mint-translations_2015.02.25.tar.gz
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/mintmenu.git/commit/?h=f22&id=5d9c16a04b16c46f9b98c89f02b6f644b8e21f80
More information about the scm-commits
mailing list