[r-cran-maps] 12/64: Import Upstream version 2.0-33

[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-maps.

commit cd084178005717e8d3bb3da8e2101b0d987ba329
Author: Andreas Tille <tille at debian.org>
Date:   Thu Sep 7 09:25:26 2017 +0200

    Import Upstream version 2.0-33
---
 DESCRIPTION | 6 +++---
 R/db.r      | 2 +-
 R/zzz.R     | 5 +++--
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/DESCRIPTION b/DESCRIPTION
index e6d2740..67b7238 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: maps
 Title: Draw Geographical Maps
-Version: 2.0-32
-Date: 2006-09-26
+Version: 2.0-33
+Date: 2007-01-29
 Author: Original S code by Richard A. Becker and Allan R. Wilks.
 	R version by Ray Brownrigg <Ray.Brownrigg at mcs.vuw.ac.nz>
         Enhancements by Thomas P Minka <surname at stat.cmu.edu>
@@ -11,4 +11,4 @@ Depends: R (>= 1.7.0)
 Suggests: mapproj
 License: GPL2
 Maintainer: Ray Brownrigg <Ray.Brownrigg at mcs.vuw.ac.nz>
-Packaged: Tue Sep 26 15:24:36 2006; ray
+Packaged: Mon Jan 29 09:21:49 2007; ray
diff --git a/R/db.r b/R/db.r
index 5e39593..cf56c11 100644
--- a/R/db.r
+++ b/R/db.r
@@ -131,7 +131,7 @@ char.to.ascii <- function(s) {
 }
 is.regexp <- function(s) {
   # test: is.regexp(c("too", ".*dak", "kj[t]"))
-  pattern = ".*[\.\?\*\[].*"
+  pattern = ".*[.?*[].*"
   result = logical(length(s))
   result[grep(pattern, s)] = TRUE
   result
diff --git a/R/zzz.R b/R/zzz.R
index c65ade7..daa3977 100644
--- a/R/zzz.R
+++ b/R/zzz.R
@@ -1,6 +1,7 @@
 .First.lib <- function(lib, pkg) {
-  # minka: only do this if R_MAP_DATA_DIR doesn't exist?
+  if(!exists("Sys.setenv", envir = baseenv()))
+    Sys.setenv <- Sys.putenv
   if (Sys.getenv("R_MAP_DATA_DIR") == "")
-    Sys.putenv("R_MAP_DATA_DIR"=paste(lib, pkg, "mapdata/", sep="/"))
+    Sys.setenv("R_MAP_DATA_DIR"=paste(lib, pkg, "mapdata/", sep="/"))
   library.dynam("maps", pkg, lib)
 }

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