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

commit e24bb5cddd4ce4c38cdd0ca0e89a64af7cf928b7
Merge: 7b605d4 0471545
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri Jan 5 23:16:49 2018 +0100

    Merge branch 'master' into debian/stretch/backports

 debian/changelog                                   | 19 ++++++++
 debian/control                                     |  5 +-
 ...x_external_localizations_in_desktop_files.patch | 55 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 debian/watch                                       |  2 +-
 5 files changed, 78 insertions(+), 4 deletions(-)

diff --cc debian/changelog
index fa6e152,8f73fa1..a201629
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,22 +1,28 @@@
+ mate-control-center (1.18.2-2) unstable; urgency=medium
+ 
+   [ Martin Wimpress ]
+   * debian/control:
+     + Bump Standards: to 4.1.2. No changes needed.
+     + Drop B-D autotools-dev. Since compatibility level 10, debhelper enables
+       the autoreconf sequence by default.
+   * debian/patches:
+     + Add 0000_fix_external_localizations_in_desktop_files.patch. Fix
+       support for external localizations in .desktop files. (LP: #1594959)
+   * debian/watch:
+     + Update URI to use HTTPS.
+ 
+   [ Mike Gabriel ]
+   * debian/control:
+     + Even bump Standards-Version: to 4.1.3. No changes needed.
+ 
+  -- Mike Gabriel <sunweaver at debian.org>  Fri, 05 Jan 2018 23:13:58 +0100
+ 
 +mate-control-center (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:20:23 +0100
 +
  mate-control-center (1.18.2-1) unstable; urgency=medium
  
    [ Aron Xu ]

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