[med-svn] [rna-star] 02/02: Merge branch 'master' of git+ssh://anonscm.debian.org/git/debian-med/rna-star

[Steffen Möller]

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

moeller pushed a commit to branch master
in repository rna-star.

commit 885140d78d4a5405250bfee0b370232f606f91c6
Merge: 9915846 c17ebd5
Author: Steffen Moeller <moeller at debian.org>
Date:   Sat Jul 22 14:24:16 2017 +0200

    Merge branch 'master' of git+ssh://anonscm.debian.org/git/debian-med/rna-star

 .travis.yml                              |   11 +
 CHANGES.md                               |   13 +
 README.md                                |   18 +-
 debian/changelog                         |   15 +-
 doc/STARmanual.pdf                       |  Bin 251507 -> 264875 bytes
 extras/doc-latex/STARmanual.tex          |   32 +-
 extras/doc-latex/parametersDefault.tex   |   79 +-
 extras/scripts/tagXSstrandedData.awk     |   35 +
 source/BAMbinSortByCoordinate.cpp        |    2 +-
 source/BAMbinSortUnmapped.cpp            |    2 +-
 source/Chain.cpp                         |  126 +
 source/Chain.h                           |   30 +
 source/Genome.cpp                        |   42 +-
 source/Genome.h                          |    2 +-
 source/IncludeDefine.h                   |    3 +-
 source/Makefile                          |    2 +-
 source/Parameters.cpp                    |  134 +-
 source/Parameters.h                      |   34 +-
 source/ReadAlign_alignBAM.cpp            |   14 +-
 source/ReadAlign_chimericDetection.cpp   |   82 +-
 source/ReadAlign_multMapSelect.cpp       |    5 +-
 source/ReadAlign_outputAlignments.cpp    |    2 +-
 source/ReadAlign_outputTranscriptSAM.cpp |    3 +
 source/STAR.cpp                          |   49 +-
 source/SharedMemory.cpp                  |   10 +-
 source/SharedMemory.h                    |    2 +-
 source/VERSION                           |    2 +-
 source/bamRemoveDuplicates.cpp           |   37 +-
 source/genomeGenerate.cpp                |   11 +-
 source/genomeParametersWrite.cpp         |    6 +
 source/parametersDefault                 |   27 +-
 source/parametersDefault.xxd             | 4548 +++++++++++++++---------------
 32 files changed, 2993 insertions(+), 2385 deletions(-)

diff --cc debian/changelog
index 368671b,6b1fb34..2efd774
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,15 +1,23 @@@
- rna-star (2.5.2b+dfsg-2) UNRELEASED; urgency=medium
++rna-star (2.5.3a+dfsg-3) unstable; urgency=medium
 +
 +  * debian/upstream/metadata: Added refs to bio.tools
 +    and OMICtools
 +
 + -- Steffen Moeller <moeller at debian.org>  Sat, 22 Jul 2017 14:22:35 +0200
 +
+ rna-star (2.5.3a+dfsg-2) unstable; urgency=medium
+ 
+   * Upload to unstable.
+ 
+  -- Sascha Steinbiss <satta at debian.org>  Sun, 18 Jun 2017 21:22:06 +0200
+ 
+ rna-star (2.5.3a+dfsg-1) experimental; urgency=medium
+ 
+   * New upstream release.
+ 
+  -- Sascha Steinbiss <satta at debian.org>  Wed, 31 May 2017 17:41:43 +0200
++>>>>>>> c17ebd505eb05156829841b6b6d823ec7c2fd709
+ 
  rna-star (2.5.2b+dfsg-1) unstable; urgency=medium
  
    * New upstream release.

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