[med-svn] r23610 - in trunk/packages/R/r-cran-dplyr/trunk/debian: . tests

Sun Jan 15 21:32:00 UTC 2017

Author: tille
Date: 2017-01-15 21:31:59 +0000 (Sun, 15 Jan 2017)
New Revision: 23610

Modified:
   trunk/packages/R/r-cran-dplyr/trunk/debian/README.test
   trunk/packages/R/r-cran-dplyr/trunk/debian/changelog
   trunk/packages/R/r-cran-dplyr/trunk/debian/compat
   trunk/packages/R/r-cran-dplyr/trunk/debian/control
   trunk/packages/R/r-cran-dplyr/trunk/debian/copyright
   trunk/packages/R/r-cran-dplyr/trunk/debian/rules
   trunk/packages/R/r-cran-dplyr/trunk/debian/tests/run-unit-test
   trunk/packages/R/r-cran-dplyr/trunk/debian/watch
Log:
  * Adjusted test dependencies (thanks to Gordon Ball)
  * Convert to dh-r
  * Canonical homepage for CRAN
  * debhelper 10
  * d/watch: version=4


Modified: trunk/packages/R/r-cran-dplyr/trunk/debian/README.test
===================================================================

--- trunk/packages/R/r-cran-dplyr/trunk/debian/README.test	2017-01-15 21:19:03 UTC (rev 23609)
+++ trunk/packages/R/r-cran-dplyr/trunk/debian/README.test	2017-01-15 21:31:59 UTC (rev 23610)
@@ -1,9 +1,8 @@
 Notes on how this package can be tested.
 ────────────────────────────────────────
 
-This package can be tested by running the provided test:
+This package can be tested by running
 
-cd tests
-LC_ALL=C R --no-save < testthat.R
+    sh run-unit-test
 
 in order to confirm its integrity.

Modified: trunk/packages/R/r-cran-dplyr/trunk/debian/changelog
===================================================================
--- trunk/packages/R/r-cran-dplyr/trunk/debian/changelog	2017-01-15 21:19:03 UTC (rev 23609)
+++ trunk/packages/R/r-cran-dplyr/trunk/debian/changelog	2017-01-15 21:31:59 UTC (rev 23610)
@@ -1,8 +1,12 @@
 r-cran-dplyr (0.5.0-2) UNRELEASED; urgency=medium
 
   * Adjusted test dependencies (thanks to Gordon Ball)
+  * Convert to dh-r
+  * Canonical homepage for CRAN
+  * debhelper 10
+  * d/watch: version=4
 
- -- Andreas Tille <tille at debian.org>  Mon, 01 Aug 2016 09:06:11 +0200
+ -- Andreas Tille <tille at debian.org>  Sun, 15 Jan 2017 22:20:07 +0100
 
 r-cran-dplyr (0.5.0-1) unstable; urgency=medium
 

Modified: trunk/packages/R/r-cran-dplyr/trunk/debian/compat
===================================================================
--- trunk/packages/R/r-cran-dplyr/trunk/debian/compat	2017-01-15 21:19:03 UTC (rev 23609)
+++ trunk/packages/R/r-cran-dplyr/trunk/debian/compat	2017-01-15 21:31:59 UTC (rev 23610)
@@ -1 +1 @@
-9
+10

Modified: trunk/packages/R/r-cran-dplyr/trunk/debian/control
===================================================================
--- trunk/packages/R/r-cran-dplyr/trunk/debian/control	2017-01-15 21:19:03 UTC (rev 23609)
+++ trunk/packages/R/r-cran-dplyr/trunk/debian/control	2017-01-15 21:31:59 UTC (rev 23610)
@@ -3,8 +3,8 @@
 Uploaders: Andreas Tille <tille at debian.org>
 Section: gnu-r
 Priority: optional
-Build-Depends: debhelper (>= 9),
-               cdbs,
+Build-Depends: debhelper (>= 10),
+               dh-r,
                r-base-dev,
                r-cran-rcpp,
                r-cran-magrittr,
@@ -17,22 +17,15 @@
 Standards-Version: 3.9.8
 Vcs-Browser: https://anonscm.debian.org/viewvc/debian-med/trunk/packages/R/r-cran-dplyr/trunk/
 Vcs-Svn: svn://anonscm.debian.org/debian-med/trunk/packages/R/r-cran-dplyr/trunk/
-Homepage: https://cran.r-project.org/web/packages/dplyr/
+Homepage: https://cran.r-project.org/package=dplyr
 
 Package: r-cran-dplyr
 Architecture: any
 Depends: ${misc:Depends},
          ${shlibs:Depends},
          ${R:Depends},
