[Xts-commits] r764 - in pkg/xts: . R inst/api_example inst/include man src

Sun Jan 20 16:15:53 CET 2013

Author: edd
Date: 2013-01-20 16:15:53 +0100 (Sun, 20 Jan 2013)
New Revision: 764

Modified:
   pkg/xts/DESCRIPTION
   pkg/xts/R/parse8601.R
   pkg/xts/inst/api_example/DESCRIPTION
   pkg/xts/inst/include/xts.h
   pkg/xts/man/xts-package.Rd
   pkg/xts/src/diff.c
   pkg/xts/src/period.max.f
   pkg/xts/src/period.sum.f
   pkg/xts/src/xts.h
Log:
o  make sure we refer to GPL (>= 2) everywhere


Modified: pkg/xts/DESCRIPTION
===================================================================

--- pkg/xts/DESCRIPTION	2013-01-20 15:10:59 UTC (rev 763)
+++ pkg/xts/DESCRIPTION	2013-01-20 15:15:53 UTC (rev 764)
@@ -1,7 +1,7 @@
 Package: xts
 Type: Package
 Title: eXtensible Time Series
-Version: 0.9-2
+Version: 0.9-1.2
 Date: 2013-01-14
 Author: Jeffrey A. Ryan, Joshua M. Ulrich
 Depends: zoo (>= 1.7-2)
@@ -10,5 +10,5 @@
 LazyLoad: yes
 Maintainer: Jeffrey A. Ryan <jeff.a.ryan at gmail.com>
 Description: Provide for uniform handling of R's different time-based data classes by extending zoo, maximizing native format information preservation and allowing for user level customization and extension, while simplifying cross-class interoperability.
-License: GPL-2
+License: GPL (>= 2)
 URL: http://r-forge.r-project.org/projects/xts/

Modified: pkg/xts/R/parse8601.R
===================================================================
--- pkg/xts/R/parse8601.R	2013-01-20 15:10:59 UTC (rev 763)
+++ pkg/xts/R/parse8601.R	2013-01-20 15:15:53 UTC (rev 764)
@@ -16,7 +16,7 @@
 # end times, in POSIXt space.
 #
 # Copyright 2009. Jeffrey A. Ryan. All rights reserved.
-# This is licensed under the GPL version 3
+# This is licensed under the GPL version 2 or later
 .makeISO8601 <- function(x) {
   paste(start(x),end(x),sep="/")
 }
@@ -36,7 +36,7 @@
  x <- gsub("TODAY",format(Sys.Date(),"%Y%m%d"),x)
 
  if(identical(grep("/|(--)|(::)", x), integer(0))) {
-   x <- paste(x,x,sep="/") 
+   x <- paste(x,x,sep="/")
  }
  intervals <- unlist(strsplit(x, "/|(--)|(::)"))
  # e.g. "/2009":  "" "xxx" end of defined, needs context
@@ -132,7 +132,7 @@
       #  remove/ignore T
       #  convert extended format (PYYYYMMDD) to basic format (PnnYnnMnnD)
       P <- gsub("P","",P)
-      P <- gsub("T(.*)M","\\1m",P) 
+      P <- gsub("T(.*)M","\\1m",P)
       n <- unlist(strsplit(P, "[[:alpha:]]"))
       d <- unlist(strsplit(gsub("[[:digit:]]", "", P),""))
       dur.vec <- list(as.numeric(n),unname(c(Y=6,M=5,D=4,H=3,m=2,S=1)[d]))

Modified: pkg/xts/inst/api_example/DESCRIPTION
===================================================================
--- pkg/xts/inst/api_example/DESCRIPTION	2013-01-20 15:10:59 UTC (rev 763)
+++ pkg/xts/inst/api_example/DESCRIPTION	2013-01-20 15:15:53 UTC (rev 764)
@@ -8,5 +8,5 @@
 Author: Jeffrey A. Ryan
 Maintainer: Jeffrey A. Ryan <jeff.a.ryan at gmail.com>
 Description: Demonstrates LinkingTo C code in packages
-License: GPL-3
+License: GPL (>= 2)
 LazyLoad: yes

Modified: pkg/xts/inst/include/xts.h
===================================================================
--- pkg/xts/inst/include/xts.h	2013-01-20 15:10:59 UTC (rev 763)
+++ pkg/xts/inst/include/xts.h	2013-01-20 15:15:53 UTC (rev 764)
@@ -9,7 +9,7 @@
 Copyright Jeffrey A. Ryan 2008
 
 This source is distributed with the same license
-as the full xts software, GPL3.
+as the full xts software, GPL (>= 2).
 */
 #include <R.h>
 #include <Rinternals.h>

Modified: pkg/xts/man/xts-package.Rd
===================================================================
--- pkg/xts/man/xts-package.Rd	2013-01-20 15:10:59 UTC (rev 763)
+++ pkg/xts/man/xts-package.Rd	2013-01-20 15:15:53 UTC (rev 764)
@@ -14,7 +14,7 @@
 Type: \tab Package\cr
 Version: \tab 0.8-0\cr
 Date: \tab 2011-02-22\cr
-License: \tab GPL-2\cr
+License: \tab GPL (>= 2)\cr
 }
 Easily convert one of \R's many time-series (and non-time-series)
 classes to a true time-based object which inherits all of zoo's

Modified: pkg/xts/src/diff.c
===================================================================
--- pkg/xts/src/diff.c	2013-01-20 15:10:59 UTC (rev 763)
+++ pkg/xts/src/diff.c	2013-01-20 15:15:53 UTC (rev 764)
@@ -221,7 +221,7 @@
    works for any S3 index and one S4 (timeDate).
 
    Copyright Jeffrey A. Ryan 2010
-   Licensed under GPL-3 or later
+   Licensed under GPL-2 or later
 */
 
 SEXP lag_zoo (SEXP x, SEXP _k, SEXP _pad)

Modified: pkg/xts/src/period.max.f
===================================================================
--- pkg/xts/src/period.max.f	2013-01-20 15:10:59 UTC (rev 763)
+++ pkg/xts/src/period.max.f	2013-01-20 15:15:53 UTC (rev 764)
@@ -7,7 +7,7 @@
 c     Copyright Jeffrey A. Ryan 2007
 c     jeff _dot_ ryan _at_ quantmod _dot_ com
 c
-c     Distributed under GPL-3
+c     Distributed under GPL-2 or later
 c
       subroutine pmaxz(bp,lbp,ia,lia,ret)
 c     Usage:

Modified: pkg/xts/src/period.sum.f
===================================================================
--- pkg/xts/src/period.sum.f	2013-01-20 15:10:59 UTC (rev 763)
+++ pkg/xts/src/period.sum.f	2013-01-20 15:15:53 UTC (rev 764)
@@ -2,7 +2,7 @@
 c     Copyright Jeffrey A. Ryan 2007
 c     jeff _dot_ ryan _at_ quantmod _dot_ com
 c
-c     Distributed under GPL-3
+c     Distributed under GPL-2 or later
 c
       subroutine psumz(bp,lbp,ia,lia,ret)
 c     Usage:

Modified: pkg/xts/src/xts.h
===================================================================
--- pkg/xts/src/xts.h	2013-01-20 15:10:59 UTC (rev 763)
+++ pkg/xts/src/xts.h	2013-01-20 15:15:53 UTC (rev 764)
@@ -9,7 +9,7 @@
 Copyright Jeffrey A. Ryan 2008
 
 This source is distributed with the same license
-as the full xts software, GPL2
+as the full xts software, GPL 2 or later
 */
 #include <R.h>
 #include <Rinternals.h>

