[med-svn] [htslib] 05/06: Merge branch 'debian/unstable' of ssh://git.debian.org/git/debian-med/htslib into debian/unstable

[Sascha Steinbiss]

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

sascha-guest pushed a commit to branch debian/unstable
in repository htslib.

commit 231557d378815709369d8d304f8e9b64399b425a
Merge: 00bd24c 5632d5d
Author: Sascha Steinbiss <sascha at steinbiss.name>
Date:   Mon Feb 8 16:46:15 2016 +0000

    Merge branch 'debian/unstable' of ssh://git.debian.org/git/debian-med/htslib into debian/unstable

 debian/changelog           |  4 ++++
 debian/upstream/tabix.edam | 16 ++++++++++++++++
 2 files changed, 20 insertions(+)

diff --cc debian/changelog
index c070f1b,0b7d3a0..9c618e8
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,9 +1,14 @@@
 -htslib (1.3-2) unstable; urgency=medium
 +htslib (1.3-2) UNRELEASED; urgency=medium
  
+   [ Steffen Moeller and Jon Ison ]
+   * Introduction of EDAM annotation
+ 
 - -- Steffen Moeller <moeller at debian.org>  Sat, 06 Feb 2016 12:14:19 +0100
++  [ Sascha Steinbiss ]
 +  * Team upload
 +  * Include upstream patch for large file support
 +  * Run configure as part of the build
 +
 + -- Sascha Steinbiss <sascha at steinbiss.name>  Mon, 08 Feb 2016 16:28:30 +0000
  
  htslib (1.3-1) unstable; urgency=medium
  

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