[Vegan-commits] r1818 - in permbranches/0.6: . man

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

Author: gsimpson
Date: 2011-09-09 23:00:51 +0200 (Fri, 09 Sep 2011)
New Revision: 1818

Modified:
   permbranches/0.6/DESCRIPTION
   permbranches/0.6/man/permCheck.Rd
Log:
merge r1816 and r1817 from permute trunk to 0.6 branch

Modified: permbranches/0.6/DESCRIPTION
===================================================================
--- permbranches/0.6/DESCRIPTION	2011-09-09 20:57:52 UTC (rev 1817)
+++ permbranches/0.6/DESCRIPTION	2011-09-09 21:00:51 UTC (rev 1818)
@@ -4,7 +4,7 @@
 Date: $Date$
 Author: Gavin L. Simpson
 Maintainer: Gavin L. Simpson <gavin.simpson at ucl.ac.uk>
-Suggests: vegan, testthat (>= 0.5)
+Suggests: vegan (>= 2.0-0), testthat (>= 0.5)
 Description: The 'permute' package implements a set of restricted permutation designsfor freely exchangeable, line transects (time series), and spatial grid designs plus permutation of blocks (groups of samples). 'permute' also allows split-plot designs, in which the whole-plots or split-plots or both can be freely-exchangeble or one of the restricted designs.
 License: GPL-2 
 URL: http://vegan.r-forge.r-project.org/

Modified: permbranches/0.6/man/permCheck.Rd
===================================================================
--- permbranches/0.6/man/permCheck.Rd	2011-09-09 20:57:52 UTC (rev 1817)
+++ permbranches/0.6/man/permCheck.Rd	2011-09-09 21:00:51 UTC (rev 1818)
@@ -111,10 +111,6 @@
 \examples{
 %\dontrun{
 
-## Only for vegan >= 2.0-0
-vers <- packageDescription("vegan")$Version
-
-if(vers >= "2.0-0") {
 ## use example data from ?pyrifos in package vegan
 require(vegan)
 example(pyrifos)
@@ -202,8 +198,8 @@
 ## well as the matrix of permutations
 ##summary(tmp) %% FIXME these don't print the scheme
 ##summary(tmp2)
-}
 
+
 %% FIXME - need all these updating to new API in permControl...
 %% Fixed one, above, but there may still be problems with some of
 %% the code below: