[mate-media] 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-media.

commit 916c2bf11f6aeb5210bd1866fa1ab6cc108852bf
Merge: b33be38 664f84f
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Thu Feb 8 20:31:41 2018 +0100

    Merge branch 'master' into debian/stretch/backports

 debian/changelog | 22 ++++++++++++++++++++++
 debian/compat    |  2 +-
 debian/control   |  7 ++++---
 debian/rules     |  4 ++++
 debian/watch     |  2 +-
 5 files changed, 32 insertions(+), 5 deletions(-)

diff --cc debian/changelog
index ccd2245,b11a141..b692b43
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,25 +1,31 @@@
+ mate-media (1.18.2-2) unstable; urgency=medium
+ 
+   [ Martin Wimpress ]
+   * debian/rules:
+     + Delete /etc/xdg/autostart/mate-volume-control-applet.desktop on Ubuntu.
+       Ubuntu MATE enables indicators by default which include indicator-sound.
+ 
+   [ Vangelis Mouhtsis ]
+   * debian/control:
+     + Bump Standards-Version: to 4.1.3. No changes needed.
+     + Temporarily have pkg-mate-team ML under Uploaders:.
+     + Update Maintainer: field to debian-mate ML on lists.debian.org.
+     + Rename pretty name of our team -> Debian+Ubuntu MATE Packaging Team.
+ 
+   [ Mike Gabriel ]
+   * debian/watch:
+     + Use secure URL to obtain upstream sources.
+   * debian/{control,compat}:
+     + Bump DH version level to 11.
+ 
+  -- Mike Gabriel <sunweaver at debian.org>  Sun, 21 Jan 2018 20:13:11 +0100
+ 
 +mate-media (1.18.2-1~bpo9+1) stretch-backports; urgency=medium
 +
 +  * Rebuild for stretch-backports.
 +
 + -- Mike Gabriel <sunweaver at debian.org>  Thu, 04 Jan 2018 23:31:04 +0100
 +
  mate-media (1.18.2-1) unstable; urgency=medium
  
    [ Martin Wimpress ]

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