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

[Andreas Tille]

Author: tille
Date: 2017-01-15 21:50:53 +0000 (Sun, 15 Jan 2017)
New Revision: 23611

Modified:
   trunk/packages/R/r-cran-googlevis/trunk/debian/changelog
   trunk/packages/R/r-cran-googlevis/trunk/debian/compat
   trunk/packages/R/r-cran-googlevis/trunk/debian/control
   trunk/packages/R/r-cran-googlevis/trunk/debian/copyright
   trunk/packages/R/r-cran-googlevis/trunk/debian/rules
   trunk/packages/R/r-cran-googlevis/trunk/debian/tests/run-unit-test
   trunk/packages/R/r-cran-googlevis/trunk/debian/watch
Log:
  * New upstream version
  * Fix autopkgtest
  * Convert to dh-r
  * Canonical homepage for CRAN
  * debhelper 10
  * d/watch:
     - version=4
     - Fix watch file


Modified: trunk/packages/R/r-cran-googlevis/trunk/debian/changelog
===================================================================
--- trunk/packages/R/r-cran-googlevis/trunk/debian/changelog	2017-01-15 21:31:59 UTC (rev 23610)
+++ trunk/packages/R/r-cran-googlevis/trunk/debian/changelog	2017-01-15 21:50:53 UTC (rev 23611)
@@ -1,3 +1,16 @@
+r-cran-googlevis (0.6.2-1) unstable; urgency=medium
+
+  * New upstream version
+  * Fix autopkgtest
+  * Convert to dh-r
+  * Canonical homepage for CRAN
+  * debhelper 10
+  * d/watch:
+     - version=4
+     - Fix watch file
+
+ -- Andreas Tille <tille at debian.org>  Sun, 15 Jan 2017 22:46:04 +0100
+
 r-cran-googlevis (0.6.0-1) unstable; urgency=low
 
   * Initial release (closes: #829663)

Modified: trunk/packages/R/r-cran-googlevis/trunk/debian/compat
===================================================================
--- trunk/packages/R/r-cran-googlevis/trunk/debian/compat	2017-01-15 21:31:59 UTC (rev 23610)
+++ trunk/packages/R/r-cran-googlevis/trunk/debian/compat	2017-01-15 21:50:53 UTC (rev 23611)
@@ -1 +1 @@
-9
+10

Modified: trunk/packages/R/r-cran-googlevis/trunk/debian/control
===================================================================
--- trunk/packages/R/r-cran-googlevis/trunk/debian/control	2017-01-15 21:31:59 UTC (rev 23610)
+++ trunk/packages/R/r-cran-googlevis/trunk/debian/control	2017-01-15 21:50:53 UTC (rev 23611)
@@ -3,20 +3,21 @@
 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-jsonlite
 Standards-Version: 3.9.8
 Vcs-Browser: https://anonscm.debian.org/viewvc/debian-med/trunk/packages/R/r-cran-googlevis/trunk/
 Vcs-Svn: svn://anonscm.debian.org/debian-med/trunk/packages/R/r-cran-googlevis/trunk/
-Homepage: https://cran.r-project.org/web/packages/googleVis
+Homepage: https://cran.r-project.org/package=googleVis
 
 Package: r-cran-googlevis
 Architecture: all
 Depends: ${misc:Depends},
          ${R:Depends},
-         r-cran-jsonlite
+Recommends: ${R:Recommends}
+Suggests: ${R:Suggests}
 Description: GNU R Interface to Google Charts
  R interface to Google Charts API, allowing users to create interactive
  charts based on data frames. Charts are displayed locally via the R HTTP

Modified: trunk/packages/R/r-cran-googlevis/trunk/debian/copyright
===================================================================
--- trunk/packages/R/r-cran-googlevis/trunk/debian/copyright	2017-01-15 21:31:59 UTC (rev 23610)
+++ trunk/packages/R/r-cran-googlevis/trunk/debian/copyright	2017-01-15 21:50:53 UTC (rev 23611)
@@ -1,7 +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: googleVis
 Upstream-Contact: Markus Gesmann <markus.gesmann at googlemail.com>
-Source: https://cran.r-project.org/web/packages/googleVis
+Source: https://cran.r-project.org/package=googleVis
 
 Files: *
 Copyright: 2013-2016 Markus Gesmann, Diego de Castillo, Joe Cheng
@@ -267,7 +267,7 @@
  Creative Commons may be contacted at creativecommons.org.
 
 Files: debian/*
-Copyright: 2016 Andreas Tille <tille at debian.org>
+Copyright: 2016-2017 Andreas Tille <tille at debian.org>
 License: GPL-2+
 
 License: GPL-2+

Modified: trunk/packages/R/r-cran-googlevis/trunk/debian/rules
===================================================================
--- trunk/packages/R/r-cran-googlevis/trunk/debian/rules	2017-01-15 21:31:59 UTC (rev 23610)
+++ trunk/packages/R/r-cran-googlevis/trunk/debian/rules	2017-01-15 21:50:53 UTC (rev 23611)
@@ -1,6 +1,8 @@
 #!/usr/bin/make -f
 
-include /usr/share/R/debian/r-cran.mk
+%:
+	dh $@ --buildsystem R
 
-install/$(package)::
-	chmod -x $(debRlib)/$(cranNameOrig)/rsp/src/simple*.rsp
+override_dh_install:
+	dh_install
+	find debian -name "*.rsp" -exec chmod -x \{\} \;

Modified: trunk/packages/R/r-cran-googlevis/trunk/debian/tests/run-unit-test
===================================================================
--- trunk/packages/R/r-cran-googlevis/trunk/debian/tests/run-unit-test	2017-01-15 21:31:59 UTC (rev 23610)
+++ trunk/packages/R/r-cran-googlevis/trunk/debian/tests/run-unit-test	2017-01-15 21:50:53 UTC (rev 23611)
@@ -4,10 +4,10 @@
 
 if [ "$ADTTMP" = "" ] ; then
   ADTTMP=`mktemp -d /tmp/${pkg}-test.XXXXXX`
-#  trap "rm -rf $ADTTMP" 0 INT QUIT ABRT PIPE TERM
+  trap "rm -rf $ADTTMP" 0 INT QUIT ABRT PIPE TERM
 fi
 cd $ADTTMP
-cp /usr/share/doc/$pkg/examples/vignettes/* $ADTTMP
+cp -a /usr/share/doc/$pkg/examples/vignettes/* $ADTTMP
 find . -name "*.gz" -exec gunzip \{\} \;
 for rnw in `ls *.[rRS]nw` ; do
 rfile=`echo $rnw | sed 's/\.[rRS]nw/.R/'`

Modified: trunk/packages/R/r-cran-googlevis/trunk/debian/watch
===================================================================
--- trunk/packages/R/r-cran-googlevis/trunk/debian/watch	2017-01-15 21:31:59 UTC (rev 23610)
+++ trunk/packages/R/r-cran-googlevis/trunk/debian/watch	2017-01-15 21:50:53 UTC (rev 23611)
@@ -1,3 +1,3 @@
-version=3
-# http://cran.r-project.org/src/contrib/googleVis_([-\d.]*)\.tar\.gz
-https://github.com/mages/googleVis/releases .*/archive/v(\d[\d.-]+)\.(?:tar(?:\.gz|\.bz2)?|tgz)
+version=4
+
+http://cran.r-project.org/src/contrib/googleVis_([-\d.]*)\.tar\.gz