[r-cran-knitr] 03/06: Convert to dh-r

Andreas Tille tille at debian.org
Sat Nov 26 22:21:45 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-knitr.

commit c2326111ee676f5f76c46f54ce5938aa6256eb55
Author: Andreas Tille <tille at debian.org>
Date:   Sat Nov 26 23:06:06 2016 +0100

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

diff --git a/debian/changelog b/debian/changelog
index 8f05f8b..b4ec979 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 r-cran-knitr (1.15.1-3) UNRELEASED; urgency=medium
 
   * New upstream version
+  * convert to dh-r
 
  -- Andreas Tille <tille at debian.org>  Sat, 26 Nov 2016 22:53:20 +0100
 
diff --git a/debian/control b/debian/control
index 499e259..55bd525 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Section: gnu-r
 Priority: optional
 Build-Depends: debhelper (>= 9),
                r-base-dev,
-               cdbs,
+               dh-r,
                r-cran-formatr,
                r-cran-highr,
                r-cran-markdown,
@@ -29,15 +29,9 @@ Package: r-cran-knitr
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-         ${R:Depends},
-         r-cran-formatr,
-         r-cran-highr,
-         r-cran-markdown,
-         r-cran-yaml,
-         r-cran-evaluate,
-         r-cran-digest,
-         r-cran-stringr
-Suggests: r-cran-tikzdevice
+         ${R:Depends}
+Recommends: ${R:Recommends}
+Suggests: ${R:Suggests}
 Description: GNU R package for dynamic report generation using Literate Programming
  The R package knitr is a general-purpose literate programming engine, with
  lightweight API's designed to give users full control of the output without
diff --git a/debian/rules b/debian/rules
index c99b39e..68d9a36 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,14 +1,4 @@
 #!/usr/bin/make -f
 
-# Uncomment this to turn on verbose mode.
-# export DH_VERBOSE=1
-
-# Use hardening flags for linking
-include /usr/share/dpkg/buildflags.mk
-makeFlags="LDFLAGS=$(LDFLAGS)"
-
-include /usr/share/R/debian/r-cran.mk
-
-common-install-arch::
-	# rm -vf $(debRlib)/$(cranNameOrig)/NEWS $(debRlib)/$(cranNameOrig)/CITATION
-	dh_installdocs -p$(package) ./inst/CITATION
+%:
+	dh $@ --buildsystem R

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/r-cran-knitr.git



More information about the debian-science-commits mailing list