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

[CDD Subversion Commit]

Author: pere
Date: Tue Jul  8 22:37:06 2008
New Revision: 948

Modified:
   cdd/trunk/cdd/debian/changelog
   cdd/trunk/cdd/devtools/cdd-gen-control
Log:
  * New task header Metapackage to make it possible to disable the
    generation of a binary package with dependencies (and only get a
    tasksel task).

Modified: cdd/trunk/cdd/debian/changelog
==============================================================================
--- cdd/trunk/cdd/debian/changelog	(original)
+++ cdd/trunk/cdd/debian/changelog	Tue Jul  8 22:37:06 2008
@@ -1,3 +1,11 @@
+cdd (0.5.5) UNRELEASED; urgency=low
+
+  * New task header Metapackage to make it possible to disable the
+    generation of a binary package with dependencies (and only get a
+    tasksel task).
+
+ -- Petter Reinholdtsen <pere at debian.org>  Wed,  9 Jul 2008 00:33:29 +0200
+
 cdd (0.5.4) unstable; urgency=low
 
   * Added patch from Petter Reinholdtsen <pere at hungry.com> to enable

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 22:37:06 2008
@@ -169,6 +169,8 @@
 sub gen_control {
     my $task;
     for $task (sort keys %taskinfo) {
+        next if (exists $taskinfo{$task}{'Metapackage'} &&
+                        $taskinfo{$task}{'Metapackage'} eq 'false');
         print "Package: $task\n";
 
         my $header;
@@ -250,8 +252,12 @@
                         print "$header: $taskinfo{$task}{$header}\n";
                     }
                 }
-                print "Key: \n";
-                print " $task\n";
+                unless (exists $taskinfo{$task}{'Metapackage'} &&
+                        $taskinfo{$task}{'Metapackage'} eq 'false') {
+                    # No use listing a metapackage as a key package, if no metapackage exist.
+                    print "Key: \n";
+                    print " $task\n";
+                }
                 my %seen;
                 $seen{$task} = 1;
                 if ($task_depends_are_keys) {
@@ -442,7 +448,7 @@
         $line =~ s/\s+$//;
 
         $_ = $line;
-        for my $header (qw(Section, Architecture Priority Leaf Enhances)) {
+        for my $header (qw(Section, Architecture Priority Leaf Enhances Metapackage)) {
             $taskinfo{$curpkg}{$header} = $1 if (m/^$header:\s+(.+)$/);
         }
         $taskinfo{$curpkg}{$1} = $2 if (m/^(test-.+):\s+(.+)$/i);