[med-svn] [r-cran-testthat] 03/06: Convert from cdbs to dh-r

[Andreas Tille]

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

tille pushed a commit to branch master
in repository r-cran-testthat.

commit 1dca79d9ae0a2863a36bfb071d50414085e072ed
Author: Andreas Tille <tille at debian.org>
Date:   Fri Oct 20 14:52:30 2017 +0200

    Convert from cdbs to dh-r
---
 debian/changelog |  1 +
 debian/control   | 16 ++++++----------
 debian/rules     | 17 +++++------------
 3 files changed, 12 insertions(+), 22 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8202af9..50520ef 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ r-cran-testthat (1.0.2-3) UNRELEASED; urgency=medium
   * Moved packaging from SVN to Git
   * Standards-Version: 4.1.1
   * debhelper 10
+  * Convert from cdbs to dh-r
 
  -- Andreas Tille <tille at debian.org>  Fri, 20 Oct 2017 14:48:18 +0200
 
diff --git a/debian/control b/debian/control
index 30aa2d0..b075e5f 100644
--- a/debian/control
+++ b/debian/control
@@ -4,8 +4,7 @@ Uploaders: Andreas Tille <tille at debian.org>
 Section: gnu-r
 Priority: optional
 Build-Depends: debhelper (>= 10),
-               cdbs,
-               r-base-dev,
+               dh-r,
                r-cran-digest,
                r-cran-stringr,
                r-cran-evaluate,
@@ -19,15 +18,12 @@ Homepage: http://cran.r-project.org/web/packages/testthat
 
 Package: r-cran-testthat
 Architecture: any
-Depends: ${R:Depends},
+Depends: ${misc:Depends},
          ${shlibs:Depends},
-         r-cran-digest,
-         r-cran-stringr,
-         r-cran-evaluate,
-         r-cran-crayon,
-         r-cran-praise,
-         r-cran-r6
-Suggests: r-cran-devtools
+         ${R:Depends}
+Recommends: ${R:Recommends}
+Suggests: ${R:Suggests},
+          r-cran-devtools
 Description: GNU R testsuite
  Testthat code. Tools to make testing fun.
  .
diff --git a/debian/rules b/debian/rules
index e2bc9e7..ae86733 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,15 +1,8 @@
 #!/usr/bin/make -f
 
-include /usr/share/R/debian/r-cran.mk
-
-install/$(package)::
-	rm -rf debian/$(package)/usr/lib/R/site-library/$(cranName)/LICENSE
-
-# 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
-#	cd debian/$(package)/usr/share/doc/$(package)/tests/ ; \
-#	if grep -qR devtools * ; then \
-#	    rm -f `grep -lR devtools *` ; \
-#	fi
+%:
+	dh $@ --buildsystem R
 
+override_dh_install:
+	dh_install
+	find debian -name LICENSE -delete

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/r-cran-testthat.git