[r-cran-mapproj] 08/23: Import Upstream version 1.1-7.2
Andreas Tille
tille at debian.org
Fri Sep 8 08:03:06 UTC 2017
This is an automated email from the git hooks/post-receive script.
tille pushed a commit to branch master
in repository r-cran-mapproj.
commit cc3c6736e6b631f47e273b682841e80a576e4b5e
Author: Andreas Tille <tille at debian.org>
Date: Fri Sep 8 09:58:06 2017 +0200
Import Upstream version 1.1-7.2
---
DESCRIPTION | 6 +++---
INDEX | 0
R/mapproj.r | 4 +++-
R/zzz.R | 0
man/map.grid.Rd | 0
man/mapproject.Rd | 0
src/Makevars.debug | 0
src/aitoff.c | 0
src/albers.c | 0
src/azequalarea.c | 0
src/azequidist.c | 0
src/bicentric.c | 0
src/bonne.c | 0
src/ccubrt.c | 0
src/complex.c | 0
src/conic.c | 0
src/cubrt.c | 0
src/cuts.c | 0
src/cylequalarea.c | 0
src/cylindrical.c | 0
src/doug/Makefile | 0
src/doug/README | 0
src/doug/ascii2map1.c | 0
src/doug/ascii2map2.c | 0
src/doug/ascii2map3.c | 0
src/doug/doc/Makefile | 0
src/doug/doc/ascii2map.1 | 0
src/doug/doc/ascii2map.1.ps | 0
src/doug/doc/maint_record | 0
src/doug/doc/map.1 | 0
src/doug/doc/map.1.ps | 0
src/doug/doc/map.3 | 0
src/doug/doc/map.3.ps | 0
src/doug/doc/map.5 | 0
src/doug/doc/map.5.ps | 0
src/doug/doc/route.1 | 0
src/doug/doc/route.1.ps | 0
src/doug/doc/tmac.anx | 0
src/doug/index.c | 0
src/doug/iplot.h | 0
src/doug/libmap/Makefile | 0
src/doug/libmap/aitoff.c | 0
src/doug/libmap/albers.c | 0
src/doug/libmap/azequalarea.c | 0
src/doug/libmap/azequidist.c | 0
src/doug/libmap/bicentric.c | 0
src/doug/libmap/bonne.c | 0
src/doug/libmap/ccubrt.c | 0
src/doug/libmap/complex.c | 0
src/doug/libmap/conic.c | 0
src/doug/libmap/cubrt.c | 0
src/doug/libmap/cuts.c | 0
src/doug/libmap/cylequalarea.c | 0
src/doug/libmap/cylindrical.c | 0
src/doug/libmap/eisenlohr.c | 0
src/doug/libmap/elco2.c | 0
src/doug/libmap/elliptic.c | 0
src/doug/libmap/fisheye.c | 0
src/doug/libmap/gall.c | 0
src/doug/libmap/gilbert.c | 0
src/doug/libmap/guyou.c | 0
src/doug/libmap/harrison.c | 0
src/doug/libmap/hex.c | 0
src/doug/libmap/homing.c | 0
src/doug/libmap/lagrange.c | 0
src/doug/libmap/lambert.c | 0
src/doug/libmap/laue.c | 0
src/doug/libmap/lune.c | 0
src/doug/libmap/mercator.c | 0
src/doug/libmap/mollweide.c | 0
src/doug/libmap/newyorker.c | 0
src/doug/libmap/orthographic.c | 0
src/doug/libmap/perspective.c | 0
src/doug/libmap/polyconic.c | 0
src/doug/libmap/rectangular.c | 0
src/doug/libmap/simpleconic.c | 0
src/doug/libmap/sinusoidal.c | 0
src/doug/libmap/tetra.c | 0
src/doug/libmap/trapezoidal.c | 0
src/doug/libmap/twocirc.c | 0
src/doug/libmap/zcoord.c | 0
src/doug/map.c | 0
src/doug/map.h | 0
src/doug/map.tar | Bin
src/doug/mapdata/counties | Bin
src/doug/mapdata/counties.x | 0
src/doug/mapdata/states | Bin
src/doug/mapdata/states.x | 0
src/doug/mapdata/world | Bin
src/doug/mapdata/world.x | 0
src/doug/plot.h | 0
src/doug/plot0.c | 0
src/doug/plotPS.c | 0
src/doug/plotV.c | 0
src/doug/route.c | 0
src/doug/symbol.c | 0
src/doug/test.results | 0
src/eisenlohr.c | 0
src/elco2.c | 0
src/elliptic.c | 0
src/fisheye.c | 0
src/gall.c | 0
src/gilbert.c | 0
src/guyou.c | 0
src/harrison.c | 0
src/hex.c | 0
src/homing.c | 0
src/lagrange.c | 0
src/lambert.c | 0
src/laue.c | 0
src/lune.c | 0
src/map.h | 0
src/mapproj_res.rc | 25 -------------------------
src/mapproject.c | 0
src/mercator.c | 0
src/mollweide.c | 0
src/newyorker.c | 0
src/orthographic.c | 0
src/perspective.c | 0
src/polyconic.c | 0
src/rectangular.c | 0
src/simpleconic.c | 0
src/sinusoidal.c | 0
src/tetra.c | 0
src/trapezoidal.c | 0
src/twocirc.c | 0
src/zcoord.c | 0
127 files changed, 6 insertions(+), 29 deletions(-)
diff --git a/DESCRIPTION b/DESCRIPTION
old mode 100644
new mode 100755
index 21e4cab..51db9f5
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -1,10 +1,10 @@
Package: mapproj
Title: Map Projections
-Version: 1.1-7.1
-Date: 2005-04-26
+Version: 1.1-7.2
+Date: 2008-08-05
Author: Doug McIlroy. Packaged for R by Ray Brownrigg and Thomas P Minka.
Description: Converts latitude/longitude into projected coordinates.
Depends: maps
License: Distribution and use for non-commercial purposes only.
Maintainer: Thomas P Minka <tpminka at media.mit.edu>
-Packaged: Tue Apr 26 11:03:59 2005; hornik
+Packaged: Tue Aug 5 14:09:54 2008; Lester
diff --git a/INDEX b/INDEX
old mode 100644
new mode 100755
diff --git a/R/mapproj.r b/R/mapproj.r
old mode 100644
new mode 100755
index 471a683..b849aa6
--- a/R/mapproj.r
+++ b/R/mapproj.r
@@ -3,7 +3,9 @@ function(x, y, projection = "", parameters = NULL, orientation = NULL)
{
# minka: cleaned up handling of defaults
r <- NULL
- if(!is.null(x$x)) {
+ # LY: change test for list so that x$x format not applied to vector
+ #if(!is.null(x$x)) {
+ if (is.list(x)) {
r <- x$range[1:2]
y <- x$y
x <- x$x
diff --git a/R/zzz.R b/R/zzz.R
old mode 100644
new mode 100755
diff --git a/man/map.grid.Rd b/man/map.grid.Rd
old mode 100644
new mode 100755
diff --git a/man/mapproject.Rd b/man/mapproject.Rd
old mode 100644
new mode 100755
diff --git a/src/Makevars.debug b/src/Makevars.debug
old mode 100644
new mode 100755
diff --git a/src/aitoff.c b/src/aitoff.c
old mode 100644
new mode 100755
diff --git a/src/albers.c b/src/albers.c
old mode 100644
new mode 100755
diff --git a/src/azequalarea.c b/src/azequalarea.c
old mode 100644
new mode 100755
diff --git a/src/azequidist.c b/src/azequidist.c
old mode 100644
new mode 100755
diff --git a/src/bicentric.c b/src/bicentric.c
old mode 100644
new mode 100755
diff --git a/src/bonne.c b/src/bonne.c
old mode 100644
new mode 100755
diff --git a/src/ccubrt.c b/src/ccubrt.c
old mode 100644
new mode 100755
diff --git a/src/complex.c b/src/complex.c
old mode 100644
new mode 100755
diff --git a/src/conic.c b/src/conic.c
old mode 100644
new mode 100755
diff --git a/src/cubrt.c b/src/cubrt.c
old mode 100644
new mode 100755
diff --git a/src/cuts.c b/src/cuts.c
old mode 100644
new mode 100755
diff --git a/src/cylequalarea.c b/src/cylequalarea.c
old mode 100644
new mode 100755
diff --git a/src/cylindrical.c b/src/cylindrical.c
old mode 100644
new mode 100755
diff --git a/src/doug/Makefile b/src/doug/Makefile
old mode 100644
new mode 100755
diff --git a/src/doug/README b/src/doug/README
old mode 100644
new mode 100755
diff --git a/src/doug/ascii2map1.c b/src/doug/ascii2map1.c
old mode 100644
new mode 100755
diff --git a/src/doug/ascii2map2.c b/src/doug/ascii2map2.c
old mode 100644
new mode 100755
diff --git a/src/doug/ascii2map3.c b/src/doug/ascii2map3.c
old mode 100644
new mode 100755
diff --git a/src/doug/doc/Makefile b/src/doug/doc/Makefile
old mode 100644
new mode 100755
diff --git a/src/doug/doc/ascii2map.1 b/src/doug/doc/ascii2map.1
old mode 100644
new mode 100755
diff --git a/src/doug/doc/ascii2map.1.ps b/src/doug/doc/ascii2map.1.ps
old mode 100644
new mode 100755
diff --git a/src/doug/doc/maint_record b/src/doug/doc/maint_record
old mode 100644
new mode 100755
diff --git a/src/doug/doc/map.1 b/src/doug/doc/map.1
old mode 100644
new mode 100755
diff --git a/src/doug/doc/map.1.ps b/src/doug/doc/map.1.ps
old mode 100644
new mode 100755
diff --git a/src/doug/doc/map.3 b/src/doug/doc/map.3
old mode 100644
new mode 100755
diff --git a/src/doug/doc/map.3.ps b/src/doug/doc/map.3.ps
old mode 100644
new mode 100755
diff --git a/src/doug/doc/map.5 b/src/doug/doc/map.5
old mode 100644
new mode 100755
diff --git a/src/doug/doc/map.5.ps b/src/doug/doc/map.5.ps
old mode 100644
new mode 100755
diff --git a/src/doug/doc/route.1 b/src/doug/doc/route.1
old mode 100644
new mode 100755
diff --git a/src/doug/doc/route.1.ps b/src/doug/doc/route.1.ps
old mode 100644
new mode 100755
diff --git a/src/doug/doc/tmac.anx b/src/doug/doc/tmac.anx
old mode 100644
new mode 100755
diff --git a/src/doug/index.c b/src/doug/index.c
old mode 100644
new mode 100755
diff --git a/src/doug/iplot.h b/src/doug/iplot.h
old mode 100644
new mode 100755
diff --git a/src/doug/libmap/Makefile b/src/doug/libmap/Makefile
old mode 100644
new mode 100755
diff --git a/src/doug/libmap/aitoff.c b/src/doug/libmap/aitoff.c
old mode 100644
new mode 100755
diff --git a/src/doug/libmap/albers.c b/src/doug/libmap/albers.c
old mode 100644
new mode 100755
diff --git a/src/doug/libmap/azequalarea.c b/src/doug/libmap/azequalarea.c
old mode 100644
new mode 100755
diff --git a/src/doug/libmap/azequidist.c b/src/doug/libmap/azequidist.c
old mode 100644
new mode 100755
diff --git a/src/doug/libmap/bicentric.c b/src/doug/libmap/bicentric.c
old mode 100644
new mode 100755
diff --git a/src/doug/libmap/bonne.c b/src/doug/libmap/bonne.c
old mode 100644
new mode 100755
diff --git a/src/doug/libmap/ccubrt.c b/src/doug/libmap/ccubrt.c
old mode 100644
new mode 100755
diff --git a/src/doug/libmap/complex.c b/src/doug/libmap/complex.c
old mode 100644
new mode 100755
diff --git a/src/doug/libmap/conic.c b/src/doug/libmap/conic.c
old mode 100644
new mode 100755
diff --git a/src/doug/libmap/cubrt.c b/src/doug/libmap/cubrt.c
old mode 100644
new mode 100755
diff --git a/src/doug/libmap/cuts.c b/src/doug/libmap/cuts.c
old mode 100644
new mode 100755
diff --git a/src/doug/libmap/cylequalarea.c b/src/doug/libmap/cylequalarea.c
old mode 100644
new mode 100755
diff --git a/src/doug/libmap/cylindrical.c b/src/doug/libmap/cylindrical.c
old mode 100644
new mode 100755
diff --git a/src/doug/libmap/eisenlohr.c b/src/doug/libmap/eisenlohr.c
old mode 100644
new mode 100755
diff --git a/src/doug/libmap/elco2.c b/src/doug/libmap/elco2.c
old mode 100644
new mode 100755
diff --git a/src/doug/libmap/elliptic.c b/src/doug/libmap/elliptic.c
old mode 100644
new mode 100755
diff --git a/src/doug/libmap/fisheye.c b/src/doug/libmap/fisheye.c
old mode 100644
new mode 100755
diff --git a/src/doug/libmap/gall.c b/src/doug/libmap/gall.c
old mode 100644
new mode 100755
diff --git a/src/doug/libmap/gilbert.c b/src/doug/libmap/gilbert.c
old mode 100644
new mode 100755
diff --git a/src/doug/libmap/guyou.c b/src/doug/libmap/guyou.c
old mode 100644
new mode 100755
diff --git a/src/doug/libmap/harrison.c b/src/doug/libmap/harrison.c
old mode 100644
new mode 100755
diff --git a/src/doug/libmap/hex.c b/src/doug/libmap/hex.c
old mode 100644
new mode 100755
diff --git a/src/doug/libmap/homing.c b/src/doug/libmap/homing.c
old mode 100644
new mode 100755
diff --git a/src/doug/libmap/lagrange.c b/src/doug/libmap/lagrange.c
old mode 100644
new mode 100755
diff --git a/src/doug/libmap/lambert.c b/src/doug/libmap/lambert.c
old mode 100644
new mode 100755
diff --git a/src/doug/libmap/laue.c b/src/doug/libmap/laue.c
old mode 100644
new mode 100755
diff --git a/src/doug/libmap/lune.c b/src/doug/libmap/lune.c
old mode 100644
new mode 100755
diff --git a/src/doug/libmap/mercator.c b/src/doug/libmap/mercator.c
old mode 100644
new mode 100755
diff --git a/src/doug/libmap/mollweide.c b/src/doug/libmap/mollweide.c
old mode 100644
new mode 100755
diff --git a/src/doug/libmap/newyorker.c b/src/doug/libmap/newyorker.c
old mode 100644
new mode 100755
diff --git a/src/doug/libmap/orthographic.c b/src/doug/libmap/orthographic.c
old mode 100644
new mode 100755
diff --git a/src/doug/libmap/perspective.c b/src/doug/libmap/perspective.c
old mode 100644
new mode 100755
diff --git a/src/doug/libmap/polyconic.c b/src/doug/libmap/polyconic.c
old mode 100644
new mode 100755
diff --git a/src/doug/libmap/rectangular.c b/src/doug/libmap/rectangular.c
old mode 100644
new mode 100755
diff --git a/src/doug/libmap/simpleconic.c b/src/doug/libmap/simpleconic.c
old mode 100644
new mode 100755
diff --git a/src/doug/libmap/sinusoidal.c b/src/doug/libmap/sinusoidal.c
old mode 100644
new mode 100755
diff --git a/src/doug/libmap/tetra.c b/src/doug/libmap/tetra.c
old mode 100644
new mode 100755
diff --git a/src/doug/libmap/trapezoidal.c b/src/doug/libmap/trapezoidal.c
old mode 100644
new mode 100755
diff --git a/src/doug/libmap/twocirc.c b/src/doug/libmap/twocirc.c
old mode 100644
new mode 100755
diff --git a/src/doug/libmap/zcoord.c b/src/doug/libmap/zcoord.c
old mode 100644
new mode 100755
diff --git a/src/doug/map.c b/src/doug/map.c
old mode 100644
new mode 100755
diff --git a/src/doug/map.h b/src/doug/map.h
old mode 100644
new mode 100755
diff --git a/src/doug/map.tar b/src/doug/map.tar
old mode 100644
new mode 100755
diff --git a/src/doug/mapdata/counties b/src/doug/mapdata/counties
old mode 100644
new mode 100755
diff --git a/src/doug/mapdata/counties.x b/src/doug/mapdata/counties.x
old mode 100644
new mode 100755
diff --git a/src/doug/mapdata/states b/src/doug/mapdata/states
old mode 100644
new mode 100755
diff --git a/src/doug/mapdata/states.x b/src/doug/mapdata/states.x
old mode 100644
new mode 100755
diff --git a/src/doug/mapdata/world b/src/doug/mapdata/world
old mode 100644
new mode 100755
diff --git a/src/doug/mapdata/world.x b/src/doug/mapdata/world.x
old mode 100644
new mode 100755
diff --git a/src/doug/plot.h b/src/doug/plot.h
old mode 100644
new mode 100755
diff --git a/src/doug/plot0.c b/src/doug/plot0.c
old mode 100644
new mode 100755
diff --git a/src/doug/plotPS.c b/src/doug/plotPS.c
old mode 100644
new mode 100755
diff --git a/src/doug/plotV.c b/src/doug/plotV.c
old mode 100644
new mode 100755
diff --git a/src/doug/route.c b/src/doug/route.c
old mode 100644
new mode 100755
diff --git a/src/doug/symbol.c b/src/doug/symbol.c
old mode 100644
new mode 100755
diff --git a/src/doug/test.results b/src/doug/test.results
old mode 100644
new mode 100755
diff --git a/src/eisenlohr.c b/src/eisenlohr.c
old mode 100644
new mode 100755
diff --git a/src/elco2.c b/src/elco2.c
old mode 100644
new mode 100755
diff --git a/src/elliptic.c b/src/elliptic.c
old mode 100644
new mode 100755
diff --git a/src/fisheye.c b/src/fisheye.c
old mode 100644
new mode 100755
diff --git a/src/gall.c b/src/gall.c
old mode 100644
new mode 100755
diff --git a/src/gilbert.c b/src/gilbert.c
old mode 100644
new mode 100755
diff --git a/src/guyou.c b/src/guyou.c
old mode 100644
new mode 100755
diff --git a/src/harrison.c b/src/harrison.c
old mode 100644
new mode 100755
diff --git a/src/hex.c b/src/hex.c
old mode 100644
new mode 100755
diff --git a/src/homing.c b/src/homing.c
old mode 100644
new mode 100755
diff --git a/src/lagrange.c b/src/lagrange.c
old mode 100644
new mode 100755
diff --git a/src/lambert.c b/src/lambert.c
old mode 100644
new mode 100755
diff --git a/src/laue.c b/src/laue.c
old mode 100644
new mode 100755
diff --git a/src/lune.c b/src/lune.c
old mode 100644
new mode 100755
diff --git a/src/map.h b/src/map.h
old mode 100644
new mode 100755
diff --git a/src/mapproj_res.rc b/src/mapproj_res.rc
deleted file mode 100644
index d47a8a0..0000000
--- a/src/mapproj_res.rc
+++ /dev/null
@@ -1,25 +0,0 @@
-#include <windows.h>
-#include "Rversion.h"
-
-VS_VERSION_INFO VERSIONINFO
-FILEVERSION R_FILEVERSION
-PRODUCTVERSION 3,0,0,0
-FILEFLAGSMASK 0x3L
-FILEOS VOS__WINDOWS32
-FILETYPE VFT_APP
-BEGIN
- BLOCK "StringFileInfo"
- BEGIN
- BLOCK "040904E4"
- BEGIN
- VALUE "FileDescription", "DLL for R package `mapproj'\0"
- VALUE "FileVersion", "1.1\0"
- VALUE "Compiled under R Version", R_MAJOR "." R_MINOR " (" R_YEAR "-" R_MONTH "-" R_DAY ")\0"
- VALUE "Project info", "http://www.r-project.org\0"
- END
- END
- BLOCK "VarFileInfo"
- BEGIN
- VALUE "Translation", 0x409, 1252
- END
-END
diff --git a/src/mapproject.c b/src/mapproject.c
old mode 100644
new mode 100755
diff --git a/src/mercator.c b/src/mercator.c
old mode 100644
new mode 100755
diff --git a/src/mollweide.c b/src/mollweide.c
old mode 100644
new mode 100755
diff --git a/src/newyorker.c b/src/newyorker.c
old mode 100644
new mode 100755
diff --git a/src/orthographic.c b/src/orthographic.c
old mode 100644
new mode 100755
diff --git a/src/perspective.c b/src/perspective.c
old mode 100644
new mode 100755
diff --git a/src/polyconic.c b/src/polyconic.c
old mode 100644
new mode 100755
diff --git a/src/rectangular.c b/src/rectangular.c
old mode 100644
new mode 100755
diff --git a/src/simpleconic.c b/src/simpleconic.c
old mode 100644
new mode 100755
diff --git a/src/sinusoidal.c b/src/sinusoidal.c
old mode 100644
new mode 100755
diff --git a/src/tetra.c b/src/tetra.c
old mode 100644
new mode 100755
diff --git a/src/trapezoidal.c b/src/trapezoidal.c
old mode 100644
new mode 100755
diff --git a/src/twocirc.c b/src/twocirc.c
old mode 100644
new mode 100755
diff --git a/src/zcoord.c b/src/zcoord.c
old mode 100644
new mode 100755
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/r-cran-mapproj.git
More information about the debian-science-commits
mailing list