[r-cran-maptools] 08/20: Import Debian patch 1:0.7-34-1
Andreas Tille
tille at debian.org
Sun Jan 15 18:55:43 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-maptools.
commit bbe447c82356189f7fdba16a041c488defb08653
Merge: 6cd513b 093f3b4
Author: Andreas Tille <tille at debian.org>
Date: Thu May 20 15:22:15 2010 +0200
Import Debian patch 1:0.7-34-1
ChangeLog | 65 ++++++++++++++++++++++-
DESCRIPTION | 8 +--
NAMESPACE | 2 +
R/AAA.R | 22 ++++++++
R/DP.R | 15 ++++--
R/Rgshhs.R | 123 ++++++++++++++++++++++++++++++++++++++++----
R/checkHoles.R | 21 ++++++--
R/nowrapRecenter.R | 30 +++++++++--
R/shapelib.R | 15 +++++-
R/sp_bind.R | 4 +-
R/union.R | 13 +++--
R/zzz.R | 6 +--
debian/README.Debian | 3 ++
debian/changelog | 11 ++++
debian/control | 2 +-
debian/copyright | 2 +-
debian/rules | 3 ++
inst/ChangeLog | 65 ++++++++++++++++++++++-
man/Rgshhs.Rd | 9 ++--
man/checkPolygonsHoles.Rd | 15 ++++--
man/nowrapRecenter.Rd | 2 +-
man/readShapeLines.Rd | 2 +-
man/readShapePoints.Rd | 2 +-
man/readShapePoly.Rd | 2 +-
man/readShapeSpatial.Rd | 6 +--
man/spRbind-methods.Rd | 8 +--
man/thinnedSpatialPoly.Rd | 4 +-
man/unionSpatialPolygons.Rd | 13 +++--
src/Rgshhs.c | 17 +++---
src/Rgshhs.h | 4 +-
30 files changed, 421 insertions(+), 73 deletions(-)
diff --cc debian/README.Debian
index 08b3094,0000000..9c908a0
mode 100644,000000..100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@@ -1,6 -1,0 +1,9 @@@
+maptools for Debian
+-------------------
+
+This package was builded as precondiion for R survaillance.
+
++This package can be tested by loading it into R with the command
++‘library(maptools)’ in order to confirm its integrity.
++
+ -- Andreas Tille <tille at debian.org> Fri, 16 Jan 2009 20:43:13 +0100
diff --cc debian/changelog
index d2b4081,0000000..04d5e5a
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,30 -1,0 +1,41 @@@
++r-cran-maptools (1:0.7-34-1) unstable; urgency=low
++
++ * New upstream version
++ * Depend on a version equal or superior than the R upstream release that
++ was used to build this package, using a R:Depends substvar
++ (debian/control, debian/rules).
++ * debian/copyright: More generic value for Upstream-Source field
++ * debian/README.Debian: explain how to test this package
++
++ -- Andreas Tille <tille at debian.org> Thu, 20 May 2010 15:22:15 +0200
++
+r-cran-maptools (1:0.7-29-1) unstable; urgency=low
+
+ * New upstream version
+ * Use upstream version scheme with dash '-' which requires epoch
+ in changelog
+ * debian/watch: Removed unneeded version mangling
+ * debian/get-orig-source: removed because unneeded (uscan is
+ perfectly sufficient)
+ * Standards-Version: 3.8.4 (no changes needed)
+
+ -- Andreas Tille <tille at debian.org> Wed, 10 Feb 2010 15:02:12 +0100
+
+r-cran-maptools (0.7.26-1) unstable; urgency=low
+
+ * New upstream version
+ * Further note to the copyright given in mail to the debian-science
+ list by the copyright holders of the critical data files which
+ make the package non-free
+ * Standards-Version: 3.8.3 (no changes needed)
+ * Changed Section from non-free/science to non-free/gnu-r
+
+ -- Andreas Tille <tille at debian.org> Fri, 30 Oct 2009 11:27:51 +0100
+
+r-cran-maptools (0.7.20-1) unstable; urgency=low
+
+ * Initial release (Closes: #515646).
+ * Many thanks to Charles Plessy who did a really great job
+ to review the copyright
+
+ -- Andreas Tille <tille at debian.org> Fri, 13 Mar 2009 09:36:18 +0100
diff --cc debian/control
index 7a364ea,0000000..64d624a
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,22 -1,0 +1,22 @@@
+Source: r-cran-maptools
+Section: non-free/gnu-r
+Priority: optional
+Maintainer: Debian Science Team <debian-science-maintainers at lists.alioth.debian.org>
+Uploaders: Andreas Tille <tille at debian.org>
+DM-Upload-Allowed: yes
+Build-Depends: debhelper (>= 7.0), cdbs, r-base-dev, r-cran-foreign, r-cran-sp
+Standards-Version: 3.8.4
+Homepage: http://cran.r-project.org/web/packages/maptools
+Vcs-Browser: http://svn.debian.org/wsvn/debian-science/packages/R/r-cran-maptools/trunk/?rev=0&sc=0
+Vcs-Svn: svn://svn.debian.org/svn/debian-science/packages/R/r-cran-maptools/trunk/
+XS-Autobuild: yes
+
+Package: r-cran-maptools
+Architecture: any
- Depends: ${shlibs:Depends}, r-base-core, r-cran-foreign, r-cran-sp
++Depends: ${shlibs:Depends}, ${R:Depends}, r-cran-foreign, r-cran-sp
+Description: GNU R Tools for reading and handling spatial objects
+ Set of tools for manipulating and reading geographic data, in particular
+ ESRI shapefiles; C code used from shapelib. It includes binary access to
+ GSHHS shoreline files. The package also provides interface wrappers for
+ exchanging spatial objects with packages such as PBSmapping, spatstat,
+ maps, RArcInfo, Stata tmap, WinBUGS, Mondrian, and others.
diff --cc debian/copyright
index 0f82809,0000000..c319357
mode 100644,000000..100644
--- a/debian/copyright
+++ b/debian/copyright
@@@ -1,195 -1,0 +1,195 @@@
+Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat
+Upstream-Name: maptools
+Upstream-Maintainer: Nicholas J. Lewin-Koh, Roger Bivand, and others
- Upstream-Source: http://cran.r-project.org/src/contrib/maptools_0.7-20.tar.gz
++Upstream-Source: http://cran.r-project.org/web/packages/maptools/
+X-Debianized-By: Andreas Tille <tille at debian.org>
+X-Packaged-Date: Tue, 13 Jan 2009 11:48:08 +0100
+Disclaimer : This package is not part of the Debian operating system.
+ The r-cran-maptools source and binary Debian packages are part of the
+ "non-free" area in our archive. The packages in this area are not part of the
+ Debian system, although they have been configured for use with Debian. We
+ nevertheless support the use of the r-cran-maptools source and binary Debian
+ pacakges and provide infrastructure for non-free packages (such as our bug
+ tracking system and mailing lists).
+ .
+ The r-cran-maptools package contains some data files, inst/shapes/baltim.*,
+ inst/shapes/columbus.*, and inst/shapes/sids.* (see below), whose license does
+ not permit modification.
+ .
+ A request about relicensing was send to Julia Koschinsky <jkoschin at asu.edu>
+ but not answered until now.
+ .
+ The r-cran-maptools package also contains files of unclear ownership and
+ licensing: `data/wrld_simpl.rda' and `inst/shapes/pointZ.*'.
+
+X-Non-Free-Autobuild: yes
+ The licence does not forbid Debian from using autobuilders to create binary
+ packages.
+
+Files: *
+License: GPL-2+
+Copyright: © 2001-2008 Nicholas J. Lewin-Koh and Roger Bivand
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+X-Comment: On Debian systems, the complete text of the GNU General Public
+ License can be found in `/usr/share/common-licenses/GPL-2'.
+
+Files: data/wrld_simpl.rda
+Copyright: unknown
+License: unknown
+ This file is a modified SpatialPolygonsDataFrame object
+ generated from the TM_WORLD_BORDERS_SIMPL-0.2 shapefile downloaded from
+ http://mappinghacks.com/data/TM_WORLD_BORDERS_SIMPL-0.2.zip with the
+ attribution: "The world_borders.zip dataset has been superseded by Bjørn
+ Sandvik's improved version, TM_WORLD_BORDERS-0.2.zip, mirrored from
+ thematicmapping.org." The country Polygons objects and the data slot data
+ frame row numbers have been set to the ISO 3166 three letter codes.
+
+Files: inst/shapes/fylk-val.*
+Copyright: Statens Kartverk 2001
+License: PD
+ These files were released (with a collection of other shapefiles) to the
+ public domain in July 2001. The link to the relevant page under
+ http://www.statkart.no has now expired, this copy downloaded 13 July 2001.
+
+Files: inst/shapes/baltim.*, inst/shapes/columbus.*, and inst/shapes/sids.*
+License:
+ These files are derived by permission from SAL data files
+ prepared by Luc Anselin; they were downloaded from:
+ .
+ http://sal.agecon.uiuc.edu/stuff/data.html (now http://geodacenter.asu.edu/sdata)
+ .
+ under the following conditions: "The data are provided as is, without
+ any warranties. Please make sure to give proper credit when using
+ them in any publications. Some of the data sets are purely illustrative
+ and should not be used for substantive research."
+X-Comment: Additional quote from an e-mail to debian-science list:
+ see http://lists.debian.org/debian-science/2009/03/msg00056.html
+ .
+ Date: Sun, 15 Mar 2009 19:22:26 -0700
+ From: Julia Koschinsky <jkoschin at asu.edu>
+ To: Stuart Prescott <stuart+debian at nanonanonano.net>
+ Cc: debian-science at lists.debian.org, Andreas Tille <tillea at rki.de>,
+ Mark Hymers <ftpmaster at debian.org>, ...
+ Subject: Re: r-cran-maptools_0.7.16-1_i386.changes REJECTED (fwd)
+ .
+ Hi Stuart,
+ .
+ As far as we are concerned at the GeoDa Center, you're welcome to use
+ our sample data at http://geodacenter.asu.edu/sdata for all of the
+ purposes you mention, including sharing them with others, uploading
+ them on your local server for your students, listing them on your
+ personal website, simplifying the data, improving it, or other
+ educational uses. We appreciate listing the credit.
+ .
+ Our primary purpose for making the data available is for our tutorials
+ and software use. If you or others find them useful for other
+ purposes, please go ahead. Several of the sample datasets include ESRI
+ shapefiles and a lot of them are based on US Census data - we're not
+ sure what the legal restrictions are in this case but I can tell you
+ that as far as the GeoDa Center is concerned, anyone who wants to use,
+ add value, make available or any other use they see for our sample
+ data for non-commercial purposes is welcome to it.
+ .
+ Enjoy.
+ Julia
+X-Comment: In addition you might like to read
+ http://www.census.gov/geo/www/tiger/faq.html#38
+
+Files: inst/shapes/pointZ.*
+Copyright: Michael Toews
+License: unknown
+ These files are a sample of points from a 3D point shapefile kindly
+ contributed by Michael Toews to be used here for illustrative purposes; this
+ sample is written out using writePointsShape().
+
+Files: R/GE_png.R
+Copyright: © 2007 by Duncan Golicher, David Forrest and Roger Bivand
+License: GPL-2+
+
+Files: R/point.in.polygon.R
+Copyright: © 2004 Edzer Pebesma
+License: GPL-2+
+X-Comment: This file was copied from the R sp package, released under the GNU
+ GPL version 2 or any later version.
+ See http://downloads.sourceforge.net/r-spatial/sp_0.7-0.tar.gz for confirmation.
+
+Files: R/readGPS.R
+Copyright: © 2007 Patrick Giraudoux and Roger Bivand
+License: GPL-2+
+
+Files: R/sp2Mondrian.R
+Copyright: © 2006-7 Patrick Hausmann and Roger Bivand
+License: GPL-2+
+
+Files: src/pip.c
+Copyright: © 2004 Edzer Pebesma, with portion © 1998 by Joseph O'Rourke.
+License: GPL-2+, with portion as follows:
+ Written by Joseph O'Rourke, contributions by Min Xu, June 1997.
+ Questions to orourke at cs.smith.edu.
+ .
+ This code is Copyright 1998 by Joseph O'Rourke. It may be freely
+ redistributed in its entirety provided that this copyright notice is
+ not removed.
+X-Comment: This file was copied from the R sp package, released under the GNU
+ GPL version 2 or any later version.
+ See http://downloads.sourceforge.net/r-spatial/sp_0.7-0.tar.gz for confirmation.
+
+Files: src/shapefil.h, src/shpopen.c, src/shptree.c
+Copyright: © 1999, 2001, Frank Warmerdam <warmerdam at pobox.com>
+License: MIT | LGPL
+ This software is available under the following "MIT Style" license,
+ or at the option of the licensee under the LGPL (see LICENSE.LGPL). This
+ option is discussed in more detail in shapelib.html.
+ .
+ --
+ .
+ Permission is hereby granted, free of charge, to any person obtaining a
+ copy of this software and associated documentation files (the "Software"),
+ to deal in the Software without restriction, including without limitation
+ the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ and/or sell copies of the Software, and to permit persons to whom the
+ Software is furnished to do so, subject to the following conditions:
+ .
+ The above copyright notice and this permission notice shall be included
+ in all copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ DEALINGS IN THE SOFTWARE.
+X-Comment: quoting from http://shapelib.maptools.org/license.html :
+ I am pleased to receive bug fixes, and improvements for Shapelib. Unless the
+ submissions indicate otherwise I will assume that changes submitted to me
+ remain under the the above "dual license" terms. If changes are made to the
+ library with the intention that those changes should be protected by the LGPL
+ then I should be informed upon submission. Note that I will not generally
+ incorporate changes into the core of Shapelib that are protected under the LGPL
+ as this would effectively limit the whole file and distribution to LGPL terms.
+
+Files: src/Rcentroid.c
+Copyright: © Joseph O'Rourke, Carl Anderson, Frank Warmerdam, Nicholas Lewin-Koh, Roger S. Bivand
+License: GPL-2+
+
+Files: src/Rgshhs.*
+Copyright: © 1996-2008 P. Wessel and W. H. F. Smith
+ © 2005-7 Roger Bivand
+License: GPL-2+
+
+Files: debian/*
+Copyright: 2009 Andreas Tille <tille at debian.org>
+License: Same as maptools itself
diff --cc debian/rules
index 7de6b02,0000000..a6c3215
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,7 -1,0 +1,10 @@@
+#!/usr/bin/make -f
+# -*- makefile -*-
+# debian/rules file for the Debian/GNU Linux r-cran-maptools package
+# Copyright 2009 by Andreas Tille <tille at debian.org>
+
+include /usr/share/R/debian/r-cran.mk
+
++# Require a number equal or superior than the R version the package was built with.
++install/r-$(debRreposname)-$(cranName)::
++ echo "R:Depends=r-base-core (>= $(shell R --version | head -n1 | perl -ne 'print / +([0-9]\.[0-9]+\.[0-9])/')~)" >> debian/r-$(debRreposname)-$(cranName).substvars
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/r-cran-maptools.git
More information about the debian-science-commits
mailing list