[med-svn] r23036 - trunk/packages/R/r-cran-testit/trunk/debian

[Andreas Tille]

Author: tille
Date: 2016-11-10 20:24:48 +0000 (Thu, 10 Nov 2016)
New Revision: 23036

Modified:
   trunk/packages/R/r-cran-testit/trunk/debian/changelog
   trunk/packages/R/r-cran-testit/trunk/debian/control
   trunk/packages/R/r-cran-testit/trunk/debian/copyright
   trunk/packages/R/r-cran-testit/trunk/debian/rules
   trunk/packages/R/r-cran-testit/trunk/debian/watch
Log:
  * New upstream version
  * Convert to dh-r
  * Canonical homepage for CRAN
  * d/watch: version=4



Modified: trunk/packages/R/r-cran-testit/trunk/debian/changelog
===================================================================
--- trunk/packages/R/r-cran-testit/trunk/debian/changelog	2016-11-10 10:17:43 UTC (rev 23035)
+++ trunk/packages/R/r-cran-testit/trunk/debian/changelog	2016-11-10 20:24:48 UTC (rev 23036)
@@ -1,3 +1,12 @@
+r-cran-testit (0.6-1) unstable; urgency=medium
+
+  * New upstream version
+  * Convert to dh-r
+  * Canonical homepage for CRAN
+  * d/watch: version=4
+
+ -- Andreas Tille <tille at debian.org>  Thu, 10 Nov 2016 21:20:46 +0100
+
 r-cran-testit (0.5-1) unstable; urgency=low
 
   * Initial release (closes: #837342)

Modified: trunk/packages/R/r-cran-testit/trunk/debian/control
===================================================================
--- trunk/packages/R/r-cran-testit/trunk/debian/control	2016-11-10 10:17:43 UTC (rev 23035)
+++ trunk/packages/R/r-cran-testit/trunk/debian/control	2016-11-10 20:24:48 UTC (rev 23036)
@@ -4,17 +4,19 @@
 Section: gnu-r
 Priority: optional
 Build-Depends: debhelper (>= 9),
-               cdbs,
+               dh-r,
                r-base-dev
 Standards-Version: 3.9.8
 Vcs-Browser: https://anonscm.debian.org/viewvc/debian-med/trunk/packages/R/r-cran-testit/trunk/
 Vcs-Svn: svn://anonscm.debian.org/debian-med/trunk/packages/R/r-cran-testit/trunk/
-Homepage: http://cran.r-project.org/web/packages/testit
+Homepage: https://cran.r-project.org/package=testit
 
 Package: r-cran-testit
 Architecture: all
 Depends: ${R:Depends},
          ${misc:Depends}
+Recommends: ${R:Recommends}
+Suggests: ${R:Suggests}
 Description: simple package for testing GNU R packages
  This GNU R package provides two convenience functions assert() and
  test_pkg() to facilitate testing R packages.

Modified: trunk/packages/R/r-cran-testit/trunk/debian/copyright
===================================================================
--- trunk/packages/R/r-cran-testit/trunk/debian/copyright	2016-11-10 10:17:43 UTC (rev 23035)
+++ trunk/packages/R/r-cran-testit/trunk/debian/copyright	2016-11-10 20:24:48 UTC (rev 23036)
@@ -1,6 +1,7 @@
 Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Contact: Yihui Xie <xie at yihui.name>
-Source: http://cran.r-project.org/web/packages/testit
+Upstream-Name: testit
+Source: https://cran.r-project.org/package=testit
 
 Files: *
 Copyright: 2014-2016 Yihui Xie <xie at yihui.name>

Modified: trunk/packages/R/r-cran-testit/trunk/debian/rules
===================================================================
--- trunk/packages/R/r-cran-testit/trunk/debian/rules	2016-11-10 10:17:43 UTC (rev 23035)
+++ trunk/packages/R/r-cran-testit/trunk/debian/rules	2016-11-10 20:24:48 UTC (rev 23036)
@@ -1,13 +1,14 @@
 #!/usr/bin/make -f
 
-include /usr/share/R/debian/r-cran.mk
+%:
+	dh $@ --buildsystem R
 
-install/$(package)::
-	rm -rf debian/$(package)/usr/lib/R/site-library/$(cranName)/LICENSE
+override_dh_install:
+	dh_install
+	find debian -name LICENSE -delete
 
-# if I would only know how to hook in after dh_installdocs - forget this magic
-# cdbs thingy and remove the file rather in the test sccript ...
-	# Delete tests depending from devtools since this is not (yet) packaged
+# needs checking idea whether this is needed any more
+    # Delete tests depending from devtools since this is not (yet) packaged
 #	cd debian/$(package)/usr/share/doc/$(package)/tests/ ; \
 #	if grep -qR devtools * ; then \
 #	    rm -f `grep -lR devtools *` ; \

Modified: trunk/packages/R/r-cran-testit/trunk/debian/watch
===================================================================
--- trunk/packages/R/r-cran-testit/trunk/debian/watch	2016-11-10 10:17:43 UTC (rev 23035)
+++ trunk/packages/R/r-cran-testit/trunk/debian/watch	2016-11-10 20:24:48 UTC (rev 23036)
@@ -1,2 +1,2 @@
-version=3
+version=4
 http://cran.r-project.org/src/contrib/testit_([-\d.]*)\.tar\.gz