[r-cran-highr] 04/10: Convert to dh-r, Canonical CRAN homepage

[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-highr.

commit 567a99cb259cacd489b217312ef73ebf24f3bae7
Author: Andreas Tille <tille at debian.org>
Date:   Wed Nov 30 11:31:45 2016 +0100

    Convert to dh-r, Canonical CRAN homepage
---
 debian/changelog |  2 ++
 debian/control   |  6 ++++--
 debian/copyright |  8 ++++----
 debian/rules     | 19 ++++++++++++-------
 4 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5925d34..e5644d0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ r-cran-highr (0.6-1) UNRELEASED; urgency=medium
   * Team upload.
   * New upstream version
   * Architecture: all
+  * convert to dh-r
+  * Canonical CRAN homepage
 
  -- Andreas Tille <tille at debian.org>  Wed, 30 Nov 2016 11:19:02 +0100
 
diff --git a/debian/control b/debian/control
index b3591ac..aa6b8d8 100644
--- a/debian/control
+++ b/debian/control
@@ -5,11 +5,11 @@ Section: gnu-r
 Priority: optional
 Build-Depends: debhelper (>= 9),
                r-base-dev,
-               cdbs
+               dh-r
 Standards-Version: 3.9.8
 Vcs-Browser: https://anonscm.debian.org/cgit/debian-science/packages/r-cran-highr.git
 Vcs-Git: https://anonscm.debian.org/git/debian-science/packages/r-cran-highr.git
-Homepage: https://cran.r-project.org/web/packages/highr/
+Homepage: https://cran.r-project.org/package=highr
 
 Package: r-cran-highr
 Architecture: all
@@ -17,6 +17,8 @@ Depends: ${R:Depends},
          ${misc:Depends},
          libjs-highlight.js,
          libjs-jquery
+Recommends: ${R:Recommends}
+Suggests: ${R:Suggests}
 Description: Syntax Highlighting for R Source Code
  The GNU R package highr provides syntax highlighting for R source code; it
  natively supports generating LaTeX and HTML output from R source code.
diff --git a/debian/copyright b/debian/copyright
index 043d07e..ba547ae 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,11 +1,11 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: highr
-Upstream-Contact: Yihui Xie <xie at yihui.name>
-Source: https://cran.r-project.org/web/packages/highr
+Upstream-Contact: Yihui Xie <xie at yihui.name>
+Source: https://cran.r-project.org/package=highr
 Comment: Yihui Xie homepage is at http://yihui.name
 
 Files: *
-Copyright: Yihui Xie <xie at yihui.name> and Yixuan Qiu http://yixuan.cos.name
+Copyright: 2013-2016 Yihui Xie <xie at yihui.name> and Yixuan Qiu http://yixuan.cos.name
 License: GPL-3
 
 Files: debian/*
diff --git a/debian/rules b/debian/rules
index cc49a73..a5a5e54 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,15 +3,20 @@
 # 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)"
+# These definitions can be removed once #842092 is fixed
+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)
 
-include /usr/share/R/debian/r-cran.mk
+%:
+	dh $@ --buildsystem R
 
-#common-install::
-
-common-install-arch::
+override_dh_install:
+	dh_install
 	echo DEBUG rm -vf $(debRlib)/$(cranNameOrig)/NEWS
 	rm -vf $(debRlib)/$(cranNameOrig)/NEWS
 	# sed -i 's/#include "yaml.h"/#include <yaml.h>/' src/r-ext.h

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