[med-svn] [harvest-tools] 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 harvest-tools.

commit 0849701a51322bb9b4568985760be4533e16405a
Merge: b55560d 14d98c4
Author: Andreas Tille <tille at debian.org>
Date:   Tue Jun 6 16:09:44 2017 +0200

    Merge branch 'master' into debian/jessie-backports

 INSTALL.txt                         |  38 +++++--
 Makefile.in                         |   6 +-
 README.md                           |  18 ++--
 configure.ac                        |   2 +-
 debian/changelog                    |   7 ++
 debian/control                      |   2 +-
 debian/patches/remove_memwrap.patch |  16 +--
 src/harvest/AnnotationList.cpp      |  27 ++++-
 src/harvest/AnnotationList.h        |   7 +-
 src/harvest/HarvestIO.cpp           |  42 +++++++-
 src/harvest/HarvestIO.h             |   3 +-
 src/harvest/LcbList.cpp             | 121 +++++++++++++++++++++
 src/harvest/LcbList.h               |   1 +
 src/harvest/PhylogenyTree.cpp       |  43 ++++++++
 src/harvest/PhylogenyTree.h         |   1 +
 src/harvest/PhylogenyTreeNode.cpp   |   5 +-
 src/harvest/PhylogenyTreeNode.h     |   5 +-
 src/harvest/ReferenceList.cpp       |  14 +--
 src/harvest/ReferenceList.h         |  12 +--
 src/harvest/VariantList.cpp         | 210 +++++++++++++++++++++++++++++++-----
 src/harvest/VariantList.h           | 139 +++++++++++++++++++++++-
 src/harvest/harvest.cpp             | 141 ++++++++++++++++++++++--
 22 files changed, 762 insertions(+), 98 deletions(-)

diff --cc debian/changelog
index 12af190,e8f4cf7..d7d03d9
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,10 +1,16 @@@
+ harvest-tools (1.3-1) unstable; urgency=medium
+ 
+   * New upstream version
+   * cme fix dpkg-control
+ 
+  -- Andreas Tille <tille at debian.org>  Fri, 21 Oct 2016 11:04:22 +0200
+ 
 +harvest-tools (1.2-2~bpo8+1) jessie-backports; urgency=medium
 +
 +  * Rebuild for jessie-backports.
 +
 + -- Andreas Tille <tille at debian.org>  Tue, 24 May 2016 09:48:12 +0200
 +
  harvest-tools (1.2-2) unstable; urgency=medium
  
    * team upload 

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