[Phylobase-commits] r879 - pkg

[noreply at r-forge.r-project.org]

Author: francois
Date: 2014-03-17 14:19:26 +0100 (Mon, 17 Mar 2014)
New Revision: 879

Modified:
   pkg/DESCRIPTION
   pkg/NAMESPACE
   pkg/cleanup
Log:
updated DESCRIPTION, NAMESPACE and cleanup

Modified: pkg/DESCRIPTION
===================================================================
--- pkg/DESCRIPTION	2014-03-17 13:18:21 UTC (rev 878)
+++ pkg/DESCRIPTION	2014-03-17 13:19:26 UTC (rev 879)
@@ -1,14 +1,14 @@
 Package: phylobase
 Type: Package
 Title: Base package for phylogenetic structures and comparative data
-Version: 0.6.7-1
-Date: 2014-03-14
+Version: 0.6.8
+Date: 2014-03-17
+Imports: ade4,
+	 ape (>= 3.0),
+	 Rcpp (>= 0.11.0),
+	 methods
 Depends:
-    methods,
-    grid,
-    Rcpp (>= 0.11.0),
-    ape (>= 2.1)
-Imports: ade4
+	grid
 LinkingTo: Rcpp
 Suggests:
     MASS,
@@ -39,6 +39,7 @@
     'setAs-Methods.R'
     'pdata.R'
     'subset.R'
+    'phylobase-package.R'
     'phylobase.options.R'
     'prune.R'
     'treePlot.R'

Modified: pkg/NAMESPACE
===================================================================
--- pkg/NAMESPACE	2014-03-17 13:18:21 UTC (rev 878)
+++ pkg/NAMESPACE	2014-03-17 13:19:26 UTC (rev 879)
@@ -6,10 +6,12 @@
 
 import(methods)
 import(ape)
+import(Rcpp)
+
 importFrom(graphics, plot)
 importFrom(stats, reorder)
 importFrom(utils, head, tail)
-importFrom(Rcpp, evalCpp)
+importFrom(ade4, newick2phylog)
 
 #----------------------------------------------------------------------
 
@@ -90,7 +92,8 @@
 ## options
 export(phylobase.options)
 
-importFrom(ade4,newick2phylog)
+
+
 ## commented out in source code, probably should be omitted here
 #export(phyloStripchart)
 #export(internEdges, terminEdges, isPoly)

Modified: pkg/cleanup
===================================================================
--- pkg/cleanup	2014-03-17 13:18:21 UTC (rev 878)
+++ pkg/cleanup	2014-03-17 13:19:26 UTC (rev 879)
@@ -61,4 +61,4 @@
 rm -f src/ncl/ncl/.deps
 rm -f src/ncl/ncl/Makefile
 rm -f tests/.RData
-rm -r tests/Rplots.pdf
+rm -f tests/Rplots.pdf