Changeset 51

Timestamp:

03/09/06 14:57:57 (19 years ago)

Author:

kdeugau

Message:

/trunk

Add Conflicts: support on main package.

File:

• trunk/debbuild (modified) (3 diffs)

trunk/debbuild

@@ -575 +575 @@
       } elsif (/^provides:\s+(.+)/i) {
         $pkgdata{main}{provides} .= ", $1";
+      } elsif (/^conflicts:\s+(.+)/i) {
+        $pkgdata{main}{conflicts} .= ", $1";
       }
 #Name: suwrap
@@ -715 +717 @@
       $pkgdata{$pkg}{provides} = expandmacros($pkgdata{$pkg}{provides},'gp');
     }
+    if (defined($pkgdata{$pkg}{conflicts})) {
+      $pkgdata{$pkg}{conflicts} =~ s/^, //;
+      $pkgdata{$pkg}{conflicts} = expandmacros($pkgdata{$pkg}{conflicts},'gp');
+    }
 
     # Gotta do this next, otherwise the control file has nowhere to go.  >:(
@@ -741 +747 @@
         ( $pkgdata{$pkg}{requires} ne '' ? "Depends: $pkgdata{$pkg}{requires}\n" : '' ).
         ( defined($pkgdata{$pkg}{provides}) ? "Provides: $pkgdata{$pkg}{provides}\n" : '' ).
+        ( defined($pkgdata{$pkg}{conflicts}) ? "Conflicts: $pkgdata{$pkg}{conflicts}\n" : '' ).
         "Description: $pkgdata{$pkg}{summary}\n";
     $control .= "$pkgdata{$pkg}{desc}\n";