[mate-desktop-environment] 01/02: Merge branch 'master' into debian/stretch/backports

[Mike Gabriel]

This is an automated email from the git hooks/post-receive script.

sunweaver pushed a commit to annotated tag debian/1.18.0+4_bpo9+1
in repository mate-desktop-environment.

commit 95700b9e0e8c447247806345306f828bca577f09
Merge: 8cfbd0c e14c1bc
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Jan 23 02:28:14 2018 +0100

    Merge branch 'master' into debian/stretch/backports

 debian/10_mate-common.gschema.override |  6 ++----
 debian/20_mate-debian.gschema.override |  6 +++---
 debian/20_mate-ubuntu.gschema.override |  6 +++---
 debian/changelog                       | 17 +++++++++++++++++
 debian/control                         |  3 ++-
 5 files changed, 27 insertions(+), 11 deletions(-)

diff --cc debian/changelog
index 4e7177d,449c283..0366fdc
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,20 +1,26 @@@
+ mate-desktop-environment (1.18.0+4) unstable; urgency=medium
+ 
+   [ Martin Wimpress ]
+   * debian/10_mate-common.gschema.override: Remove duplicate overrides for
+     org.gnome.desktop.wm.preferences:MATE.
+   * debian/20_mate-debian.gschema.override: Enable Breeze Snow cursors by
+     default.
+   * debian/20_mate-ubuntu.gschema.override: Enable Breeze Dark cursors by
+     default.
+   * debian/10_mate-common.gschema.override: Disable click finger. (Closes:
+     #888034).
+ 
+   * debian/control:
+     + Add D: breeze-cursor-theme (mate-desktop-environment-core).
+ 
+  -- Mike Gabriel <sunweaver at debian.org>  Tue, 23 Jan 2018 02:24:23 +0100
+ 
 +mate-desktop-environment (1.18.0+3~bpo9+1) stretch-backports; urgency=medium
 +
 +  * Rebuild for stretch-backports.
 +
 + -- Mike Gabriel <sunweaver at debian.org>  Sat, 20 Jan 2018 01:18:13 +0100
 +
  mate-desktop-environment (1.18.0+3) unstable; urgency=medium
  
    [ Vangelis Mouhtsis ]

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mate/mate-desktop-environment.git