[r-cran-maptools] 18/20: Import Debian patch 1:0.8-39+dfsg-1
Andreas Tille
tille at debian.org
Sun Jan 15 18:55:45 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 6f9eec2ccf508699aa3e3a7c9769a0989a6b589b
Merge: ee7784d 00ffe66
Author: Andreas Tille <tille at debian.org>
Date: Fri Nov 4 14:44:18 2016 +0100
Import Debian patch 1:0.8-39+dfsg-1
ChangeLog | 928 +++++++++++++++++++----------------------
DESCRIPTION | 27 +-
MD5 | 98 ++---
NAMESPACE | 9 +-
R/DP.R | 6 +-
R/Rgshhs.R | 14 +-
R/SP2owin.R | 14 +-
R/checkHoles.R | 46 +-
R/colslegs.R | 45 +-
R/getKMLcoordinates.R | 3 +-
R/kmlPoints.R | 2 +-
R/nowrapRecenter.R | 148 ++++++-
R/point_line_distance.R | 10 +-
R/sp2pbs.R | 34 +-
R/sp_spat1.R | 40 +-
R/spatstat1.R | 95 +++--
R/spmaps.R | 44 +-
R/union.R | 16 +-
build/vignette.rds | Bin 224 -> 223 bytes
data/gpcholes.rda | Bin 354 -> 0 bytes
data/state.vbm.rda | Bin 4397 -> 0 bytes
debian/changelog | 10 +
debian/control | 15 +-
debian/copyright | 95 +----
debian/rules | 12 +-
debian/watch | 3 +-
inst/ChangeLog | 928 +++++++++++++++++++----------------------
inst/README | 3 +
inst/doc/combine_maptools.R | 2 +-
inst/doc/combine_maptools.Rnw | 4 +-
inst/doc/combine_maptools.pdf | Bin 451410 -> 451411 bytes
inst/shapes/Testing.kml | 14 +
man/GE_SpatialGrid.Rd | 8 +-
man/SpatialLines2PolySet.Rd | 9 +-
man/as.ppp.Rd | 16 +-
man/dotsInPolys.Rd | 3 +-
man/getKMLcoordinates.Rd | 2 +
man/gzAzimuth.Rd | 2 +-
man/kmlLine.Rd | 2 +-
man/kmlLines.Rd | 2 +-
man/kmlOverlay.Rd | 16 +-
man/kmlPoints.Rd | 6 +-
man/leglabs.Rd | 14 +-
man/map2SpatialPolygons.Rd | 14 +-
man/nowrapRecenter.Rd | 17 +-
man/nowrapSpatialLines.Rd | 41 ++
man/readGPS.Rd | 32 +-
man/readSplus.Rd | 2 +-
man/sp2Mondrian.Rd | 2 +-
man/sp2WB.Rd | 4 +-
man/sp2tmap.Rd | 2 +
man/symbolsInPolys.Rd | 3 +-
man/wrld_simpl.Rd | 2 +-
src/Rgshhs.c | 10 +-
src/pip.c | 19 -
src/shapefil.h | 14 +-
vignettes/combine_maptools.Rnw | 4 +-
57 files changed, 1514 insertions(+), 1397 deletions(-)
diff --cc debian/changelog
index f967f8b,0000000..28c95db
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,83 -1,0 +1,93 @@@
++r-cran-maptools (1:0.8-39+dfsg-1) unstable; urgency=medium
++
++ * New upstream version
++ * xz compression in d/watch
++ * Convert to dh-r
++ * Canonical homepage for CRAN
++ * cme fix dpkg-copyright
++
++ -- Andreas Tille <tille at debian.org> Fri, 04 Nov 2016 14:44:18 +0100
++
+r-cran-maptools (1:0.8-30-1) unstable; urgency=medium
+
+ * New upstream version
+ * debian/copyright: exclude files with unclear license
+ * Upload to Debian main since no non-free parts are remaining
+ * debian/README.source: document binary data files
+ * debian/README.Debian: Hint about removed data files
+
+ -- Andreas Tille <tille at debian.org> Mon, 23 Jun 2014 14:22:43 +0200
+
+r-cran-maptools (1:0.8-23-1) unstable; urgency=low
+
+ * New upstream version
+ * debian/source/format: 3.0 (quilt)
+ * debian/control:
+ - Standards-Version: 3.9.4 (no changes needed)
+ - DM-Upload-Allowed removed
+ - debhelper 9 (also debian/compat)
+ - normalised using `cme fix dpkg-control`
+ * Separate information about testing from README.Debian
+ * debian/copyright: Use `cme fix dpkg-copyright` to make it DEP5
+ compatible
+ * debian/rules: Drop unneeded code to create R:Depends
+
+ -- Andreas Tille <tille at debian.org> Thu, 16 May 2013 17:35:43 +0200
+
+r-cran-maptools (1:0.7-38-1) unstable; urgency=low
+
+ * New upstream version
+ * Standards-Version: 3.9.1 (no changes needed)
+ * debian/rules: Remove extra license file in /usr/lib, content is
+ just in debian/copyright
+
+ -- Andreas Tille <tille at debian.org> Wed, 24 Nov 2010 08:37:20 +0100
+
+r-cran-maptools (1:0.7-34-2) unstable; urgency=low
+
+ * debian/rules: Make sure whitespace is really a tab to get
+ R:Depends substvar working
+
+ -- Andreas Tille <tille at debian.org> Mon, 31 May 2010 13:54:16 +0200
+
+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 4522d49,0000000..1c05cbe
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,27 -1,0 +1,28 @@@
+Source: r-cran-maptools
+Maintainer: Debian Science Team <debian-science-maintainers at lists.alioth.debian.org>
+Uploaders: Andreas Tille <tille at debian.org>
+Section: gnu-r
+Priority: optional
+Build-Depends: debhelper (>= 9.0),
- cdbs,
++ dh-r,
+ r-base-dev,
+ r-cran-foreign,
+ r-cran-sp
- Standards-Version: 3.9.5
- Vcs-Browser: http://anonscm.debian.org/viewvc/debian-science/packages/R/r-cran-maptools/trunk/
++Standards-Version: 3.9.8
++Vcs-Browser: https://anonscm.debian.org/viewvc/debian-science/packages/R/r-cran-maptools/trunk/
+Vcs-Svn: svn://anonscm.debian.org/debian-science/packages/R/r-cran-maptools/trunk/
- Homepage: http://cran.r-project.org/web/packages/maptools
++Homepage: https://cran.r-project.org/package=maptools
+
+Package: r-cran-maptools
+Architecture: any
+Depends: ${shlibs:Depends},
- ${R:Depends},
- r-cran-foreign,
- r-cran-sp
++ ${misc:Depends},
++ ${R:Depends}
++Recommends: ${R:Recommends}
++Suggests: ${R:Suggests}
+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 0e8055a,0000000..044ae4c
mode 100644,000000..100644
--- a/debian/copyright
+++ b/debian/copyright
@@@ -1,200 -1,0 +1,119 @@@
- Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
++Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: maptools
+Upstream-Contact: Roger Bivand <Roger.Bivand at nhh.no>
- Source: http://cran.r-project.org/web/packages/maptools/
++Source: https://cran.r-project.org/package=maptools
+Files-Excluded: data/wrld_simpl.rda
+ data/gpcholes.rda
+ data/state.vbm.rda
+ inst/shapes/pointZ.*
+ inst/shapes/baltim.*
+ inst/shapes/columbus.*
+ inst/shapes/sids.*
+
+Files: *
- Copyright: © 2001-2008 Nicholas J. Lewin-Koh and Roger Bivand
++Copyright: © 2001-2016 Nicholas J. Lewin-Koh and Roger Bivand
+License: GPL-2+
- 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.
- .
- 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.*
- Copyright: 2005-2006 GeoDa Center for Geospatial Analysis and Computation
- License: unknown2
- 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."
- 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
- .
- ---------------------------------------------
- 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: unknown3
- 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+
+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
+ 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.
+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
++License: Expat
+ 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.
+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
++ remain under 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>
++Copyright: 2009-2016 Andreas Tille <tille at debian.org>
+License: GPL-2+
+
+License: GPL-2+
+ 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, see <http://www.gnu.org/licenses/>.
+ .
- On Debian systems, the complete text of the GNU Public
++ On Debian systems, the complete text of the GNU General Public
+ License can be found in `/usr/share/common-licenses/GPL'.
diff --cc debian/rules
index a726724,0000000..ae86733
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,10 -1,0 +1,8 @@@
+#!/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
++%:
++ dh $@ --buildsystem R
+
- install/$(package)::
- # remove extra license file, the content is just in debian/copyright
- rm -f debian/$(package)/usr/lib/R/site-library/maptools/LICENSE
++override_dh_install:
++ dh_install
++ find debian -name LICENSE -delete
diff --cc debian/watch
index bb9c895,0000000..09e4df2
mode 100644,000000..100644
--- a/debian/watch
+++ b/debian/watch
@@@ -1,2 -1,0 +1,3 @@@
+version=3
- http://cran.r-project.org/src/contrib/maptools_([-\d.]*)\.tar\.gz
++opts="repacksuffix=+dfsg,dversionmangle=s/\+dfsg//g,repack,compression=xz" \
++ http://cran.r-project.org/src/contrib/maptools_([-\d.]*)\.tar\.gz
--
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