[r-cran-spam] 03/09: Upgrade spam packaging to latest standards

Sébastien Villemot sebastien at debian.org
Fri Nov 17 09:18:48 UTC 2017


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

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

commit 86c30de217ef5f5eeecd8cb5815249ed9277f53b
Author: Andreas Tille <tille at debian.org>
Date:   Fri Oct 10 15:26:19 2014 +0000

    Upgrade spam packaging to latest standards
---
 debian/README.source       | 11 +++++++
 debian/README.test         |  8 +++++
 debian/changelog           |  6 ++--
 debian/compat              |  2 +-
 debian/control             | 29 ++++++++++--------
 debian/copyright           | 76 ++++++++--------------------------------------
 debian/docs                |  3 ++
 debian/get-orig-source     |  7 -----
 debian/rules               |  7 +----
 debian/source/format       |  1 +
 debian/tests/control       |  3 ++
 debian/tests/run-unit-test | 24 +++++++++++++++
 debian/watch               |  4 ---
 13 files changed, 84 insertions(+), 97 deletions(-)

diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 0000000..2d903cb
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,11 @@
+Explanation for binary files inside source package according to
+  http://lists.debian.org/debian-devel/2013/09/msg00332.html
+
+Files: data/weather.rda
+Documented in: man/weather.Rd
+  The data were obtained from Cliff Mass and Jeff Baars in the University
+  of Washington Department of Atmospheric Sciences.
+
+
+ -- Andreas Tille <tille at debian.org>  Mon, 23 Jun 2014 09:24:05 +0200
+
diff --git a/debian/README.test b/debian/README.test
new file mode 100644
index 0000000..ef34ccc
--- /dev/null
+++ b/debian/README.test
@@ -0,0 +1,8 @@
+Notes on how this package can be tested.
+────────────────────────────────────────
+
+To run the unit tests provided by the package you can do
+
+   sh run-unit-test
+
+in this directory.
diff --git a/debian/changelog b/debian/changelog
index bad7e83..8b26fd6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,5 @@
-r-cran-spam (0.15.4-1) UNRELEASED; urgency=low
+r-cran-spam (1.0-1-1) UNRELEASED; urgency=medium
 
