[dh-r] 01/02: Reorder dependency fixing in dh-update-R

[Gordon Ball]

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 68535b2c859c3dc88bffb43b0150d26f8bcb3c1f
Author: Gordon Ball <gordon at chronitis.net>
Date:   Fri Dec 1 21:52:38 2017 +0100

    Reorder dependency fixing in dh-update-R
---
 scripts/dh-update-R | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/scripts/dh-update-R b/scripts/dh-update-R
index b3d391a..f20c4bc 100755
--- a/scripts/dh-update-R
+++ b/scripts/dh-update-R
@@ -51,18 +51,17 @@ sub unmanaged {
     return deps_concat(@keep);
 }
 
+say "I: Updating Build-Depends";
 my $unmanaged_builddeps = unmanaged($dsrc->{'Build-Depends'});
-my $unmanaged_depends = unmanaged($dbin->{Depends});
-my $unmanaged_recommends = unmanaged($dbin->{Recommends});
-my $unmanaged_suggests = unmanaged($dbin->{Suggests});
-
 my $rdepends = deps_concat(Debian::Debhelper::Buildsystem::R::parse_depends("Depends", $desc->{Depends}, \%apthash));
 my $rimports = deps_concat(Debian::Debhelper::Buildsystem::R::parse_depends("Imports", $desc->{Imports}, \%apthash));
-
 my $compiled = lc $desc->{NeedsCompilation} eq "yes";
-say "I: Updating Build-Depends";
 $dsrc->{'Build-Depends'} = deps_concat("debhelper (>= 10)", "dh-r", "r-base-dev", $rdepends, $rimports, $unmanaged_builddeps);
+
 say "I: Updating binary Depends, Recommends, Suggests";
+my $unmanaged_depends = unmanaged($dbin->{Depends});
+my $unmanaged_recommends = unmanaged($dbin->{Recommends});
+my $unmanaged_suggests = unmanaged($dbin->{Suggests});
 $dbin->{Depends} = deps_concat("\${R:Depends}", $compiled ? "\${shlibs:Depends}" : "", "\${misc:Depends}", $unmanaged_depends);
 $dbin->{Recommends} = deps_concat("\${R:Recommends}", $unmanaged_recommends);
 $dbin->{Suggests} = deps_concat("\${R:Suggests}", $unmanaged_suggests);

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