mate-session-manager 1.26.1-2.10 for Callisto Desktop

debian/changelog

@@ -1,3 +1,39 @@
+mate-session-manager (1.26.1-2.10) unstable; urgency=medium
+
+  * Japanese mnemonic delete
+
+ -- Maia <maia@tsundoku.ne.jp>  Thu, 08 May 2025 22:34:35 -0700
+
+mate-session-manager (1.26.1-2) unstable; urgency=medium
+
+  * debian/rules:
+    + Set LIBEXECDIR to /usr/libexec/. This is required for some correct
+      interaction with mate-system-monitor. Thanks to Jeremy Bicha for
+      bringing this up.
+
+ -- Mike Gabriel <sunweaver@debian.org>  Sun, 24 Sep 2023 23:25:19 +0200
+
+mate-session-manager (1.26.1-1) unstable; urgency=medium
+
+  * New upstream release. (Closes: #1038638).
+    - mate-session-check-accelerated*.c: Fix memory leaks.
+    - mate-session/{main.c,gsm-manager.c}: Fix memory leaks.
+  * debian/patches:
+    + Cherry-pick upstream double-free fix: 0009_main-fix-double-free-on-
+      gl_renderer.patch.
+    + Trivial rebase of 0005_lock-session-before-user-switch.patch.
+  * debian/default-settings/X11/Xsession.d/99mate-environment:
+    + Allow clutter backends other than x11 (while preferring x11). (Closes:
+      #954783).
+  * debian/control:
+    + Bump Standards-Version: to 4.6.2. No changes needed.
+  * debian/rules:
+    + Set libexecdir to /usr/libexec/mate-session-manager.
+  * debian/copyright:
+    + Update copyright attribution for debian/ folder.
+
+ -- Mike Gabriel <sunweaver@debian.org>  Mon, 19 Jun 2023 13:53:53 +0200
+
 mate-session-manager (1.26.0-1) unstable; urgency=medium
 
   [ Martin Wimpress ]

debian/control

@@ -6,8 +6,6 @@ Uploaders: Mike Gabriel <sunweaver@debian.org>,
            John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>,
            Stefano Karapetsas <stefano@karapetsas.com>,
            Vangelis Mouhtsis <vangelis@gnugr.org>,
-Standards-Version: 4.6.0
-Rules-Requires-Root: no
 Build-Depends: autoconf-archive,
                debhelper-compat (= 13),
                dpkg-dev (>= 1.16.1.1),
@@ -30,6 +28,8 @@ Build-Depends: autoconf-archive,
                mate-submodules-source (>= 0.0~git20210623.f3091f9),
                xmlto,
                xsltproc,
+Standards-Version: 4.6.2
+Rules-Requires-Root: no
 Homepage: http://www.mate-desktop.org/
 Vcs-Browser: https://salsa.debian.org/debian-mate-team/mate-session-manager
 Vcs-Git: https://salsa.debian.org/debian-mate-team/mate-session-manager.git

debian/copyright

@@ -246,7 +246,7 @@ License: public-domain
 Files: debian/*
 Copyright: 2011-2014, Stefano Karapetsas <stefano@karapetsas.com>
            2014-2015, Martin Wimpress <code@flexion.org>
-           2014-2021, Mike Gabriel <sunweaver@debian.org>
+           2014-2023, Mike Gabriel <sunweaver@debian.org>
 License: GPL-2+ or LGPL-2+
 
 License: GPL-2+

debian/default-settings/X11/Xsession.d/99mate-environment

@@ -33,6 +33,6 @@ if [ "x$DESKTOP_SESSION" = "xmate" ] || [ "x$XDG_SESSION_DESKTOP" = "xmate" ]; t
     #  - Telegram doesn't work with QT_STYLE_OVERRIDE=gtk
     # export QT_STYLE_OVERRIDE=gtk
 
-    # Workaround clutter issue (LP: #1462445)
-    export CLUTTER_BACKEND=x11
+    # Workaround clutter issue (LP: #1462445, Debian #954783)
+    export CLUTTER_BACKEND="x11,*"
 fi

debian/patches/0005_lock-session-before-user-switch.patch

@@ -6,7 +6,7 @@ Date:   Wed Dec 9 13:52:31 2015 +0100
 
 --- a/mate-session/gsm-manager.c
 +++ b/mate-session/gsm-manager.c
-@@ -3429,6 +3429,19 @@
+@@ -3433,6 +3433,19 @@
          case GTK_RESPONSE_DELETE_EVENT:
                  break;
          case GSM_LOGOUT_RESPONSE_SWITCH_USER:

debian/patches/3000_ja-no-mnemonics.patch

@@ -0,0 +1,149 @@
+Description: Remove mnemonics from Japanese localized strings
+Origin: Callisto Desktop
+Author: Maia <maia@tsundoku.ne.jp>
+Last-Update: 2023-06-19 1.26.1
+
+diff -urN a/po/ja.po b/po/ja.po
+--- a/po/ja.po	2023-05-05 08:29:11.000000000 -0700
++++ b/po/ja.po	2023-06-19 13:35:55.742351334 -0700
+@@ -42,7 +42,7 @@
+ #: capplet/gsm-app-dialog.c:218 mate-session/gsm-logout-dialog.c:453
+ #: mate-session/gsm-logout-dialog.c:486
+ msgid "_Cancel"
+-msgstr "キャンセル(_C)"
++msgstr "キャンセル"
+ 
+ #: capplet/gsm-app-dialog.c:224
+ msgid "Add Startup Program"
+@@ -50,7 +50,7 @@
+ 
+ #: capplet/gsm-app-dialog.c:226 data/session-properties.ui:86
+ msgid "_Add"
+-msgstr "追加(_A)"
++msgstr "追加"
+ 
+ #: capplet/gsm-app-dialog.c:229
+ msgid "Edit Startup Program"
+@@ -58,7 +58,7 @@
+ 
+ #: capplet/gsm-app-dialog.c:231
+ msgid "_Save"
+-msgstr "保存(_S)"
++msgstr "保存"
+ 
+ #: capplet/gsm-app-dialog.c:544
+ msgid "The startup command cannot be empty"
+@@ -70,11 +70,11 @@
+ 
+ #: capplet/gsm-properties-dialog.c:586
+ msgid "_Help"
+-msgstr "ヘルプ(_H)"
++msgstr "ヘルプ"
+ 
+ #: capplet/gsm-properties-dialog.c:590
+ msgid "_Close"
+-msgstr "閉じる(_C)"
++msgstr "閉じる"
+ 
+ #: capplet/gsm-properties-dialog.c:640
+ msgid "Enabled"
+@@ -299,19 +299,19 @@
+ 
+ #: data/session-properties.ui:35
+ msgid "Additional startup _programs:"
+-msgstr "自動的に起動するプログラムの追加(_P):"
++msgstr "自動的に起動するプログラムの追加:"
+ 
+ #: data/session-properties.ui:101
+ msgid "_Remove"
+-msgstr "削除(_R)"
++msgstr "削除"
+ 
+ #: data/session-properties.ui:117
+ msgid "_Edit"
+-msgstr "編集(_E)"
++msgstr "編集"
+ 
+ #: data/session-properties.ui:147
+ msgid "_Show hidden"
+-msgstr "隠しフォルダを表示(_S)"
++msgstr "隠しフォルダを表示"
+ 
+ #: data/session-properties.ui:168
+ msgid "Startup Programs"
+@@ -319,11 +319,11 @@
+ 
+ #: data/session-properties.ui:183
+ msgid "_Automatically remember running applications when logging out"
+-msgstr "ログアウト時に実行中のアプリを自動的に記憶しておく(_A)"
++msgstr "ログアウト時に実行中のアプリを自動的に記憶しておく"
+ 
+ #: data/session-properties.ui:225
+ msgid "_Remember Currently Running Application"
+-msgstr "現在実行中のアプリを記憶しておく(_R)"
++msgstr "現在実行中のアプリを記憶しておく"
+ 
+ #: data/session-properties.ui:259
+ msgid "Options"
+@@ -335,19 +335,19 @@
+ 
+ #: data/session-properties.ui:340
+ msgid "Comm_ent:"
+-msgstr "説明(_E):"
++msgstr "説明:"
+ 
+ #: data/session-properties.ui:354
+ msgid "Co_mmand:"
+-msgstr "コマンド(_M):"
++msgstr "コマンド:"
+ 
+ #: data/session-properties.ui:368
+ msgid "_Name:"
+-msgstr "名前(_N):"
++msgstr "名前:"
+ 
+ #: data/session-properties.ui:382
+ msgid "_Delay:"
+-msgstr "間隔(_D):"
++msgstr "間隔:"
+ 
+ #: mate-submodules/libegg/eggdesktopfile.c:168
+ msgid "File is not a valid .desktop file"
+@@ -488,11 +488,11 @@
+ 
+ #: mate-session/gsm-logout-dialog.c:448
+ msgid "_Switch User"
+-msgstr "ユーザーを切り替える(_S)"
++msgstr "ユーザーを切り替える"
+ 
+ #: mate-session/gsm-logout-dialog.c:457
+ msgid "_Log Out"
+-msgstr "ログアウト(_L)"
++msgstr "ログアウト"
+ 
+ #: mate-session/gsm-logout-dialog.c:463
+ msgid "Shut down this system now?"
+@@ -500,19 +500,19 @@
+ 
+ #: mate-session/gsm-logout-dialog.c:469
+ msgid "S_uspend"
+-msgstr "サスペンド(_U)"
++msgstr "サスペンド"
+ 
+ #: mate-session/gsm-logout-dialog.c:475
+ msgid "_Hibernate"
+-msgstr "ハイバーネート(_H)"
++msgstr "ハイバーネート"
+ 
+ #: mate-session/gsm-logout-dialog.c:481
+ msgid "_Restart"
+-msgstr "再起動(_R)"
++msgstr "再起動"
+ 
+ #: mate-session/gsm-logout-dialog.c:491
+ msgid "_Shut Down"
+-msgstr "シャットダウン(_S)"
++msgstr "シャットダウン"
+ 
+ #: mate-session/gsm-manager.c:1527 mate-session/gsm-manager.c:2352
+ msgid "Not responding"

debian/patches/series

@@ -1,3 +1,4 @@
 0005_lock-session-before-user-switch.patch
 0006_util-Blacklist-some-session-specific-variables.patch
 0009_main-fix-double-free-on-gl_renderer.patch
+3000_ja-no-mnemonics.patch

debian/rules

@@ -36,7 +36,7 @@ override_dh_auto_configure:
 	dh_auto_configure $(DHFLAGS) -- \
 		--disable-silent-rules \
 		--localstatedir=/var/lib \
-		--libexecdir=/usr/lib \
+		--libexecdir=/usr/libexec \
 		$(SYSTEMD_OPTS)
 
 get-orig-source: