[Pkg-mono-svn-commits] rev 970 - mono/trunk/debian

[Eduard Bloch]

Author: blade
Date: 2004-06-12 12:47:47 -0600 (Sat, 12 Jun 2004)
New Revision: 970

Modified:
   mono/trunk/debian/dh_makenetlibs
   mono/trunk/debian/dh_netdeps
Log:
Fixes


Modified: mono/trunk/debian/dh_makenetlibs
===================================================================
--- mono/trunk/debian/dh_makenetlibs	2004-06-12 18:39:27 UTC (rev 969)
+++ mono/trunk/debian/dh_makenetlibs	2004-06-12 18:47:47 UTC (rev 970)
@@ -106,7 +106,7 @@
 
 init();
 
-if ( system "grep \"Build-Dep.*mono-utils.*0.95\" debian/control" ) {
+if ( system "grep -q \"Build-Dep.*mono-utils.*0.95\" debian/control" ) {
     warning("Warning! No Build-Depends on mono-utils (>= 0.95)!");
 }
 
@@ -170,10 +170,6 @@
         $dis =~ m/Version:\s+(\S+)/;
         $ver  = $1;
 
-        if ( defined( $dh{M_PARAMS} ) && $dh{M_PARAMS} ne '' ) {
-            $ver = $dh{M_PARAMS};
-        }
-
         if ( !-d "$tmp/DEBIAN" ) {
             doit( "install", "-d", "$tmp/DEBIAN" );
         }
@@ -194,7 +190,11 @@
 
                 # Remove debian version, if any.
                 $version =~ s/-[^-]+$//;
-            }
+             }
+
+             if ( defined( $dh{M_PARAMS} ) && $dh{M_PARAMS} ne '' ) {
+                $version = $dh{M_PARAMS};
+             }
             if ($dh{V_FLAG_SET}) {
                if ($dh{V_FLAG} ne '') {
                   $deps=$dh{V_FLAG};

Modified: mono/trunk/debian/dh_netdeps
===================================================================
--- mono/trunk/debian/dh_netdeps	2004-06-12 18:39:27 UTC (rev 969)
+++ mono/trunk/debian/dh_netdeps	2004-06-12 18:47:47 UTC (rev 970)
@@ -110,8 +110,7 @@
          $ret.= (", ".$shlibdata{$1}) if(defined($shlibdata{$1}));
       }
    }
-   $ret=~s/^, //;
-   print "TEST: $ret\n";
+   $ret=~s/^, // if $ret;
    return $ret;
 }
 
@@ -162,7 +161,7 @@
     #exit 1;
 
     addsubstvar( $package, "net:Depends",
-        "mono-jit (>> $mono_version) | cli-virtual-machine".(%depkgs?join(", ", "", (keys %depkgs)):""));
+        "mono-jit (>= $mono_version) | mono-mint (>= $mono_version)".(%depkgs?join(", ", "", (keys %depkgs)):""));
 
     #     # finaly resolve the version and add it to substvars
     #     foreach my $pkg (keys %deps) {