[Distr-commits] r915 - branches/distr-2.6 branches/distr-2.6/pkg branches/distr-2.6/pkg/distr branches/distr-2.6/pkg/distr/man branches/distr-2.6/pkg/distrMod branches/distr-2.6/pkg/distrMod/man branches/distr-2.6/pkg/distrSim branches/distr-2.6/pkg/distrSim/man pkg/utils
noreply at r-forge.r-project.org
noreply at r-forge.r-project.org
Fri Sep 13 01:35:11 CEST 2013
Author: ruckdeschel
Date: 2013-09-13 01:35:11 +0200 (Fri, 13 Sep 2013)
New Revision: 915
Added:
branches/distr-2.6/pkg/
branches/distr-2.6/pkg/distr/
branches/distr-2.6/pkg/distrMod/
branches/distr-2.6/pkg/distrSim/
Modified:
branches/distr-2.6/pkg/distr/DESCRIPTION
branches/distr-2.6/pkg/distr/man/0distr-package.Rd
branches/distr-2.6/pkg/distrMod/DESCRIPTION
branches/distr-2.6/pkg/distrMod/man/0distrMod-package.Rd
branches/distr-2.6/pkg/distrSim/DESCRIPTION
branches/distr-2.6/pkg/distrSim/man/0distrSim-package.Rd
pkg/utils/DESCRIPTIONutils.R
Log:
after acceptance on CRAN, generated branches/distr-2.6/pkg versions of distr, distrSim, distrMod
Modified: branches/distr-2.6/pkg/distr/DESCRIPTION
===================================================================
--- pkg/distr/DESCRIPTION 2013-09-12 13:15:18 UTC (rev 913)
+++ branches/distr-2.6/pkg/distr/DESCRIPTION 2013-09-12 23:35:11 UTC (rev 915)
@@ -1,14 +1,13 @@
Package: distr
-Version: 2.5.2
-Date: 2013-09-12
+Version: 2.6
+Date: 2013-09-13
Title: Object oriented implementation of distributions
Description: S4 Classes and Methods for distributions
-Authors at R: c(person("Florian", "Camphausen", role=c("aut")),
- person("Matthias", "Kohl", role=c("aut", "cph")),
- person("Peter", "Ruckdeschel", role=c("cre", "cph"), email="Peter.Ruckdeschel at itwm.fraunhofer.de"),
- person("Thomas", "Stabla", role=c("aut", "cph")),
- person("R Core Team", role = c("ctb", "cph"),
- comment="for source file ks.c/ routines 'pKS2' and 'pKolmogorov2x'"))
+Authors at R: c(person("Florian", "Camphausen", role=c("aut")), person("Matthias", "Kohl",
+ role=c("aut", "cph")), person("Peter", "Ruckdeschel", role=c("cre", "cph"),
+ email="Peter.Ruckdeschel at itwm.fraunhofer.de"), person("Thomas", "Stabla", role=c("aut",
+ "cph")), person("R Core Team", role = c("ctb", "cph"), comment="for source file ks.c/
+ routines 'pKS2' and 'pKolmogorov2x'"))
Depends: R(>= 2.14.0), methods, graphics, startupmsg, sfsmisc, SweaveListingUtils
Suggests: distrEx
Imports: stats
@@ -18,4 +17,4 @@
URL: http://distr.r-forge.r-project.org/
LastChangedDate: {$LastChangedDate$}
LastChangedRevision: {$LastChangedRevision$}
-SVNRevision: 910
+SVNRevision: 914
Modified: branches/distr-2.6/pkg/distr/man/0distr-package.Rd
===================================================================
--- pkg/distr/man/0distr-package.Rd 2013-09-12 13:15:18 UTC (rev 913)
+++ branches/distr-2.6/pkg/distr/man/0distr-package.Rd 2013-09-12 23:35:11 UTC (rev 915)
@@ -43,14 +43,14 @@
\details{
\tabular{ll}{
Package: \tab distr \cr
-Version: \tab 2.5 \cr
-Date: \tab 2013-09-11 \cr
+Version: \tab 2.6 \cr
+Date: \tab 2013-09-13 \cr
Depends: \tab R(>= 2.2.0), methods, graphics, startupmsg, sfsmisc,
SweaveListingUtils\cr
LazyLoad: \tab yes \cr
License: \tab LGPL-3 \cr
URL: \tab http://distr.r-forge.r-project.org/\cr
-SVNRevision: \tab 904 \cr
+SVNRevision: \tab 914 \cr
}}
Modified: branches/distr-2.6/pkg/distrMod/DESCRIPTION
===================================================================
--- pkg/distrMod/DESCRIPTION 2013-09-12 13:15:18 UTC (rev 913)
+++ branches/distr-2.6/pkg/distrMod/DESCRIPTION 2013-09-12 23:35:11 UTC (rev 915)
@@ -1,16 +1,17 @@
Package: distrMod
-Version: 2.5.2
-Date: 2013-09-12
+Version: 2.6
+Date: 2013-09-13
Title: Object oriented implementation of probability models
Description: Object oriented implementation of probability models based on packages 'distr' and
'distrEx'
Author: Matthias Kohl, Peter Ruckdeschel
Maintainer: Peter Ruckdeschel <Peter.Ruckdeschel at itwm.fraunhofer.de>
-Depends: R(>= 2.14.0), distr(>= 2.5.2), distrEx(>= 2.4), RandVar(>= 0.6.3), MASS, stats4, methods
+Depends: R(>= 2.14.0), distr(>= 2.5.2), distrEx(>= 2.4), RandVar(>= 0.6.3), MASS, stats4,
+ methods
ByteCompile: yes
License: LGPL-3
Encoding: latin1
URL: http://distr.r-forge.r-project.org/
LastChangedDate: {$LastChangedDate$}
LastChangedRevision: {$LastChangedRevision$}
-SVNRevision: 909
+SVNRevision: 914
Modified: branches/distr-2.6/pkg/distrMod/man/0distrMod-package.Rd
===================================================================
--- pkg/distrMod/man/0distrMod-package.Rd 2013-09-12 13:15:18 UTC (rev 913)
+++ branches/distr-2.6/pkg/distrMod/man/0distrMod-package.Rd 2013-09-12 23:35:11 UTC (rev 915)
@@ -15,14 +15,14 @@
\details{
\tabular{ll}{
Package: \tab distrMod \cr
-Version: \tab 2.5 \cr
-Date: \tab 2013-09-11 \cr
+Version: \tab 2.6 \cr
+Date: \tab 2013-09-13 \cr
Depends: \tab R(>= 2.6.0), methods, startupmsg, distr(>= 2.2), distrEx(>=
2.2), RandVar(>= 0.6.3), MASS, stats4 \cr
LazyLoad: \tab yes \cr
License: \tab LGPL-3 \cr
URL: \tab http://distr.r-forge.r-project.org/\cr
-SVNRevision: \tab 904 \cr
+SVNRevision: \tab 914 \cr
}}
\section{Classes}{
Modified: branches/distr-2.6/pkg/distrSim/DESCRIPTION
===================================================================
--- pkg/distrSim/DESCRIPTION 2013-09-12 13:15:18 UTC (rev 913)
+++ branches/distr-2.6/pkg/distrSim/DESCRIPTION 2013-09-12 23:35:11 UTC (rev 915)
@@ -1,6 +1,6 @@
Package: distrSim
-Version: 2.5.2
-Date: 2013-09-12
+Version: 2.6
+Date: 2013-09-13
Title: Simulation classes based on package distr
Depends: R(>= 2.14.0), methods, graphics, setRNG(>= 2006.2-1), distr(>= 2.5.2)
Suggests: distrEx(>= 2.2)
@@ -13,4 +13,4 @@
URL: http://distr.r-forge.r-project.org/
LastChangedDate: {$LastChangedDate$}
LastChangedRevision: {$LastChangedRevision$}
-SVNRevision: 909
+SVNRevision: 914
Modified: branches/distr-2.6/pkg/distrSim/man/0distrSim-package.Rd
===================================================================
--- pkg/distrSim/man/0distrSim-package.Rd 2013-09-12 13:15:18 UTC (rev 913)
+++ branches/distr-2.6/pkg/distrSim/man/0distrSim-package.Rd 2013-09-12 23:35:11 UTC (rev 915)
@@ -13,14 +13,14 @@
\details{
\tabular{ll}{
Package: \tab distrSim \cr
-Version: \tab 2.5 \cr
-Date: \tab 2013-09-11 \cr
+Version: \tab 2.6 \cr
+Date: \tab 2013-09-13 \cr
Depends: \tab R(>= 2.6.0), methods, graphics, setRNG(>= 2006.2-1), distr(>=
2.0), startupmsg\cr
LazyLoad: \tab yes \cr
License: \tab LGPL-3 \cr
URL: \tab http://distr.r-forge.r-project.org/\cr
-SVNRevision: \tab 904 \cr
+SVNRevision: \tab 914 \cr
}
}
\section{Classes}{
Modified: pkg/utils/DESCRIPTIONutils.R
===================================================================
--- pkg/utils/DESCRIPTIONutils.R 2013-09-12 21:37:25 UTC (rev 914)
+++ pkg/utils/DESCRIPTIONutils.R 2013-09-12 23:35:11 UTC (rev 915)
@@ -35,9 +35,10 @@
oldDir <- getwd()
on.exit(setwd(oldDir))
setwd(startDir)
- if(is.null(pathRepo)) pathRepo <- gsub(".*/([^/]+)/*$","\\1", startDir)
if(withSVNread){
- svnrev <- getRevNr(startDir, pathRepo)[[1]]
+ startD <- gsub("/branches/[^/]+","",startDir)
+ if(is.null(pathRepo)) pathRepo <- gsub(".*/([^/]+)/*$","\\1", startD)
+ svnrev <- getRevNr(startD, pathRepo)[[1]]
print(svnrev)
if("SVNRevision" %in% names){
values[which(names=="SVNRevision"),] <- svnrev
@@ -177,12 +178,20 @@
"distrTeach",
"distrTEst", "distrEllipse", "distrRmetrics")
Names <- c("Version")
-Values <- matrix(c("2.5",1,length(Pkgs))
+Values <- matrix(c("2.5"),1,length(Pkgs))
colnames(Values) <- Pkgs
rownames(Values) <- Names
Values["Version",,drop=FALSE] <- c("0.9", "0.7", rep("2.5",6))
changeDescription(startDir = "C:/rtest/distr",names=Names,
pkgs=Pkgs, values=Values)
+
+Pkgs <- c("distr", "distrSim","distrMod")
+Names <- c("Version")
+Values <- matrix(c("2.6"),1,length(Pkgs))
+colnames(Values) <- Pkgs
+rownames(Values) <- Names
+changeDescription(startDir = "C:/rtest/distr/branches/distr-2.6",names=Names,
+ pkgs=Pkgs, values=Values)
}
##############################################################################
More information about the Distr-commits
mailing list