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

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

@@ -12,19 +12,18 @@ Subject: [PATCH] RDA: Don't apply stored monitor configuration if session is
 
 --- a/configure.ac
 +++ b/configure.ac
-@@ -59,6 +59,7 @@ MATE_DESKTOP_REQUIRED_VERSION=1.23.2
- LIBMATEKBD_REQUIRED_VERSION=1.17.0
+@@ -61,6 +61,7 @@
  LIBNOTIFY_REQUIRED_VERSION=0.7.0
+ LIBATSPI_REQUIRED_VERSION=2.0
  LIBMATEMIXER_REQUIRED_VERSION=1.10.0
 +RDA_REQUIRED_VERSION=0.0.3
  
  PKG_CHECK_MODULES(SETTINGS_DAEMON,
  	glib-2.0 >= $GLIB_REQUIRED_VERSION
-@@ -363,6 +364,15 @@ fi
- 
+@@ -386,6 +387,15 @@
  AM_CONDITIONAL(BUILD_RFKILL, [test x"$enable_rfkill" = x"yes"])
  
-+# ---------------------------------------------------------------------------
+ # ---------------------------------------------------------------------------
 +# - Check if Remote Desktop Awareness support is available
 +# ---------------------------------------------------------------------------
 +
@@ -33,10 +32,11 @@ Subject: [PATCH] RDA: Don't apply stored monitor configuration if session is
 +  AC_DEFINE(HAVE_RDA, 1, [Have the Remote Desktop Awareness library])
 +fi
 +
- # ---------------------------------------------------------------------------
++# ---------------------------------------------------------------------------
  # Enable Profiling
  # ---------------------------------------------------------------------------
-@@ -498,4 +508,5 @@ ${NSS_DATABASE:+\
+ AC_ARG_ENABLE(profiling,
+@@ -502,4 +512,5 @@
      System nssdb:             ${NSS_DATABASE}
  }\
      Profiling support:        ${enable_profiling}
@@ -44,7 +44,7 @@ Subject: [PATCH] RDA: Don't apply stored monitor configuration if session is
  "
 --- a/plugins/xrandr/Makefile.am
 +++ b/plugins/xrandr/Makefile.am
-@@ -67,6 +67,7 @@ libxrandr_la_CPPFLAGS =						\
+@@ -67,6 +67,7 @@
  libxrandr_la_CFLAGS =			\
  	$(SETTINGS_PLUGIN_CFLAGS)	\
  	$(LIBNOTIFY_CFLAGS)		\
@@ -52,7 +52,7 @@ Subject: [PATCH] RDA: Don't apply stored monitor configuration if session is
  	$(MATE_DESKTOP_CFLAGS)		\
  	$(AM_CFLAGS)			\
  	$(WARN_CFLAGS)
-@@ -77,6 +78,7 @@ libxrandr_la_LDFLAGS = 			\
+@@ -77,6 +78,7 @@
  libxrandr_la_LIBADD  =			\
  	$(SETTINGS_PLUGIN_LIBS)		\
  	$(LIBNOTIFY_LIBS)		\
@@ -62,7 +62,7 @@ Subject: [PATCH] RDA: Don't apply stored monitor configuration if session is
  plugin_in_files =			\
 --- a/plugins/xrandr/msd-xrandr-manager.c
 +++ b/plugins/xrandr/msd-xrandr-manager.c
-@@ -50,6 +50,10 @@
+@@ -51,6 +51,10 @@
  #include <libnotify/notify.h>
  #endif
  
@@ -73,7 +73,7 @@ Subject: [PATCH] RDA: Don't apply stored monitor configuration if session is
  #include "mate-settings-profile.h"
  #include "msd-xrandr-manager.h"
  
-@@ -2405,6 +2409,12 @@ apply_intended_configuration (MsdXrandrManager *manager, const char *intended_fi
+@@ -2410,6 +2414,12 @@
          GError *my_error;
          gboolean result;