[r-cran-maps] 06/64: Import Upstream version 2.0-30

[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 057ac2a2911b27370229c1dd043269a45e6c3191
Author: Andreas Tille <tille at debian.org>
Date:   Thu Sep 7 09:25:00 2017 +0200

    Import Upstream version 2.0-30
---
 DESCRIPTION         |  6 +++---
 INDEX               | 20 --------------------
 man/world.cities.Rd |  1 -
 src/Gmake.c         |  2 ++
 src/Lmake.c         |  2 ++
 src/Makefile        | 10 +++++-----
 src/Makefile.win    |  9 +++++----
 7 files changed, 17 insertions(+), 33 deletions(-)

diff --git a/DESCRIPTION b/DESCRIPTION
index 2e2a1c8..fbfb75d 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: maps
 Title: Draw Geographical Maps
-Version: 2.0-27
-Date: 2005-04-29
+Version: 2.0-30
+Date: 2005-12-20
 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>
@@ -10,4 +10,4 @@ Description: Display of maps.  Projection code and larger maps are in
 Depends: R (>= 1.7.0)
 License: GPL2
 Maintainer: Ray Brownrigg <Ray.Brownrigg at mcs.vuw.ac.nz>
-Packaged: Fri Apr 29 08:17:50 2005; ray
+Packaged: Tue Dec 20 22:26:01 2005; ray
diff --git a/INDEX b/INDEX
deleted file mode 100644
index 642f0bf..0000000
--- a/INDEX
+++ /dev/null
@@ -1,20 +0,0 @@
-area.map                Area of projected map regions
-county                  United States County Map
-france                  France Map
-identify.map            Identify regions on a map
-italy                   Italy Map
-map                     Draw Geographical Maps
-map.axes                Draw Axes on Geographical Maps
-map.cities              Add Cities to Existing Map
-map.scale               Add Scale to Existing Unprojected Map
-map.text                Draw a map with labeled regions
-map.where               Locate points on a map
-match.map               Index map regions
-nz                      New Zealand Basic Map
-ozone                   Sample datasets
-smooth.map              Smooth out aggregated data
-state                   United States State Boundaries Map
-usa                     United States Coast Map
-world                   Low resolution World Map
-world.cities            Database of world cities
-world2                  Pacific Centric Low resolution World Map
diff --git a/man/world.cities.Rd b/man/world.cities.Rd
index 2902627..04ded96 100644
--- a/man/world.cities.Rd
+++ b/man/world.cities.Rd
@@ -4,7 +4,6 @@
 \title{
 Database of world cities
 }
-\usage{data(world.cities)}
 
 \description{
 This database is primarily of world cities of population greater than
diff --git a/src/Gmake.c b/src/Gmake.c
index 26ec0dd..b819545 100644
--- a/src/Gmake.c
+++ b/src/Gmake.c
@@ -25,6 +25,7 @@ isspace(int c);
 int
 fatal(s, a, b)
 char *s;
+int a, b;
 {
 	fprintf(stderr, s, a, a, b);
 	fprintf(stderr, "\n");
@@ -197,6 +198,7 @@ FILE *in, *out;
 
 int
 main(ac, av)
+int ac;
 char *av[];
 {
 
diff --git a/src/Lmake.c b/src/Lmake.c
index 291829a..57e9094 100644
--- a/src/Lmake.c
+++ b/src/Lmake.c
@@ -25,6 +25,7 @@ isspace(int c);
 int
 fatal(s, a, b)
 char *s;
+int a, b;
 {
 	fprintf(stderr, s, a, b);
 	fprintf(stderr, "\n");
@@ -209,6 +210,7 @@ FILE *in, *out;
 
 int
 main(ac, av)
+int ac;
 char *av[];
 {
 
diff --git a/src/Makefile b/src/Makefile
index f47cd20..02b5493 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -23,9 +23,9 @@ NDATA = county.N state.N usa.N nz.N world.N world2.N italy.N france.N
 .name.N:
 	@$(CP) ${*}.name ../inst/mapdata/${*}.N
 
-.PHONY: all gdata ldata
+.PHONY: all gdata ldata ndata
 
-all: $(PKGNAME).so gdata ndata
+all: gdata ndata $(PKGNAME)$(SHLIB_EXT)
 
 gdata: Gmake ldata
 	$(MAKE) $(GDATA)
@@ -33,11 +33,11 @@ gdata: Gmake ldata
 ldata: Lmake world2.line
 	$(MAKE) $(LDATA)
 
-ndata:
+ndata: world2.line
 	$(MAKE) $(NDATA)
 
-$(PKGNAME).so: $(OBJS)
-	$(R_HOME)/bin/R CMD SHLIB -o $(PKGNAME).so $(OBJS)
+$(PKGNAME)$(SHLIB_EXT): $(OBJS)
+	$(R_HOME)/bin/R CMD SHLIB -o $(PKGNAME)$(SHLIB_EXT) $(OBJS)
 
 world2.line: world.line
 	@$(ECHO) "Converting world to world2"
diff --git a/src/Makefile.win b/src/Makefile.win
index cfd929a..9097963 100644
--- a/src/Makefile.win
+++ b/src/Makefile.win
@@ -5,11 +5,11 @@ include $(RHOME)/src/gnuwin32/MkRules
 
 DLLNAME = maps
 
-CFLAGS = -I$(RHOME)/src/include -Wall -pedantic -O2 -DWin32
+CFLAGS = -I$(RHOME)/include -Wall -pedantic -O2 -DWin32
 
-DLLLIBS = -L$(RHOME)/src/gnuwin32 -lR 
+DLLLIBS = -L$(RHOME)/bin -L$(RHOME)/src/gnuwin32 -lR 
 
-RESFLAGS = --include-dir $(RHOME)/src/include
+RESFLAGS = --include-dir $(RHOME)/include
 
 OBJS = mapget.o		\
 	smooth.o	\
@@ -46,7 +46,7 @@ gdata: Gmake ldata
 ldata: Lmake world2.line
 	$(MAKE) $(LDATA)
 
-ndata:
+ndata: world2.line
 	$(MAKE) $(NDATA)
 
 instdata: gdata ndata
@@ -76,3 +76,4 @@ world2.line: world.line
 
 clean:
 	$(RM) $(DLLNAME).dll *.a $(OBJS) $(DLLNAME).def *.rc Gmake.exe Lmake.exe ../inst/mapdata/* ../libs/$(DLLNAME).dll world2.*
+	$(RM) -r ../libs

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