[atril] 03/03: debian/{changelog,control}: resolve merge conflict

[Martin Wimpress]

This is an automated email from the git hooks/post-receive script.

flexiondotorg-guest pushed a commit to branch master
in repository atril.

commit 561b465f73db50a2650a51bbdccc2f98331217b0
Merge: d50d635 902fa54
Author: Martin Wimpress <martin.wimpress at ubuntu.com>
Date:   Wed Feb 7 18:18:26 2018 +0000

    debian/{changelog,control}: resolve merge conflict

 debian/changelog                 | 10 ++++++++--
 debian/copyright                 | 22 ++++++++++++++--------
 debian/libatrildocument3.symbols |  8 ++++++++
 debian/libatrilview3.symbols     | 30 +++++++++++++++++++++++++++++-
 4 files changed, 59 insertions(+), 11 deletions(-)

diff --cc debian/changelog
index 780b095,c33cf43..19f3477
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,22 -1,14 +1,28 @@@
+ atril (1.20.0-1) UNRELEASED; urgency=medium
+ 
+   * New upstream release.
+ 
+  -- Martin Wimpress <martin.wimpress at ubuntu.com>  Wed, 07 Feb 2018 14:03:56 +0000
+ 
 -atril (1.19.6-1) UNRELEASED; urgency=medium
 +atril (1.18.3-2) unstable; urgency=medium
  
 -  * New upstream release.
 +  [ 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.
  
 - -- Martin Wimpress <martin.wimpress at ubuntu.com>  Tue, 23 Jan 2018 23:55:02 +0000
 + -- Mike Gabriel <sunweaver at debian.org>  Wed, 24 Jan 2018 23:21:07 +0100
  
  atril (1.18.3-1) unstable; urgency=medium
  

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