The following commit has been merged in the master branch: commit fd08b447a75e2ccfdefa344a3c9401f18f55734e Author: Mike Gabriel <mike.gabr...@das-netzwerkteam.de> Date: Fri Aug 11 23:29:49 2017 -0400
Revert "Revert "devtools/blend-gen-control: With -D (no depends) set, assure that packages under Depends: _and_ Recommends: in task files end up under Recommends: in debian/control."" This reverts commit ccc56ca41b29e8212ff1aafbf7ce7c1355726395. diff --git a/devtools/blend-gen-control b/devtools/blend-gen-control index 45a2cad..d0e8d33 100755 --- a/devtools/blend-gen-control +++ b/devtools/blend-gen-control @@ -256,12 +256,14 @@ sub gen_control { # if defined $taskinfo{$task}{Recommends}; push(@suggests, @{$taskinfo{$task}{Suggests}}) if defined $taskinfo{$task}{Suggests}; + my @recommends_sorted = sort_uniq(\%seenlist, @recommends); + my @suggests_sorted = sort_uniq(\%seenlist, @suggests); print("Recommends: ", - join(",\n ", sort_uniq(\%seenlist, @recommends)),"\n") - if defined $taskinfo{$task}{Depends}; + join(",\n ", @recommends_sorted),"\n") + if @recommends_sorted; print("Suggests: ", - join(",\n ", sort_uniq(\%seenlist, @suggests)),"\n") - if @suggests; + join(",\n ", @suggests_sorted),"\n") + if @suggests_sorted; } else { for $header (qw(Depends Recommends Suggests)) { -- Git repository for blends code _______________________________________________ Blends-commit mailing list Blends-commit@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/blends-commit