[med-svn] [r-cran-adegraphics] 01/03: Update for new location of shapes/sids.shp

[Graham Inggs]

This is an automated email from the git hooks/post-receive script.

ginggs pushed a commit to branch master
in repository r-cran-adegraphics.

commit 697ba552a0c44b264df5e25a42ffc8ac252f8e89
Author: Graham Inggs <ginggs at debian.org>
Date:   Sun Oct 15 18:57:35 2017 +0200

    Update for new location of shapes/sids.shp
---
 debian/changelog                                 |  6 +++++
 debian/patches/series                            |  2 +-
 debian/patches/shapes_sids.shp_is_in_spdep.patch | 28 ++++++++++--------------
 3 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d358eb2..5b4ed45 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+r-cran-adegraphics (1.0-8-2) UNRELEASED; urgency=medium
+
+  * Update for new location of shapes/sids.shp
+
+ -- Graham Inggs <ginggs at debian.org>  Sun, 15 Oct 2017 16:56:39 +0000
+
 r-cran-adegraphics (1.0-8-1) unstable; urgency=medium
 
   * New upstream version
diff --git a/debian/patches/series b/debian/patches/series
index 1cb477a..8c929ec 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-# shapes_sids.shp_is_in_spdep.patch
+shapes_sids.shp_is_in_spdep.patch
diff --git a/debian/patches/shapes_sids.shp_is_in_spdep.patch b/debian/patches/shapes_sids.shp_is_in_spdep.patch
index 2a7e185..e3a1033 100644
--- a/debian/patches/shapes_sids.shp_is_in_spdep.patch
+++ b/debian/patches/shapes_sids.shp_is_in_spdep.patch
@@ -1,50 +1,46 @@
-Description: Specify absolute Path of shape file shapes/sids.shp from package spdep
- For some reason the shape file is not found - make sure it can be found at
- absolute path
- .
- FIXME: This does not fix the problem
-Author: Andreas Tille <tille at debian.org>
-Last-Update: Sun, 15 Jan 2017 21:24:20 +0100
-
+Description: Update for new location of shapes/sids.shp
+Forwarded: https://github.com/sdray/adegraphics/pull/4
+Author: Graham Inggs <ginggs at debian.org>
+Last-Update: 2017-10-15
 --- a/tests/panelSpatial.R
 +++ b/tests/panelSpatial.R
-@@ -3,7 +3,7 @@ library(maptools)
+@@ -3,7 +3,7 @@
  pdf("panelSpatial.pdf")
  
  ## ex1
 -nc <- readShapePoly(system.file("shapes/sids.shp", package = "maptools")[1], proj4string = CRS("+proj=longlat +datum=NAD27"))
-+nc <- readShapePoly(system.file("/usr/lib/R/site-library/spdep/etc/shapes/sids.shp", package = "maptools")[1], proj4string = CRS("+proj=longlat +datum=NAD27"))
++nc <- readShapePoly(system.file("etc/shapes/sids.shp", package = "spdep")[1], proj4string = CRS("+proj=longlat +datum=NAD27"))
  dfxy1 <- coordinates(nc)
  g1 <- s.label(dfxy1, Sp = nc, pSp.col = colorRampPalette(c("yellow", "blue"))(52), pgrid.draw = FALSE, plabels.cex = 0)
  
-@@ -49,7 +49,7 @@ g4 <- s.class(dfxy4, region.names, ellip
+@@ -49,7 +49,7 @@
  ## ex4
  library(sp)
  library(lattice)
 -nc <- readShapePoly(system.file("shapes/sids.shp", package = "maptools")[1], proj4string = CRS("+proj=longlat +datum=NAD27"))
-+nc <- readShapePoly(system.file("/usr/lib/R/site-library/spdep/etc/shapes/sids.shp", package = "maptools")[1], proj4string = CRS("+proj=longlat +datum=NAD27"))
++nc <- readShapePoly(system.file("etc/shapes/sids.shp", package = "spdep")[1], proj4string = CRS("+proj=longlat +datum=NAD27"))
  
  sp <- SpatialPolygons(nc at polygons, nc at plotOrder)
  g5 <- xyplot(1 ~ 1, xlim = bbox(sp)[1, ], ylim = bbox(sp)[2, ], panel = function(...) {adeg.panel.Spatial(SpObject = sp, col = "black", border = "black")})
 --- a/man/adeg.panel.Spatial.Rd
 +++ b/man/adeg.panel.Spatial.Rd
-@@ -69,7 +69,7 @@ adeg.panel.Spatial(SpObject, sp.layout =
+@@ -69,7 +69,7 @@
  
  if(require(maptools, quietly = TRUE) & require(lattice, quietly = TRUE)) {
  
 -nc <- readShapePoly(system.file("shapes/sids.shp", package = "maptools")[1], 
-+nc <- readShapePoly(system.file("shapes/sids.shp", package = "shapes/sids.shp")[1], 
++nc <- readShapePoly(system.file("etc/shapes/sids.shp", package = "spdep")[1],
    proj4string = CRS("+proj=longlat +datum=NAD27"))
  xy <- coordinates(nc)
  arrow <- list("SpatialPolygonsRescale", layout.north.arrow(), 
 --- a/tests/parameter.R
 +++ b/tests/parameter.R
-@@ -79,7 +79,7 @@ update(g3, plines = list(col = "blue", l
+@@ -79,7 +79,7 @@
  
  ## with spatial object
  library(maptools)
 -nc <- readShapePoly(system.file("shapes/sids.shp", package = "maptools")[1], proj4string = CRS("+proj=longlat +datum=NAD27"))
-+nc <- readShapePoly(system.file("/usr/lib/R/site-library/spdep/etc/shapes/sids.shp", package = "maptools")[1], proj4string = CRS("+proj=longlat +datum=NAD27"))
++nc <- readShapePoly(system.file("etc/shapes/sids.shp", package = "spdep")[1], proj4string = CRS("+proj=longlat +datum=NAD27"))
  xy <- coordinates(nc)
  g4 <- s.label(xy, label = as.character(1:nrow(xy)), porigin.include = FALSE, Sp = nc, pSp.col = colorRampPalette(c("yellow", "blue"))(52), pgrid.draw = TRUE)
  update(g4, pSp = list(col = "yellow", border = "blue", lwd = 2, lty = 5, alpha = 0.01)) ## don't match : to solve

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/r-cran-adegraphics.git