[med-svn] [pbgenomicconsensus] 01/02: Merge branch 'master' into debian/jessie-backports

[Afif Elghraoui]

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

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

commit ccbe8cfc75ec8432e6d8b2ebd03a179c77b84d78
Merge: aeb28bd 43f2095
Author: Afif Elghraoui <afif at ghraoui.name>
Date:   Mon Dec 7 21:44:39 2015 -0800

    Merge branch 'master' into debian/jessie-backports

 CHANGELOG                           |  3 +++
 GenomicConsensus/ResultCollector.py |  2 +-
 GenomicConsensus/__init__.py        |  2 +-
 GenomicConsensus/io/utils.py        | 17 +++++------------
 GenomicConsensus/main.py            | 27 ++++++++++++++-------------
 GenomicConsensus/options.py         |  9 +++++++++
 GenomicConsensus/quiver/model.py    |  2 +-
 GenomicConsensus/quiver/quiver.py   |  2 +-
 GenomicConsensus/reference.py       | 30 +++++++++++++++++++++---------
 debian/changelog                    | 12 ++++++++++++
 debian/tests/control                |  4 ++--
 11 files changed, 70 insertions(+), 40 deletions(-)

diff --cc debian/changelog
index 121f4e3,111a52e..dc0f3d6
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,15 +1,21 @@@
+ pbgenomicconsensus (1.1.0-1) unstable; urgency=medium
+ 
+   * Imported Upstream version 1.1.0 (untagged release: bee9a1f from Jun 24)
+ 
+  -- Afif Elghraoui <afif at ghraoui.name>  Tue, 24 Nov 2015 23:47:01 -0800
+ 
+ pbgenomicconsensus (1.0.0-2) unstable; urgency=low
+ 
+   * Fix autopkgtest dependencies.
+ 
+  -- Afif Elghraoui <afif at ghraoui.name>  Mon, 23 Nov 2015 21:18:46 -0800
+ 
 +pbgenomicconsensus (1.0.0-1~bpo8+1) jessie-backports; urgency=medium
 +
 +  * Rebuild for jessie-backports.
 +
 + -- Afif Elghraoui <afif at ghraoui.name>  Sun, 15 Nov 2015 02:19:04 -0800
 +
  pbgenomicconsensus (1.0.0-1) unstable; urgency=low
  
    * Initial release (Closes: #794447)

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