[r-cran-formatr] 04/12: convert to dh-r

Andreas Tille tille at debian.org
Tue Nov 29 12:45:54 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-formatr.

commit bba6f1c67e6f25d5e919da643e16c7e242682763
Author: Andreas Tille <tille at debian.org>
Date:   Tue Nov 29 13:14:23 2016 +0100

    convert to dh-r
---
 debian/changelog |  1 +
 debian/control   |  4 +++-
 debian/rules     | 14 ++++----------
 3 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a890174..cb91e5d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ r-cran-formatr (1.4-1) UNRELEASED; urgency=medium
   * Team upload.
   * New upstream version
   * cme fix dpkg-control
+  * convert to dh-r
 
  -- Andreas Tille <tille at debian.org>  Tue, 29 Nov 2016 13:10:23 +0100
 
diff --git a/debian/control b/debian/control
index ada3aeb..cbcf37f 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Section: gnu-r
 Priority: optional
 Build-Depends: debhelper (>= 9),
                r-base-dev,
-               cdbs,
+               dh -r,
                dpkg-dev
 Standards-Version: 3.9.8
 Vcs-Browser: https://anonscm.debian.org/cgit/debian-science/packages/r-cran-formatr.git
@@ -17,6 +17,8 @@ Architecture: any
 Depends: ${shlibs:Depends},
          ${R:Depends},
          ${misc:Depends}
+Recommends: ${R:Recommends}
+Suggests: ${R:Suggests}
 Description: Format R code automatically
  The GNU R package formatr provides a function tidy_source() to format R
  source code. Spaces and indent will be added to the code automatically,
diff --git a/debian/rules b/debian/rules
index 4cc3209..f0a9fae 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,13 +1,7 @@
 #!/usr/bin/make -f
 
-# Uncomment this to turn on verbose mode.
-# export DH_VERBOSE=1
+%:
+	dh $@ --buildsystem R
 
-# 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
+override_dh_installchangelogs:
+	dh_installchangelogs NEWS

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



More information about the debian-science-commits mailing list