-         r-cran-rcpp,
-         r-cran-magrittr,
-         r-cran-dbi,
-         r-cran-lazyeval,
-         r-cran-assertthat,
-         r-cran-r6,
-         r-cran-tibble
-Recommends: r-cran-data.table, r-cran-rsqlite
-Suggests: r-cran-lahman
+Recommends: ${R:Recommends}
+Suggests: ${R:Suggests}
 Description: GNU R grammar of data manipulation
  This GNU R package provides a fast, consistent tool for working with
  data frame like objects, both in memory and out of memory.

Modified: trunk/packages/R/r-cran-dplyr/trunk/debian/copyright
===================================================================
--- trunk/packages/R/r-cran-dplyr/trunk/debian/copyright	2017-01-15 21:19:03 UTC (rev 23609)
+++ trunk/packages/R/r-cran-dplyr/trunk/debian/copyright	2017-01-15 21:31:59 UTC (rev 23610)
@@ -1,6 +1,7 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: dplyr
 Upstream-Contact: Hadley Wickham <hadley at rstudio.com>
-Source: https://cran.r-project.org/web/packages/dplyr/
+Source: https://cran.r-project.org/package=dplyr
 
 Files: *
 Copyright: 2013-2015 Hadley Wickham <hadley at rstudio.com>,
@@ -9,7 +10,7 @@
 
 Files: debian/*
 Copyright: 2016 Chris Lawrence <lawrencc at debian.org>,
-                Andreas Tille <tille at debian.org>
+           2016-2017 Andreas Tille <tille at debian.org>
 License: MIT
 
 License: MIT

Modified: trunk/packages/R/r-cran-dplyr/trunk/debian/rules
===================================================================
--- trunk/packages/R/r-cran-dplyr/trunk/debian/rules	2017-01-15 21:19:03 UTC (rev 23609)
+++ trunk/packages/R/r-cran-dplyr/trunk/debian/rules	2017-01-15 21:31:59 UTC (rev 23610)
@@ -1,18 +1,8 @@
 #!/usr/bin/make -f
 
-DPKG_EXPORT_BUILDFLAGS = 1
-include /usr/share/dpkg/buildflags.mk
+%:
+	dh $@ --buildsystem R
 
-PKG_CFLAGS=$(CFLAGS)
-PKG_CXXFLAGS=$(CXXFLAGS)
-PKG_CPPFLAGS=$(CPPFLAGS)
-PKG_FFLAGS=$(FFLAGS)
-
-export PKG_CFLAGS PKG_CXXFLAGS PKG_CPPFLAGS PKG_FFLAGS
-
-makeFlags="LDFLAGS=$(LDFLAGS)"
-
-include /usr/share/R/debian/r-cran.mk
-
-install/$(package)::
-	rm -rf $(debRlib)/$(cranName)/LICENSE
+override_dh_install:
+	dh_install
+	find debian -name LICENSE -delete

Modified: trunk/packages/R/r-cran-dplyr/trunk/debian/tests/run-unit-test
===================================================================
--- trunk/packages/R/r-cran-dplyr/trunk/debian/tests/run-unit-test	2017-01-15 21:19:03 UTC (rev 23609)
+++ trunk/packages/R/r-cran-dplyr/trunk/debian/tests/run-unit-test	2017-01-15 21:31:59 UTC (rev 23610)
@@ -1,10 +1,11 @@
 #!/bin/sh -e
 
 oname=dplyr
-pkg=r-cran-`echo $oname | tr [A-Z] [a-z]`
+pkg=r-cran-`echo $oname | tr '[A-Z]' '[a-z]'`
 
 if [ "$ADTTMP" = "" ] ; then
   ADTTMP=`mktemp -d /tmp/${pkg}-test.XXXXXX`
+  trap "rm -rf $ADTTMP" 0 INT QUIT ABRT PIPE TERM
 fi
 cd $ADTTMP
 cp -a /usr/share/doc/${pkg}/tests/* $ADTTMP
@@ -17,4 +18,3 @@
 done
 sed -i '/[Ll]ahman/d' testthat.R
 LC_ALL=C R --no-save < testthat.R
-rm -fr $ADTTMP/*

Modified: trunk/packages/R/r-cran-dplyr/trunk/debian/watch
===================================================================
--- trunk/packages/R/r-cran-dplyr/trunk/debian/watch	2017-01-15 21:19:03 UTC (rev 23609)
+++ trunk/packages/R/r-cran-dplyr/trunk/debian/watch	2017-01-15 21:31:59 UTC (rev 23610)
@@ -1,3 +1,3 @@
-version=3
+version=4
 http://cran.r-project.org/src/contrib/dplyr_([-0-9\.]*)\.tar\.(?:gz|bz2|xz)
 


