r46731 - in /packages/R/r-cran-polycub/trunk/debian: README.test changelog control copyright docs patches/ patches/series patches/skip_gpclib_test.patch tests/ tests/control tests/run-unit-test

tille at users.alioth.debian.org tille at users.alioth.debian.org
Mon Jun 23 14:03:56 UTC 2014 

Author: tille
Date: Mon Jun 23 14:03:56 2014
New Revision: 46731

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=46731
Log:
New upstream version, Add autopkgtest

Added:
    packages/R/r-cran-polycub/trunk/debian/patches/
    packages/R/r-cran-polycub/trunk/debian/patches/series
    packages/R/r-cran-polycub/trunk/debian/patches/skip_gpclib_test.patch
    packages/R/r-cran-polycub/trunk/debian/tests/
    packages/R/r-cran-polycub/trunk/debian/tests/control
    packages/R/r-cran-polycub/trunk/debian/tests/run-unit-test
Modified:
    packages/R/r-cran-polycub/trunk/debian/README.test
    packages/R/r-cran-polycub/trunk/debian/changelog
    packages/R/r-cran-polycub/trunk/debian/control
    packages/R/r-cran-polycub/trunk/debian/copyright
    packages/R/r-cran-polycub/trunk/debian/docs

Modified: packages/R/r-cran-polycub/trunk/debian/README.test
URL: http://svn.debian.org/wsvn/debian-science/packages/R/r-cran-polycub/trunk/debian/README.test?rev=46731&op=diff
==============================================================================
--- packages/R/r-cran-polycub/trunk/debian/README.test	(original)
+++ packages/R/r-cran-polycub/trunk/debian/README.test	Mon Jun 23 14:03:56 2014
@@ -1,24 +1,21 @@
 Notes on how this package can be tested.
 ────────────────────────────────────────
 
-This package can be tested by running the provided test:
+To run the unit tests provided by the package you can do
 
+   sh  run-unit-test
 
