Changeset 39

Timestamp:

02/23/06 11:40:26 (18 years ago)

Author:

kdeugau

Message:

/trunk

Fix a few bugs:

• Don't include #-comments in the description
• Make sure $pkgdata{package}{provides} is defined before we do anything to it.
• Clean up some progress messages

File:

• trunk/debbuild (modified) (4 diffs)

trunk/debbuild

@@ -333 +333 @@
         }
         while (<SPECFILE>) {
+          next if /^#/;    # Messy.  Should be possible to do better.  :/
           redo LINE if /^\%/;
           $pkgdata{$subname}{desc} .= " $_";
@@ -694 +695 @@
 
     # Do this here since we're doing {depends}...
-    $pkgdata{$pkg}{provides} =~ s/^, //;
+    $pkgdata{$pkg}{provides} =~ s/^, // if defined($pkgdata{$pkg}{provides});
 
     # Gotta do this next, otherwise the control file has nowhere to go.  >:(
@@ -720 +721 @@
         "Maintainer: $pkgdata{main}{packager}\n".
         "Depends: $pkgdata{$pkg}{depends}\n".
-        "Provides: $pkgdata{$pkg}{provides}\n".
+        ( defined($pkgdata{$pkg}{provides}) ? "Provides: $pkgdata{$pkg}{provides}\n" : '' ).
         "Description: $pkgdata{$pkg}{summary}\n";
     $control .= "$pkgdata{$pkg}{desc}\n";
@@ -917 +918 @@
   my $pkgtree = $_[0];
 
-  print "checking reqs on executables in $pkgtree...\n";
+  print "Checking library requirements...\n";
   my @reqlist = qx { find $pkgtree -type f -perm 755 | grep -v $pkgtree/etc | xargs ldd };