[r-cran-eco] 05/30: Import Upstream version 2.2-2

[Andreas Tille]

This is an automated email from the git hooks/post-receive script.

tille pushed a commit to branch master
in repository r-cran-eco.

commit 8770e90140886b97a10e932a6df040c1b35e0fd9
Author: Andreas Tille <tille at debian.org>
Date:   Thu Sep 7 08:59:20 2017 +0200

    Import Upstream version 2.2-2
---
 DESCRIPTION                | 8 ++++----
 R/{onLoad.R => onAttach.R} | 4 ++--
 src/gibbsBase.c            | 2 +-
 src/gibbsDP.c              | 2 +-
 src/gibbsXBase.c           | 2 +-
 src/gibbsXDP.c             | 2 +-
 src/preBaseX.c             | 2 +-
 src/preDP.c                | 2 +-
 src/preDPX.c               | 2 +-
 src/subroutines.c          | 3 ++-
 10 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/DESCRIPTION b/DESCRIPTION
index 6604407..8b886d3 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -1,11 +1,11 @@
 Package: eco
-Version: 2.2-1
-Date: 2005-09-28
+Version: 2.2-2
+Date: 2006-09-23
 Title: R Package for Fitting Bayesian Models of Ecological Inference in 2x2 Tables
 Author: Kosuke Imai <kimai at princeton.edu>,
         Ying Lu <ylu at iq.harvard.edu>.
 Maintainer: Kosuke Imai <kimai at princeton.edu>
-Depends: R (>= 2.0), MASS
+Depends: R (>= 2.0), MASS, utils
 Description: eco is a publicly available R package that fits the
              parametric and nonparametric Bayesian models for
              ecological inference in 2x2 tables. The models are fit
@@ -15,4 +15,4 @@ LazyLoad: yes
 LazyData: yes
 License: GPL (version 2 or later)
 URL: http://imai.princeton.edu/research/eco.html
-Packaged: Thu Sep 29 20:44:14 2005; kimai
+Packaged: Sat Sep 23 14:31:01 2006; kimai
diff --git a/R/onLoad.R b/R/onAttach.R
similarity index 61%
rename from R/onLoad.R
rename to R/onAttach.R
index 97b17c1..64fee23 100644
--- a/R/onLoad.R
+++ b/R/onAttach.R
@@ -1,7 +1,7 @@
-".onLoad" <- function(lib, pkg) {
+".onAttach" <- function(lib, pkg) {
   mylib <- dirname(system.file(package = pkg))
   title <- packageDescription(pkg, lib = mylib)$Title
   ver <- packageDescription(pkg, lib = mylib)$Version
-  cat(paste(pkg, ": ", title, "\nVersion ", ver, "\n", sep=""))
+  cat(paste(pkg, ": ", title, "\nVersion: ", ver, "\n", sep=""))
 }
 
diff --git a/src/gibbsBase.c b/src/gibbsBase.c
index b718510..ed7782b 100644
--- a/src/gibbsBase.c
+++ b/src/gibbsBase.c
@@ -9,7 +9,7 @@
 #include <stdio.h>      
 #include <math.h>
 #include <Rmath.h>
-#include <R_ext/Utils.h>
+#include <R.h>
 #include "vector.h"
 #include "subroutines.h"
 #include "rand.h"
diff --git a/src/gibbsDP.c b/src/gibbsDP.c
index eb75c88..dc8e521 100644
--- a/src/gibbsDP.c
+++ b/src/gibbsDP.c
@@ -9,7 +9,7 @@
 #include <stdio.h>      
 #include <math.h>
 #include <Rmath.h>
-#include <R_ext/Utils.h>
+#include <R.h>
 #include "vector.h"
 #include "subroutines.h"
 #include "rand.h"
diff --git a/src/gibbsXBase.c b/src/gibbsXBase.c
index 6acbf47..8cd3392 100644
--- a/src/gibbsXBase.c
+++ b/src/gibbsXBase.c
@@ -9,7 +9,7 @@
 #include <stdio.h>      
 #include <math.h>
 #include <Rmath.h>
-#include <R_ext/Utils.h>
+#include <R.h>
 #include "vector.h"
 #include "subroutines.h"
 #include "rand.h"
diff --git a/src/gibbsXDP.c b/src/gibbsXDP.c
index bbc8e50..b2c15d1 100644
--- a/src/gibbsXDP.c
+++ b/src/gibbsXDP.c
@@ -9,7 +9,7 @@
 #include <stdio.h>      
 #include <math.h>
 #include <Rmath.h>
-#include <R_ext/Utils.h>
+#include <R.h>
 #include "vector.h"
 #include "subroutines.h"
 #include "rand.h"
diff --git a/src/preBaseX.c b/src/preBaseX.c
index 75918e3..1d1c614 100644
--- a/src/preBaseX.c
+++ b/src/preBaseX.c
@@ -9,7 +9,7 @@
 #include <stdio.h>      
 #include <math.h>
 #include <Rmath.h>
-#include <R_ext/Utils.h>
+#include <R.h>
 #include "vector.h"
 #include "subroutines.h"
 #include "rand.h"
diff --git a/src/preDP.c b/src/preDP.c
index b56aff8..8118ef5 100644
--- a/src/preDP.c
+++ b/src/preDP.c
@@ -9,7 +9,7 @@
 #include <stdio.h>      
 #include <math.h>
 #include <Rmath.h>
-#include <R_ext/Utils.h>
+#include <R.h>
 #include "vector.h"
 #include "subroutines.h"
 #include "rand.h"
diff --git a/src/preDPX.c b/src/preDPX.c
index f913bc5..1ee4eb1 100644
--- a/src/preDPX.c
+++ b/src/preDPX.c
@@ -9,7 +9,7 @@
 #include <stdio.h>      
 #include <math.h>
 #include <Rmath.h>
-#include <R_ext/Utils.h>
+#include <R.h>
 #include "vector.h"
 #include "subroutines.h"
 #include "rand.h"
diff --git a/src/subroutines.c b/src/subroutines.c
index a3e0989..68f2a67 100644
--- a/src/subroutines.c
+++ b/src/subroutines.c
@@ -9,7 +9,8 @@
 #include <stdlib.h>
 #include <string.h>
 #include <math.h>
-#include <R_ext/Utils.h>
+#include <Rmath.h>
+#include <R_ext/Lapack.h>
 #include <R.h> 
 #include "vector.h"
 #include "rand.h"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/r-cran-eco.git