Commits:
-
0cace887
by Mike Gabriel at 2023-11-05T15:05:28+01:00
debian/patches: Add 0001_fix-upstream-version.patch, 0002_fix-categories-without-icon.patch (cherry-picked from upstream PRs). Add 1001_py-setup-clean-i18n.patch: Stop using clean_i18n class from distutils.extra. (Closes: #1054802).
-
238034c3
by Mike Gabriel at 2023-11-05T15:05:30+01:00
debian/control: Bump Standards-Version: to 4.6.2. No changes needed.
-
fa8b6192
by Mike Gabriel at 2023-11-05T15:06:21+01:00
upload to unstable (debian/22.04.2-2)
6 changed files:
Changes:
debian/changelog
|
|
1
|
+mate-menu (22.04.2-2) unstable; urgency=medium
|
|
|
2
|
+
|
|
|
3
|
+ * debian/patches:
|
|
|
4
|
+ + Add 0001_fix-upstream-version.patch, 0002_fix-categories-without-
|
|
|
5
|
+ icon.patch (cherry-picked from upstream PRs).
|
|
|
6
|
+ + Add 1001_py-setup-clean-i18n.patch: Stop using clean_i18n class from
|
|
|
7
|
+ distutils.extra. (Closes: #1054802).
|
|
|
8
|
+ * debian/control:
|
|
|
9
|
+ + Bump Standards-Version: to 4.6.2. No changes needed.
|
|
|
10
|
+
|
|
|
11
|
+ -- Mike Gabriel <sunweaver@debian.org> Sun, 05 Nov 2023 14:02:54 +0000
|
|
|
12
|
+
|
|
1
|
13
|
mate-menu (22.04.2-1) unstable; urgency=medium
|
|
2
|
14
|
|
|
3
|
15
|
[ Martin Wimpress ]
|
debian/control
| ... |
... |
@@ -10,7 +10,7 @@ Build-Depends: debhelper-compat (= 13), |
|
10
|
10
|
python3,
|
|
11
|
11
|
python3-setuptools,
|
|
12
|
12
|
python3-distutils-extra,
|
|
13
|
|
-Standards-Version: 4.6.0
|
|
|
13
|
+Standards-Version: 4.6.2
|
|
14
|
14
|
Rules-Requires-Root: no
|
|
15
|
15
|
Homepage: https://github.com/ubuntu-mate/mate-menu/
|
|
16
|
16
|
Vcs-Browser: https://salsa.debian.org/debian-mate-team/mate-menu
|
debian/patches/0001_fix-upstream-version.patch
|
|
1
|
+From 219fb38debb49e49168a09e36036118f9b874b2f Mon Sep 17 00:00:00 2001
|
|
|
2
|
+From: Andrey Cherepanov <cas@altlinux.org>
|
|
|
3
|
+Date: Thu, 12 Jan 2023 13:03:34 +0300
|
|
|
4
|
+Subject: [PATCH] Fix application version (same as tag)
|
|
|
5
|
+
|
|
|
6
|
+---
|
|
|
7
|
+ lib/mate-menu.py | 2 +-
|
|
|
8
|
+ 1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
9
|
+
|
|
|
10
|
+diff --git a/lib/mate-menu.py b/lib/mate-menu.py
|
|
|
11
|
+index 6cf7198..6735012 100755
|
|
|
12
|
+--- a/lib/mate-menu.py
|
|
|
13
|
++++ b/lib/mate-menu.py
|
|
|
14
|
+@@ -19,7 +19,7 @@
|
|
|
15
|
+ # Free Software Foundation, Inc.,
|
|
|
16
|
+ # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
|
|
|
17
|
+
|
|
|
18
|
+-__VERSION__='22.04.1'
|
|
|
19
|
++__VERSION__='22.04.2'
|
|
|
20
|
+
|
|
|
21
|
+ import gc
|
|
|
22
|
+ import gi |
debian/patches/0002_fix-categories-without-icon.patch
|
|
1
|
+From 7bf131515e618aff394dbd1900f68e9ec1862052 Mon Sep 17 00:00:00 2001
|
|
|
2
|
+From: Andrey Cherepanov <cas@altlinux.org>
|
|
|
3
|
+Date: Sun, 7 May 2023 15:58:01 +0300
|
|
|
4
|
+Subject: [PATCH] Fix categories without icon
|
|
|
5
|
+
|
|
|
6
|
+For example, Citrix StoreFront sub-system generate menu file without
|
|
|
7
|
+<Directory> tag. Application plugin get from get_icon() value None and
|
|
|
8
|
+try to call .to_string(). Because it generates exception therefore any
|
|
|
9
|
+other categories did not process and menu is empty. This commit catches
|
|
|
10
|
+this situation and substitutes 'application-other' icon for categories
|
|
|
11
|
+without icon.
|
|
|
12
|
+---
|
|
|
13
|
+ mate_menu/plugins/applications.py | 6 +++++-
|
|
|
14
|
+ 1 file changed, 5 insertions(+), 1 deletion(-)
|
|
|
15
|
+
|
|
|
16
|
+diff --git a/mate_menu/plugins/applications.py b/mate_menu/plugins/applications.py
|
|
|
17
|
+index b5d6b8f..f41b9e8 100644
|
|
|
18
|
+--- a/mate_menu/plugins/applications.py
|
|
|
19
|
++++ b/mate_menu/plugins/applications.py
|
|
|
20
|
+@@ -1569,7 +1569,11 @@ def buildCategoryList( self ):
|
|
|
21
|
+ for child in get_contents(menu.directory):
|
|
|
22
|
+ if isinstance(child, MateMenu.TreeDirectory):
|
|
|
23
|
+ name = child.get_name()
|
|
|
24
|
+- icon = child.get_icon().to_string()
|
|
|
25
|
++ icon = child.get_icon()
|
|
|
26
|
++ if ( icon == None ):
|
|
|
27
|
++ icon = "applications-other"
|
|
|
28
|
++ else:
|
|
|
29
|
++ icon = icon.to_string()
|
|
|
30
|
+ newCategoryList.append( { "name": name, "icon": icon, "tooltip": name, "filter": name, "index": num } )
|
|
|
31
|
+ num += 1
|
|
|
32
|
+ |
debian/patches/1001_py-setup-clean-i18n.patch
|
|
1
|
+Description: Don't use clean_i18n command from distutils.extra. Causes FTBFS nowadays.
|
|
|
2
|
+Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
|
|
|
3
|
+
|
|
|
4
|
+--- a/setup.py
|
|
|
5
|
++++ b/setup.py
|
|
|
6
|
+@@ -102,7 +102,6 @@
|
|
|
7
|
+ cmdclass = {
|
|
|
8
|
+ "build" : DistUtilsExtra.command.build_extra.build_extra,
|
|
|
9
|
+ "build_i18n" : DistUtilsExtra.command.build_i18n.build_i18n,
|
|
|
10
|
+- "clean": DistUtilsExtra.command.clean_i18n.clean_i18n,
|
|
|
11
|
+ }
|
|
|
12
|
+
|
|
|
13
|
+ setup( |
debian/patches/series
|
|
1
|
+0001_fix-upstream-version.patch
|
|
|
2
|
+0002_fix-categories-without-icon.patch
|
|
|
3
|
+1001_py-setup-clean-i18n.patch |
|