[dh-r] 23/43: Use deps_concat to join dependencies

Gordon Ball chronitis-guest at moszumanska.debian.org
Thu Sep 15 13:45:35 UTC 2016


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

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

commit 007ece614c32aff53b8caef4a725eaa17c344f00
Author: Gordon Ball <gordon at chronitis.net>
Date:   Tue Sep 6 13:48:38 2016 +0200

    Use deps_concat to join dependencies
---
 dh/R.pm | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/dh/R.pm b/dh/R.pm
index c18c30d..8a4f93b 100644
--- a/dh/R.pm
+++ b/dh/R.pm
@@ -9,6 +9,7 @@ use Dpkg::Control;
 use Dpkg::Control::Info;
 use Dpkg::Changelog::Parse;
 use Debian::Debhelper::Dh_Lib;
+use Dpkg::Deps qw(deps_concat);
 use base 'Debian::Debhelper::Buildsystem';
 
 sub DESCRIPTION {
@@ -170,13 +171,14 @@ sub install {
     my %apthash;
     @apthash{@aptavail} = ();
 
-    my $rdepends = join(",", parse_depends("Depends", $desc->{Depends}, \%apthash));
-    my $rrecommends = join(",", parse_depends("Recommends", $desc->{Recommends}, \%apthash));
-    my $rsuggests = join(",", parse_depends("Suggests", $desc->{Suggests}, \%apthash));
-    my $rimports = join(",", parse_depends("Imports", $desc->{Imports}, \%apthash));
+    my $rdepends = deps_concat(parse_depends("Depends", $desc->{Depends}, \%apthash));
+    my $rrecommends = deps_concat(parse_depends("Recommends", $desc->{Recommends}, \%apthash));
+    my $rsuggests = deps_concat(parse_depends("Suggests", $desc->{Suggests}, \%apthash));
+    my $rimports = deps_concat(parse_depends("Imports", $desc->{Imports}, \%apthash));
 
     open(my $svs, ">>", "debian/$sourcepackage.substvars");
-    say $svs "R:Depends=r-base-core (>= $rbase_version), $rapi_version, $rdepends, $rimports";
+    my $depends = deps_concat("r-base-core (>= $rbase_version)", $rapi_version, $rdepends, $rimports);
+    say $svs "R:Depends=$depends";
     say $svs "R:Recommends=$rrecommends";
     say $svs "R:Suggests=$rsuggests";
     close $svs;

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



More information about the debian-science-commits mailing list