Commit 2d1077e7 authored by Julien Y. Dutheil's avatar Julien Y. Dutheil
Browse files

New upstream version 2.4.1

parent 0f9752d1

CMakeLists.txt

+2 −2
Original line number Diff line number Diff line
@@ -95,10 +95,10 @@ ENDIF(NO_DEP_CHECK) 
# Packager

SET(CPACK_PACKAGE_NAME "libbpp-phyl")

SET(CPACK_PACKAGE_VENDOR "Bio++ Development Team")

SET(CPACK_PACKAGE_VERSION "2.4.0")

SET(CPACK_PACKAGE_VERSION "2.4.1")

SET(CPACK_PACKAGE_VERSION_MAJOR "2")

SET(CPACK_PACKAGE_VERSION_MINOR "4")

SET(CPACK_PACKAGE_VERSION_PATCH "0")

SET(CPACK_PACKAGE_VERSION_PATCH "1")

SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "The Bio++ Phylogenetics library")

SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/COPYING.txt")

SET(CPACK_RESOURCE_FILE_AUTHORS "${CMAKE_SOURCE_DIR}/AUTHORS.txt")

Doxyfile

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ PROJECT_NAME = bpp-phyl 
# could be handy for archiving the generated documentation or if some version

# control system is used.



PROJECT_NUMBER         = 2.4.0

PROJECT_NUMBER         = 2.4.1



# Using the PROJECT_BRIEF tag one can provide an optional one line description

# for a project that appears at the top of each page and should give viewer a

bpp-phyl.spec

+3 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
URL: https://github.com/BioPP/bpp-phyl



Name: bpp-phyl

Version: 1.4.0

Version: 2.4.1

Release: 1%{?dist}

License: CECILL-2.0

Vendor: The Bio++ Project
@@ -85,6 +85,8 @@ rm -rf $RPM_BUILD_ROOT 
%{_prefix}/include/*



%changelog

* Mon Aug 13 2018 Julien Dutheil <julien.dutheil@univ-montp2.fr> 2.4.1-1

- Compatibility update gcc8

* Mon Mar 12 2018 Julien Dutheil <julien.dutheil@univ-montp2.fr> 2.4.0-1

- Increased interface number

- Removed dynamic exceptions specifications.

src/Bpp/Phyl/Io/BppOTransitionModelFormat.cpp

+5 −4
Original line number Diff line number Diff line
@@ -138,13 +138,14 @@ TransitionModel* BppOTransitionModelFormat::readTransitionModel( 
    }



    delete nestedModel;

  }

  else

    model.reset(BppOSubstitutionModelFormat::read(alphabet, modelDescription, data, parseArguments));



    // update only for transition models

    updateParameters_(model.get(), args);

    if (parseArguments)

      initialize_(*model, data);

  }

  else

    model.reset(BppOSubstitutionModelFormat::read(alphabet, modelDescription, data, parseArguments));



  return model.release();

}

src/Bpp/Phyl/Io/IoTree.h

+2 −2
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
//



/*

Copyright or © or Copr. CNRS, (November 16, 2004)

Copyright or © or Copr. Bio++ Development Team, (November 16, 2004)



This software is a computer program whose purpose is to provide classes

for phylogenetic data analysis.
@@ -170,7 +170,7 @@ class AbstractOTree: 
        write(tree, output);

        output.close();

      }

      catch (IOException e)

      catch (IOException& e)

        {

          std::stringstream ss ;

          ss << e.what() <<"\nProblem writing tree to file "<< path <<"\n Is the file path correct and do \