debian/changelog

+mate-settings-daemon (1.22.1-2) unstable; urgency=medium
+
+  * debian/control:
+    + Bump Standards-Version: to 4.4.1. No changes needed.
+    + Add Rules-Requires-Root: field and set it to no.
+    + Add B-D librda-dev (>= 0.0.3).
+  * debian/patches:
+    + Add 1001_RDA-Don-t-apply-stored-monitor-configuration-if-sess.patch.
+      Don't re-apply stored monitor configuration if session is remote.
+
+ -- Mike Gabriel <sunweaver@debian.org>  Wed, 18 Dec 2019 09:17:14 +0100
+
 mate-settings-daemon (1.22.1-1) unstable; urgency=medium
 
   [ Martin Wimpress ]

debian/control

@@ -24,6 +24,7 @@ Build-Depends: debhelper (>= 10.3~),
                libpolkit-agent-1-dev,
                libpolkit-gobject-1-dev,
                libpulse-dev,
+               librda-dev (>= 0.0.3),
                libstartup-notification0-dev,
                libx11-dev,
                libxext-dev,

debian/patches/1001_RDA-Don-t-apply-stored-monitor-configuration-if-sess.patch

+From f6254cafe0920ecc8e3d96becbd83d297cb158c4 Mon Sep 17 00:00:00 2001
+From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+Date: Wed, 18 Dec 2019 09:11:12 +0100
+Subject: [PATCH] RDA: Don't apply stored monitor configuration if session is
+ remote.
+
+---
+ configure.ac                        | 11 +++++++++++
+ plugins/xrandr/Makefile.am          |  2 ++
+ plugins/xrandr/msd-xrandr-manager.c | 10 ++++++++++
+ 3 files changed, 23 insertions(+)
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -58,6 +58,7 @@
+ LIBMATEKBD_REQUIRED_VERSION=1.17.0
+ LIBNOTIFY_REQUIRED_VERSION=0.7.0
+ LIBMATEMIXER_REQUIRED_VERSION=1.10.0
++RDA_REQUIRED_VERSION=0.0.3
+ 
+ EXTRA_COMPILE_WARNINGS(yes)
+ 
+@@ -365,6 +366,15 @@
+ AM_CONDITIONAL(BUILD_RFKILL, [test x"$enable_rfkill" = x"yes"])
+ 
+ # ---------------------------------------------------------------------------
++# - Check if Remote Desktop Awareness support is available
++# ---------------------------------------------------------------------------
++
++PKG_CHECK_MODULES(RDA, rda >= $RDA_REQUIRED_VERSION, 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
++
++# ---------------------------------------------------------------------------
+ # Enable Profiling
+ # ---------------------------------------------------------------------------
+ AC_ARG_ENABLE(profiling,
+@@ -537,4 +547,5 @@
+     System nssdb:             ${NSS_DATABASE}
+ }\
+     Profiling support:        ${enable_profiling}
++    RD awareness:             ${have_rda}
+ "
+--- a/plugins/xrandr/Makefile.am
++++ b/plugins/xrandr/Makefile.am
+@@ -55,6 +55,7 @@
+ libxrandr_la_CFLAGS =			\
+ 	$(SETTINGS_PLUGIN_CFLAGS)	\
+ 	$(LIBNOTIFY_CFLAGS)		\
++	$(RDA_CFLAGS)			\
+ 	$(MATE_DESKTOP_CFLAGS)		\
+ 	$(AM_CFLAGS)
+ 
+@@ -64,6 +65,7 @@
+ libxrandr_la_LIBADD  =			\
+ 	$(SETTINGS_PLUGIN_LIBS)		\
+ 	$(LIBNOTIFY_LIBS)		\
++	$(RDA_LIBS)			\
+ 	$(MATE_DESKTOP_LIBS)
+ 
+ plugin_in_files =			\
+--- a/plugins/xrandr/msd-xrandr-manager.c
++++ b/plugins/xrandr/msd-xrandr-manager.c
+@@ -50,6 +50,10 @@
+ #include <libnotify/notify.h>
+ #endif
+ 
++#ifdef HAVE_RDA
++#include <rda/rda.h>
++#endif
++
+ #include "mate-settings-profile.h"
+ #include "msd-xrandr-manager.h"
+ 
+@@ -2418,6 +2422,12 @@
+         GError *my_error;
+         gboolean result;
+ 
++#ifdef HAVE_RDA
++	if (rda_session_is_remote()) {
++		return;
++	}
++#endif
++
+         my_error = NULL;
+         result = apply_configuration_from_filename (manager, intended_filename, TRUE, timestamp, &my_error);
+         if (!result) {

debian/patches/series

 0001_new_video_key.patch
+1001_RDA-Don-t-apply-stored-monitor-configuration-if-sess.patch