[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 branch debian/stretch/backports
in repository mate-desktop-environment.

commit 4f3fac97dd7995ac84e8dda0893c88dcb11ba81a
Merge: c8a5e84 39d59a3
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sat Jan 20 01:18:05 2018 +0100

    Merge branch 'master' into debian/stretch/backports

 debian/10_mate-common.gschema.override | 110 +++++++++++++++++++++++++++++++++
 debian/10_mate-debian.gschema.override |   2 -
 debian/10_mate-ubuntu.gschema.override |  17 -----
 debian/20_mate-debian.gschema.override |  47 ++++++++++++++
 debian/20_mate-ubuntu.gschema.override |  47 ++++++++++++++
 debian/changelog                       |  27 ++++++++
 debian/control                         |   6 +-
 debian/rules                           |   5 +-
 8 files changed, 238 insertions(+), 23 deletions(-)

diff --cc debian/changelog
index caee572,05baadf..b72be63
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,30 +1,36 @@@
+ mate-desktop-environment (1.18.0+3) unstable; urgency=medium
+ 
+   [ Vangelis Mouhtsis ]
+   * debian/control:
+     + Bump Standards-Version: to 4.1.3. No changes needed.
+     + Rename pretty name of our team -> Debian+Ubuntu MATE Packaging Team.
+     + Update Maintainer: field to debian-mate ML on lists.debian.org.
+     + Temporarily have pkg-mate-team ML under Uploaders:.
+ 
+   [ Martin Wimpress ]
+   * debian/10_mate-common.gschema.override:
+     + Add common defaults for MATE on Debian and Ubuntu MATE.
+   * debian/10_mate-debian.gschema.override:
+     + Update MATE on Debian defaults.
+     + Renamed to conform with glib-compile-schema naming convention for
+       overrides.
+   * debian/10_mate-ubuntu.gschema.override:
+     + Update Ubuntu MATE defaults.
+     + Renamed to conform with glib-compile-schema naming convention for
+       overrides.
+   * debian/rules:
+     + Update dh_install for gschema overrides.
+   * debian/control:
+     + Install the appropriate default fonts.
+ 
+  -- Mike Gabriel <sunweaver at debian.org>  Sat, 20 Jan 2018 01:07:51 +0100
+ 
 +mate-desktop-environment (1.18.0+2~bpo9+1) stretch-backports; urgency=medium
 +
 +  * Rebuild for stretch-backports.
 +
 + -- Mike Gabriel <sunweaver at debian.org>  Fri, 05 Jan 2018 00:21:04 +0100
 +
  mate-desktop-environment (1.18.0+2) unstable; urgency=medium
  
    [ Martin Wimpress ]

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