[med-svn] [fastaq_tmp] 02/03: Merge tag 'upstream/1.6.0'

[Andreas Tille]

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

tille pushed a commit to branch master
in repository fastaq_tmp.

commit b3417d897635ad74badc269331fd9d6484158213
Merge: a12e4b2 9134772
Author: Andreas Tille <tille at debian.org>
Date:   Tue Mar 3 08:43:11 2015 +0100

    Merge tag 'upstream/1.6.0'
    
    Upstream version 1.6.0

 debian/changelog                                   |   5 -
 debian/compat                                      |   1 -
 debian/control                                     | 174 -----
 debian/copyright                                   |  22 -
 debian/fastaq.manpages                             |   1 -
 ...ay-import-statements-for-manpage-creation.patch | 737 ---------------------
 debian/patches/series                              |   1 -
 debian/rules                                       |  25 -
 debian/source/format                               |   1 -
 debian/upstream/metadata                           |  12 -
 debian/usage_to_man                                |  99 ---
 debian/watch                                       |   3 -
 fastaq/tasks.py                                    |  31 +-
 ...sequences_test_fastaq_to_quasr_primers.expected |   2 -
 .../data/sequences_test_fastaq_to_quasr_primers.fa |   4 -
 fastaq/tests/data/tasks_test_sequence_trim_1.fa    |  24 +-
 .../data/tasks_test_sequence_trim_1.trimmed.fa     |  14 +-
 fastaq/tests/data/tasks_test_sequence_trim_2.fa    |  24 +-
 .../data/tasks_test_sequence_trim_2.trimmed.fa     |  14 +-
 fastaq/tests/data/tasks_test_sequences_to_trim.fa  |   8 +-
 fastaq/tests/tasks_test.py                         |  11 +-
 scripts/fastaq_sequence_trim                       |   4 +-
 scripts/fastaq_to_quasr_primers_file               |  12 -
 setup.py                                           |   2 +-
 24 files changed, 76 insertions(+), 1155 deletions(-)

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