[mate-desktop] 03/03: debian/{changelog, libmate-desktop-2-17.symbols}: 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 mate-desktop.

commit ece739808f97db57178808ab9d04b65d4cae837e
Merge: 789ab18 beec8b3
Author: Martin Wimpress <martin.wimpress at ubuntu.com>
Date:   Wed Feb 7 18:22:43 2018 +0000

    debian/{changelog,libmate-desktop-2-17.symbols}: resolve merge conflict

 debian/changelog                             | 10 ++++-
 debian/copyright                             |  5 +--
 debian/libmate-desktop-2-17.symbols          | 64 ++++++++++++++--------------
 debian/patches/1000_global_menu_support.diff | 29 -------------
 debian/patches/series                        |  1 -
 5 files changed, 42 insertions(+), 67 deletions(-)

diff --cc debian/changelog
index 0cb1d93,4c71c17..07e90ce
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,22 -1,21 +1,28 @@@
+ mate-desktop (1.20.0-1) UNRELEASED; urgency=medium
+ 
+   * New upstream release.
+ 
+  -- Martin Wimpress <martin.wimpress at ubuntu.com>  Wed, 07 Feb 2018 14:03:55 +0000
+ 
 -mate-desktop (1.19.3-0ubuntu2) UNRELEASED; urgency=medium
 -
 -  * debian/patches:
 -    + Add 0001_hidpi: Add HiDPI support.
 -
 - -- Martin Wimpress <martin.wimpress at ubuntu.com>  Thu, 01 Feb 2018 06:59:13 -0800
 -
 -mate-desktop (1.19.3-1) UNRELEASED; urgency=medium
 -
 -  * New upstream release.
 -
 - -- Martin Wimpress <martin.wimpress at ubuntu.com>  Tue, 23 Jan 2018 12:14:40 +0000
 +mate-desktop (1.18.0-2) unstable; urgency=medium
 +
 +  [ Mike Gabriel ]
 +  * Rename GIR package to match Debian Policy.
 +  * debian/{control,compat}:
 +    + Bump DH version level to 11.
 +  * debian/watch:
 +    + Use secure URL to obtain upstream sources.
 +  * debian/libmate-desktop-2-17.symbols:
 +    + Update symbols file for 1.18.0 release.
 +
 +  [ Vangelis Mouhtsis ]
 +  * debian/control:
 +    + 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.
 +    + Bump Standards-Version: to 4.1.3. No changes needed.
 +
 + -- Mike Gabriel <sunweaver at debian.org>  Wed, 24 Jan 2018 21:09:08 +0100
  
  mate-desktop (1.18.0-1) unstable; urgency=medium
  

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