[med-svn] [trimmomatic] 01/02: Merge tag 'debian/0.36+dfsg-1' into debian/jessie-backports

[Andreas Tille]

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

tille pushed a commit to branch debian/jessie-backports
in repository trimmomatic.

commit 724cc04ce01508e1060366f5f18ab3691aa1877a
Merge: f38fd9b e3cc663
Author: Andreas Tille <tille at debian.org>
Date:   Fri Nov 11 15:10:23 2016 +0100

    Merge tag 'debian/0.36+dfsg-1' into debian/jessie-backports

 .gitignore                                         |  9 ++++
 build.xml                                          |  4 +-
 debian/README.source                               | 17 ++++++
 debian/changelog                                   | 13 +++++
 debian/control                                     |  6 +--
 debian/patches/buildxmlJbzip2.patch                |  2 +-
 debian/patches/remove_jar_version.path             |  2 +-
 .../patches/search_in_usr_share_trimmomatic.patch  | 28 ++++++++++
 debian/patches/series                              |  1 +
 debian/rules                                       |  3 --
 debian/upstream/edam                               | 16 ++++++
 debian/upstream/metadata                           | 12 +++++
 debian/watch                                       |  2 +-
 src/org/usadellab/trimmomatic/Trimmomatic.java     | 33 ++++++++++--
 src/org/usadellab/trimmomatic/TrimmomaticPE.java   | 11 +++-
 src/org/usadellab/trimmomatic/TrimmomaticSE.java   |  9 +++-
 .../trimmomatic/trim/HeadCropTrimmer.java          | 26 +++++++--
 .../trimmomatic/trim/TailCropTrimmer.java          | 61 ++++++++++++++++++++++
 .../usadellab/trimmomatic/trim/TrimmerFactory.java |  3 ++
 .../trimmomatic/util/ConcatGZIPInputStream.java    | 51 ++----------------
 20 files changed, 239 insertions(+), 70 deletions(-)

diff --cc debian/changelog
index e99f165,52ce6f7..83620f2
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,16 +1,22 @@@
+ trimmomatic (0.36+dfsg-1) unstable; urgency=medium
+ 
+   [ Steffen Moeller ]
+   * Introduced EDAM ontology information to 
+     debian/upstream/edam
+   * Added patch to find adapters in /usr/share/trimmomatic
+ 
+   [ Andreas Tille ]
+   * Use xz compression in watch file
+   * cme fix dpkg-control
+ 
+  -- Andreas Tille <tille at debian.org>  Thu, 19 May 2016 13:46:49 +0200
+ 
 +trimmomatic (0.35+dfsg-1~bpo8+1) jessie-backports; urgency=medium
 +
 +  * Rebuild for jessie-backports.
 +
 + -- Andreas Tille <tille at debian.org>  Wed, 02 Dec 2015 17:48:05 +0100
 +
  trimmomatic (0.35+dfsg-1) unstable; urgency=medium
  
    * New upstream version

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