Changeset 134 for trunk

Timestamp:

10/31/07 16:11:53 (17 years ago)

Author:

kdeugau

Message:

/trunk

Convert build-dep version check block to use dpkg --compare-versions.
Drop attempts to allow or'ed deps, because rpm doesn't support them.

File:

• trunk/debbuild (modified) (1 diff)

trunk/debbuild

@@ -1379 +1379 @@
       $reqflag = 0;
     } else {
-# gotta be a better way to do this... :/
-      if ($rel eq '>=' && !($reqver ge $ver)) {
-        print " * Buildreq $pkg is installed, but wrong version ($reqver):  Need $ver\n";
+      my ($resp) = qx { dpkg --compare-versions $reqver '$rel' $ver && echo "ok" };
+      if ($resp !~ /^ok/) {
         $reqflag = 0;
-      }
-      if ($rel eq '>' && !($reqver gt $ver)) {
-        print " * Buildreq $pkg is installed, but wrong version ($reqver):  Need $ver\n";
-        $reqflag = 0;
-      }
-      if ($rel eq '<=' && !($reqver le $ver)) {
-        print " * Buildreq $pkg is installed, but wrong version ($reqver):  Need $ver\n";
-        $reqflag = 0;
-      }
-      if ($rel eq '<' && !($reqver lt $ver)) {
-        print " * Buildreq $pkg is installed, but wrong version ($reqver):  Need $ver\n";
-        $reqflag = 0;
-      }
-      if ($rel eq '=' && !($reqver eq $ver)) {
-        print " * Buildreq $pkg is installed, but wrong version ($reqver):  Need $ver\n";
-        $reqflag = 0;
+        print " * Buildreq $pkg is installed, but wrong version ($reqver):  Need $ver\n"
       }
     } # end not installed/installed check