[med-svn] [python-cutadapt] 02/03: Merge tag 'debian/1.12-2' 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 python-cutadapt.

commit 026288a9358279d475c998599311ca072a92505e
Merge: 36c2d2a 771b508
Author: Andreas Tille <tille at debian.org>
Date:   Thu Jun 8 08:49:50 2017 +0200

    Merge tag 'debian/1.12-2' into debian/jessie-backports

 CHANGES.rst                                        |  149 +-
 MANIFEST.in                                        |   19 +
 PKG-INFO                                           |   48 +-
 README.rst                                         |    2 +-
 bin/_preamble.py                                   |   21 -
 bin/cutadapt                                       |   10 -
 cutadapt.egg-info/PKG-INFO                         |   60 +
 cutadapt.egg-info/SOURCES.txt                      |  210 ++
 cutadapt.egg-info/dependency_links.txt             |    1 +
 cutadapt.egg-info/entry_points.txt                 |    3 +
 cutadapt.egg-info/requires.txt                     |    1 +
 cutadapt.egg-info/top_level.txt                    |    1 +
 cutadapt/__init__.py                               |    4 +-
 cutadapt/_align.c                                  |   36 +-
 cutadapt/_seqio.c                                  | 2107 ++++++--------------
 cutadapt/_seqio.pyx                                |   18 +-
 cutadapt/_version.py                               |   21 +
 cutadapt/adapters.py                               |   12 +-
 cutadapt/filters.py                                |    2 +-
 cutadapt/modifiers.py                              |    9 +
 cutadapt/scripts/cutadapt.py                       |  193 +-
 cutadapt/seqio.py                                  |   36 +-
 cutadapt/xopen.py                                  |  182 --
 debian/changelog                                   |   22 +
 debian/control                                     |    7 +-
 debian/copyright                                   |   22 -
 .../0002-Fix-encoding-issue-in-setup.py.patch      |   23 +
 debian/patches/0003_fixtest.patch                  |   37 +
 debian/patches/cython_version.patch                |   17 +-
 debian/patches/series                              |    2 +
 debian/rules                                       |   13 +-
 doc/colorspace.rst                                 |   26 +-
 doc/conf.py                                        |   12 +-
 doc/guide.rst                                      |  181 +-
 doc/recipes.rst                                    |   74 +-
 setup.cfg                                          |   13 +
 setup.py                                           |   45 +-
 tests/cut/SRR2040271_1.fastq                       |    8 +
 tests/cut/shortened.fastq                          |   12 +
 tests/cut/small-no-trim.fasta                      |    6 +
 tests/data/SRR2040271_1.fastq                      |    8 +
 tests/testmodifiers.py                             |   19 +-
 tests/testpaired.py                                |   88 +-
 tests/tests.py                                     |   13 +
 tests/testseqio.py                                 |    4 +-
 tests/testxopen.py                                 |  101 -
 versioneer.py                                      | 1774 ++++++++++++++++
 47 files changed, 3542 insertions(+), 2130 deletions(-)

diff --cc debian/changelog
index dbd9524,758e3d3..4904cfb
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,25 +1,31 @@@
+ python-cutadapt (1.12-2) unstable; urgency=medium
+ 
+   * Depends: python-xopen
+     Closes: #858053
+   * Run build time tests
+ 
+  -- Andreas Tille <tille at debian.org>  Mon, 20 Mar 2017 16:49:26 +0100
+ 
+ python-cutadapt (1.12-1) unstable; urgency=medium
+ 
+   * New upstream version 1.12 (Closes: #846471)
+   * Fix up d/copyright: remove duplicate license stanzas, and Files: pattern
+     without matching files.
+ 
+  -- Kevin Murray <kdmfoss at gmail.com>  Fri, 02 Dec 2016 13:56:33 +1100
+ 
+ python-cutadapt (1.11-1) unstable; urgency=medium
+ 
+   * New upstream release 
+ 
+  -- Olivier Sallou <osallou at debian.org>  Thu, 18 Aug 2016 10:04:43 +0200
+ 
 +python-cutadapt (1.10-2~bpo8+1) jessie-backports; urgency=medium
 +
 +  * Rebuild for jessie-backports.
 +
 + -- Andreas Tille <tille at debian.org>  Tue, 12 Jul 2016 09:05:28 +0200
 +
  python-cutadapt (1.10-2) unstable; urgency=medium
  
    * Add missing Breaks for new package cutadapt

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