[r-cran-maps] 41/64: Import Debian changes 2.2-5-1

Andreas Tille tille at debian.org
Thu Sep 7 07:32:33 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-maps.

commit 346448b54f16080cf70106a5872883db471dc07d
Merge: 68b27d3 0997702
Author: Chris Lawrence <lawrencc at debian.org>
Date:   Thu Mar 22 14:19:33 2012 -0400

    Import Debian changes 2.2-5-1
    
    r-cran-maps (2.2-5-1) unstable; urgency=low
    
      * New upstream release.
      * Finally use r-cran.mk.

 DESCRIPTION                 |  16 +-
 MD5                         |  46 ++--
 R/map.r                     |   6 +-
 R/zzz.R                     |   2 -
 data/state.carto.center.rda | Bin 0 -> 674 bytes
 data/state.cartoMapEnv.r    |   1 +
 data/state.vbm.center.rda   | Bin 0 -> 338 bytes
 data/state.vbmMapEnv.r      |   1 +
 debian/changelog            |   7 +
 debian/control              |   4 +-
 debian/rules                |  20 +-
 man/map.Rd                  |  10 +-
 man/state.carto.Rd          |  49 +++++
 man/state.fips.Rd           |   6 +-
 man/state.vbm.Rd            |  51 +++++
 src/Makefile                |  14 +-
 src/Makefile.win            |  14 +-
 src/county.gon              |   6 +-
 src/county.gonstats         |   2 +-
 src/county.line             |  20 +-
 src/county.linestats        |   2 +-
 src/county.name             |   3 +-
 src/mapget.c                |   8 +-
 src/maps.def                |   6 +
 src/state.carto.gon         | 100 +++++++++
 src/state.carto.gonstats    |   1 +
 src/state.carto.line        | 524 ++++++++++++++++++++++++++++++++++++++++++++
 src/state.carto.linestats   |   1 +
 src/state.carto.name        |  50 +++++
 src/state.vbm.gon           | 100 +++++++++
 src/state.vbm.gonstats      |   1 +
 src/state.vbm.line          | 494 +++++++++++++++++++++++++++++++++++++++++
 src/state.vbm.linestats     |   1 +
 src/state.vbm.name          |  50 +++++
 src/thin.c                  |  55 ++---
 src/thin.c.orig             | 216 ------------------
 36 files changed, 1555 insertions(+), 332 deletions(-)

