[Blends-commit] [SCM] blends-dev branch, master, updated. 688466d0ad7d41cf251a7e994aa9b67188c4f9c1

[Andreas Tille]

The following commit has been merged in the master branch:
commit 20c7815702a7ded5749071dbf8d59d057959ef35
Author: Andreas Tille <tille at debian.org>
Date:   Mon Sep 12 09:40:09 2016 +0200

    Apply patch by Wolfgang Schweer <wschweer at arcor.de> to support udebs using blends

diff --git a/debian/changelog b/debian/changelog
index c17bd58..0035044 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,11 @@ blends (0.6.94) UNRELEASED; urgency=medium
   * Adjust description of Debian Edu: use correct project spelling and improve
     language.
 
+  [ Andreas Tille ]
+  * Apply patch by Wolfgang Schweer <wschweer at arcor.de> to support udebs using
+    blends (thanks Wolfgang for the patch
+    Closes: #835528
+
  -- Ole Streicher <olebole at debian.org>  Thu, 28 Apr 2016 11:57:38 +0200
 
 blends (0.6.93) unstable; urgency=medium
diff --git a/devtools/Makefile b/devtools/Makefile
index 811b94e..caf19e6 100755
--- a/devtools/Makefile
+++ b/devtools/Makefile
@@ -11,6 +11,7 @@
 TARGET_DIST := $(shell head -1 debian/changelog |awk '{print $$3}'|tr -d ';')
 BLEND := $(shell /usr/share/blends-dev/blend-get-names blendname)
 GENCONTROL := /usr/share/blends-dev/blend-gen-control
+TASKSELOPTS := $(shell grep TASKSELOPTS Makefile | cut -d '=' -f2)
 
 # Verify whether config/control exists, if yes, add it to the depends of debian/control
 CONFIGCONTROL := $(shell if [ -d config -a -e config/control ] ; then echo config/control; fi)
@@ -26,7 +27,7 @@ debian/control: debian/control.stub debian/changelog tasks/* $(CONFIGCONTROL)
 
 tasksel: $(BLEND)-tasks.desc
 $(BLEND)-tasks.desc: tasks/* debian/changelog
-	LC_ALL=C $(GENCONTROL) -s $(TARGET_DIST) -S -t -A > $(BLEND)-tasks.desc.new && mv $(BLEND)-tasks.desc.new $(BLEND)-tasks.desc
+	LC_ALL=C $(GENCONTROL) -s $(TARGET_DIST) $(TASKSELOPTS) -S -t -A > $(BLEND)-tasks.desc.new && mv $(BLEND)-tasks.desc.new $(BLEND)-tasks.desc
 
 packages.txt: tasks/*
 	$(GENCONTROL) -s $(TARGET_DIST) -a > packages.txt.$$$$ && mv packages.txt.$$$$ packages.txt
diff --git a/devtools/blend-gen-control b/devtools/blend-gen-control
index 9d3ad76..1aba552 100755
--- a/devtools/blend-gen-control
+++ b/devtools/blend-gen-control
@@ -60,12 +60,13 @@ usage: $0 [options]
    -s <sourcefile>  : specify which sources.list file to use
    -S               : suppress tasks without any recommended package
    -t               : print task descriptions and package list for task
+   -u               : modify tasks desc file in case the blend uses udebs
 
 example: $0 -s sources.list.etch -D -c -m -i
 EOF
 }
 
-getopts("cdaemis:StDhA", \%opts);
+getopts("cdaemis:StuDhA", \%opts);
 
 usage() and exit if $opts{'h'};
 
@@ -283,15 +284,16 @@ sub gen_control {
 # Enable to list all dependencies as key packages
 my $task_depends_are_keys = 0;
 sub print_task_desc {
-        print "Task: $blendname\n";
-	print "Relevance: 7\n";
-	print "Section: $blendname\n";
+	if (! $opts{'u'} ) {
+	    print "Task: $blendname\n";
+	    print "Relevance: 7\n";
+	    print "Section: $blendname\n";
 #	print "Key: \n";
 #	print " $blendshortname-tasks\n";
-	print "Description: $blendtitle Pure Blend\n";
-	print " .\n"; # no long description available
-	print "\n";
-    
+	    print "Description: $blendtitle Pure Blend\n";
+	    print " .\n"; # no long description available
+	    print "\n";
+	}
         foreach my $task (sort keys %taskinfo) {
                 next if (exists $taskinfo{$task}{'Leaf'} &&
                         $taskinfo{$task}{'Leaf'} eq 'false');
@@ -317,15 +319,22 @@ sub print_task_desc {
 		    }
 		}
                 print "Task: $task\n";
-                print "Parent: $blendname\n";
+                if (! $opts{'u'}) {
+                    print "Parent: $blendname\n";
+                }
                 print "Section: $blendname\n";
                 print "Description: $taskinfo{$task}{Description}\n";
                 print "$taskinfo{$task}{'Description-long'}"; # Already contain newline
+                if ($opts{'u'}) {
+                    print "Relevance: 10\n";
+                }
                 print "Enhances: $taskinfo{$task}{Enhances}\n"
                     if exists $taskinfo{$task}{Enhances};
 		if (exists $taskinfo{$task}{'Install'} &&
 		    $taskinfo{$task}{'Install'} eq 'true') {
-		    print "Test-new-install: mark show\n";
+                        if (! $opts{'u'}) {
+                            print "Test-new-install: mark show\n";
+                        }
 		}
                 for $header (keys %{$taskinfo{$task}}) {
                     if ($header =~ m/test-.+/i) {
@@ -347,6 +356,15 @@ sub print_task_desc {
                     }
                 }
 
+                if ($opts{'u'}) {
+                    print "Packages: list\n";
+                    for my $header (qw(Depends Recommends)) {
+                        foreach my $package (task_packages($task, $header, 1)) {
+                            print " $package\n" unless $seen{$package};
+                            $seen{$package} = 1;
+                        }
+                    }
+                }
                 print "\n";
         }
 }

-- 
Git repository for blends code