This is an automated email from the git hooks/post-receive script. tille pushed a commit to branch master in repository libbpp-phyl-omics.
commit 293924bf9fab46df600bdc9837ae3fdb5fc2fb4f Merge: 80a4514 f9473fb Author: Andreas Tille <[email protected]> Date: Wed Apr 13 16:13:20 2016 +0200 Merge tag 'upstream/2.2.0' Upstream version 2.2.0 Conflicts: debian/changelog CMakeLists.txt | 9 +- ChangeLog | 8 + Doxyfile | 2 +- bpp-phyl-omics.spec | 6 +- debian/control | 6 +- debian/copyright | 6 +- genIncludes.sh | 35 ++++ .../Io/Maf/AbstractDistanceEstimationMafIterator.h | 4 +- src/Bpp/Seq/Io/Maf/CountClustersMafStatistics.cpp | 2 +- ...imumLikelihoodDistanceEstimationMafIterator.cpp | 2 +- ...aximumLikelihoodDistanceEstimationMafIterator.h | 4 +- .../Maf/MaximumLikelihoodModelFitMafStatistics.cpp | 115 ++++++++++++ .../Maf/MaximumLikelihoodModelFitMafStatistics.h | 202 +++++++++++++++++++++ src/CMakeLists.txt | 2 + 14 files changed, 381 insertions(+), 22 deletions(-) diff --cc debian/control index 1ef6f6d,e7f57c3..6e2b7c6 --- a/debian/control +++ b/debian/control @@@ -4,38 -4,22 +4,38 @@@ Priority: optiona Maintainer: Loic Dachary <[email protected]> Uploaders: Julien Dutheil <[email protected]> Build-Depends: debhelper (>= 5), cmake (>= 2.6), - libbpp-phyl-dev (>= 2.1.0), libbpp-seq-omics-dev (>= 2.1.0) + libbpp-phyl-dev (>= 2.2.0), libbpp-seq-omics-dev (>= 2.2.0) Standards-Version: 3.9.4 +Vcs-Browser: https://anonscm.debian.org/cgit/debian-med/libbpp-phyl-omics.git +Vcs-Git: https://anonscm.debian.org/git/debian-med/libbpp-phyl-omics.git +Homepage: http://biopp.univ-montp2.fr/wiki/index.php/Main_Page Package: libbpp-phyl-omics-dev Section: libdevel Architecture: any Depends: libbpp-phyl-omics1 (= ${binary:Version}), ${misc:Depends}, - libbpp-phyl-dev (>= 2.1.0), libbpp-seq-omics-dev (>= 2.1.0) + libbpp-phyl-dev (>= 2.2.0), libbpp-seq-omics-dev (>= 2.2.0) Description: Bio++ Phylogenetics library: genomics components. - Contains the Bio++ sequence classes dedicated to phylogenomics. + Bio++ is a set of C++ libraries for Bioinformatics, including sequence + analysis, phylogenetics, molecular evolution and population genetics. + Bio++ is Object Oriented and is designed to be both easy to use and + computer efficient. Bio++ intends to help programmers to write computer + expensive programs, by providing them a set of re-usable tools. + . + This package contains the static library and the header files of the + Bio++ classes dedicated to genomic phylogeny. Package: libbpp-phyl-omics1 Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, - libbpp-phyl9 (>= 2.1.0), libbpp-seq-omics1 (>= 2.1.0) + libbpp-phyl9 (>= 2.2.0), libbpp-seq-omics1 (>= 2.2.0) Description: Bio++ Phylogenetics library: genomics components. - Contains the Bio++ sequence classes dedicated to phylogenomics. - + Bio++ is a set of C++ libraries for Bioinformatics, including sequence + analysis, phylogenetics, molecular evolution and population genetics. + Bio++ is Object Oriented and is designed to be both easy to use and + computer efficient. Bio++ intends to help programmers to write computer + expensive programs, by providing them a set of re-usable tools. + . + This package contains the dynamic library of the Bio++ classes + dedicated to genomic phylogeny. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/libbpp-phyl-omics.git _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
