[Soiltexture-commits] r121 - / pkg/soiltexture pkg/soiltexture/R pkg/soiltexture/inst pkg/soiltexture/man
noreply at r-forge.r-project.org
noreply at r-forge.r-project.org
Mon Mar 9 10:35:22 CET 2015
Author: jmoeys
Date: 2015-03-09 10:35:22 +0100 (Mon, 09 Mar 2015)
New Revision: 121
Modified:
pkg/soiltexture/DESCRIPTION
pkg/soiltexture/NAMESPACE
pkg/soiltexture/NEWS
pkg/soiltexture/R/soiltextureInfo.R
pkg/soiltexture/inst/SVN_VERSION
pkg/soiltexture/man/soiltexture-package.Rd
soiltexture_2_RCMDcheck_noexamples.bat
soiltexture_3_RCMDINSTALL_build.BAT
soiltexture_4_RCMDRd2pdf.BAT
soiltexture_compile.R
Log:
Fix package imports (utils, tools)
Modified: pkg/soiltexture/DESCRIPTION
===================================================================
--- pkg/soiltexture/DESCRIPTION 2015-03-06 12:31:09 UTC (rev 120)
+++ pkg/soiltexture/DESCRIPTION 2015-03-09 09:35:22 UTC (rev 121)
@@ -1,13 +1,13 @@
Package: soiltexture
-Version: 1.2.21
-Date: 2015-03-06
+Version: 1.2.22
+Date: 2015-03-09
Title: Functions for soil texture plot, classification and transformation
Author: Julien Moeys [aut, cre], Wei Shangguan [ctb], Rainer Petzold [ctb], Budiman Minasny [ctb], Bogdan Rosca [ctb], Nic Jelinski [ctb], Wiktor Zelazny [ctb], Rodolfo Marcondes Silva Souza [ctb], Jose Lucas Safanelli [ctb], Alexandre ten Caten [ctb]
Authors at R: c( person( "Julien", "Moeys", role = c("aut", "cre"), email = "jules_m78-soiltexture at yahoo.fr" ), person( "Wei", "Shangguan", role = "ctb" ), person( "Rainer", "Petzold", role = "ctb" ), person( "Budiman", "Minasny", role = "ctb" ), person( "Bogdan", "Rosca", role = "ctb" ), person( "Nic", "Jelinski", role = "ctb" ), person( "Wiktor", "Zelazny", role = "ctb" ), person( "Rodolfo", "Marcondes Silva Souza", role = "ctb" ), person( "Jose Lucas", "Safanelli", role = "ctb" ), person( "Alexandre", "ten Caten", role = "ctb" ) )
Maintainer: Julien Moeys <jules_m78-soiltexture at yahoo.fr>
Depends: R (>= 3.1.1)
-Suggests: xtable, tools, utils
+Suggests: xtable
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 soil texture triangle / classification into any triangle geometry (isosceles, right-angled triangles, etc.). This set of function is expected to be useful to people using soil textures data from different soil texture classification or different particle size systems. Several texture triangles are predefined: USDA; FAO (which is also the triangle for the soil map of Europe); Aisne (France); GEPPA (France); German triangles "Bodenkundliche Kartieranleitung 1994", "SEA 1974" and "TGL 1985"; Soil Survey of England and Wales; Australian triangle; Belgian triangle; Canadian triangle; ISSS triangle; Romanian triangle; Polish triangle.
License: AGPL (>=3)
URL: http://soiltexture.r-forge.r-project.org/
-Imports: sp, MASS
+Imports: sp, MASS, tools, utils
Modified: pkg/soiltexture/NAMESPACE
===================================================================
--- pkg/soiltexture/NAMESPACE 2015-03-06 12:31:09 UTC (rev 120)
+++ pkg/soiltexture/NAMESPACE 2015-03-09 09:35:22 UTC (rev 121)
@@ -3,3 +3,5 @@
importFrom(sp,point.in.polygon)
importFrom(MASS,kde2d)
importFrom(MASS,mvrnorm)
+importFrom(utils,installed.packages)
+importFrom(tools,package_dependencies)
Modified: pkg/soiltexture/NEWS
===================================================================
--- pkg/soiltexture/NEWS 2015-03-06 12:31:09 UTC (rev 120)
+++ pkg/soiltexture/NEWS 2015-03-09 09:35:22 UTC (rev 121)
@@ -1,6 +1,10 @@
package: 'soiltexture'
+CHANGES IN VERSION 1.2.22
+
+ 2014/03/09 Fix package imports from tools and utils.
+
CHANGES IN VERSION 1.2.21
2014/03/06 Added a new Brazilian texture triangle:
Modified: pkg/soiltexture/R/soiltextureInfo.R
===================================================================
--- pkg/soiltexture/R/soiltextureInfo.R 2015-03-06 12:31:09 UTC (rev 120)
+++ pkg/soiltexture/R/soiltextureInfo.R 2015-03-09 09:35:22 UTC (rev 121)
@@ -92,7 +92,7 @@
loadedPackages <- .packages()
- require( "utils" )
+ # require( "utils" )
installedPackages <- utils::installed.packages()
loadedPackages <- installedPackages[ sort( loadedPackages ),
@@ -128,7 +128,7 @@
if( depends ){
# Find dependencies
- require( "tools" )
+ # require( "tools" )
dep <- unlist( lapply(
X = packages,
Modified: pkg/soiltexture/inst/SVN_VERSION
===================================================================
--- pkg/soiltexture/inst/SVN_VERSION 2015-03-06 12:31:09 UTC (rev 120)
+++ pkg/soiltexture/inst/SVN_VERSION 2015-03-09 09:35:22 UTC (rev 121)
@@ -1 +1 @@
-118:119M
+118:120M
Modified: pkg/soiltexture/man/soiltexture-package.Rd
===================================================================
--- pkg/soiltexture/man/soiltexture-package.Rd 2015-03-06 12:31:09 UTC (rev 120)
+++ pkg/soiltexture/man/soiltexture-package.Rd 2015-03-09 09:35:22 UTC (rev 121)
@@ -14,9 +14,9 @@
\tabular{ll}{Package: \tab soiltexture\cr
-Version: \tab 1.2.21\cr
+Version: \tab 1.2.22\cr
-Date: \tab 2015-03-06\cr
+Date: \tab 2015-03-09\cr
Title: \tab Functions for soil texture plot, classification and transformation\cr
@@ -28,13 +28,13 @@
Depends: \tab R (>= 3.1.1)\cr
-Suggests: \tab xtable, tools, utils\cr
+Suggests: \tab xtable\cr
License: \tab AGPL (>=3)\cr
URL: \tab http://soiltexture.r-forge.r-project.org/\cr
-Imports: \tab sp, MASS\cr}
+Imports: \tab sp, MASS, tools, utils\cr}
}
Modified: soiltexture_2_RCMDcheck_noexamples.bat
===================================================================
--- soiltexture_2_RCMDcheck_noexamples.bat 2015-03-06 12:31:09 UTC (rev 120)
+++ soiltexture_2_RCMDcheck_noexamples.bat 2015-03-09 09:35:22 UTC (rev 121)
@@ -1,5 +1,5 @@
set pkgname=soiltexture
-set version=1.2.21
+set version=1.2.22
cd /D "%rPackagesDir%\%pkgname%\pkg"
Modified: soiltexture_3_RCMDINSTALL_build.BAT
===================================================================
--- soiltexture_3_RCMDINSTALL_build.BAT 2015-03-06 12:31:09 UTC (rev 120)
+++ soiltexture_3_RCMDINSTALL_build.BAT 2015-03-09 09:35:22 UTC (rev 121)
@@ -1,5 +1,5 @@
set pkgname=soiltexture
-set version=1.2.21
+set version=1.2.22
cd /D "%rPackagesDir%\%pkgname%\pkg"
Modified: soiltexture_4_RCMDRd2pdf.BAT
===================================================================
--- soiltexture_4_RCMDRd2pdf.BAT 2015-03-06 12:31:09 UTC (rev 120)
+++ soiltexture_4_RCMDRd2pdf.BAT 2015-03-09 09:35:22 UTC (rev 121)
@@ -1,5 +1,5 @@
set pkgname=soiltexture
-set version=1.2.21
+set version=1.2.22
cd /D "%rPackagesDir%\%pkgname%\pkg"
Modified: soiltexture_compile.R
===================================================================
--- soiltexture_compile.R 2015-03-06 12:31:09 UTC (rev 120)
+++ soiltexture_compile.R 2015-03-09 09:35:22 UTC (rev 121)
@@ -17,10 +17,10 @@
pkgDescription(
pkgName = pkgName,
pkgDir = pkgDir,
- pkgVersion = "1.2.21",
+ pkgVersion = "1.2.22",
pkgDepends = NULL,
- pkgSuggests = c( "xtable", "tools", "utils" ), # c("drc","plotrix"),
- pkgImports = c( "sp","MASS" ),
+ pkgSuggests = c( "xtable" ), # c("drc","plotrix"),
+ pkgImports = c( "sp", "MASS", "tools", "utils" ),
RVersion = NULL
)
More information about the Soiltexture-commits
mailing list