[med-svn] [htsjdk] branch master updated (74fe236 -> e5fdc73)

[Vincent Danjean]

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

vdanjean pushed a change to branch master
in repository htsjdk.

      from  74fe236   Minor typo
       new  cb46fd0   Fix version in MANIFEST
       new  17f8e6a   rename quilt patches
       new  d27ca79   Add 'dfsg' in MANIFEST version
       new  e5fdc73   Merge remote-tracking branch 'origin/master' into master

The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 debian/changelog                                         |  6 ++++++
 debian/patches/01-for-upstream-fix-version-in-manifest   | 16 ++++++++++++++++
 debian/patches/{01-build.xml => 10-build.xml}            |  9 +++++++++
 ...tibility.patch => 11-snappy-java-compatibility.patch} |  0
 .../{use_libjbzip2-java => 12-use_libjbzip2-java}        |  0
 debian/patches/series                                    |  7 ++++---
 6 files changed, 35 insertions(+), 3 deletions(-)
 create mode 100644 debian/patches/01-for-upstream-fix-version-in-manifest
 rename debian/patches/{01-build.xml => 10-build.xml} (83%)
 rename debian/patches/{02-snappy-java-compatibility.patch => 11-snappy-java-compatibility.patch} (100%)
 rename debian/patches/{use_libjbzip2-java => 12-use_libjbzip2-java} (100%)

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