r47361 - in /packages/R/r-cran-maptools/trunk/debian: changelog control copyright rules watch

tille at users.alioth.debian.org tille at users.alioth.debian.org
Fri Nov 4 14:16:10 UTC 2016


Author: tille
Date: Fri Nov  4 14:16:10 2016
New Revision: 47361

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=47361
Log:
  * New upstream version
  * xz compression in d/watch
  * Convert to dh-r
  * Canonical homepage for CRAN
  * cme fix dpkg-copyright


Modified:
    packages/R/r-cran-maptools/trunk/debian/changelog
    packages/R/r-cran-maptools/trunk/debian/control
    packages/R/r-cran-maptools/trunk/debian/copyright
    packages/R/r-cran-maptools/trunk/debian/rules
    packages/R/r-cran-maptools/trunk/debian/watch

Modified: packages/R/r-cran-maptools/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/R/r-cran-maptools/trunk/debian/changelog?rev=47361&op=diff
==============================================================================
--- packages/R/r-cran-maptools/trunk/debian/changelog	(original)
+++ packages/R/r-cran-maptools/trunk/debian/changelog	Fri Nov  4 14:16:10 2016
@@ -1,3 +1,13 @@
+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

Modified: packages/R/r-cran-maptools/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/R/r-cran-maptools/trunk/debian/control?rev=47361&op=diff
==============================================================================
--- packages/R/r-cran-maptools/trunk/debian/control	(original)
+++ packages/R/r-cran-maptools/trunk/debian/control	Fri Nov  4 14:16:10 2016
@@ -4,21 +4,22 @@
 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

Modified: packages/R/r-cran-maptools/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/debian-science/packages/R/r-cran-maptools/trunk/debian/copyright?rev=47361&op=diff
==============================================================================
--- packages/R/r-cran-maptools/trunk/debian/copyright	(original)
+++ packages/R/r-cran-maptools/trunk/debian/copyright	Fri Nov  4 14:16:10 2016
@@ -1,7 +1,7 @@
-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
@@ -11,35 +11,8 @@
                 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
@@ -47,60 +20,6 @@
  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
@@ -136,7 +55,7 @@
 
 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.
@@ -163,7 +82,7 @@
 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
@@ -179,7 +98,7 @@
 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+
@@ -196,5 +115,5 @@
  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'.

Modified: packages/R/r-cran-maptools/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/R/r-cran-maptools/trunk/debian/rules?rev=47361&op=diff
==============================================================================
--- packages/R/r-cran-maptools/trunk/debian/rules	(original)
+++ packages/R/r-cran-maptools/trunk/debian/rules	Fri Nov  4 14:16:10 2016
@@ -1,10 +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

Modified: packages/R/r-cran-maptools/trunk/debian/watch
URL: http://svn.debian.org/wsvn/debian-science/packages/R/r-cran-maptools/trunk/debian/watch?rev=47361&op=diff
==============================================================================
--- packages/R/r-cran-maptools/trunk/debian/watch	(original)
+++ packages/R/r-cran-maptools/trunk/debian/watch	Fri Nov  4 14:16:10 2016
@@ -1,2 +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




More information about the debian-science-commits mailing list