[med-svn] [r-cran-distory] 06/14: New upstream version 1.4.3

[Andreas Tille]

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

tille pushed a commit to branch master
in repository r-cran-distory.

commit d3485b27ba29e942089993bdaa59a845583b14a5
Author: Andreas Tille <tille at debian.org>
Date:   Sat Sep 23 07:31:44 2017 +0200

    New upstream version 1.4.3
---
 DESCRIPTION       | 11 +++++++----
 MD5               |  4 ++--
 src/phydist_r.cpp |  3 ++-
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/DESCRIPTION b/DESCRIPTION
index 605d16a..9c791f0 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -1,15 +1,18 @@
 Package: distory
 Type: Package
 Title: Distance Between Phylogenetic Histories
-Version: 1.4.2
+Version: 1.4.3
 Date: 2010-06-07
 Author: John Chakerian and Susan Holmes
-Maintainer: Susan Holmes <susan at stat.stanford.edu>
+Maintainer: ORPHANED
 Depends: ape (>= 2.3), R (>= 2.6.0)
 Description: Geodesic distance between phylogenetic trees and
         associated functions.
 License: BSD
-Packaged: 2013-11-12 09:21:46 UTC; ripley
+Packaged: 2017-03-16 07:56:14 UTC; ripley
 Repository: CRAN
-Date/Publication: 2013-11-12 10:27:52
+Date/Publication: 2017-03-21 06:06:57 UTC
 NeedsCompilation: yes
+X-CRAN-Original-Maintainer: Susan Holmes <susan at stat.stanford.edu>
+X-CRAN-Comment: Orphaned on 2017-03-21 as long-standing errors were not
+        corrected.  NMU by CRAN team.
diff --git a/MD5 b/MD5
index 9f37364..d784ec3 100644
--- a/MD5
+++ b/MD5
@@ -1,4 +1,4 @@
-f168f781a67f6e7f7ab62ae647228db3 *DESCRIPTION
+4e14c02ca38b130aa19d95ba5ec5d3dc *DESCRIPTION
 26de99ccfb9ca8a2a213a4818be3b0bf *NAMESPACE
 850d5d746dff4c1e7e623fe7cd35b03a *R/bethe.tree.R
 a2ed747f17ee32505c78a67a2ab03945 *R/bin.multiPhylo.R
@@ -20,7 +20,7 @@ d679ae0bc472e781b887c1506f70d7bd *man/phylo.diff.Rd
 0d297ad815b52a39bfe52ca3075b8a32 *man/position.leverage.Rd
 f4d2b55dddfbaca90b778b3e1f45e536 *src/newick.cpp
 76960301ce979b7a7595211c7f3df496 *src/newick.h
-578f0107cf2171675d24aa978bc145e0 *src/phydist_r.cpp
+5f84e1edcdbd8fde7662fc282747fed1 *src/phydist_r.cpp
 ab78adf7f6f16d7cbc09a1265f36b4e1 *src/phylo.h
 32800a06d5f51921d0ce2c1ba960bff1 *src/treedist-stripped.cpp
 16f8de5df9c6f8798a3e6f57495ec821 *src/treedist.h
diff --git a/src/phydist_r.cpp b/src/phydist_r.cpp
index 1cc5871..04ee06b 100644
--- a/src/phydist_r.cpp
+++ b/src/phydist_r.cpp
@@ -20,6 +20,7 @@
 
 #include <R.h>
 #include <Rinternals.h>
+#include <Rmath.h> // for fmax2
 
 using namespace std;
 
@@ -309,7 +310,7 @@ R2:
     switch(scale)
     {
         case 2:
-            raw_delta /= fmax(a,b);
+            raw_delta /= fmax2(a,b);
             break;
         case 3:
             double dd[4];

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