[med-svn] [freecontact] 02/02: Merge branch 'master' of ssh://anonscm.debian.org/git/debian-med/freecontact

[Steffen Möller]

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

moeller pushed a commit to branch master
in repository freecontact.

commit 1b272f0cce17c7e95f8f79c216b9912ff6da08bc
Merge: ec95b39 19d1c45
Author: Steffen Moeller <moeller at debian.org>
Date:   Thu Aug 3 16:18:52 2017 +0200

    Merge branch 'master' of ssh://anonscm.debian.org/git/debian-med/freecontact

 debian/changelog     | 9 ++++++++-
 debian/rules         | 4 ++--
 debian/upstream/edam | 5 +++--
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --cc debian/changelog
index 4720221,a884418..4efa351
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,10 +1,17 @@@
- freecontact (1.0.21-5) UNRELEASED; urgency=medium
++freecontact (1.0.21-6) UNRELEASED; urgency=medium
 +
 +  * debian/upstream/metadata: Added ref to OMICtools
 +    and declared bio.tools, RRID misssing
 +
 + -- Steffen Moeller <moeller at debian.org>  Thu, 03 Aug 2017 16:17:32 +0200
 +
+ freecontact (1.0.21-5) unstable; urgency=medium
+ 
+   [ Adrian Heine ]
+   * gcc-6 transition (Closes: #855881).
+ 
+  -- Andreas Tille <tille at debian.org>  Thu, 23 Feb 2017 11:26:26 +0100
+ 
  freecontact (1.0.21-4) unstable; urgency=medium
  
    * cme fix dpkg-control

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/freecontact.git