[med-svn] [circlator] 01/02: Merge tag 'debian/1.2.1-1' into debian/jessie-backports

[Afif Elghraoui]

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

afif pushed a commit to branch debian/jessie-backports
in repository circlator.

commit bea0f2f1755028bfe62d4b5d1ed504af526903ff
Merge: af901be f62822a
Author: Afif Elghraoui <afif at ghraoui.name>
Date:   Sun May 8 01:08:19 2016 -0700

    Merge tag 'debian/1.2.1-1' into debian/jessie-backports
    
    tagging package circlator version debian/1.2.1-1
    
    Conflicts:
    	debian/control

 circlator/__init__.py                      |  9 +++++++
 circlator/bamfilter.py                     | 20 ++++++++++++++-
 circlator/common.py                        |  2 --
 circlator/external_progs.py                | 10 +++-----
 circlator/tasks/all.py                     | 23 +++++++++++++++--
 circlator/tasks/bam2reads.py               |  2 ++
 circlator/tasks/progcheck.py               |  5 ++--
 circlator/tasks/version.py                 |  3 ++-
 circlator/versions.py                      | 40 ++++++++++++++++++++++++++++++
 debian/changelog                           | 11 ++++++++
 debian/control                             |  6 ++---
 debian/patches/bundle-bioassemblyref.patch |  6 ++---
 debian/patches/pysam-maxversion.patch      | 17 +++++++++++++
 debian/patches/series                      |  1 +
 debian/patches/spades-call.patch           |  2 +-
 debian/upstream/metadata                   |  2 +-
 setup.py                                   |  8 +++---
 17 files changed, 140 insertions(+), 27 deletions(-)

diff --cc debian/changelog
index 66f1d75,de46686..8e9c60a
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,14 +1,20 @@@
+ circlator (1.2.1-1) unstable; urgency=medium
+ 
+   * Fix typo in d/upstream/metadata
+   * Add explicit build-dependency on bwa with proper minimum version
+   * Imported Upstream version 1.2.1
+   * Refresh patches
+   * Don't restrict pysam max version
+   * Update Standards-Version to 3.9.8
+ 
+  -- Afif Elghraoui <afif at debian.org>  Sat, 30 Apr 2016 01:35:58 -0700
+ 
 +circlator (1.2.0-1~bpo8+1) jessie-backports; urgency=medium
 +
 +  * Rebuild for jessie-backports.
 +
 + -- Afif Elghraoui <afif at debian.org>  Sat, 09 Apr 2016 12:47:56 -0700
 +
  circlator (1.2.0-1) unstable; urgency=medium
  
    * Initial release (Closes: #818575)

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