Thu Dec 2 14:14:26 CET 2010

Author: ruckdeschel
Date: 2010-12-02 14:14:26 +0100 (Thu, 02 Dec 2010)
New Revision: 693

Added:
   branches/distr-2.4/
   branches/distr-2.4/README
   branches/distr-2.4/pkg/
   branches/distr-2.4/www/
Modified:
   branches/distr-2.3/pkg/utils/DESCRIPTIONutils.R
   branches/distr-2.4/pkg/SweaveListingUtils/DESCRIPTION
   branches/distr-2.4/pkg/SweaveListingUtils/man/0SweaveListingUtils-package.Rd
   branches/distr-2.4/pkg/distr/DESCRIPTION
   branches/distr-2.4/pkg/distr/man/0distr-package.Rd
   branches/distr-2.4/pkg/distrDoc/DESCRIPTION
   branches/distr-2.4/pkg/distrDoc/man/0distrDoc-package.Rd
   branches/distr-2.4/pkg/distrEllipse/DESCRIPTION
   branches/distr-2.4/pkg/distrEllipse/man/0distrEllipse-package.Rd
   branches/distr-2.4/pkg/distrEx/DESCRIPTION
   branches/distr-2.4/pkg/distrEx/man/0distrEx-package.Rd
   branches/distr-2.4/pkg/distrMod/DESCRIPTION
   branches/distr-2.4/pkg/distrMod/man/0distrMod-package.Rd
   branches/distr-2.4/pkg/distrSim/DESCRIPTION
   branches/distr-2.4/pkg/distrSim/man/0distrSim-package.Rd
   branches/distr-2.4/pkg/distrTEst/DESCRIPTION
   branches/distr-2.4/pkg/distrTEst/man/0distrTEst-package.Rd
   branches/distr-2.4/pkg/distrTeach/DESCRIPTION
   branches/distr-2.4/pkg/distrTeach/man/0distrTeach-package.Rd
   branches/distr-2.4/pkg/utils/DESCRIPTIONutils.R
Log:
created branch 2.4
modified version, date and Revision number in DESCRIPTION files in branch distr-2.4
modified DESCRIPTIONutils.R 

Modified: branches/distr-2.3/pkg/utils/DESCRIPTIONutils.R
===================================================================

--- branches/distr-2.3/pkg/utils/DESCRIPTIONutils.R	2010-12-02 10:46:56 UTC (rev 692)
+++ branches/distr-2.3/pkg/utils/DESCRIPTIONutils.R	2010-12-02 13:14:26 UTC (rev 693)
@@ -34,14 +34,16 @@
   on.exit(setwd(oldDir))
   setwd(startDir)
   if(withSVNread){
-      svn <- getRevAllNr(startDir,list="max")
+      svn <- getAllRevNr(startDir,list="max")
       svnrev <- svn[[1]]
+      print(svnrev)
       if("SVNRevision" %in% names){
-         values[which(names=="SVNRevsion")] <- svnrev
+         values[which(names=="SVNRevision"),] <- svnrev
       }
   }
+#  print(names)
+#  print(values)
   
-  
   if(is.matrix(values) && is.null(colnames(values))) 
      colnames(values) <- rep(pkgs, length.out = ncol(values))
      
