[Cdd-commits] r940 - in cdd/trunk/cdd: debian devtools

[CDD Subversion Commit]

Author: tille
Date: Tue Jul  8 08:42:41 2008
New Revision: 940

Modified:
   cdd/trunk/cdd/debian/changelog
   cdd/trunk/cdd/devtools/cdd-gen-control
Log:
Added Enhances feature for tasksel.  Thanks to Petter Reinholdtsen for providing the patch


Modified: cdd/trunk/cdd/debian/changelog
==============================================================================
--- cdd/trunk/cdd/debian/changelog	(original)
+++ cdd/trunk/cdd/debian/changelog	Tue Jul  8 08:42:41 2008
@@ -1,3 +1,11 @@
+cdd (0.5.4) unstable; urgency=low
+
+  * Added patch from Petter Reinholdtsen <pere at hungry.com> to enable
+    Enhances feature for tasksel.
+    Closes: #489811
+
+ -- Andreas Tille <tille at debian.org>  Tue, 08 Jul 2008 10:40:42 +0200
+
 cdd (0.5.3) unstable; urgency=low
 
   * Avoid rsync to build dist target

Modified: cdd/trunk/cdd/devtools/cdd-gen-control
==============================================================================
--- cdd/trunk/cdd/devtools/cdd-gen-control	(original)
+++ cdd/trunk/cdd/devtools/cdd-gen-control	Tue Jul  8 08:42:41 2008
@@ -243,6 +243,14 @@
                 print "Description: $taskinfo{$task}{Description}\n";
                 print "$taskinfo{$task}{'Description-long'}"; # Already contain newline
                 print "Relevance: 10\n";
+                print "Enhances: $taskinfo{$task}{Enhances}\n"
+                    if exists $taskinfo{$task}{Enhances};
+                for my $header (keys %{$taskinfo{$task}}) {
+print "Testheader: '$header'\n";
+                    if ($header =~ m/test-.+/i) {
+                        print "$header: $taskinfo{$task}{$header}\n";
+                    }
+                }
                 print "Key: \n";
                 print " $task\n";
                 my %seen;
@@ -435,12 +443,10 @@
         $line =~ s/\s+$//;
 
         $_ = $line;
-        $taskinfo{$curpkg}{'Section'}      = $1 if (m/^Section:\s+(.+)$/);
-        $taskinfo{$curpkg}{'Architecture'} = $1 if (m/^Architecture:\s+(.+)$/);
-
-        $taskinfo{$curpkg}{'Priority'}     = $1 if (m/^Priority:\s+(.+)$/);
-
-        $taskinfo{$curpkg}{'Leaf'}         = $1 if (m/^Leaf:\s+(.+)$/);
+        for my $header (qw(Section, Architecture Priority Leaf Enhances)) {
+            $taskinfo{$curpkg}{$header} = $1 if (m/^$header:\s+(.+)$/);
+        }
+        $taskinfo{$curpkg}{$1} = $2 if (m/^(test-.+):\s+(.+)$/i);
 
         if (m/^Description:\s+(.+)$/) {
             $taskinfo{$curpkg}{'Description'} = $1;