diff --cc debian/changelog
index 980c04a,0000000..c9a9983
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,188 -1,0 +1,195 @@@
++r-cran-maps (2.2-5-1) unstable; urgency=low
++
++  * New upstream release.
++  * Finally use r-cran.mk.
++
++ -- Chris Lawrence <lawrencc at debian.org>  Thu, 22 Mar 2012 14:19:33 -0400
++
 +r-cran-maps (2.2-1-1) unstable; urgency=low
 +
 +  * New upstream release.
 +
 + -- Chris Lawrence <lawrencc at debian.org>  Fri, 04 Nov 2011 13:07:01 -0400
 +
 +r-cran-maps (2.1-6-2) unstable; urgency=low
 +
 +  * Rebuild for R 2.14.0.  (Closes: #646051).
 +
 + -- Chris Lawrence <lawrencc at debian.org>  Thu, 20 Oct 2011 21:23:02 -0400
 +
 +r-cran-maps (2.1-6-1) unstable; urgency=low
 +
 +  * New upstream release.
 +
 + -- Chris Lawrence <lawrencc at debian.org>  Fri, 06 May 2011 13:13:49 -0500
 +
 +r-cran-maps (2.1-5-1) unstable; urgency=low
 +
 +  * New upstream release
 +
 + -- Chris Lawrence <lawrencc at debian.org>  Mon, 17 Jan 2011 14:41:52 -0600
 +
 +r-cran-maps (2.1-4-1) unstable; urgency=low
 +
 +  * New upstream release.
 +
 + -- Chris Lawrence <lawrencc at debian.org>  Wed, 07 Jul 2010 03:48:50 -0500
 +
 +r-cran-maps (2.1-3-1) unstable; urgency=low
 +
 +  * New upstream release.
 +
 + -- Chris Lawrence <lawrencc at debian.org>  Tue, 18 May 2010 17:10:17 -0500
 +
 +r-cran-maps (2.1-2-1) unstable; urgency=low
 +
 +  * New upstream release.
 +
 + -- Chris Lawrence <lawrencc at debian.org>  Sun, 25 Apr 2010 19:42:03 -0500
 +
 +r-cran-maps (2.1-1-1) unstable; urgency=low
 +
 +  * New upstream release.
 +
 + -- Chris Lawrence <lawrencc at debian.org>  Tue, 30 Mar 2010 20:01:29 -0500
 +
 +r-cran-maps (2.1-0-1) unstable; urgency=low
 +
 +  * New upstream release.
 +
 + -- Chris Lawrence <lawrencc at debian.org>  Wed, 01 Apr 2009 12:06:12 -0500
 +
 +r-cran-maps (2.0-40-1) unstable; urgency=low
 +
 +  * New upstream release
 +
 + -- Chris Lawrence <lawrencc at debian.org>  Tue, 22 Apr 2008 21:11:11 -0500
 +
 +r-cran-maps (2.0-39-1) unstable; urgency=low
 +
 +  * New upstream release
 +
 + -- Chris Lawrence <lawrencc at debian.org>  Thu, 06 Dec 2007 19:17:25 -0600
 +
 +r-cran-maps (2.0-38-1) unstable; urgency=low
 +
 +  * New upstream release
 +
 + -- Chris Lawrence <lawrencc at debian.org>  Sat, 15 Sep 2007 22:15:33 -0500
 +
 +r-cran-maps (2.0-37-1) unstable; urgency=low
 +
 +  * New upstream release
 +
 + -- Chris Lawrence <lawrencc at debian.org>  Tue, 11 Sep 2007 17:48:45 -0500
 +
 +r-cran-maps (2.0-36-2) unstable; urgency=low
 +
 +  * Always use /usr/bin/awk when building.  (Closes: #440326)
 +
 + -- Chris Lawrence <lawrencc at debian.org>  Mon, 03 Sep 2007 17:36:57 -0500
 +
 +r-cran-maps (2.0-36-1) unstable; urgency=low
 +
 +  * New upstream release
 +
 + -- Chris Lawrence <lawrencc at debian.org>  Thu, 14 Jun 2007 13:55:34 -0500
 +
 +r-cran-maps (2.0-33-1) unstable; urgency=low
 +
 +  * New upstream release.
 +  * Update debian/watch.
 +
 + -- Chris Lawrence <lawrencc at debian.org>  Sat,  3 Feb 2007 22:53:02 -0600
 +
 +r-cran-maps (2.0-32-1) unstable; urgency=low
 +
 +  * New upstream release
 +
 + -- Chris Lawrence <lawrencc at debian.org>  Thu,  5 Oct 2006 02:18:47 -0500
 +
 +r-cran-maps (2.0-31-1) unstable; urgency=low
 +
 +  * New upstream release
 +
 + -- Chris Lawrence <lawrencc at debian.org>  Mon, 13 Feb 2006 19:53:15 -0500
 +
 +r-cran-maps (2.0-30-1) unstable; urgency=low
 +
 +  * New upstream release
 +
 + -- Chris Lawrence <lawrencc at debian.org>  Wed, 11 Jan 2006 04:10:26 -0500
 +
 +r-cran-maps (2.0-27-2) unstable; urgency=low
 +
 +  * Use mawk, even on platforms where gawk was present when r-base was
 +    built.  (Closes: #307683)
 +
 + -- Chris Lawrence <lawrencc at debian.org>  Mon,  9 May 2005 01:05:19 -0500
 +
 +r-cran-maps (2.0-27-1) unstable; urgency=low
 +
 +  * New upstream release.
 +
 + -- Chris Lawrence <lawrencc at debian.org>  Fri, 29 Apr 2005 19:41:07 -0500
 +
 +r-cran-maps (2.0-26-1) unstable; urgency=low
 +
 +  * New upstream release.
 +
 + -- Chris Lawrence <lawrencc at debian.org>  Sun, 23 Jan 2005 05:03:51 -0600
 +
 +r-cran-maps (2.0-25-1) unstable; urgency=low
 +
 +  * New upstream release.
 +
 + -- Chris Lawrence <lawrencc at debian.org>  Sun, 21 Nov 2004 00:44:28 -0600
 +
 +r-cran-maps (2.0-24-1) unstable; urgency=low
 +
 +  * New upstream release.
 +
 + -- Chris Lawrence <lawrencc at debian.org>  Fri, 29 Oct 2004 16:40:37 -0500
 +
 +r-cran-maps (2.0-23-2) unstable; urgency=low
 +
 +  * Upload to unstable.
 +
 + -- Chris Lawrence <lawrencc at debian.org>  Thu,  7 Oct 2004 23:52:37 -0500
 +
 +r-cran-maps (2.0-23-1) experimental; urgency=low
 +
 +  * New upstream release.
 +  * Build for R 2.0.0 beta.
 +
 + -- Chris Lawrence <lawrencc at debian.org>  Sat,  2 Oct 2004 04:07:57 -0500
 +
 +r-cran-maps (2.0-22-1) unstable; urgency=low
 +
 +  * New upstream release.
 +
 + -- Chris Lawrence <lawrencc at debian.org>  Wed, 21 Jul 2004 00:48:04 -0500
 +
 +r-cran-maps (2.0-21-1) unstable; urgency=low
 +
 +  * New upstream release
 +
 + -- Chris Lawrence <lawrencc at debian.org>  Fri,  4 Jun 2004 16:44:25 -0500
 +
 +r-cran-maps (2.0-20-1) unstable; urgency=low
 +
 +  * New upstream release.
 +
 + -- Chris Lawrence <lawrencc at debian.org>  Mon, 19 Apr 2004 18:53:25 -0500
 +
 +r-cran-maps (2.0-15-1) unstable; urgency=low
 +
 +  * New upstream release.
 +
 + -- Chris Lawrence <lawrencc at debian.org>  Tue, 17 Feb 2004 23:44:51 -0600
 +
 +r-cran-maps (2.0-13-1) unstable; urgency=low
 +
 +  * Initial Debian Release.  (Closes: #227670)
 +
 + -- Chris Lawrence <lawrencc at debian.org>  Wed, 14 Jan 2004 02:13:22 -0600
diff --cc debian/control
index 7798e34,0000000..e946f4e
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,24 -1,0 +1,24 @@@
 +Source: r-cran-maps
 +Section: gnu-r
 +Priority: optional
 +Maintainer: Chris Lawrence <lawrencc at debian.org>
 +Build-Depends: debhelper (>> 7), r-base-dev (>= 2.14), cdbs
- Standards-Version: 3.9.2
++Standards-Version: 3.9.3
 +
 +Package: r-cran-maps
 +Architecture: any
- Depends: r-base-core (>= 2.14), ${shlibs:Depends}, ${misc:Depends}
++Depends: ${R:Depends}, ${shlibs:Depends}, ${misc:Depends}
 +Suggests: r-cran-mapproj, r-cran-mapdata
 +Description: GNU R support for producing geographic maps
 + This package provides facilities for easily producing maps based on
 + data sets in the GNU R statistical computing environment.  
 + .
 + The r-cran-maps package includes map data for the United States
 + (including state and county-level maps), New Zealand, and a world
 + map; additional maps (including a higher-resolution world map) are
 + available in the suggested r-cran-mapdata package.
 + .
 + The suggested r-cran-mapproj package adds facilities for calculating
 + geographic projections, which are used by mapmakers to compensate for
 + the inaccuracies inherent in projecting a spheroid's surface onto a
 + two-dimensional plane.
diff --cc debian/rules
index 614d858,0000000..62c5ab3
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,27 -1,0 +1,9 @@@
 +#!/usr/bin/make -f
 +# 							-*- makefile -*-
 +# debian/rules file for the Debian/GNU Linux r-cran-car package
 +# Copyright 2003 by Dirk Eddelbuettel <edd at debian.org>
 +
- include /usr/share/cdbs/1/rules/debhelper.mk
- include /usr/share/cdbs/1/class/langcore.mk
- 
- ## We need the CRAN (upstream) name 
- cranName	:= $(shell grep Package: DESCRIPTION | cut -f2 -d" ")
- ## and we need to build a Debian Policy-conformant lower-case package name
- cranNameLC	:= $(shell echo $(cranName) | tr "[A-Z]" "[a-z]" | tr "." "-" )
- ## which we can use to build the package directory 
- package		:= r-cran-$(cranNameLC)
- ## which we use for the to-be-installed-in directory
- debRlib		:= $(CURDIR)/debian/$(package)/usr/lib/R/site-library
- 
- common-install-indep:: R_any_arch
- common-install-arch:: R_any_arch
- 
- R_any_arch:
- 		dh_installdirs		usr/lib/R/site-library
- 		AWK=/usr/bin/awk R CMD INSTALL -l $(debRlib) .
- 		rm -vf $(debRlib)/R.css $(debRlib)/$(cranName)/COPYING
++include /usr/share/R/debian/r-cran.mk
 +
 +clean::
 +		(cd src; make clean)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/r-cran-maps.git



More information about the debian-science-commits mailing list