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

commit d2da3bd016a34c3670ac307786b57adaf4250f34
Merge: 95fb68e dd7d9a6
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Thu Feb 8 20:40:21 2018 +0100

    Merge branch 'master' into debian/stretch/backports

 .../25_mate-power-manager-ubuntu.gschema.override  |  3 ++
 debian/changelog                                   | 40 ++++++++++++++++++++++
 debian/compat                                      |  2 +-
 debian/control                                     |  8 ++---
 .../2000_disable_notification_prefs_ui.patch       | 14 ++++++++
 debian/patches/series                              |  1 +
 debian/patches/ubuntu.series                       |  1 +
 debian/rules                                       |  6 ++++
 debian/watch                                       |  2 +-
 9 files changed, 71 insertions(+), 6 deletions(-)

diff --cc debian/changelog
index 17d7e93,7ff86ce..1c82033
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,43 +1,49 @@@
+ mate-power-manager (1.18.1-3) unstable; urgency=medium
+ 
+   [ Martin Wimpress ]
+   * debian/patches:
+     + Add 2000_disable_notification_prefs_ui.patch. Disable the notification
+       preferences so options are not presented that indicator-power now handles.
+   * debian/rules:
+     + Override mate-power-manager defaults on Ubuntu. Ubuntu MATE enables
+       indicators by default which include indicator-power, these overrides
+       ensure indicator-power integrates with mate-power-manager.
+   * debian/25_mate-power-manager-ubuntu.gschema.override:
+     + Add overrides so mate-power-manager integrates with indicator-power.
+ 
+   [ 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:26:56 +0100
+ 
+ mate-power-manager (1.18.1-2) 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:.
+ 
+   [ Mike Gabriel ]
+   * debian/rules:
+     + Build with --without-keyring configure option until m-p-m has been ported
+       to libsecret or the keyring integration has been removed entirely by
+       upstream.
+   * debian/control:
+     + Drop B-D on deprecated libgnome-keyring-dev. (Closes: #867937).
+ 
+  -- Mike Gabriel <sunweaver at debian.org>  Mon, 15 Jan 2018 12:11:45 +0100
+ 
 +mate-power-manager (1.18.1-1~bpo9+1) stretch-backports; urgency=medium
 +
 +  * Rebuild for stretch-backports.
 +
 + -- Mike Gabriel <sunweaver at debian.org>  Thu, 04 Jan 2018 17:52:20 +0100
 +
  mate-power-manager (1.18.1-1) unstable; urgency=medium
  
    * New upstream release.

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