[med-svn] [r-cran-adegraphics] 08/13: Add a patch with a no-successful attemt to fix autopkgtest

[Andreas Tille]

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

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

commit 29faf6c727b7a0594afae667c701dc9ded896ea4
Author: Andreas Tille <tille at debian.org>
Date:   Sat Sep 30 08:17:47 2017 +0200

    Add a patch with a no-successful attemt to fix autopkgtest
---
 debian/patches/series                            |  1 +
 debian/patches/shapes_sids.shp_is_in_spdep.patch | 50 ++++++++++++++++++++++++
 debian/tests/run-unit-test                       |  5 ++-
 3 files changed, 54 insertions(+), 2 deletions(-)

diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..1cb477a
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+# 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
new file mode 100644
index 0000000..794cef3
--- /dev/null
+++ b/debian/patches/shapes_sids.shp_is_in_spdep.patch
@@ -0,0 +1,50 @@
+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
+
+--- a/tests/panelSpatial.R
++++ b/tests/panelSpatial.R
+@@ -3,7 +3,7 @@ library(maptools)
+ 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"))
+ 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
+ ## 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"))
+ 
+ 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 =
+ 
+ if(require(maptools, quiet = TRUE) & require(lattice, quiet = TRUE)) {
+ 
+-nc <- readShapePoly(system.file("shapes/sids.shp", package = "maptools")[1], 
++nc <- readShapePoly(system.file("shapes/sids.shp", package = "shapes/sids.shp")[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
+ 
+ ## 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"))
+ 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
diff --git a/debian/tests/run-unit-test b/debian/tests/run-unit-test
index 4a4773d..46a766d 100644
--- a/debian/tests/run-unit-test
+++ b/debian/tests/run-unit-test
@@ -1,14 +1,15 @@
 #!/bin/sh -e
 
 oname=adegraphics
-pkg=r-cran-`echo $oname | tr [A-Z] [a-z]`
+pkg=r-cran-`echo $oname | tr '[A-Z]' '[a-z]'`
 
 if [ "$ADTTMP" = "" ] ; then
   ADTTMP=`mktemp -d /tmp/${pkg}-test.XXXXXX`
+#  trap "rm -rf $ADTTMP" 0 INT QUIT ABRT PIPE TERM
 fi
 cd $ADTTMP
 cp -a /usr/share/doc/${pkg}/tests/* $ADTTMP
+gunzip -r *
 for rscript in *.R ; do
    LC_ALL=C R --no-save < $rscript
 done
-rm -fr $ADTTMP/*

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