[r-cran-spdep] 19/24: Upload new upstream without questionably licensed file and fixed copyright
Sébastien Villemot
sebastien at debian.org
Sun Nov 19 15:23:33 UTC 2017
This is an automated email from the git hooks/post-receive script.
sebastien pushed a commit to annotated tag debian/0.6-15-1
in repository r-cran-spdep.
commit f16b132969334855b45399e069847a2f4e8e6c74
Author: Andreas Tille <tille at debian.org>
Date: Sat Jun 25 15:10:49 2016 +0000
Upload new upstream without questionably licensed file and fixed copyright
---
changelog | 7 +--
copyright | 50 ++++++----------------
...atch_from_svn_to_enable_removing_soigraph.patch | 23 ----------
patches/series | 1 -
watch | 2 +-
5 files changed, 19 insertions(+), 64 deletions(-)
diff --git a/changelog b/changelog
index 02814db..90736bd 100644
--- a/changelog
+++ b/changelog
@@ -1,6 +1,7 @@
-r-cran-spdep (0.6-4+dfsg-1) unstable; urgency=low
+r-cran-spdep (0.6-5-1) unstable; urgency=low
* Initial release (Closes: #752876).
- * Upstream clarified licence, file with non-free license is removed
+ * Upstream has removed file with non-free license
+ * More copyright fixes (thanks to Thorsten Alteholz)
- -- Andreas Tille <tille at debian.org> Thu, 02 Jun 2016 01:06:17 +0200
+ -- Andreas Tille <tille at debian.org> Sat, 25 Jun 2016 17:03:07 +0200
diff --git a/copyright b/copyright
index 66cc16c..7a80822 100644
--- a/copyright
+++ b/copyright
@@ -2,10 +2,9 @@ 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,
+Copyright: 2008-2016 Roger Bivand,
Micah Altman,
Luc Anselin,
Renato Assunção,
@@ -87,42 +86,21 @@ Copyright: 2005 Yongwan Chun, Michael Tiefelsdorf and Roger Bivand
License: GPL-2+
Files: R/bptest.sarlm.R
-Copyright: 1998 Joseph O'Rourke <orourke at cs.smith.edu>
-License: freelyredistributable
- 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
- .
- includes arm/arm.c with the affected functions. This file has:
- .
- /*
- This code is described in "Computational Geometry in C" (Second Edition),
- Chapter 8. It is not written to be comprehensible without the
- explanation in that book.
- .
- Prints out one arm configuration to reach given target.
- Assumes number of links >= 3.
- Input:
- nlinks Number of links
- L1 L2 ... Ln Link lengths
- x0 y0 target0
- x1 x2 target1
- ...
- .
- Written by Joseph O'Rourke.
- Last modified: December 1997
- Questions to orourke at cs.smith.edu.
- --------------------------------------------------------------------
- This code is Copyright 1998 by Joseph O'Rourke. It may be freely
- redistributed in its entirety provided that this copyright notice is
- not removed.
- --------------------------------------------------------------------
- */
+Copyright: 2004-2011 Roger Bivand
+ original taken from bptest() in the lmtest package, 2001 Torsten Hothorn and Achim Zeileis
+License: GPL-2+
+
+Files: R/lextrB.R
+Copyright: 2015 Roger S. Bivand, Yongwan Chun and Daniel A. Griffith
+License: GPL-2+
+
+Files: R/nb2mat.R
+Copyright: 2001-2010 Roger Bivand, Markus Reder and Werner Mueller
+ 2015 Martin Gubri
+License: GPL-2+
Files: debian/*
-Copyright: 2014 Andreas Tille <tille at debian.org>
+Copyright: 2014-2016 Andreas Tille <tille at debian.org>
License: GPL-2+
License: GPL-2+
diff --git a/patches/patch_from_svn_to_enable_removing_soigraph.patch b/patches/patch_from_svn_to_enable_removing_soigraph.patch
deleted file mode 100644
index 673a38a..0000000
--- a/patches/patch_from_svn_to_enable_removing_soigraph.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-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/patches/series b/patches/series
index 74c98f2..16b17ee 100644
--- a/patches/series
+++ b/patches/series
@@ -1,2 +1 @@
-patch_from_svn_to_enable_removing_soigraph.patch
use_libjs_mathjax.patch
diff --git a/watch b/watch
index 823dc3d..eacbe9b 100644
--- a/watch
+++ b/watch
@@ -1,4 +1,4 @@
version=3
-opts="repacksuffix=+dfsg,dversionmangle=s/\+dfsg//g,repack,compression=xz" \
+opts="repacksuffix=+dfsg,dversionmangle=s/\+dfsg//g" \
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
More information about the debian-science-commits
mailing list