[Soiltexture-commits] r114 - / pkg/soiltexture pkg/soiltexture/R pkg/soiltexture/inst pkg/soiltexture/man

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

Author: jmoeys
Date: 2014-09-30 17:14:03 +0200 (Tue, 30 Sep 2014)
New Revision: 114

Modified:
   pkg/soiltexture/DESCRIPTION
   pkg/soiltexture/NEWS
   pkg/soiltexture/R/soiltextureInfo.R
   pkg/soiltexture/inst/SVN_VERSION
   pkg/soiltexture/man/soiltexture-package.Rd
   soiltexture_compile.R
Log:
compiled for R 3.1.1 (fix an issue)

Modified: pkg/soiltexture/DESCRIPTION
===================================================================
--- pkg/soiltexture/DESCRIPTION	2014-09-26 09:35:13 UTC (rev 113)
+++ pkg/soiltexture/DESCRIPTION	2014-09-30 15:14:03 UTC (rev 114)
@@ -1,11 +1,11 @@
 Package: soiltexture
 Version: 1.2.19
-Date: 2014-09-25
+Date: 2014-09-29
 Title: Functions for soil texture plot, classification and transformation
 Author: Julien MOEYS <jules_m78-soiltexture at yahoo.fr>, contributions from Wei Shangguan.
 Maintainer: Julien MOEYS <jules_m78-soiltexture at yahoo.fr> 
 Depends: R (>= 3.1.1), sp, MASS
-Suggests: xtable, tools
+Suggests: xtable, tools, utils
 Description: "The Soil Texture Wizard" is a set of R functions designed to produce 
     texture triangles (also called texture plots, texture diagrams, texture ternary plots), 
     classify and transform soil textures data. These functions virtually allows to plot any 

Modified: pkg/soiltexture/NEWS
===================================================================
--- pkg/soiltexture/NEWS	2014-09-26 09:35:13 UTC (rev 113)
+++ pkg/soiltexture/NEWS	2014-09-30 15:14:03 UTC (rev 114)
@@ -5,6 +5,8 @@
 
     2014/09/25  Compiled for R 3.1.1
     
+        Attempt to fix imports from tools::package_dependencies
+    
 CHANGES IN VERSION 1.2.18
     
     2014/07/03  Added SVN_VERSION file and show SVN version when 

Modified: pkg/soiltexture/R/soiltextureInfo.R
===================================================================
--- pkg/soiltexture/R/soiltextureInfo.R	2014-09-26 09:35:13 UTC (rev 113)
+++ pkg/soiltexture/R/soiltextureInfo.R	2014-09-30 15:14:03 UTC (rev 114)
@@ -91,8 +91,10 @@
     cat2( "Loaded packages:\n" ) 
     
     loadedPackages    <- .packages() 
-    installedPackages <- installed.packages() 
     
+    require( "utils" ) 
+    installedPackages <- utils::installed.packages() 
+    
     loadedPackages    <- installedPackages[ sort( loadedPackages ), 
         "Version" ] 
     loadedPackages    <- data.frame( 
@@ -131,7 +133,7 @@
         dep <- unlist( lapply( 
             X   = packages, 
             FUN = function(X){ 
-                out <- package_dependencies( 
+                out <- tools::package_dependencies( 
                     packages  = packages, 
                     db        = installedPackages, 
                     recursive = TRUE ) 

Modified: pkg/soiltexture/inst/SVN_VERSION
===================================================================
--- pkg/soiltexture/inst/SVN_VERSION	2014-09-26 09:35:13 UTC (rev 113)
+++ pkg/soiltexture/inst/SVN_VERSION	2014-09-30 15:14:03 UTC (rev 114)
@@ -1 +1 @@
-105:112M
+105:113M

Modified: pkg/soiltexture/man/soiltexture-package.Rd
===================================================================
--- pkg/soiltexture/man/soiltexture-package.Rd	2014-09-26 09:35:13 UTC (rev 113)
+++ pkg/soiltexture/man/soiltexture-package.Rd	2014-09-30 15:14:03 UTC (rev 114)
@@ -36,7 +36,7 @@
 
 Version: \tab 1.2.19\cr
 
-Date: \tab 2014-09-25\cr
+Date: \tab 2014-09-29\cr
 
 Title: \tab Functions for soil texture plot, classification and transformation\cr
 
@@ -46,7 +46,7 @@
 
 Depends: \tab R (>= 3.1.1), sp, MASS\cr
 
-Suggests: \tab xtable, tools\cr
+Suggests: \tab xtable, tools, utils\cr
 
 License: \tab AGPL (>=3)\cr
 

Modified: soiltexture_compile.R
===================================================================
--- soiltexture_compile.R	2014-09-26 09:35:13 UTC (rev 113)
+++ soiltexture_compile.R	2014-09-30 15:14:03 UTC (rev 114)
@@ -19,7 +19,7 @@
     pkgDir      = pkgDir, 
     pkgVersion  = "1.2.19", 
     pkgDepends  = c( "sp","MASS" ), 
-    pkgSuggests = c( "xtable", "tools" ), # c("drc","plotrix"), 
+    pkgSuggests = c( "xtable", "tools", "utils" ), # c("drc","plotrix"), 
     RVersion    = NULL   
 )