r47308 - in /packages/R/r-cran-spdep/trunk/debian: changelog copyright patches/patch_from_svn_to_enable_removing_soigraph.patch patches/series watch

[tille at users.alioth.debian.org]

Author: tille
Date: Sat Jun 25 15:10:49 2016
New Revision: 47308

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=47308
Log:
Upload new upstream without questionably licensed file and fixed copyright

Removed:
    packages/R/r-cran-spdep/trunk/debian/patches/patch_from_svn_to_enable_removing_soigraph.patch
Modified:
    packages/R/r-cran-spdep/trunk/debian/changelog
    packages/R/r-cran-spdep/trunk/debian/copyright
    packages/R/r-cran-spdep/trunk/debian/patches/series
    packages/R/r-cran-spdep/trunk/debian/watch

Modified: packages/R/r-cran-spdep/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/R/r-cran-spdep/trunk/debian/changelog?rev=47308&op=diff
==============================================================================
--- packages/R/r-cran-spdep/trunk/debian/changelog	(original)
+++ packages/R/r-cran-spdep/trunk/debian/changelog	Sat Jun 25 15:10:49 2016
@@ -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

Modified: packages/R/r-cran-spdep/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/debian-science/packages/R/r-cran-spdep/trunk/debian/copyright?rev=47308&op=diff
==============================================================================
--- packages/R/r-cran-spdep/trunk/debian/copyright	(original)
+++ packages/R/r-cran-spdep/trunk/debian/copyright	Sat Jun 25 15:10:49 2016
@@ -2,10 +2,9 @@
 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 @@
 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+

Modified: packages/R/r-cran-spdep/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/R/r-cran-spdep/trunk/debian/patches/series?rev=47308&op=diff
==============================================================================
--- packages/R/r-cran-spdep/trunk/debian/patches/series	(original)
+++ packages/R/r-cran-spdep/trunk/debian/patches/series	Sat Jun 25 15:10:49 2016
@@ -1,2 +1 @@
-patch_from_svn_to_enable_removing_soigraph.patch
 use_libjs_mathjax.patch

Modified: packages/R/r-cran-spdep/trunk/debian/watch
URL: http://svn.debian.org/wsvn/debian-science/packages/R/r-cran-spdep/trunk/debian/watch?rev=47308&op=diff
==============================================================================
--- packages/R/r-cran-spdep/trunk/debian/watch	(original)
+++ packages/R/r-cran-spdep/trunk/debian/watch	Sat Jun 25 15:10:49 2016
@@ -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