[Blends-commit] [SCM] blends-dev branch, master, updated. 784d3a0ddc635e1305f6bc489ef7fb97d63c88a1

[Ole Streicher]

The following commit has been merged in the master branch:
commit 784d3a0ddc635e1305f6bc489ef7fb97d63c88a1
Author: Ole Streicher 
Date:   Tue May 24 12:16:09 2016 +0200

Suppress the creation of the -all package if no task to be installed

diff --git a/devtools/blend-gen-control b/devtools/blend-gen-control
index bd12c3b..ca627e9 100755
--- a/devtools/blend-gen-control
+++ b/devtools/blend-gen-control
@@ -178,9 +178,6 @@ sub uniq {
 sub gen_control {
 my $task;
 
-print "Package: $blendshortname-all\n";
-print "Section: metapackages\n" ;
-print "Architecture: all\n";
 my @recommends;
 my @suggests;
 for $task (sort keys %taskinfo) {
@@ -194,11 +191,16 @@ sub gen_control {
push (@suggests, $task)
}
 }
-print("Recommends: ", join(",\n ", @recommends),"\n") if @recommends;
-print("Suggests: ", join(",\n ", @suggests),"\n") if @suggests;
-print "Description: Default selection of tasks for $blendtitle\n";
-print " This package is part of the $blendtitle Pure Blend and installs 
all\n";
-print " tasks for a default installation of this blend.\n\n";
+if (@recommends) {
+   print "Package: $blendshortname-all\n";
+   print "Section: metapackages\n" ;
+   print "Architecture: all\n";
+   print("Recommends: ", join(",\n ", @recommends),"\n");
+   print("Suggests: ", join(",\n ", @suggests),"\n") if @suggests;
+   print "Description: Default selection of tasks for $blendtitle\n";
+   print " This package is part of the $blendtitle Pure Blend and installs 
all\n";
+   print " tasks for a default installation of this blend.\n\n";
+}
 
 for $task (sort keys %taskinfo) {
 next if (exists $taskinfo{$task}{'Metapackage'} &&

-- 
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

[Blends-commit] [SCM] blends-dev branch, master, updated. 784d3a0ddc635e1305f6bc489ef7fb97d63c88a1

[Ole Streicher]

The following commit has been merged in the master branch:
commit 9987bd1c6f60ca8e4f955d16b784f9284500e152
Author: Ole Streicher 
Date:   Tue May 24 12:08:50 2016 +0200

Install a task in the Debian installer as opt-in instead of opt-out
This means that a task should have now a "Install: true" in the header field
for the tasks that should be installed during Debian installation when the
blend is selected.

diff --git a/devtools/blend-gen-control b/devtools/blend-gen-control
index 7b7756c..bd12c3b 100755
--- a/devtools/blend-gen-control
+++ b/devtools/blend-gen-control
@@ -188,10 +188,10 @@ sub gen_control {
 $taskinfo{$task}{'Metapackage'} eq 'false');
 next if ( $suppressempty && $taskinfo{$task}{'haspackages'} == 0 );
 if (exists $taskinfo{$task}{'Install'} &&
-   $taskinfo{$task}{'Install'} eq 'false') {
-   push (@suggests, $task)
-   } else {
+   $taskinfo{$task}{'Install'} eq 'true') {
push (@recommends, $task)
+   } else {
+   push (@suggests, $task)
}
 }
 print("Recommends: ", join(",\n ", @recommends),"\n") if @recommends;
@@ -319,8 +319,8 @@ sub print_task_desc {
 print "$taskinfo{$task}{'Description-long'}"; # Already 
contain newline
 print "Enhances: $taskinfo{$task}{Enhances}\n"
 if exists $taskinfo{$task}{Enhances};
-   if (!exists $taskinfo{$task}{'Install'} ||
-   $taskinfo{$task}{'Install'} ne 'false') {
+   if (exists $taskinfo{$task}{'Install'} &&
+   $taskinfo{$task}{'Install'} eq 'true') {
print "Test-new-install: mark show\n";
}
 for $header (keys %{$taskinfo{$task}}) {

-- 
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