[dh-r] 01/01: Improve support of packages from outside CRAN or Bioconductor repositories: r-other-*

[Dylan Aïssi]

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

bob.dybian-guest pushed a commit to branch master
in repository dh-r.

commit 0812944059c4e5a42ae3a3c35ea961a7e1615425
Author: Dylan Aïssi <bob.dybian at gmail.com>
Date:   Thu Dec 7 23:38:31 2017 +0100

    Improve support of packages from outside CRAN or Bioconductor repositories: r-other-*
---
 debian/changelog  | 7 +++++++
 scripts/dh-make-R | 6 +++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index e321efc..6067146 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+dh-r (20171207) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Improve support of packages from outside CRAN or Bioconductor repositories.
+
+ -- Dylan Aïssi <bob.dybian at gmail.com>  Thu, 07 Dec 2017 22:34:51 +0100
+
 dh-r (20171201) unstable; urgency=medium
 
   [ Andreas Tille ]
diff --git a/scripts/dh-make-R b/scripts/dh-make-R
old mode 100755
new mode 100644
index 5400e04..2cb13d3
--- a/scripts/dh-make-R
+++ b/scripts/dh-make-R
@@ -37,7 +37,7 @@ pod2usage(1) if $opt_help;
 my $desc = Dpkg::Control->new(type => Dpkg::Control::CTRL_UNKNOWN);
 $desc->load("DESCRIPTION");
 
-my $repo = "CRAN";
+my $repo = "other";
 if ($opt_repo) {
     $repo = $opt_repo;
     say "I: Using repo=$repo from --repo";
@@ -95,6 +95,8 @@ if ($repo eq "CRAN") {
     $homepage = "https://cran.r-project.org/package=$desc->{Package}";
 } elsif ($repo eq "BIOC") {
     $homepage = "https://bioconductor.org/packages/$desc->{Package}/";
+} elsif ($repo eq "other") {
+    $homepage = $desc->{URL};
 }
 
 my $maintainer = "$ENV{DEBFULLNAME} <$ENV{DEBEMAIL}>";
@@ -165,6 +167,8 @@ if ($repo eq "CRAN") {
     $dwatch = "version=4\nhttps://cran.r-project.org/src/contrib/" . $desc->{Package} . '_([-\d.]*)\.tar\.gz';
 } elsif ($repo eq "BIOC") {
     $dwatch = "version=4\n" . 'opts=downloadurlmangle=s?^(.*)\.\.?https:$1packages/release/bioc? \\' . "\nhttps://bioconductor.org/packages/release/bioc/html/$desc->{Package}.html .*/$desc->{Package}_(.*).tar.gz";
+} elsif ($repo eq "other") {
+    $dwatch = "version=4\nFIXME: $homepage";
 }
 
 maybe_write("debian/watch", $dwatch);

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