[r-cran-httpuv] 05/07: Convert from cdbs to dh-r

Andreas Tille tille at debian.org
Thu Sep 14 11:44:05 UTC 2017


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

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

commit cb208fd525ecdc67db1edb59398cbf9a9bd08bc3
Author: Andreas Tille <tille at debian.org>
Date:   Thu Sep 14 13:34:59 2017 +0200

    Convert from cdbs to dh-r
---
 debian/changelog |  1 +
 debian/control   |  6 ++++--
 debian/rules     | 19 ++++++-------------
 3 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 40967c9..85ce746 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ r-cran-httpuv (1.3.5-1) UNRELEASED; urgency=medium
   * New upstream version
   * debhelper 10
   * cme fix dpkg-control
+  * Convert from cdbs to dh-r
 
  -- Andreas Tille <tille at debian.org>  Thu, 14 Sep 2017 13:29:54 +0200
 
diff --git a/debian/control b/debian/control
index dfa0022..9c37979 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Priority: optional
 Build-Depends: debhelper (>= 10),
                r-base-dev,
                r-cran-rcpp,
-               cdbs,
+               dh-r
 Standards-Version: 4.1.0
 Vcs-Browser: https://anonscm.debian.org/cgit/debian-science/packages/r-cran-httpuv.git
 Vcs-Git: https://anonscm.debian.org/git/debian-science/packages/r-cran-httpuv.git
@@ -15,8 +15,10 @@ Homepage: https://cran.r-project.org/web/packages/httpuv/
 Package: r-cran-httpuv
 Architecture: any
 Depends: ${shlibs:Depends},
+         ${misc:Depends},
          ${R:Depends},
-         ${misc:Depends}
+Recommends: ${R:Recommends}
+Suggests: ${R:Suggests}
 Description: GNU R package of HTTP and WebSocket Server Library
  The R package httpuv provides low-level socket and protocol support for
  handling HTTP and WebSocket requests directly from within R. It is primarily
diff --git a/debian/rules b/debian/rules
index 9de6575..01568fd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,16 +1,9 @@
 #!/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)/LICENSE $(debRlib)/$(cranNameOrig)/NEWS
-
-clean::
-	rm -vf src/libuv/libuv.a src/libuv/src/.buildstamp src/libuv/src/unix/.buildstamp
+override_dh_install:
+	dh_install
+	find debian -name LICENSE -delete
+	find debian -name NEWS -delete

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



More information about the debian-science-commits mailing list