[r-cran-spdep] 18/26: Removed file with non-free license + according patches from SVN

[Sébastien Villemot]

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

sebastien pushed a commit to branch master
in repository r-cran-spdep.

commit 60e81751eb6ab1545ff7c1957548f2e076b50d44
Author: Andreas Tille <tille at debian.org>
Date:   Wed Jun 1 23:17:51 2016 +0000

    Removed file with non-free license + according patches from SVN
---
 debian/changelog                                   |  6 +++---
 debian/copyright                                   | 15 +-------------
 ...atch_from_svn_to_enable_removing_soigraph.patch | 23 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 debian/watch                                       |  4 +++-
 5 files changed, 31 insertions(+), 18 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c62023e..02814db 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
-r-cran-spdep (0.6-4-1) unstable; urgency=low
+r-cran-spdep (0.6-4+dfsg-1) unstable; urgency=low
 
   * Initial release (Closes: #752876).
-  * Upstream clarified licence
+  * Upstream clarified licence, file with non-free license is removed
 
- -- Andreas Tille <tille at debian.org>  Wed, 23 Mar 2016 12:03:26 +0100
+ -- Andreas Tille <tille at debian.org>  Thu, 02 Jun 2016 01:06:17 +0200
diff --git a/debian/copyright b/debian/copyright
index 5ead50e..66cc16c 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,6 +2,7 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: spdep
 Upstream-Contact: Roger Bivand <Roger.Bivand at nhh.no>
 Source: http://cran.r-project.org/web/packages/spdep/
+Files-Excluded: */soigraph.c
 
 Files: *
 Copyright: 2008-2014 Roger Bivand,
@@ -120,20 +121,6 @@ Remark: The code at:
  --------------------------------------------------------------------
  */
 
-Files: src/soigraph.c
-Copyright: 2001 Nicholas Lewin-Koh
-License: soigraph
- The subroutines TwoCirclesxx and SubVec are adapted for R and Double
- precision coordinates by Nicholas Lewin-Koh, from Computational
- Geometry in C, Joseph O'Rourke, Cambridge University Press
- (1998). Copyright for those subroutines remains his.
- .
- This code may be freely redistributed in its entirety provided that this
- copyright notice is not removed.
-Remark: The code at:
- http://cs.smith.edu/~orourke/books/ftp.html
- http://cs.smith.edu/~orourke/CGCode/SecondEdition/Ccode2.tar.gz
-
 Files: debian/*
 Copyright: 2014 Andreas Tille <tille at debian.org>
 License: GPL-2+
diff --git a/debian/patches/patch_from_svn_to_enable_removing_soigraph.patch b/debian/patches/patch_from_svn_to_enable_removing_soigraph.patch
new file mode 100644
index 0000000..673a38a
--- /dev/null
+++ b/debian/patches/patch_from_svn_to_enable_removing_soigraph.patch
@@ -0,0 +1,23 @@
+Origin: Upstream SVN
+Description: Enable removing src/soigraph.c
+
+--- a/src/init.c
++++ b/src/init.c
+@@ -9,7 +9,6 @@ static const R_CMethodDef CEntries[]  =
+     {"compute_gabriel", (DL_FUNC) &compute_gabriel, 7},
+     {"compute_relative", (DL_FUNC) &compute_relative, 7},
+     {"prunemst", (DL_FUNC) &prunemst, 4},
+-    {"compute_soi", (DL_FUNC) &compute_soi, 10},
+     {"gcdist", (DL_FUNC) &gcdist, 5},
+     {"knearneigh", (DL_FUNC) &knearneigh, 7},
+     {NULL, NULL, 0}
+--- a/src/spdep.h
++++ b/src/spdep.h
+@@ -52,7 +52,6 @@ void dfs(SEXP nblst, SEXP cmpnm, SEXP vi
+ void compute_gabriel(int *no_nodes, int *g1, int *g2, int *nogab, int *ngaballoc,  double *nodes_xd, double *nodes_yd);
+ void compute_relative(int *no_nodes, int *g1, int *g2, int *nogab, int *ngaballoc, double *nodes_xd, double *nodes_yd);
+ void prunemst(int *e1, int *e2, int *ne, int *gr);
+-void compute_soi(int *no_nodes, int *g1, int *g2, int *noedges, int *noneigh, int *neigh, int *nearneigh, double *rad, double *nodes_xd, double *nodes_yd);
+ 
+ void gcdist(double *lon1, double *lon2, double *lat1, double *lat2, double *dist);
+ void knearneigh(int *kin, int *pnte, int *p, double *test, int *res, double *dists, int *lonlat);
diff --git a/debian/patches/series b/debian/patches/series
index 16b17ee..74c98f2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
+patch_from_svn_to_enable_removing_soigraph.patch
 use_libjs_mathjax.patch
diff --git a/debian/watch b/debian/watch
index 16b97e6..823dc3d 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,4 @@
 version=3
-http://cran.r-project.org/src/contrib/spdep_([-\d.]*)\.tar\.gz
+
+opts="repacksuffix=+dfsg,dversionmangle=s/\+dfsg//g,repack,compression=xz" \
+  http://cran.r-project.org/src/contrib/spdep_([-\d.]*)\.tar\.gz

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