[med-svn] [htsjdk] 04/04: Merge remote-tracking branch 'origin/master' into sid

[Vincent Danjean]

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

vdanjean pushed a commit to branch master
in repository htsjdk.

commit 8f67825f7478fe4ffb3f524dc83db235c2ee23ad
Merge: 1090487 4ab4b5c
Author: Vincent Danjean <Vincent.Danjean at ens-lyon.org>
Date:   Mon Mar 14 22:16:09 2016 +0100

    Merge remote-tracking branch 'origin/master' into sid
    
    Update changelog

 debian/changelog | 8 +++++++-
 debian/rules     | 3 ---
 debian/watch     | 2 +-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --cc debian/changelog
index f576306,1f5d2d7..735a4b0
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,14 +1,14 @@@
 -htsjdk (2.1.1+dfsg.1-2) UNRELEASED; urgency=medium
 +htsjdk (2.1.1+dfsg.1-1) UNRELEASED; urgency=medium
  
++  [ Andreas Tille ]
+   * Make sure repackaged tarball is compressed with xz
+ 
 - -- Andreas Tille <tille at debian.org>  Mon, 14 Mar 2016 21:35:34 +0100
 -
 -htsjdk (2.1.1+dfsg.1-1) unstable; urgency=medium
 -
++  [ Vincent Danjean ]
    * New upstream version
++  * Bump Standard-Version to 3.9.7
++  * Switch back to default-jdk now that it is >= 1.8
  
-- -- Vincent Danjean <vdanjean at debian.org>  Mon, 14 Mar 2016 16:46:35 +0100
++ -- Vincent Danjean <vdanjean at debian.org>  Mon, 14 Mar 2016 22:13:50 +0100
  
  htsjdk (2.0.1+dfsg.1-1) unstable; urgency=medium
  

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