[med-svn] [r-cran-adegraphics] 01/01: Add test Depends: r-cran-guerry, drop skip_test_needing_guerry.patch

[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 c3e3922814d555df66a1fc7911efda7c5645c0a0
Author: Graham Inggs <ginggs at debian.org>
Date:   Thu Nov 9 15:40:46 2017 +0200

    Add test Depends: r-cran-guerry, drop skip_test_needing_guerry.patch
---
 debian/changelog                              |  8 ++++++++
 debian/patches/series                         |  1 -
 debian/patches/skip_test_needing_guerry.patch | 26 --------------------------
 debian/tests/control                          |  2 +-
 4 files changed, 9 insertions(+), 28 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f478b4c..65c607f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+r-cran-adegraphics (1.0-8-3) unstable; urgency=medium
+
+  * Team upload
+  * Add test Depends: r-cran-guerry
+  * Drop skip_test_needing_guerry.patch
+
+ -- Graham Inggs <ginggs at debian.org>  Thu, 09 Nov 2017 13:29:20 +0000
+
 r-cran-adegraphics (1.0-8-2) unstable; urgency=medium
 
   * Team upload
diff --git a/debian/patches/series b/debian/patches/series
index c190a13..8c929ec 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 shapes_sids.shp_is_in_spdep.patch
-skip_test_needing_guerry.patch
diff --git a/debian/patches/skip_test_needing_guerry.patch b/debian/patches/skip_test_needing_guerry.patch
deleted file mode 100644
index 1f3f8d1..0000000
--- a/debian/patches/skip_test_needing_guerry.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Description: Skip test needing Guerry
- This patch may be dropped once r-cran-guerry clears NEW, see #878577
-Author: Graham Inggs <ginggs at debian.org>
-Last-Update: 2017-10-15
---- a/tests/panelSpatial.R
-+++ b/tests/panelSpatial.R
-@@ -37,13 +37,13 @@
-   porigin.include = FALSE, Sp = meuse.sr)
- 
- ## ex3
--library(Guerry)
--data(gfrance85)
-+#library(Guerry)
-+#data(gfrance85)
- 
--dfxy4 <- coordinates(gfrance85)
--region.names <- data.frame(gfrance85)[, 5]
--col.region <- colors()[c(149, 254, 468, 552, 26)]
--g4 <- s.class(dfxy4, region.names, ellip = 0, star = 0, col = col.region, Sp = gfrance85, pSp.col = col.region[region.names], porig.inclu = F)
-+#dfxy4 <- coordinates(gfrance85)
-+#region.names <- data.frame(gfrance85)[, 5]
-+#col.region <- colors()[c(149, 254, 468, 552, 26)]
-+#g4 <- s.class(dfxy4, region.names, ellip = 0, star = 0, col = col.region, Sp = gfrance85, pSp.col = col.region[region.names], porig.inclu = F)
- 
- 
- ## ex4
diff --git a/debian/tests/control b/debian/tests/control
index 26bc112..4e0b128 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,3 +1,3 @@
 Tests: run-unit-test
-Depends: @, r-cran-testthat, r-cran-spdep, r-cran-maptools
+Depends: @, r-cran-testthat, r-cran-spdep, r-cran-maptools, r-cran-guerry
 Restrictions: allow-stderr

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