[r-cran-maptools] 06/20: Import Debian patch 1:0.7-29-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 6cd513bbe4c47a7f4aca7283d23c08cf0b9a8a6d
Merge: 9fc1b03 35198e6
Author: Andreas Tille <tille at debian.org>
Date:   Wed Feb 10 15:02:12 2010 +0100

    Import Debian patch 1:0.7-29-1

 ChangeLog                                    |  66 ++++++++-
 DESCRIPTION                                  |  18 +--
 INDEX                                        |  17 +--
 NAMESPACE                                    |  26 ++--
 R/CCmaps.R                                   | 195 +++++++++++++++++++++++++++
 R/DP.R                                       | 128 ++++++++++++++++++
 R/dotsinpolys.R                              |   4 +-
 R/sp_bind.R                                  |  49 -------
 data/gpcholes.rda                            | Bin 405 -> 354 bytes
 debian/changelog                             |  12 ++
 debian/control                               |   2 +-
 debian/get-orig-source                       |   7 -
 debian/rules                                 |   2 -
 debian/watch                                 |   4 -
 inst/ChangeLog                               |  66 ++++++++-
 {man => inst/old_man}/Map2poly.Rd            |   0
 {man => inst/old_man}/get.Pcent.Rd           |   0
 {man => inst/old_man}/maptools.Rd            |   0
 {man => inst/old_man}/plot.Map.Rd            |   0
 {man => inst/old_man}/plot.polylist.Rd       |   0
 {man => inst/old_man}/read.shape.Rd          |   0
 {man => inst/old_man}/subset.polylist.Rd     |   0
 {man => inst/old_man}/write.linelistShape.Rd |   0
 {man => inst/old_man}/write.pointShape.Rd    |   0
 {man => inst/old_man}/write.polylistShape.Rd |   0
 inst/share/gshhs_c.b                         | Bin 163512 -> 184528 bytes
 inst/share/wdb_borders_c.b                   | Bin 71448 -> 84912 bytes
 man/CCmaps.Rd                                |  61 +++++++++
 man/Rgshhs.Rd                                |  11 +-
 man/dotsInPolys.Rd                           |  12 +-
 man/getinfo.shape.Rd                         |  35 +++++
 man/holepolys.Rd                             |   6 +-
 man/leglabs.Rd                               |  35 +++++
 man/readShapeLines.Rd                        |   2 +-
 man/readShapePoints.Rd                       |   2 +-
 man/readShapePoly.Rd                         |   2 +-
 man/readShapeSpatial.Rd                      |   6 +-
 man/spCbind-methods.Rd                       |   2 +-
 man/spChFIDs-methods.Rd                      |  39 ------
 man/spRbind-methods.Rd                       |  19 ++-
 man/symbolsInPolys.Rd                        |   9 +-
 man/thinnedSpatialPoly.Rd                    |  41 ++++++
 src/Rgshhs.c                                 |  29 +++-
 src/Rgshhs.h                                 |  49 +++++--
 44 files changed, 764 insertions(+), 192 deletions(-)

diff --cc debian/changelog
index b4a39aa,0000000..d2b4081
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,18 -1,0 +1,30 @@@
++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 721a92d,0000000..7a364ea
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.3
++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
 +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/rules
index caba265,0000000..7de6b02
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,9 -1,0 +1,7 @@@
 +#!/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
 +
- get-orig-source:
- 	. debian/get-orig-source
diff --cc debian/watch
index 04c8a78,0000000..bb9c895
mode 100644,000000..100644
--- a/debian/watch
+++ b/debian/watch
@@@ -1,6 -1,0 +1,2 @@@
 +version=3
- # Same effect as dversionmangle, but we have to rename the orig.tar.gz
- # anyway and it is easier to write a get-origsource script this way
- # opts="uversionmangle=s/([\d.]+)-(\d)/$1.$2/"
- opts="dversionmangle=s/([\d.]+)\.(\d)/$1-$2/" \
 +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