debian/changelog

+mate-panel (1.20.4-1) unstable; urgency=medium
+
+  * New upstream release.
+    - Transfer focus on alt-F1 correctly. (Closes: #909176).
+  * debian/patches:
+    + Add 0001_RDA-support-Make-MATE-panel-aware-of-being-run-insid.patch,
+          0002_mate-panel-panel-menu-items.c-Only-offer-Shutdown-bu.patch,
+          0003_configure.ac-Report-RDA-support-status-in-configurat.patch.
+      Introduce RDA (remote desktop awareness).
+  * debian/control:
+    + Bump Standards-Version: to 4.3.0. No changes needed.
+    + Add B-D librda-dev.
+  * debian/libmate-panel-applet-4-1.symbols:
+    + Add Build-Depends-Package meta data field.
+  * debian/compat:
+    + Drop file. Use new debhelper-compat notation in control file (and bump
+      to DH compat level version 12).
+  * debian/copyright:
+    + Update copyright attributions
+
+ -- Mike Gabriel <sunweaver@debian.org>  Sun, 06 Jan 2019 17:10:27 +0100
+
 mate-panel (1.20.3-1) unstable; urgency=medium
 
   * New upstream release.

debian/compat

-11

debian/control

@@ -7,7 +7,7 @@ Uploaders: Mike Gabriel <sunweaver@debian.org>,
            Stefano Karapetsas <stefano@karapetsas.com>,
            Vangelis Mouhtsis <vangelis@gnugr.org>,
            Petr Baudis <pasky@ucw.cz>,
-Build-Depends: debhelper (>= 11~),
+Build-Depends: debhelper-compat (= 12),
                dpkg-dev (>= 1.16.1.1),
                gir1.2-freedesktop,
                gobject-introspection,
@@ -26,6 +26,7 @@ Build-Depends: debhelper (>= 11~),
                libmate-menu-dev (>= 1.18),
                libmateweather-dev (>= 1.18),
                libpango1.0-dev,
+               librda-dev,
                librsvg2-dev,
                libsm-dev,
                libsoup2.4-dev,

debian/copyright

@@ -600,6 +600,8 @@ Comment:
  Assume license as found either in COPYING or in COPYING.LIB file.
 
 Files: mate-panel.pot
+       mate-clock.pot
+       mate-fish.pot
        po/*.po
        po/gnome-copyrights.txt
 Copyright: THE PACKAGE'S COPYRIGHT HOLDER

debian/libmate-panel-applet-4-1.symbols

 libmate-panel-applet-4.so.1 libmate-panel-applet-4-1 #MINVER#
+* Build-Depends-Package: libmate-panel-applet-dev
  _mate_panel_applet_apply_css@Base 1.14.0
  mate_panel_applet_background_type_get_type@Base 1.6.1
 #MISSING: 1.18.7# g_cclosure_marshal_VOID__ENUM@Base 1.18.6

debian/patches/0001_RDA-support-Make-MATE-panel-aware-of-being-run-insid.patch

+From 4934f12e597c137822f25c456de36341bc374e4b Mon Sep 17 00:00:00 2001
+From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+Date: Wed, 27 Jun 2018 15:20:16 +0200
+Subject: [PATCH 1/3] RDA support: Make MATE panel aware of being run inside a
+ remote desktop technology.
+
+---
+ configure.ac                       |  7 +++++++
+ mate-panel/Makefile.am             |  2 ++
+ mate-panel/panel-action-button.c   | 38 ++++++++++++++++++++++++++++++++++++++
+ mate-panel/panel-enums-gsettings.h |  1 +
+ mate-panel/panel-icon-names.h      |  1 +
+ mate-panel/panel-menu-items.c      | 25 +++++++++++++++++++++++++
+ 6 files changed, 74 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index 1196f44..2c544ed 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -202,6 +202,13 @@ if test "x$have_randr" = "xyes"; then
+   AC_DEFINE(HAVE_RANDR, 1, [Have the Xrandr extension library])
+ fi
+ 
++dnl Remote Desktop Awareness
++
++PKG_CHECK_MODULES(RDA, rda, have_rda=yes, have_rda=no)
++if test "x$have_rda" = "xyes"; then
++  AC_DEFINE(HAVE_RDA, 1, [Have the Remote Desktop Awareness library])
++fi
++
+ dnl Modules dir
+ AC_SUBST([modulesdir],"\$(libdir)/mate-panel/modules")
+ 
+diff --git a/mate-panel/Makefile.am b/mate-panel/Makefile.am
+index 836b49e..3c21782 100644
+--- a/mate-panel/Makefile.am
++++ b/mate-panel/Makefile.am
+@@ -124,6 +124,7 @@ mate_panel_SOURCES = \
+ mate_panel_CPPFLAGS = \
+ 	$(AM_CPPFLAGS) \
+ 	$(XRANDR_CFLAGS) \
++	$(RDA_CFLAGS) \
+ 	-DPANEL_MODULES_DIR=\"$(modulesdir)\" \
+ 	-DMATEMENU_I_KNOW_THIS_IS_UNSTABLE
+ 
+@@ -135,6 +136,7 @@ mate_panel_LDADD = \
+ 	$(DCONF_LIBS) \
+ 	$(XRANDR_LIBS) \
+ 	$(X_LIBS) \
++	$(RDA_LIBS) \
+ 	-lm
+ 
+ mate_panel_LDFLAGS = -export-dynamic
+diff --git a/mate-panel/panel-action-button.c b/mate-panel/panel-action-button.c
+index e0612b2..bebfc61 100644
+--- a/mate-panel/panel-action-button.c
++++ b/mate-panel/panel-action-button.c
+@@ -33,6 +33,10 @@
+ #include <glib/gi18n.h>
+ #include <gio/gio.h>
+ 
++#ifdef HAVE_RDA
++#include <rda/rda.h>
++#endif
++
+ #define MATE_DESKTOP_USE_UNSTABLE_API
+ #include <libmate-desktop/mate-desktop-utils.h>
+ #include <libmate-desktop/mate-gsettings.h>
+@@ -96,6 +100,9 @@ static ObsoleteEnumStringPair panel_action_type_map [] = {
+ 	{ PANEL_ACTION_FORCE_QUIT,     "force-quit"     },
+ 	{ PANEL_ACTION_CONNECT_SERVER, "connect-server" },
+ 	{ PANEL_ACTION_SHUTDOWN,       "shutdown"       },
++#ifdef HAVE_RDA
++	{ PANEL_ACTION_SUSPEND,        "suspend"        },
++#endif
+ 	{ 0,                           NULL             },
+ };
+ 
+@@ -232,6 +239,24 @@ panel_action_logout (GtkWidget *widget)
+ 						      PANEL_SESSION_MANAGER_LOGOUT_MODE_NORMAL);
+ }
+ 
++#ifdef HAVE_RDA
++/* Suspend Remote Session
++ */
++static void
++panel_action_suspend (GtkWidget *widget)
++{
++
++	rda_session_suspend();
++
++}
++
++static gboolean
++panel_action_suspend_not_supported(void)
++{
++	return (!rda_session_can_be_suspended());
++}
++#endif /* HAVE_RDA */
++
+ static void
+ panel_action_shutdown (GtkWidget *widget)
+ {
+@@ -412,6 +437,19 @@ static PanelAction actions [] = {
+ 		panel_action_shutdown, NULL, NULL,
+ 		panel_action_shutdown_reboot_is_disabled
+ 	}
++#ifdef HAVE_RDA
++        ,
++	{
++		PANEL_ACTION_SUSPEND,
++		PANEL_ICON_SUSPEND,
++		N_("Suspend Session..."),
++		N_("Suspend the Remote Session and Resume later"),
++		"gospanel-20",
++		"ACTION:suspend:NEW",
++		panel_action_suspend, NULL, NULL,
++		panel_action_suspend_not_supported
++	}
++#endif /* HAVE_RDA */
+ };
+ 
+ gboolean
+diff --git a/mate-panel/panel-enums-gsettings.h b/mate-panel/panel-enums-gsettings.h
+index 3f9a756..da2bcef 100644
+--- a/mate-panel/panel-enums-gsettings.h
++++ b/mate-panel/panel-enums-gsettings.h
+@@ -68,6 +68,7 @@ typedef enum {
+ 	PANEL_ACTION_FORCE_QUIT,
+ 	PANEL_ACTION_CONNECT_SERVER,
+ 	PANEL_ACTION_SHUTDOWN,
++	PANEL_ACTION_SUSPEND,
+ 	PANEL_ACTION_LAST
+ } PanelActionButtonType;
+ 
+diff --git a/mate-panel/panel-icon-names.h b/mate-panel/panel-icon-names.h
+index 4c948b7..c887a34 100644
+--- a/mate-panel/panel-icon-names.h
++++ b/mate-panel/panel-icon-names.h
+@@ -33,6 +33,7 @@
+ #define PANEL_ICON_SAVED_SEARCH		"folder-saved-search"
+ #define PANEL_ICON_SEARCHTOOL		"system-search"
+ #define PANEL_ICON_SHUTDOWN		"system-shutdown"
++#define PANEL_ICON_SUSPEND		"stock_media-pause"
+ #define PANEL_ICON_THEME		"preferences-desktop-theme"
+ #define PANEL_ICON_TRASH		"user-trash"
+ #define PANEL_ICON_UNKNOWN		"image-missing"
+diff --git a/mate-panel/panel-menu-items.c b/mate-panel/panel-menu-items.c
+index 6ea12c2..cc73c7f 100644
+--- a/mate-panel/panel-menu-items.c
++++ b/mate-panel/panel-menu-items.c
+@@ -39,6 +39,9 @@
+ #include <string.h>
+ #include <glib/gi18n.h>
+ #include <gio/gio.h>
++#ifdef HAVE_RDA
++#include <rda/rda.h>
++#endif
+ #include <libmate-desktop/mate-gsettings.h>
+ 
+ #include <libpanel-util/panel-error.h>
+@@ -1582,6 +1585,28 @@ panel_menu_items_append_lock_logout (GtkWidget *menu)
+ 	}
+ 	g_list_free (children);
+ 
++#ifdef HAVE_RDA
++	if (rda_session_can_be_suspended())
++	{
++
++		label = g_strdup_printf (_("Suspend %s Session..."),
++                                        rda_get_remote_technology_name());
++		tooltip = g_strdup_printf (_("Suspend this %s session and resume it later..."),
++                                        rda_get_remote_technology_name());
++		item = panel_menu_items_create_action_item_full (PANEL_ACTION_SUSPEND,
++                                                                label, tooltip);
++		g_free (label);
++		g_free (tooltip);
++
++		if (item != NULL) {
++			/* this separator will always be inserted */
++			add_menu_separator (menu);
++			gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
++		}
++
++	}
++#endif /* HAVE_RDA */
++
+ 	if (panel_lock_screen_action_available("lock"))
+ 	{
+ 		item = panel_menu_items_create_action_item(PANEL_ACTION_LOCK);
+-- 
+2.11.0
+

debian/patches/0002_mate-panel-panel-menu-items.c-Only-offer-Shutdown-bu.patch

+From 9836f965bfbb16d3eb882453175f6754fe395820 Mon Sep 17 00:00:00 2001
+From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+Date: Thu, 28 Jun 2018 14:45:04 +0200
+Subject: [PATCH 2/3] mate-panel/panel-menu-items.c: Only offer Shutdown
+ button, if not running remotely (with HAVE_RDA defined).
+
+---
+ mate-panel/panel-menu-items.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/mate-panel/panel-menu-items.c b/mate-panel/panel-menu-items.c
+index cc73c7f..3112e61 100644
+--- a/mate-panel/panel-menu-items.c
++++ b/mate-panel/panel-menu-items.c
+@@ -1669,6 +1669,9 @@ panel_menu_items_append_lock_logout (GtkWidget *menu)
+ 		gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
+ 	}
+ 
++#ifdef HAVE_RDA
++	if (rda_session_is_local()) {
++#endif /* HAVE_RDA */
+ 	item = panel_menu_items_create_action_item (PANEL_ACTION_SHUTDOWN);
+ 	if (item != NULL) {
+ 		if (!separator_inserted)
+@@ -1676,6 +1679,9 @@ panel_menu_items_append_lock_logout (GtkWidget *menu)
+ 
+ 		gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
+ 	}
++#ifdef HAVE_RDA
++	}
++#endif /* HAVE_RDA */
+ }
+ 
+ void
+-- 
+2.11.0
+

debian/patches/0003_configure.ac-Report-RDA-support-status-in-configurat.patch

+From 191f9703a723520954f55de551b70b5849a62c74 Mon Sep 17 00:00:00 2001
+From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+Date: Thu, 28 Jun 2018 15:39:47 +0200
+Subject: [PATCH 3/3] configure.ac: Report RDA support status in configuration
+ summary.
+
+---
+ configure.ac | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/configure.ac b/configure.ac
+index 2c544ed..276a832 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -337,6 +337,7 @@ echo "
+         Use *_DISABLE_DEPRECATED:      ${enable_deprecation_flags}
+         Applets to build in-process:   ${PANEL_INPROCESS_APPLETS}
+         XRandr support:                ${have_randr}
++        RDA support:                   ${have_rda}
+         Build introspection support:   ${found_introspection}
+         Build gtk-doc documentation:   ${enable_gtk_doc}
+ 
+-- 
+2.11.0
+

debian/patches/series

+0001_RDA-support-Make-MATE-panel-aware-of-being-run-insid.patch
+0002_mate-panel-panel-menu-items.c-Only-offer-Shutdown-bu.patch
+0003_configure.ac-Report-RDA-support-status-in-configurat.patch