[r-cran-maps] 25/64: Import Upstream version 2.1-0

[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 3c5b09711bce20e11c7028f2a5ee4d525902f4c8
Author: Andreas Tille <tille at debian.org>
Date:   Thu Sep 7 09:26:27 2017 +0200

    Import Upstream version 2.1-0
---
 DESCRIPTION      | 18 ++++++++++--------
 man/map.axes.Rd  |  2 --
 src/Makefile.win | 30 +++++++++++-------------------
 src/README       | 10 +++++-----
 4 files changed, 26 insertions(+), 34 deletions(-)

diff --git a/DESCRIPTION b/DESCRIPTION
index c0c59b1..bb5746c 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -1,15 +1,17 @@
 Package: maps
 Title: Draw Geographical Maps
-Version: 2.0-40
-Date: 2008-04-17
-Author: Original S code by Richard A. Becker and Allan R. Wilks.
-	R version by Ray Brownrigg <Ray.Brownrigg at mcs.vuw.ac.nz>
+Version: 2.1-0
+Date: 2009-03-21
+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>
 Description: Display of maps.  Projection code and larger maps are in
-             separate packages (mapproj and mapdata).
-Depends: R (>= 2.0.0)
+        separate packages (mapproj and mapdata).
+Depends: R (>= 2.7.0)
 LazyLoad: yes
 Suggests: mapproj
-License: GPL2
+License: GPL-2
 Maintainer: Ray Brownrigg <Ray.Brownrigg at mcs.vuw.ac.nz>
-Packaged: Thu Apr 17 09:52:34 2008; ray
+Packaged: Sat Mar 21 20:06:53 2009; ray
+Repository: CRAN
+Date/Publication: 2009-03-21 09:09:37
diff --git a/man/map.axes.Rd b/man/map.axes.Rd
index ccfb9ad..b3c2a3a 100644
--- a/man/map.axes.Rd
+++ b/man/map.axes.Rd
@@ -12,8 +12,6 @@ x- and y-axes are drawn for the currently displayed map.  These will
 display in longitude and latitude (if no projection= has been
 specified in the map() call).
 }
-\details{
-}
 \examples{
 map("state")
 map.axes()
diff --git a/src/Makefile.win b/src/Makefile.win
index 9097963..9450b71 100644
--- a/src/Makefile.win
+++ b/src/Makefile.win
@@ -1,4 +1,7 @@
 #-*- Makefile -*-
+
+## this needs a *source* build of R
+## RHOME is obsolete, but still set
 include $(RHOME)/src/gnuwin32/MkRules
 
 .SUFFIXES: .G .L .N .gon .line .name
@@ -7,9 +10,7 @@ DLLNAME = maps
 
 CFLAGS = -I$(RHOME)/include -Wall -pedantic -O2 -DWin32
 
-DLLLIBS = -L$(RHOME)/bin -L$(RHOME)/src/gnuwin32 -lR 
-
-RESFLAGS = --include-dir $(RHOME)/include
+DLLLIBS = -L$(RHOME)/bin -lR 
 
 OBJS = mapget.o		\
 	smooth.o	\
@@ -36,29 +37,20 @@ Lmake:
 	$(MAKE) CC=gcc Lmake
 endif
 
-.PHONY: all gdata instdata ldata ndata
+.PHONY: all gdata ldata ndata
 
-all: ../libs/$(DLLNAME).dll instdata
+all: ../libs/$(DLLNAME).dll ldata gdata ndata
 
 gdata: Gmake ldata
-	$(MAKE) $(GDATA)
+	$(MAKE) -f Makefile.win $(GDATA)
 
 ldata: Lmake world2.line
-	$(MAKE) $(LDATA)
+	$(MAKE) -f Makefile.win $(LDATA)
 
 ndata: world2.line
-	$(MAKE) $(NDATA)
-
-instdata: gdata ndata
-	@$(ECHO) "copying new inst files"
-	$(CP) -r ../inst/* $(RLIB)/$(PKG)
-
-$(DLLNAME).a: $(OBJS)
-	$(RM) -f $@
-	$(AR) cr $@ *.o
-	$(RANLIB) $@
+	$(MAKE) -f Makefile.win $(NDATA)
 
-$(DLLNAME).dll: $(DLLNAME).a 
+$(DLLNAME).dll: $(OBJS) 
 
 ../libs/$(DLLNAME).dll: ../libs $(DLLNAME).dll
 	$(CP) $(DLLNAME).dll $@
@@ -75,5 +67,5 @@ world2.line: world.line
 	@$(CP) world.name world2.name
 
 clean:
-	$(RM) $(DLLNAME).dll *.a $(OBJS) $(DLLNAME).def *.rc Gmake.exe Lmake.exe ../inst/mapdata/* ../libs/$(DLLNAME).dll world2.*
+	$(RM) -f $(DLLNAME).dll *.a $(OBJS) *.rc Gmake.exe Lmake.exe ../inst/mapdata/* ../libs/$(DLLNAME).dll world2.*
 	$(RM) -r ../libs
diff --git a/src/README b/src/README
index 9a4d071..1d4dfe8 100644
--- a/src/README
+++ b/src/README
@@ -9,12 +9,12 @@ Richard A. Becker, and Allan R. Wilks,
 "Constructing a Geographical Database",
 \emph{AT\&T Bell Laboratories Statistics Research Report [95.2], 1995.}
 
-2) After the .line .gon and .n ascii files have been created, rerun
-./getstats.sh to generate the appropriate .linestats and .gonstats
+2) After the .line .gon and .n ascii files have been created or modified,
+rerun ./getstats.sh to generate the appropriate .linestats and .gonstats
 files.
 
-3) Edit the Makefiles to add the appropriate names to the lists of .G,
-.L and .N files
+3) Edit the Makefiles to add the appropriate names to the lists of
+.G, .L and .N files
 
 4) Create the ../data/<mapname>.r file consisting of the assignment
 '<mapname>MapEnv <- "R_MAP_DATA_DIR"'.  This sets the name of the
@@ -23,4 +23,4 @@ specifies the location of the binary data files for this collection
 of maps. [The mapdata package uses a different environment variable.]
 
 Ray Brownrigg
-29 September 2003
+21 March 2009

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