@@ -63,6 +65,11 @@
      sapply(pkgs, function(x){
        FN <- file.path("pkg",x,"DESCRIPTION")
        xx <- read.dcf(FN)
+#       print(xx)
+#       print(values)
+#       print(names)
+#       print(values[names,x])
+#       print(xx[,names])
        xx[,names] <- values[names,x]
        write.dcf(xx, file=FN)
        if(withPackageHelpUpdate)

Copied: branches/distr-2.4/README (from rev 692, branches/distr-2.3/README)
===================================================================
--- branches/distr-2.4/README	                        (rev 0)
+++ branches/distr-2.4/README	2010-12-02 13:14:26 UTC (rev 693)
@@ -0,0 +1,49 @@
+			R-Forge SVN README
+
+
+(See "http://download.r-forge.r-project.org/manuals/R-Forge_Manual.pdf"
+       for detailed information on registering a new project.
+
+1. Introduction
+-----------------------------------------------------------------------
+R is free software distributed under a GNU-style copyleft. R-Forge is
+a service for R users and package developers providing certain tools
+for collaborative source code management.
+
+2. The directory you're in
+-----------------------------------------------------------------------
+This is the repository of your project. It contains two important
+pre-defined directories namely 'www' and 'pkg'. They must not be
+deleted otherwise R-Forge's core functionality will not be available
+(daily check and build of your package or project websites).
+These two directories are standardized and therefore are going to be
+described in this README. The rest of your repository can be used as
+you like.
+
+3. 'pkg' directory
+-----------------------------------------------------------------------
+Typically this directory contains the R package with the usual
+DESCRIPTION and R/, man/, data/ directories etc (see 'Writing R 
+Extension' for more details). In the future it will also be possible to
+have multiple packages managed by a control file, however currently
+this feature is still under development).
+
+Furthermore, this directory will be checked out daily, the package is
+checked and if it passes this procedure it is build and made available at
+http://R-Forge.R-project.org/src/contrib/ (as source tar.gz and win32
+.zip). It should be possible to install the package via
+install.packages("foo",url="R-Forge.R-project.org") within R
+then.
+
+4. 'www' directory
+-----------------------------------------------------------------------
+This directory contains your project homepage which is available at
+http://<projectname>.R-Forge.R-project.org. 
+Note that it will be checked out daily, so please take
+into consideration that it will not be available right after you
+commit your changes or updates. 
+
+5. Help
+-----------------------------------------------------------------------
+If you need help don't hesitate to contact us
+(R-Forge at R-project.org)

Modified: branches/distr-2.4/pkg/SweaveListingUtils/DESCRIPTION
===================================================================
--- branches/distr-2.3/pkg/SweaveListingUtils/DESCRIPTION	2010-12-02 10:46:56 UTC (rev 692)
+++ branches/distr-2.4/pkg/SweaveListingUtils/DESCRIPTION	2010-12-02 13:14:26 UTC (rev 693)
@@ -1,18 +1,21 @@
 Package: SweaveListingUtils
 Title: Utilities for Sweave together with TeX listings package
 Encoding: latin1
-Version: 0.5
+Version: 0.6
 Depends: R(>= 2.10.0), startupmsg
 Suggests: distr
 Imports: stats
 LazyLoad: yes
 Author: Peter Ruckdeschel
-Description: provides utilities for defining R / Rd as Tex-package-listings "language" and including R / Rd source file (sniplets) copied
-               from R-forge in its most recent version (or another url) thereby avoiding inconsistencies between vignette and documented
-               source code
+Description: provides utilities for defining R / Rd as
+        Tex-package-listings "language" and including R / Rd source
+        file (sniplets) copied from R-forge in its most recent version
+        (or another url) thereby avoiding inconsistencies between
+        vignette and documented source code
 Maintainer: Peter Ruckdeschel <Peter.Ruckdeschel at itwm.fraunhofer.de>
 License: LGPL-3
-Date: 2009-11-01
-LastChangedDate: {$LastChangedDate$}
+Date: 2010-12-02
+LastChangedDate: {$LastChangedDate: 2010-10-20 15:06:27 +0200 (Mi, 20
+        Okt 2010) $}
 LastChangedRevision: {$LastChangedRevision$}
-SVNRevision: 684
+SVNRevision: 692

Modified: branches/distr-2.4/pkg/SweaveListingUtils/man/0SweaveListingUtils-package.Rd
===================================================================
--- branches/distr-2.3/pkg/SweaveListingUtils/man/0SweaveListingUtils-package.Rd	2010-12-02 10:46:56 UTC (rev 692)
+++ branches/distr-2.4/pkg/SweaveListingUtils/man/0SweaveListingUtils-package.Rd	2010-12-02 13:14:26 UTC (rev 693)
@@ -15,12 +15,12 @@
 \details{
 \tabular{ll}{
 Package: \tab SweaveListingUtils \cr
-Version: \tab 0.5\cr
-Date: \tab 2010-03-01 \cr
+Version: \tab 0.6 \cr
+Date: \tab 2010-12-02 \cr
 Depends: \tab R(>= 2.10.0), startupmsg \cr
 LazyLoad: \tab yes \cr
 License: \tab LGPL-3 \cr
-SVNRevision: \tab 684  \cr
+SVNRevision: \tab 692 \cr
 }
 
 TeX-package \file{listings}, confer \url{http://www.ctan.org/tex-archive/macros/latex/contrib/listings/},

Modified: branches/distr-2.4/pkg/distr/DESCRIPTION
===================================================================
--- branches/distr-2.3/pkg/distr/DESCRIPTION	2010-12-02 10:46:56 UTC (rev 692)
+++ branches/distr-2.4/pkg/distr/DESCRIPTION	2010-12-02 13:14:26 UTC (rev 693)
@@ -1,17 +1,20 @@
 Package: distr
-Version: 2.3
-Date: 2010-02-07
+Version: 2.4
+Date: 2010-12-02
 Title: Object oriented implementation of distributions
 Description: S4 Classes and Methods for distributions
-Author: Florian Camphausen, Matthias Kohl, Peter Ruckdeschel, Thomas Stabla
+Author: Florian Camphausen, Matthias Kohl, Peter Ruckdeschel, Thomas
+        Stabla
 Maintainer: Peter Ruckdeschel <Peter.Ruckdeschel at itwm.fraunhofer.de>
-Depends: R(>= 2.2.0), methods, graphics, startupmsg, sfsmisc, SweaveListingUtils
+Depends: R(>= 2.2.0), methods, graphics, startupmsg, sfsmisc,
+        SweaveListingUtils
 Suggests: distrEx, SweaveListingUtils
 Imports: stats
 LazyLoad: yes
 Encoding: latin1
 License: LGPL-3
 URL: http://distr.r-forge.r-project.org/
-LastChangedDate: {$LastChangedDate$}
+LastChangedDate: {$LastChangedDate: 2010-10-20 15:06:27 +0200 (Mi, 20
+        Okt 2010) $}
 LastChangedRevision: {$LastChangedRevision$}
-SVNRevision: 684
\ No newline at end of file
+SVNRevision: 692

Modified: branches/distr-2.4/pkg/distr/man/0distr-package.Rd
===================================================================
--- branches/distr-2.3/pkg/distr/man/0distr-package.Rd	2010-12-02 10:46:56 UTC (rev 692)
+++ branches/distr-2.4/pkg/distr/man/0distr-package.Rd	2010-12-02 13:14:26 UTC (rev 693)
@@ -43,14 +43,14 @@
 \details{
 \tabular{ll}{
 Package: \tab distr \cr
-Version: \tab 2.3 \cr
-Date: \tab 2009-11-01 \cr
+Version: \tab 2.4 \cr
+Date: \tab 2010-12-02 \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 684  \cr
+SVNRevision: \tab 692 \cr
 }}
 
 

Modified: branches/distr-2.4/pkg/distrDoc/DESCRIPTION
===================================================================
--- branches/distr-2.3/pkg/distrDoc/DESCRIPTION	2010-12-02 10:46:56 UTC (rev 692)
+++ branches/distr-2.4/pkg/distrDoc/DESCRIPTION	2010-12-02 13:14:26 UTC (rev 693)
@@ -1,17 +1,23 @@
 Package: distrDoc
-Version: 2.3
-Date: 2010-02-07
-Title: Documentation for packages distr, distrEx, distrSim, distrTEst, distrTeach, distrMod, and distrEllipse
-Description: provides documentation in form of a common vignette to packages distr, distrEx, distrMod, distrSim, distrTEst, distrTeach, and distrEllipse
-Author: Florian Camphausen, Matthias Kohl, Peter Ruckdeschel, Thomas Stabla
+Version: 2.4
+Date: 2010-12-02
+Title: Documentation for packages distr, distrEx, distrSim, distrTEst,
+        distrTeach, distrMod, and distrEllipse
+Description: provides documentation in form of a common vignette to
+        packages distr, distrEx, distrMod, distrSim, distrTEst,
+        distrTeach, and distrEllipse
+Author: Florian Camphausen, Matthias Kohl, Peter Ruckdeschel, Thomas
+        Stabla
 Maintainer: Peter Ruckdeschel <Peter.Ruckdeschel at itwm.fraunhofer.de>
-Depends: R(>= 2.6.0), tools, startupmsg, distr(>= 2.2.0), distrEx(>= 2.2.0), distrSim(>= 2.2.0), 
-         distrTEst(>= 2.2.0), distrTeach(>= 2.2.0), RandVar(>= 0.7), distrMod(>= 2.2.0), MASS, methods
+Depends: R(>= 2.6.0), tools, startupmsg, distr(>= 2.2.0), distrEx(>=
+        2.2.0), distrSim(>= 2.2.0), distrTEst(>= 2.2.0), distrTeach(>=
+        2.2.0), RandVar(>= 0.7), distrMod(>= 2.2.0), MASS, methods
 Suggests: Biobase, SweaveListingUtils
 LazyLoad: yes
 Encoding: latin1
 License: LGPL-3
 URL: http://distr.r-forge.r-project.org/
-LastChangedDate: {$LastChangedDate$}
+LastChangedDate: {$LastChangedDate: 2010-10-20 15:06:27 +0200 (Mi, 20
+        Okt 2010) $}
 LastChangedRevision: {$LastChangedRevision$}
-SVNRevision: 684
\ No newline at end of file
+SVNRevision: 692

Modified: branches/distr-2.4/pkg/distrDoc/man/0distrDoc-package.Rd
===================================================================
--- branches/distr-2.3/pkg/distrDoc/man/0distrDoc-package.Rd	2010-12-02 10:46:56 UTC (rev 692)
+++ branches/distr-2.4/pkg/distrDoc/man/0distrDoc-package.Rd	2010-12-02 13:14:26 UTC (rev 693)
@@ -14,14 +14,14 @@
 \details{
 \tabular{ll}{
 Package: \tab distrDoc \cr
-Version: \tab 2.3 \cr
-Date: \tab 2009-11-01 \cr
+Version: \tab 2.4 \cr
+Date: \tab 2010-12-02 \cr
 Depends: \tab R(>= 2.6.0), tools, distr(>= 2.2.0), startupmsg, distrEx(>= 2.2.0), distrSim(>= 2.2.0), distrTEst(>= 2.2.0), distrTeach(>=
 2.2.0), RandVar(>= 0.7), distrMod(>= 2.2.0), MASS, methods \cr
 LazyLoad: \tab yes \cr
 License: \tab LGPL-3 \cr
 URL: \tab http://distr.r-forge.r-project.org/\cr
-SVNRevision: \tab 684  \cr
+SVNRevision: \tab 692 \cr
 }}
 
 

Modified: branches/distr-2.4/pkg/distrEllipse/DESCRIPTION
===================================================================
--- branches/distr-2.3/pkg/distrEllipse/DESCRIPTION	2010-12-02 10:46:56 UTC (rev 692)
+++ branches/distr-2.4/pkg/distrEllipse/DESCRIPTION	2010-12-02 13:14:26 UTC (rev 693)
@@ -1,16 +1,19 @@
 Package: distrEllipse
-Version: 2.3
-Date: 2009-11-01
+Version: 2.4
+Date: 2010-12-02
 Title: S4 classes for elliptically contoured distributions
-Depends: R(>= 2.8.0), methods, graphics, mvtnorm, setRNG(>= 2006.2-1), distr(>= 2.2), distrEx(>= 2.2), distrSim(>= 2.2), startupmsg
+Depends: R(>= 2.8.0), methods, graphics, mvtnorm, setRNG(>= 2006.2-1),
+        distr(>= 2.2), distrEx(>= 2.2), distrSim(>= 2.2), startupmsg
 Suggests: distrMod(>= 2.2), distrTEst(>= 2.2)
 Author: Peter Ruckdeschel
-Description: Distribution (S4-)classes for elliptically contoured distributions (based on package distr)
+Description: Distribution (S4-)classes for elliptically contoured
+        distributions (based on package distr)
 Maintainer: Peter Ruckdeschel <Peter.Ruckdeschel at itwm.fraunhofer.de>
 LazyLoad: yes
 License: LGPL-3
 URL: http://distr.r-forge.r-project.org/
 Encoding: latin1
-LastChangedDate: {$LastChangedDate: 2009-03-31 15:31:30 +0200 (Di, 31 Mrz 2009) $}
+LastChangedDate: {$LastChangedDate: 2009-03-31 15:31:30 +0200 (Di, 31
+        Mrz 2009) $}
 LastChangedRevision: {$LastChangedRevision: 447 $}
-SVNRevision: 684
\ No newline at end of file
+SVNRevision: 692

Modified: branches/distr-2.4/pkg/distrEllipse/man/0distrEllipse-package.Rd
===================================================================
--- branches/distr-2.3/pkg/distrEllipse/man/0distrEllipse-package.Rd	2010-12-02 10:46:56 UTC (rev 692)
+++ branches/distr-2.4/pkg/distrEllipse/man/0distrEllipse-package.Rd	2010-12-02 13:14:26 UTC (rev 693)
@@ -12,14 +12,14 @@
 \details{
 \tabular{ll}{
 Package: \tab distrEllipse \cr
-Version: \tab 2.3 \cr
-Date: \tab 2009-11-01 \cr
+Version: \tab 2.4 \cr
+Date: \tab 2010-12-02 \cr
 Depends: \tab R(>= 2.8.0), methods, graphics, mvtnorm, setRNG(>= 2006.2-1),
               distr(>= 2.2), distrEx(>= 2.2), distrSim(>= 2.2), startupmsg\cr
 LazyLoad: \tab yes \cr
 License: \tab LGPL-3 \cr
 URL: \tab http://distr.r-forge.r-project.org/\cr
-SVNRevision: \tab 684  \cr
+SVNRevision: \tab 692 \cr
 }
 }
 \section{Classes}{

Modified: branches/distr-2.4/pkg/distrEx/DESCRIPTION
===================================================================
--- branches/distr-2.3/pkg/distrEx/DESCRIPTION	2010-12-02 10:46:56 UTC (rev 692)
+++ branches/distr-2.4/pkg/distrEx/DESCRIPTION	2010-12-02 13:14:26 UTC (rev 693)
@@ -1,8 +1,9 @@
 Package: distrEx
-Version: 2.3
-Date: 2009-11-01
+Version: 2.4
+Date: 2010-12-02
 Title: Extensions of package distr
-Description: Extensions of package distr and some additional functionality
+Description: Extensions of package distr and some additional
+        functionality
 Depends: R(>= 2.6.0), methods, distr(>= 2.2), evd, actuar, startupmsg
 Suggests: tcltk
 Author: Matthias Kohl, Peter Ruckdeschel
@@ -11,6 +12,7 @@
 License: LGPL-3
 Encoding: latin1
 URL: http://distr.r-forge.r-project.org/
-LastChangedDate: {$LastChangedDate$}
+LastChangedDate: {$LastChangedDate: 2010-10-20 15:06:27 +0200 (Mi, 20
+        Okt 2010) $}
 LastChangedRevision: {$LastChangedRevision$}
-SVNRevision: 684
\ No newline at end of file
+SVNRevision: 692

Modified: branches/distr-2.4/pkg/distrEx/man/0distrEx-package.Rd
===================================================================
--- branches/distr-2.3/pkg/distrEx/man/0distrEx-package.Rd	2010-12-02 10:46:56 UTC (rev 692)
+++ branches/distr-2.4/pkg/distrEx/man/0distrEx-package.Rd	2010-12-02 13:14:26 UTC (rev 693)
@@ -26,13 +26,13 @@
 \details{
 \tabular{ll}{
 Package: \tab distrEx \cr
-Version: \tab 2.3 \cr
-Date: \tab 2009-11-01 \cr
+Version: \tab 2.4 \cr
+Date: \tab 2010-12-02 \cr
 Depends: \tab R(>= 2.6.0), methods, distr(>= 2.2), evd, actuar, startupmsg \cr
 LazyLoad: \tab yes \cr
 License: \tab LGPL-3 \cr
 URL: \tab http://distr.r-forge.r-project.org/\cr
-SVNRevision: \tab 684  \cr
+SVNRevision: \tab 692 \cr
 }
 }
 \section{Classes}{

Modified: branches/distr-2.4/pkg/distrMod/DESCRIPTION
===================================================================
--- branches/distr-2.3/pkg/distrMod/DESCRIPTION	2010-12-02 10:46:56 UTC (rev 692)
+++ branches/distr-2.4/pkg/distrMod/DESCRIPTION	2010-12-02 13:14:26 UTC (rev 693)
@@ -1,15 +1,18 @@
 Package: distrMod
-Version: 2.3
-Date: 2009-11-01
+Version: 2.4
+Date: 2010-12-02
 Title: Object oriented implementation of probability models
-Description: Object oriented implementation of probability models based on packages 'distr' and 'distrEx'
+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.6.0), methods, startupmsg, distr(>= 2.2), distrEx(>= 2.2), RandVar(>= 0.6.3), MASS, stats4
+Depends: R(>= 2.6.0), methods, startupmsg, distr(>= 2.2), distrEx(>=
+        2.2), RandVar(>= 0.6.3), MASS, stats4
 LazyLoad: yes
 License: LGPL-3
 Encoding: latin1
 URL: http://distr.r-forge.r-project.org/
-LastChangedDate: {$LastChangedDate$}
+LastChangedDate: {$LastChangedDate: 2010-10-20 15:06:27 +0200 (Mi, 20
+        Okt 2010) $}
 LastChangedRevision: {$LastChangedRevision$}
-SVNRevision: 684
\ No newline at end of file
+SVNRevision: 692

Modified: branches/distr-2.4/pkg/distrMod/man/0distrMod-package.Rd
===================================================================
--- branches/distr-2.3/pkg/distrMod/man/0distrMod-package.Rd	2010-12-02 10:46:56 UTC (rev 692)
+++ branches/distr-2.4/pkg/distrMod/man/0distrMod-package.Rd	2010-12-02 13:14:26 UTC (rev 693)
@@ -15,13 +15,14 @@
 \details{
 \tabular{ll}{
 Package: \tab distrMod \cr
-Version: \tab 2.3 \cr
-Date: \tab 2009-11-01 \cr
-Depends: \tab R(>= 2.6.0), methods, startupmsg, distr(>= 2.2), distrEx(>= 2.2), RandVar(>= 0.6.3), MASS, stats4 \cr
+Version: \tab 2.4 \cr
+Date: \tab 2010-12-02 \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 684  \cr
+SVNRevision: \tab 692 \cr
 }}
 
 \section{Classes}{

Modified: branches/distr-2.4/pkg/distrSim/DESCRIPTION
===================================================================
--- branches/distr-2.3/pkg/distrSim/DESCRIPTION	2010-12-02 10:46:56 UTC (rev 692)
+++ branches/distr-2.4/pkg/distrSim/DESCRIPTION	2010-12-02 13:14:26 UTC (rev 693)
@@ -1,16 +1,19 @@
 Package: distrSim
-Version: 2.3
-Date: 2009-11-01
+Version: 2.4
+Date: 2010-12-02
 Title: Simulation classes based on package distr
-Depends: R(>= 2.6.0), methods, graphics, setRNG(>= 2006.2-1), distr(>= 2.2), startupmsg
+Depends: R(>= 2.6.0), methods, graphics, setRNG(>= 2006.2-1), distr(>=
+        2.2), startupmsg
 Suggests: distrEx(>= 2.2)
-Author: Florian Camphausen, Matthias Kohl, Peter Ruckdeschel, Thomas Stabla
+Author: Florian Camphausen, Matthias Kohl, Peter Ruckdeschel, Thomas
+        Stabla
 Description: Simulation (S4-)classes based on package distr
 Maintainer: Peter Ruckdeschel <Peter.Ruckdeschel at itwm.fraunhofer.de>
 LazyLoad: yes
 License: LGPL-3
 Encoding: latin1
 URL: http://distr.r-forge.r-project.org/
-LastChangedDate: {$LastChangedDate$}
+LastChangedDate: {$LastChangedDate: 2010-10-20 15:06:27 +0200 (Mi, 20
+        Okt 2010) $}
 LastChangedRevision: {$LastChangedRevision$}
-SVNRevision: 684
+SVNRevision: 692

Modified: branches/distr-2.4/pkg/distrSim/man/0distrSim-package.Rd
===================================================================
--- branches/distr-2.3/pkg/distrSim/man/0distrSim-package.Rd	2010-12-02 10:46:56 UTC (rev 692)
+++ branches/distr-2.4/pkg/distrSim/man/0distrSim-package.Rd	2010-12-02 13:14:26 UTC (rev 693)
@@ -13,14 +13,14 @@
 \details{
 \tabular{ll}{
 Package: \tab distrSim \cr
-Version: \tab 2.3 \cr
-Date: \tab 2009-11-01 \cr
+Version: \tab 2.4 \cr
+Date: \tab 2010-12-02 \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 684  \cr
+SVNRevision: \tab 692 \cr
 }
 }
 \section{Classes}{

Modified: branches/distr-2.4/pkg/distrTEst/DESCRIPTION
===================================================================
--- branches/distr-2.3/pkg/distrTEst/DESCRIPTION	2010-12-02 10:46:56 UTC (rev 692)
+++ branches/distr-2.4/pkg/distrTEst/DESCRIPTION	2010-12-02 13:14:26 UTC (rev 693)
@@ -1,18 +1,22 @@
 Package: distrTEst
-Version: 2.3
-Date: 2009-11-01
+Version: 2.4
+Date: 2010-12-02
 Title: Estimation and Testing classes based on package distr
-Depends: R(>= 2.6.0), methods, graphics, setRNG(>= 2006.2-1), distr(>= 2.2), distrSim(>= 2.2), startupmsg
+Depends: R(>= 2.6.0), methods, graphics, setRNG(>= 2006.2-1), distr(>=
+        2.2), distrSim(>= 2.2), startupmsg
 Suggests: distrEx(>= 2.2)
 Imports: stats
-Author: Florian Camphausen, Matthias Kohl, Peter Ruckdeschel, Thomas Stabla
-Description: Evaluation (S4-)classes based on package distr for evaluating procedures (estimators/tests) at data/simulation in a unified
-               way.
+Author: Florian Camphausen, Matthias Kohl, Peter Ruckdeschel, Thomas
+        Stabla
+Description: Evaluation (S4-)classes based on package distr for
+        evaluating procedures (estimators/tests) at data/simulation in
+        a unified way.
 Maintainer: Peter Ruckdeschel <Peter.Ruckdeschel at itwm.fraunhofer.de>
 LazyLoad: yes
 Encoding: latin1
 License: LGPL-3
 URL: http://distr.r-forge.r-project.org/
-LastChangedDate: {$LastChangedDate$}
+LastChangedDate: {$LastChangedDate: 2010-10-20 15:06:27 +0200 (Mi, 20
+        Okt 2010) $}
 LastChangedRevision: {$LastChangedRevision$}
-SVNRevision: 684
+SVNRevision: 692

Modified: branches/distr-2.4/pkg/distrTEst/man/0distrTEst-package.Rd
===================================================================
--- branches/distr-2.3/pkg/distrTEst/man/0distrTEst-package.Rd	2010-12-02 10:46:56 UTC (rev 692)
+++ branches/distr-2.4/pkg/distrTEst/man/0distrTEst-package.Rd	2010-12-02 13:14:26 UTC (rev 693)
@@ -15,14 +15,14 @@
 \details{
 \tabular{ll}{
 Package: \tab distrTEst \cr
-Version: \tab 2.3 \cr
-Date: \tab 2009-11-01 \cr
+Version: \tab 2.4 \cr
+Date: \tab 2010-12-02 \cr
 Depends: \tab R(>= 2.6.0), methods, graphics, setRNG(>= 2006.2-1), distr(>=
 2.0), distrSim(>= 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 684  \cr
+SVNRevision: \tab 692 \cr
 }}
 \section{Classes}{
 \preformatted{

Modified: branches/distr-2.4/pkg/distrTeach/DESCRIPTION
===================================================================
--- branches/distr-2.3/pkg/distrTeach/DESCRIPTION	2010-12-02 10:46:56 UTC (rev 692)
+++ branches/distr-2.4/pkg/distrTeach/DESCRIPTION	2010-12-02 13:14:26 UTC (rev 693)
@@ -1,9 +1,12 @@
 Package: distrTeach
-Version: 2.3
-Date: 2009-11-01
-Title: Extensions of package distr for teaching Stochastics/Statistics in secondary school
-Description: Extensions of package distr and some additional functionality
-Depends: R(>= 2.2.0), methods, distr(>= 2.2), distrEx(>= 2.2), startupmsg
+Version: 2.4
+Date: 2010-12-02
+Title: Extensions of package distr for teaching Stochastics/Statistics
+        in secondary school
+Description: Extensions of package distr and some additional
+        functionality
+Depends: R(>= 2.2.0), methods, distr(>= 2.2), distrEx(>= 2.2),
+        startupmsg
 Suggests: tcltk
 Author: Peter Ruckdeschel, Matthias Kohl, Anja Hueller, Eleonara Feist
 Maintainer: Peter Ruckdeschel <Peter.Ruckdeschel at itwm.fraunhofer.de>
@@ -12,6 +15,7 @@
 Encoding: latin1
 URL: http://distr.r-forge.r-project.org/
 Packaged: Fri Jun 8 00:12:57 2007; Peter
-LastChangedDate: {$LastChangedDate$}
+LastChangedDate: {$LastChangedDate: 2010-10-20 15:06:27 +0200 (Mi, 20
+        Okt 2010) $}
 LastChangedRevision: {$LastChangedRevision$}
-SVNRevision: 684
+SVNRevision: 692

Modified: branches/distr-2.4/pkg/distrTeach/man/0distrTeach-package.Rd
===================================================================
--- branches/distr-2.3/pkg/distrTeach/man/0distrTeach-package.Rd	2010-12-02 10:46:56 UTC (rev 692)
+++ branches/distr-2.4/pkg/distrTeach/man/0distrTeach-package.Rd	2010-12-02 13:14:26 UTC (rev 693)
@@ -20,14 +20,14 @@
 \details{
 \tabular{ll}{
 Package: \tab distrTeach \cr
-Version: \tab 2.3 \cr
-Date: \tab 2009-11-01 \cr
+Version: \tab 2.4 \cr
+Date: \tab 2010-12-02 \cr
 Depends: \tab R(>= 2.2.0), methods, distr(>= 2.0), distrEx(>= 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 684  \cr
+SVNRevision: \tab 692 \cr
 }
 }
 \section{Classes}{

Modified: branches/distr-2.4/pkg/utils/DESCRIPTIONutils.R
===================================================================
--- branches/distr-2.3/pkg/utils/DESCRIPTIONutils.R	2010-12-02 10:46:56 UTC (rev 692)
+++ branches/distr-2.4/pkg/utils/DESCRIPTIONutils.R	2010-12-02 13:14:26 UTC (rev 693)
@@ -34,14 +34,16 @@
   on.exit(setwd(oldDir))
   setwd(startDir)
   if(withSVNread){
-      svn <- getRevAllNr(startDir,list="max")
+      svn <- getAllRevNr(startDir,list="max")
       svnrev <- svn[[1]]
+      print(svnrev)
       if("SVNRevision" %in% names){
-         values[which(names=="SVNRevsion")] <- svnrev
+         values[which(names=="SVNRevision"),] <- svnrev
       }
   }
+#  print(names)
+#  print(values)
   
-  
   if(is.matrix(values) && is.null(colnames(values))) 
      colnames(values) <- rep(pkgs, length.out = ncol(values))
      
@@ -63,6 +65,11 @@
      sapply(pkgs, function(x){
        FN <- file.path("pkg",x,"DESCRIPTION")
        xx <- read.dcf(FN)
+#       print(xx)
+#       print(values)
+#       print(names)
+#       print(values[names,x])
+#       print(xx[,names])
        xx[,names] <- values[names,x]
        write.dcf(xx, file=FN)
        if(withPackageHelpUpdate)

