[med-svn] [seer] 01/02: Merge branch 'master' 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 seer.

commit 4b9f4e54652aa72aab95baac2ee8d91e7d431456
Merge: b7d51ae 2ad3914
Author: Andreas Tille <tille at debian.org>
Date:   Wed Mar 22 12:16:42 2017 +0100

    Merge branch 'master' into debian/jessie-backports

 .gitignore                      |     3 +-
 .travis.yml                     |    18 +
 README.md                       |    47 +-
 debian/changelog                |    16 +
 debian/compat                   |     2 +-
 debian/control                  |     6 +-
 debian/rules                    |     4 +-
 debian/watch                    |     2 +-
 scripts/R_mds.pl                |   143 +
 scripts/blast_top_hits.pl       |     2 +-
 scripts/mash2matrix.pl          |    60 +
 seer-logo.png                   |   Bin 0 -> 30410 bytes
 src/Makefile                    |     9 +
 src/filterCmdLine.cpp           |     6 +
 src/filter_seer.hpp             |     3 +
 src/kmdsCmdLine.cpp             |     8 +-
 src/kmdsStruct.cpp              |     5 +-
 src/mapCmdLine.cpp              |     6 +
 src/mapMain.cpp                 |     6 +
 src/map_back.hpp                |     1 +
 src/seerBinaryAssoc.cpp         |     2 +-
 src/seerCmdLine.cpp             |     7 +-
 src/seerCommon.cpp              |     9 -
 src/seerFilter.cpp              |    31 +-
 src/seerIO.cpp                  |     6 +-
 src/seerMain.cpp                |     9 +
 src/seercommon.hpp              |     4 +-
 src/significant_kmer.cpp        |    38 +-
 src/significant_kmer.hpp        |     6 +
 test/6259_5_16.fa               | 35643 ++++++++++++++++++++++++++++++++++++++
 test/all_structure_new          |   Bin 75800 -> 196442 bytes
 test/assembly_locations.txt     |     1 +
 test/map_in.txt                 |     2 +
 test/run_test.pl                |    25 +-
 test/{test1.txt => test1.e.txt} |     4 +-
 test/test1.o.txt                |     1 +
 test/{test1.txt => test2.e.txt} |     4 +-
 test/{test2.txt => test2.o.txt} |     3 -
 test/{test1.txt => test3.e.txt} |     4 +-
 test/{test3.txt => test3.o.txt} |     3 -
 test/test4.e.txt                |     6 +
 test/{test4.txt => test4.o.txt} |     3 -
 test/{test1.txt => test5.e.txt} |     4 +-
 test/{test5.txt => test5.o.txt} |     3 -
 test/{test1.txt => test6.e.txt} |     4 +-
 test/{test6.txt => test6.o.txt} |     3 -
 test/test7.e.txt                |     2 +
 test/{test7.txt => test7.o.txt} |   308 +-
 test/test8.e.txt                |     4 +
 test/test8.o.txt                |     1 +
 50 files changed, 36245 insertions(+), 242 deletions(-)

diff --cc debian/changelog
index c672fbb,e15f150..56927fe
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,19 +1,26 @@@
+ seer (1.1.2-2) unstable; urgency=medium
+ 
+   * Install all available scripts in scripts/ dir into binary package
+     Closes: #858430
+ 
+  -- Andreas Tille <tille at debian.org>  Wed, 22 Mar 2017 11:43:16 +0100
+ 
+ seer (1.1.2-1) unstable; urgency=medium
+ 
+   * New upstream version
+   * Add versioned Build-Depends libarmadillo-dev
+   * debhelper 10
+   * d/watch: version=4
+ 
+  -- Andreas Tille <tille at debian.org>  Wed, 07 Dec 2016 23:05:02 +0100
+ 
 +seer (1.1.1-2~bpo8+1) jessie-backports; urgency=medium
 +
 +  * Rebuild for jessie-backports.
 +  * Add versioned Depends: libarmadillo-dev
 +
 + -- Andreas Tille <tille at debian.org>  Tue, 24 May 2016 09:29:28 +0200
 +
  seer (1.1.1-2) unstable; urgency=medium
  
    * use -DARMA_USE_HDF5=1

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