[atril] 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 atril.

commit a62d7bb0bbac8daa52e9b94c956744263e51efae
Merge: a5b1da4 d50d635
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Thu Jan 25 21:10:22 2018 +0100

    Merge branch 'master' into debian/stretch/backports

 debian/atril-common.install               |  2 +-
 debian/changelog                          | 20 +++++++++++++
 debian/compat                             |  2 +-
 debian/control                            | 48 +++++++++++++++++++++++++++----
 debian/gir1.2-atril.install               |  2 --
 debian/gir1.2-atrildocument-1.5.0.install |  1 +
 debian/gir1.2-atrilview-1.5.0.install     |  1 +
 debian/libatrildocument-dev.install       |  1 +
 debian/libatrilview-dev.install           |  1 +
 debian/rules                              |  2 ++
 debian/source.lintian-overrides           |  2 ++
 11 files changed, 72 insertions(+), 10 deletions(-)

diff --cc debian/changelog
index d43d6a2,780b095..cee4492
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,23 +1,29 @@@
+ atril (1.18.3-2) unstable; urgency=medium
+ 
+   [ Mike Gabriel ]
+   * Rename GIR package to match Debian Policy.
+   * debian/{rules,atril-common.install}:
+     + Move atril.appdata.xml to /usr/share/metainfo/ before running dh_install.
+   * debian/control:
+     + White-space clean-up.
+   * debian/{control,compat}:
+     + Bump DH version level to 11.
+ 
+   [ Vangelis Mouhtsis ]
+   * debian/control:
+     + Rename pretty name of our team -> Debian+Ubuntu Mate Packaging Team.
+     + Temporarily have pkg-mate-team ML under Uploaders:.
+     + Bump Standards-Version: to 4.1.3. No changes needed.
+     + Update Maintainer: field to debian-mate ML on list.debian.org.
+ 
+  -- Mike Gabriel <sunweaver at debian.org>  Wed, 24 Jan 2018 23:21:07 +0100
+ 
 +atril (1.18.3-1~bpo9+1) stretch-backports; urgency=medium
 +
 +  * Rebuild for stretch-backports.
 +
 + -- Mike Gabriel <sunweaver at debian.org>  Thu, 04 Jan 2018 23:47:05 +0100
 +
  atril (1.18.3-1) unstable; urgency=medium
  
    * New upstream release.

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