-  * Initial release (Closes: #).
+  * Initial release (Closes: #???).
 
- -- Andreas Tille <tille at debian.org>  Tue, 21 Apr 2009 13:41:52 +0200
+ -- Andreas Tille <tille at debian.org>  Fri, 10 Oct 2014 17:04:23 +0200
diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index 538f06b..aae652f 100644
--- a/debian/control
+++ b/debian/control
@@ -1,20 +1,25 @@
 Source: r-cran-spam
-Section: non-free/science
+Section: gnu-r
 Priority: optional
 Maintainer: Debian Science Team <debian-science-maintainers at lists.alioth.debian.org>
 Uploaders: Andreas Tille <tille at debian.org>
-DM-Upload-Allowed: yes
-Build-Depends: debhelper (>= 7.0), cdbs, r-base-dev
-Standards-Version: 3.8.1
+Build-Depends: debhelper (>= 9.0),
+               cdbs,
+               r-base-dev
+Standards-Version: 3.9.6
+Vcs-Browser: http://anonscm.debian.org/viewvc/debian-science/packages/R/r-cran-spam/trunk/
+Vcs-Svn: svn://anonscm.debian.org/debian-science/packages/R/r-cran-spam/trunk/
 Homepage: http://cran.r-project.org/web/packages/spam/
-Vcs-Browser: http://svn.debian.org/wsvn/debian-science/packages/R/r-cran-spam/trunk/
-Vcs-Svn: svn://svn.debian.org/debian-science/packages/R/r-cran-spam/trunk/
 
 Package: r-cran-spam
 Architecture: any
-Depends: ${shlibs:Depends}, r-base-core, r-cran-mvtnorm, r-cran-survival
-Description: GNU R SPArse Matrix
- Set of function for sparse matrix algebra. Differences with SparseM/Matrix are:
- (1) onlyone sparse matrix format is supported (essentially) , (2) based on
- transparent and simple structure(s), (3) tailored for MCMC calculations within
- GMRF. (4) S3 and S4 like-"compatible" ... and it is fast.
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
+         ${R:Depends}
+Description: GNU R functions for sparse matrix algebra
+ Set of functions for sparse matrix algebra. Differences with SparseM/Matrix
+ are:
+  1. only (essentially) one sparse matrix format supported,
+  2. based on transparent and simple structure(s),
+  3. tailored for MCMC calculations within GMRF.
+  4. S3 and S4 like-"compatible"
diff --git a/debian/copyright b/debian/copyright
index 2ec605e..2374ea9 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,70 +1,18 @@
-Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: spam
-Upstream-Maintainer: Reinhard Furrer <rfurrer at mines.edu>
-Upstream-Source: http://cran.r-project.org/web/packages/spam/
-X-Debianized-By: Andreas Tille <tille at debian.org>
-X-Packaged-Date: Tue, 21 Apr 2009 13:41:52 +0200
-
-Files: debian/*
-Copyright: 2009 Andreas Tille <tille at debian.org>
-License: Same as spam itself
+Upstream-Contact: Reinhard Furrer <reinhard.furrer at math.uzh.ch>
+Source: http://cran.r-project.org/web/packages/spam/
 
 Files: *
-Copyright: (C) 2008, 2009 Reinhard Furrer
-
-All R code and documentation in this package is licensed under the terms of the GPL license.  
-
-The Fortran functions in spammodified.f were written by Reinhard Furrer.
-
-The Fortran functions in bckslvmodified.f cholmod.f are modifications of 
-Fortran functions provided by the SparseM package.
-
-The code in cholesky.f is a modified version of code originally
-written by Esmond Ng and Barry Peyton.  The modified version is
-distributed as part of PCx by Czyzyk, Mehrotra, Wagner, and Wright and
-is copywrite by the University of Chicago.  The PCx distribution makes
-the following stipulation:
-
-
-	This software discloses material protectable under copyright 
-	laws of the United States. Permission is hereby granted to use, 
-	reproduce, prepare derivative works, and redistribute to others 
-	at no charge, provided that the original PCx copyright notice, 
-	Government license and disclaimer are retained and any changes 
-	are clearly documented; however, any entity desiring permission 
-	to use this software within a commercial organization or to 
-	incorporate this software or a work based on the software into 
-	a product for sale must contact Paul Betten at the Industrial 
-	Technology Development Center, Argonne National Laboratory.
-
-		PAUL BETTEN
-		betten at anl.gov
-		Industrial Technology Development Center,
-		Argonne National Laboratory,
-		Argonne, IL 60439
-		(630) 252-4962
-		FAX: (630) 252-5230 
-
-All other Fortran functions are from
-
-   http://www-users.cs.umn.edu/~saad/software/SPARSKIT/sparskit.html
-
-(GNU Lesser General Public License)
+Copyright: 2012-2014 Reinhard Furrer <reinhard.furrer at math.uzh.ch>,
+                     Florian Gerber 
+License: LGPL-2
 
+Files: debian/*
+Copyright: 2014 Andreas Tille <tille at debian.org>
+License: LGPL-2
 
+License: LGPL-2
+ On Debian systems, the complete text of the GNU Library General Public
+ License can be found in `/usr/share/common-licenses/LGPL-2'.
 
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
- .
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
- .
- You should have received a copy of the GNU General Public License along
- with this program; if not, write to the Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-X-Comment: On Debian systems, the complete text of the GNU General Public
- License can be found in `/usr/share/common-licenses/GPL'.
diff --git a/debian/docs b/debian/docs
new file mode 100644
index 0000000..3adf0d6
--- /dev/null
+++ b/debian/docs
@@ -0,0 +1,3 @@
+debian/README.test
+debian/tests/run-unit-test
+tests
diff --git a/debian/get-orig-source b/debian/get-orig-source
deleted file mode 100644
index 96ee179..0000000
--- a/debian/get-orig-source
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-PKG=`dpkg-parsechangelog | awk '/^Source/ { print $2 }'`
-RENAME=`uscan --verbose --force-download | \
-   grep "Newest version on remote site is .* local version is .*" | \
-   head -n 1 | \
-   sed "s?Newest .* \([-0-9.]\+\),.* \([0-9.]\+\)?mv ../${PKG}_\1.orig.tar.gz ../${PKG}_\2.orig.tar.gz?"`
-$RENAME
diff --git a/debian/rules b/debian/rules
index e5b3cd3..1cb1c9f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,9 +1,4 @@
 #!/usr/bin/make -f
-# 							-*- makefile -*-
-# debian/rules file for the Debian/GNU Linux r-cran-spam package
-# Copyright 2009 by Andreas Tille <tille at debian.org>
+#	-*- makefile -*-
 
 include /usr/share/R/debian/r-cran.mk
-
-get-orig-source:
-	. debian/get-orig-source
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/tests/control b/debian/tests/control
new file mode 100644
index 0000000..d2aa55a
--- /dev/null
+++ b/debian/tests/control
@@ -0,0 +1,3 @@
+Tests: run-unit-test
+Depends: @
+Restrictions: allow-stderr
diff --git a/debian/tests/run-unit-test b/debian/tests/run-unit-test
new file mode 100644
index 0000000..5899a77
--- /dev/null
+++ b/debian/tests/run-unit-test
@@ -0,0 +1,24 @@
+#!/bin/sh -e
+
+oname=spam
+pkg=r-cran-`echo $oname | tr [A-Z] [a-z]`
+
+if [ "$ADTTMP" = "" ] ; then
+  ADTTMP=`mktemp -d /tmp/${pkg}-test.XXXXXX`
+fi
+cd $ADTTMP
+cp -a /usr/share/doc/${pkg}/tests/* $ADTTMP
+# gunzip *.gz
+export LC_ALL=C
+for test in *R
+do
+  R CMD BATCH ${test}
+  if [ ! $? ] ; then
+    echo "Test ${test} failed"
+    exit 1
+  else
+    echo "Test ${test} passed"
+  fi
+  rm -f ${test}out .RData
+done
+rm -f $ADTTMP/*
diff --git a/debian/watch b/debian/watch
index e24d111..6f56757 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,6 +1,2 @@
 version=3
-# Same effect as dversionmangle, but we have to rename the orig.tar.gz
-# anyway and it is easier to write a get-origsource script this way
-# opts="uversionmangle=s/([\d.]+)-(\d)/$1.$2/"
-opts="dversionmangle=s/([\d.]+)\.(\d)/$1-$2/" \
 http://cran.r-project.org/src/contrib/spam_([-\d.]*)\.tar\.gz

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



More information about the debian-science-commits mailing list