[r-cran-maptools] 12/20: Import Debian patch 1:0.7-38-1

Andreas Tille tille at debian.org
Sun Jan 15 18:55:44 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 10a895997dffaeabf28990ebd129e36d678927cb
Merge: 1d30c52 95a1fd9
Author: Andreas Tille <tille at debian.org>
Date:   Wed Nov 24 08:37:20 2010 +0100

    Import Debian patch 1:0.7-38-1

 ChangeLog                | 31 ++++++++++++++++++++++++++++++-
 DESCRIPTION              |  8 ++++----
 R/Rgshhs.R               |  9 +++++----
 R/SpatialLines-methods.R | 30 +++++++++++++++++++++++++++---
 R/kmlLine.R              |  2 +-
 R/maptools.R             | 12 ++++++++----
 R/readGPS.R              |  2 +-
 R/shapelib.R             |  5 ++++-
 R/sp2pbs.R               |  8 ++++----
 R/sp_spat1.R             |  6 +++++-
 R/union.R                |  2 +-
 debian/changelog         |  9 +++++++++
 debian/control           |  2 +-
 debian/rules             |  8 +++++---
 inst/ChangeLog           | 31 ++++++++++++++++++++++++++++++-
 man/holepolys.Rd         | 11 +++++------
 man/readShapeLines.Rd    |  3 ++-
 man/readShapePoly.Rd     |  2 +-
 man/readShapeSpatial.Rd  |  2 +-
 19 files changed, 144 insertions(+), 39 deletions(-)

diff --cc debian/changelog
index 3e11f6d,0000000..f91d218
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,48 -1,0 +1,57 @@@
++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 64d624a,0000000..11d2bcf
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
++Standards-Version: 3.9.1
 +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: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/rules
index 6258541,0000000..3517337
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,10 -1,0 +1,12 @@@
 +#!/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
++install/$(package)::
++	# Require a number equal or superior than the R version the package was built with.
++	echo "R:Depends=r-base-core (>= $(shell R --version | head -n1 | perl -ne 'print / +([0-9]\.[0-9]+\.[0-9])/')~)" >> debian/$(package).substvars
++	# remove extra license file, the content is just in debian/copyright
++	rm -f debian/$(package)/usr/lib/R/site-library/maptools/LICENSE

-- 
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