-#!/bin/sh -e
-DIR=`mktemp -d`
-cd $DIR
-cp -a /usr/share/doc/r-cran-polycub/tests/* .
-LC_ALL=C R --no-save < test-all.R
-cd ..
-rm -rf $DIR
+in this directory.
 
+One test of the test suite is requiring the gpclib GNU R
+package with non-free license.  It is available from
+  http://cran.r-project.org/web/packages/gpclib/
+and the Debian packaging available from
+  svn://svn.debian.org/debian-science/packages/R/r-cran-gpclib/trunk/
+could be used to create a Debian package from this code.
 
-in order to confirm its integrity.
+Since we can not rely from non-free software the test in question is 
+excluded by a quilt patch in the packaging source.
 
-However, to do this test you also need to install gpclib
+ -- Andreas Tille <tille at debian.org>  Mon, 23 Jun 2014 15:18:25 +0200
 
-   http://cran.r-project.org/web/packages/gpclib/
-
-which is non-free and thus can not be distributet in Debian main.
-
- -- Andreas Tille <tille at debian.org>  Tue, 14 Jan 2014 16:30:53 +0100

Modified: packages/R/r-cran-polycub/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/R/r-cran-polycub/trunk/debian/changelog?rev=46731&op=diff
==============================================================================
--- packages/R/r-cran-polycub/trunk/debian/changelog	(original)
+++ packages/R/r-cran-polycub/trunk/debian/changelog	Mon Jun 23 14:03:56 2014
@@ -1,3 +1,10 @@
+r-cran-polycub (0.5-0-1) unstable; urgency=medium
+
+  * New upstream version
+  * Add autopkgtest (skipped gpclib test since gpclib is non-free)
+
+ -- Andreas Tille <tille at debian.org>  Mon, 23 Jun 2014 15:18:25 +0200
+
 r-cran-polycub (0.4-1-1) unstable; urgency=low
 
   * Initial release (Closes: #736509)

Modified: packages/R/r-cran-polycub/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/R/r-cran-polycub/trunk/debian/control?rev=46731&op=diff
==============================================================================
--- packages/R/r-cran-polycub/trunk/debian/control	(original)
+++ packages/R/r-cran-polycub/trunk/debian/control	Mon Jun 23 14:03:56 2014
@@ -1,6 +1,7 @@
 Source: r-cran-polycub
 Section: gnu-r
 Priority: optional
+Testsuite: autopkgtest
 Maintainer: Debian Science Team <debian-science-maintainers at lists.alioth.debian.org>
 Uploaders: Andreas Tille <tille at debian.org>
 Build-Depends: debhelper (>= 9.0),
@@ -15,8 +16,9 @@
 Homepage: http://cran.r-project.org/web/packages/polyCub/
 
 Package: r-cran-polycub
-Architecture: all
+Architecture: any
 Depends: ${misc:Depends},
+         ${shlibs:Depends},
          ${R:Depends},
          r-cran-sp,
          r-cran-spatstat,

Modified: packages/R/r-cran-polycub/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/debian-science/packages/R/r-cran-polycub/trunk/debian/copyright?rev=46731&op=diff
==============================================================================
--- packages/R/r-cran-polycub/trunk/debian/copyright	(original)
+++ packages/R/r-cran-polycub/trunk/debian/copyright	Mon Jun 23 14:03:56 2014
@@ -5,13 +5,13 @@
 
 Files: *
 Copyright: (C) 2005 - 2013 Sebastian Meyer, Michael Hoehle
-License: GPL2
+License: GPL-2+
 
 Files: debian/*
 Copyright: 2014 Andreas Tille <tille at debian.org>
-License: GPL2
+License: GPL-2+
 
-License: GPL2
+License: GPL-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.
@@ -26,4 +26,4 @@
  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  .
  On Debian systems, the complete text of the GNU General Public
- License can be found in `/usr/share/common-licenses/GPL'.
+ License can be found in `/usr/share/common-licenses/GPL-2'.

Modified: packages/R/r-cran-polycub/trunk/debian/docs
URL: http://svn.debian.org/wsvn/debian-science/packages/R/r-cran-polycub/trunk/debian/docs?rev=46731&op=diff
==============================================================================
--- packages/R/r-cran-polycub/trunk/debian/docs	(original)
+++ packages/R/r-cran-polycub/trunk/debian/docs	Mon Jun 23 14:03:56 2014
@@ -1,2 +1,3 @@
 debian/README.test
+debian/tests/run-unit-test
 tests

Added: packages/R/r-cran-polycub/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/R/r-cran-polycub/trunk/debian/patches/series?rev=46731&op=file
==============================================================================
--- packages/R/r-cran-polycub/trunk/debian/patches/series	(added)
+++ packages/R/r-cran-polycub/trunk/debian/patches/series	Mon Jun 23 14:03:56 2014
@@ -0,0 +1 @@
+skip_gpclib_test.patch

Added: packages/R/r-cran-polycub/trunk/debian/patches/skip_gpclib_test.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/R/r-cran-polycub/trunk/debian/patches/skip_gpclib_test.patch?rev=46731&op=file
==============================================================================
--- packages/R/r-cran-polycub/trunk/debian/patches/skip_gpclib_test.patch	(added)
+++ packages/R/r-cran-polycub/trunk/debian/patches/skip_gpclib_test.patch	Mon Jun 23 14:03:56 2014
@@ -0,0 +1,25 @@
+Author: Andreas Tille <tille at debian.org>
+Last-Update: Mon, 23 Jun 2014 15:18:25 +0200
+Description: One test of the test suite is requiring the gpclib GNU R
+ package with non-free license.  It is available from
+  http://cran.r-project.org/web/packages/gpclib/
+ and the Debian packaging available from
+  svn://svn.debian.org/debian-science/packages/R/r-cran-gpclib/trunk/
+ could be used to create a Debian package from this code.
+ .
+ Since we can not rely from non-free software the test in question is
+ excluded by this patch.
+
+--- a/tests/testthat/test-polyCub.R
++++ b/tests/testthat/test-polyCub.R
+@@ -18,7 +18,9 @@ sd <- 3
+ 
+ ## exact value of the integral over the _polygonal_ circle
+ intExact <- 0.65844436
+-if (requireNamespace("mvtnorm") && gpclibPermit()) {
++# if (requireNamespace("mvtnorm") && gpclibPermit()) {
++# Skip this test since gpclib is non-free
++if ( 0 == 1 ) {
+     ## run this conditionally since gpclib might not be available on all
+     ## platforms (as pointed out by Uwe Ligges, 2014-04-20)
+     test_that("polyCub.exact.Gauss returns validated result", {

Added: packages/R/r-cran-polycub/trunk/debian/tests/control
URL: http://svn.debian.org/wsvn/debian-science/packages/R/r-cran-polycub/trunk/debian/tests/control?rev=46731&op=file
==============================================================================
--- packages/R/r-cran-polycub/trunk/debian/tests/control	(added)
+++ packages/R/r-cran-polycub/trunk/debian/tests/control	Mon Jun 23 14:03:56 2014
@@ -0,0 +1,3 @@
+Tests: run-unit-test
+Depends: @, r-cran-testthat
+Restrictions: allow-stderr

Added: packages/R/r-cran-polycub/trunk/debian/tests/run-unit-test
URL: http://svn.debian.org/wsvn/debian-science/packages/R/r-cran-polycub/trunk/debian/tests/run-unit-test?rev=46731&op=file
==============================================================================
--- packages/R/r-cran-polycub/trunk/debian/tests/run-unit-test	(added)
+++ packages/R/r-cran-polycub/trunk/debian/tests/run-unit-test	Mon Jun 23 14:03:56 2014
@@ -0,0 +1,12 @@
+#!/bin/sh -e
+
+pkg=r-cran-polycub
+
+if [ "$ADTTMP" = "" ] ; then
+  ADTTMP=`mktemp -d /tmp/${pkg}-test.XXXXXX`
+fi
+cd $ADTTMP
+cp -a /usr/share/doc/${pkg}/tests/* $ADTTMP
+# Make sure we are using C locale to pass all tests
+LC_ALL=C R --no-save < test-all.R
+rm -rf $ADTTMP/*

More information about the debian-science-commits mailing list