[med-svn] [r-cran-scatterd3] 04/08: Switch to dh-r

Andreas Tille tille at debian.org
Tue Nov 8 10:22:51 UTC 2016


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

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

commit dd835a93e9e8b06d40fdc24210d42d128ea6d1c4
Author: Andreas Tille <tille at debian.org>
Date:   Tue Nov 8 10:59:19 2016 +0100

    Switch to dh-r
---
 debian/changelog |  1 +
 debian/control   |  7 +++----
 debian/rules     | 14 ++++++++++++--
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1ab72bc..646532c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 r-cran-scatterd3 (0.7+dfsg-1) UNRELEASED; urgency=medium
 
   * New upstream version
+  * Switch to dh-r
 
  -- Andreas Tille <tille at debian.org>  Tue, 08 Nov 2016 10:05:19 +0100
 
diff --git a/debian/control b/debian/control
index 745b396..7943d17 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Uploaders: Andreas Tille <tille at debian.org>
 Section: gnu-r
 Priority: optional
 Build-Depends: debhelper (>= 9),
-               cdbs,
+               dh-r,
                r-base-dev,
                r-cran-htmlwidgets,
                r-cran-digest,
@@ -18,10 +18,9 @@ Package: r-cran-scatterd3
 Architecture: all
 Depends: ${misc:Depends},
          ${R:Depends},
-         r-cran-htmlwidgets,
-         r-cran-digest,
-         r-cran-ellipse,
          libjs-d3
+Recommends: ${R:Recommends}
+Suggests: ${R:Suggests}
 Description: GNU R D3 JavaScript Scatterplot from R
  This GNU R package creates 'D3' 'JavaScript' scatterplots from 'R' with
  interactive features : panning, zooming, tooltips, etc.
diff --git a/debian/rules b/debian/rules
index 04c01d2..4916e9f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,16 @@
 #!/usr/bin/make -f
 
-include /usr/share/R/debian/r-cran.mk
+debRreposname   := $(shell dpkg-parsechangelog | awk '/^Source:/ {print $$2}' | sed 's/r-\([a-z]\+\)-.*/\1/')
+awkString       := "'/^(Package|Bundle):/ {print $$2 }'"
+cranNameOrig    := $(shell awk "$(awkString)" DESCRIPTION)
+cranName        := $(shell echo "$(cranNameOrig)" | tr A-Z a-z)
+package         := r-$(debRreposname)-$(cranName)
+debRdir         := usr/lib/R/site-library
+debRlib         := $(CURDIR)/debian/$(package)/$(debRdir)
 
-install/$(package)::
+%:
+	dh $@ --buildsystem R
+
+override_dh_link:
+	dh_link
 	ln -s /usr/share/javascript/d3/d3.min.js $(debRlib)/$(cranNameOrig)/htmlwidgets/lib/d3-3.5.6.min.js

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



More information about the debian-med-commit mailing list