[med-svn] [htslib] 02/02: Merge tag 'debian/1.5-2' into debian/unstable

[Mattia Rizzolo]

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

mattia pushed a commit to branch debian/unstable
in repository htslib.

commit 6940ebf30f2c8ff36598a93a63944eea8a30ff9e
Merge: e73fa42 2823ef8
Author: Mattia Rizzolo <mattia at debian.org>
Date:   Fri Nov 10 12:39:15 2017 +0100

    Merge tag 'debian/1.5-2' into debian/unstable
    
    Debian release 1.5-2

 .gitattributes   | 12 ------------
 .gitignore       | 51 ---------------------------------------------------
 .travis.yml      | 29 -----------------------------
 README.md        | 34 ----------------------------------
 debian/changelog | 17 +++++++++--------
 5 files changed, 9 insertions(+), 134 deletions(-)

diff --cc debian/changelog
index 9c15839,4926ec4..aced9dd
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,16 -1,11 +1,17 @@@
- htslib (1.5-2) UNRELEASED; urgency=medium
++htslib (1.5-3) UNRELEASED; urgency=medium
++
++  * Restore libhts2.symbols and update for changes from 1.4.1 and 1.5
++    versions of htslib.
++
++ -- Diane Trout <diane at ghic.org>  Fri, 10 Nov 2017 12:38:12 +0100
++
+ htslib (1.5-2) unstable; urgency=medium
  
-   [ Andreas Tille ]
    * Apply patch provided by Graham Inggs <ginggs at debian.org> to fix FTBFS
      on armel armhf and ppc64el of bcftools
      Closes: #877670
    * Standards-Version: 4.1.1
- 
-   [ Diane Trout ]
-   * Restore libhts2.symbols and update for changes from 1.4.1 and 1.5
-     versions of htslib.
--
-  -- Andreas Tille <tille at debian.org>  Wed, 08 Nov 2017 08:21:37 +0100
+  -- Andreas Tille <tille at debian.org>  Wed, 08 Nov 2017 08:24:26 +0100
  
  htslib (1.5-1) unstable; urgency=medium
  

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