[Pkg-mono-svn-commits] rev 2875 - in mono/trunk/debian: . patches

Mirco Bauer meebey-guest at alioth.debian.org
Fri Nov 24 00:09:52 UTC 2006


Author: meebey-guest
Date: 2006-11-24 01:09:52 +0100 (Fri, 24 Nov 2006)
New Revision: 2875

Added:
   mono/trunk/debian/libmono-system-web2.0-cil.clideps-override
   mono/trunk/debian/patches/fix_directory_exists_reverts_r67043.dpatch
Modified:
   mono/trunk/debian/NEWS
   mono/trunk/debian/changelog
   mono/trunk/debian/control
   mono/trunk/debian/dh_clideps
   mono/trunk/debian/mono-gmcs.install
   mono/trunk/debian/patches/00list
   mono/trunk/debian/rules
Log:
- almost release



Modified: mono/trunk/debian/NEWS
===================================================================
--- mono/trunk/debian/NEWS	2006-11-24 00:01:33 UTC (rev 2874)
+++ mono/trunk/debian/NEWS	2006-11-24 00:09:52 UTC (rev 2875)
@@ -1,3 +1,9 @@
+mono (1.2-1) unstable; urgency=low
+
+  * WRITE ME
+
+ -- Debian Mono Group <pkg-mono-group at lists.alioth.debian.org>  Sun, 12 Nov 2006 13:53:44 +0100
+
 mono (0.96-1) unstable; urgency=low
 
   * It has been quite a while since the last Mono release in Debian and

Modified: mono/trunk/debian/changelog
===================================================================
--- mono/trunk/debian/changelog	2006-11-24 00:01:33 UTC (rev 2874)
+++ mono/trunk/debian/changelog	2006-11-24 00:09:52 UTC (rev 2875)
@@ -1,3 +1,21 @@
+mono (1.2.1-1~pre1) unstable; urgency=low
+
+  * New upstream release
+  * Mirco 'meebey' Bauer:
+    + debian/NEWS: 
+      - Added entry for Mono 1.2
+    + debian/patches/gmcs-static-anonmethods.dpatch:
+      - Removed, already applied upstream.
+    + debian/mono-gmcs.install:
+      - Added mkbundle2
+      - Added sgen
+    + debian/libmono-system-web2.0-cil.clideps-override:
+      - Override for GUI/X11 dependency on libmono-winforms2.0-cil to suggests.
+    + debian/dh_clideps:
+      - Synced from cli-common-dev 0.4.7.
+
+ -- Debian Mono Group <pkg-mono-group at lists.alioth.debian.org>  Wed, 22 Nov 2006 21:36:33 +0100
+
 mono (1.1.18-3) unstable; urgency=low
 
   * Sebastian 'slomo' Dröge:

Modified: mono/trunk/debian/control
===================================================================
--- mono/trunk/debian/control	2006-11-24 00:01:33 UTC (rev 2874)
+++ mono/trunk/debian/control	2006-11-24 00:09:52 UTC (rev 2875)
@@ -357,6 +357,7 @@
 Architecture: all
 Replaces: mono-classlib-2.0 (<< 1.1.13.6-2), mono-classlib-2.0-dbg (<< 1.1.13.6-1)
 Depends: ${cli:Depends}
+Suggests: ${cli:Suggests}
 Description: Mono System.Web Library
  Mono is a platform for running and developing applications based on the
  ECMA/ISO Standards. Mono is an open source effort led by Novell.

Modified: mono/trunk/debian/dh_clideps
===================================================================
--- mono/trunk/debian/dh_clideps	2006-11-24 00:01:33 UTC (rev 2874)
+++ mono/trunk/debian/dh_clideps	2006-11-24 00:09:52 UTC (rev 2875)
@@ -210,114 +210,66 @@
 }
 close($fh);
 
+our $needs_net_1_0;
+our $needs_net_2_0;
+
 foreach my $package (@{$dh{DOPACKAGES}}) {
-    my $tmp = tmpdir($package);
-    my %refs = ( depends => [],
-                 recommends => [],
-                 suggests => [] );
-    my $found_exe = 0;
-    my $needs_net_1_0 = 0;
-    my $needs_net_2_0 = 0;
-    
-    # for idempotency
-    delsubstvar($package, "cli:Depends");
-    delsubstvar($package, "cli:Suggests");
-    delsubstvar($package, "cli:Recommends");
+  my $tmp = tmpdir($package);
+  my %refs = ( depends => [],
+               recommends => [],
+               suggests => [] );
+  my $found_exe = 0;
+  $needs_net_1_0 = 0;
+  $needs_net_2_0 = 0;
+  
+  # for idempotency
+  delsubstvar($package, "cli:Depends");
+  delsubstvar($package, "cli:Suggests");
+  delsubstvar($package, "cli:Recommends");
 
-    # find binaries
-    find (sub {
-        return unless -f && !-l && /\.(exe|dll)$/;
-        my $vers;
-        my $file = $_;
-        if (/\.exe$/) {
-          $found_exe = 1;
-        }
+  # find binaries
+  find (sub {
+    return unless -f && !-l && /\.(exe|dll)$/;
+    my $file = $_;
+    if (/\.exe$/) {
+      $found_exe = 1;
+    }
 
-        verbose_print("Package: $package Assembly: $file");
+    verbose_print("Package: $package Assembly: $file");
         
-        my %shlibRefs = resolveShlibRefs($package, $file);
-        push(@{$refs{depends}},    @{$shlibRefs{depends}});
-        push(@{$refs{recommends}}, @{$shlibRefs{recommends}});
-        push(@{$refs{suggests}},   @{$shlibRefs{suggests}});
-        
-        my (undef, $tmpfile) = File::Temp::tempfile("/tmp/".basename($0).".XXXX", UNLINK => 1);
-        my $command = "LANG=C $cli_parser_paths MONO_GAC_PREFIX=\$MONO_GAC_PREFIX:$tmp/usr $cli_parser --assemblyref $file 2>&1 > $tmpfile";
-        verbose_print("running CLI parser command: $command");
-        
-        system($command);
-        if ($?) {
-          my $output;
-          {
-            local *F;
-            open(F, $tmpfile);
-            local $/;
-            $output = <F>;
-            close(F);
-          }
-          error("cli_parser call failed: '".$command."' rc: $? output: $output");
-          return;
-        }
-        
-        our($vers, $name, $key);
-        local *F;
-        open(F, $tmpfile);
-        while (<F>) {
-            $vers = $1 if /Version=(.*)\n/;
-            $name = $1 if /Could not find assembly ([^,]+),/;
-            $name = $1 if /Name=(.*)\n/;
-            $vers = "$1.$2" if /Major\/Minor:\s*(\d+),(\d+)/;
-            $vers .= ".$1.$2" if /Build:\s*(\d+),(\d+)/;
+    my %shlibRefs = resolveShlibRefs($package, $file);
+    push(@{$refs{depends}},    @{$shlibRefs{depends}});
+    push(@{$refs{recommends}}, @{$shlibRefs{recommends}});
+    push(@{$refs{suggests}},   @{$shlibRefs{suggests}});
 
-            if (/0x\S+:.([ABCDEF0123456789 ]+)\n/ || /Token:\s*(\w+)/) {
-                $key = $1;
-                $key =~ s/\ //g;
-                $key = $vers . "__" . lc($key);
-                my $compat = "$name/$key";
-                if (!defined($clilibdata{$compat})) {
-                    warning("Warning: No Debian dependency data for $name ($key)!");
-                } else {
-                    push(@{$refs{depends}}, $clilibdata{$compat});
-                }
-                #print "ok, ".$deps{ "$name/$vers" . "__" . lc($key) };
+    my %clilibRefs = resolveClilibRefs($package, $tmp, $file);
+    push(@{$refs{depends}},    @{$clilibRefs{depends}});
+    push(@{$refs{recommends}}, @{$clilibRefs{recommends}});
+    push(@{$refs{suggests}},   @{$clilibRefs{suggests}});
+  }, $tmp);
 
-                if ($name eq "mscorlib") {
-                  if ($vers eq "1.0.5000.0") {
-                    $needs_net_1_0 = 1;
-                  } elsif ($vers eq "2.0.3600.0") {
-                    $needs_net_2_0 = 1;
-                  } elsif ($vers eq "2.0.0.0") {
-                    $needs_net_2_0 = 1;
-                  } else {
-                    warning("Warning: Unknown mscorlib version: $vers!");
-                  }
-                } 
-            }
-        }
-        close(F);
-     }, $tmp);
+  $refs{depends}    = filterDuplicates($package, $refs{depends});
+  $refs{recommends} = filterDuplicates($package, $refs{recommends});
+  $refs{suggests}   = filterDuplicates($package, $refs{suggests});
 
-    $refs{depends}    = filterDuplicates($package, $refs{depends});
-    $refs{recommends} = filterDuplicates($package, $refs{recommends});
-    $refs{suggests}   = filterDuplicates($package, $refs{suggests});
-
-    my $vm_ref = "";
-    if (!defined($dh{R_FLAG}) && $found_exe) {
-        if ($clr eq "mono") {
-          if ($needs_net_2_0) {
-            $vm_ref = "mono-runtime (>= 1.1.8.1), ";
-          } elsif ($needs_net_1_0) {
-            $vm_ref = "mono-runtime (>= 1.0), ";
-          } else {
-            $vm_ref = "mono-runtime (>= $cli_version), ";
-          }
-        } elsif ($clr eq "pnet") {
-          $vm_ref = "pnet-interpreter (>= $cli_version), ";
-        }
+  my $vm_ref = "";
+  if (!defined($dh{R_FLAG}) && $found_exe) {
+    if ($clr eq "mono") {
+      if ($needs_net_2_0) {
+        $vm_ref = "mono-runtime (>= 1.1.8.1), ";
+      } elsif ($needs_net_1_0) {
+        $vm_ref = "mono-runtime (>= 1.0), ";
+      } else {
+        $vm_ref = "mono-runtime (>= $cli_version), ";
+      }
+    } elsif ($clr eq "pnet") {
+      $vm_ref = "pnet-interpreter (>= $cli_version), ";
     }
+  }
     
-    if (-f "$tmp/usr/share/cli-common/packages.d/$package.installcligac") {
-        $vm_ref .= "cli-common (>= 0.4.0), ";
-    }
+  if (-f "$tmp/usr/share/cli-common/packages.d/$package.installcligac") {
+    $vm_ref .= "cli-common (>= 0.4.0), ";
+  }
     
     #$deps .= join(", ", "",
     #    sort {
@@ -334,13 +286,13 @@
     #    } (keys %depkgsFiltered)
     #);
     
-    @{$refs{depends}}    = sort(@{$refs{depends}});
-    @{$refs{recommends}} = sort(@{$refs{recommends}});
-    @{$refs{suggests}}   = sort(@{$refs{suggests}});
+  @{$refs{depends}}    = sort(@{$refs{depends}});
+  @{$refs{recommends}} = sort(@{$refs{recommends}});
+  @{$refs{suggests}}   = sort(@{$refs{suggests}});
 
-    addsubstvar($package, "cli:Depends",    $vm_ref . join(", ", @{$refs{depends}}));
-    addsubstvar($package, "cli:Recommends", join(", ", @{$refs{recommends}}));
-    addsubstvar($package, "cli:Suggests",   join(", ", @{$refs{suggests}}));
+  addsubstvar($package, "cli:Depends",    $vm_ref . join(", ", @{$refs{depends}}));
+  addsubstvar($package, "cli:Recommends", join(", ", @{$refs{recommends}}));
+  addsubstvar($package, "cli:Suggests",   join(", ", @{$refs{suggests}}));
 }
 
 sub filterDuplicates {
@@ -349,9 +301,14 @@
   
   my %packagesFiltered;
   for (@{$packages}) {
-    # filter dupes and don't depend on this package
+    # filter undef, empties, dups and don't depend on ourself package
+    if (!$_) {
+      next;
+    }
+    
     /^(\S+)/;
-    if ($1 ne $package) {
+    if ($1 &&
+        $1 ne $package) {
       $packagesFiltered{$_} = 1;
     }
   }
@@ -397,6 +354,142 @@
    }
 }
 
+sub loadOverrides {
+   my $package = shift;
+   my $overridedata = shift;
+   
+   # load clideps overrides
+   verbose_print("Loading clideps-override for $package...");
+   my $fh;
+   open($fh, "cat $pwd/debian/$package.clideps-override 2> /dev/null |");
+   while (<$fh>) {
+     /(\S+)\s+(\S+)(?:\s+(\(\S+\s+\S+\)))?\n?/;
+     my ($type, $package, $version);
+     $type = $1;    
+     $package = $2; 
+     $version = $3 if defined($3);
+     if ($version) {
+       $overridedata->{$package} = $type." ".$version;
+     } else {
+       $overridedata->{$package} = $type;
+     }
+   }
+   close($fh);
+}
+
+sub resolveOverride {
+  my $package = shift;
+  my $pkgref = shift;
+  my %ret = ( depends => undef,
+              recommends => undef,
+              suggests => undef );
+
+  my $type = "depends";
+  my $newpkgref = $pkgref;
+  $newpkgref =~ m/(\S+)(?:\s+(\(\S+\s+\S+\)))?/;
+  my $pkgname = $1;
+  my $ver = $2;
+  # hack for libc6, for ia64 and alpha the package name is libc6.1
+  if ($pkgname =~ m/^libc6/) {
+    $newpkgref = "libc6 $ver | libc6.1 $ver";
+  }
+ 
+  my %overridedata;
+  loadOverrides($package, \%overridedata);
+  if (defined($overridedata{$pkgname})) {
+    verbose_print("Found clideps-override: $pkgname for: $package");
+
+    my $override = $overridedata{$pkgname};
+    $override =~ m/(\S+)(?:\s+(\(\S+\s+\S+\)))?/;
+    if ($1 eq "suggests" ||
+        $1 eq "recommends") {
+      $type = $1;
+    } elsif ($1 eq "ignores") {
+    } else {
+      warning("Warning: unknown override type: $1 in: '$override' for: $package!");
+    }
+       
+    if (defined($2)) {
+      $newpkgref = "$pkgname $2";
+    } else {
+      $newpkgref = $pkgref;
+    }
+  }
+  verbose_print("resolved pkgref: $pkgref to $type: $newpkgref");
+  $ret{$type} = $newpkgref;
+  
+  return %ret; 
+}
+
+sub resolveClilibRefs {
+  my $package = shift;
+  my $tmp = shift;
+  my $assembly_filename = shift;
+  my %ret = ( depends => [],
+              recommends => [],
+              suggests => [] );
+
+  my (undef, $tmpfile) = File::Temp::tempfile("/tmp/".basename($0).".XXXX", UNLINK => 1);
+  my $command = "LANG=C $cli_parser_paths MONO_GAC_PREFIX=\$MONO_GAC_PREFIX:$tmp/usr $cli_parser --assemblyref $assembly_filename 2>&1 > $tmpfile";
+  verbose_print("running CLI parser command: $command");
+  
+  system($command);
+  if ($?) {
+    my $output;
+    {
+      local *F;
+      open(F, $tmpfile);
+      local $/;
+      $output = <F>;
+      close(F);
+    }
+    error("cli_parser call failed: '".$command."' rc: $? output: $output");
+    return;
+  }
+        
+  my ($ver, $name, $key);
+  local *F;
+  open(F, $tmpfile);
+  while (<F>) {
+    $ver  = $1 if /Version=(.*)\n/;
+    $name = $1 if /Could not find assembly ([^,]+),/;
+    $name = $1 if /Name=(.*)\n/;
+    $ver  = "$1.$2" if /Major\/Minor:\s*(\d+),(\d+)/;
+    $ver  .= ".$1.$2" if /Build:\s*(\d+),(\d+)/;
+
+    if (/0x\S+:.([ABCDEF0123456789 ]+)\n/ || /Token:\s*(\w+)/) {
+      $key = $1;
+      $key =~ s/\ //g;
+      $key = $ver . "__" . lc($key);
+      my $compat = "$name/$key";
+      if (!defined($clilibdata{$compat})) {
+        warning("Warning: No Debian dependency data for $name ($key)!");
+      } else {
+        my $pkgref = $clilibdata{$compat};
+        my %overriddenRef = resolveOverride($package, $pkgref);
+        push(@{$ret{depends}},    $overriddenRef{depends});
+        push(@{$ret{recommends}}, $overriddenRef{recommends});
+        push(@{$ret{suggests}},   $overriddenRef{suggests});
+      }
+
+      if ($name eq "mscorlib") {
+        if ($ver eq "1.0.5000.0") {
+          $needs_net_1_0 = 1;
+        } elsif ($ver eq "2.0.3600.0") {
+          $needs_net_2_0 = 1;
+        } elsif ($ver eq "2.0.0.0") {
+          $needs_net_2_0 = 1;
+        } else {
+          warning("Warning: Unknown mscorlib version: $ver!");
+        }
+      } 
+    }
+  }
+  close(F);
+  
+  return %ret;
+}
+
 sub resolveShlibRefs {
    my $package = shift;
    my $assembly_filename = shift;
@@ -416,24 +509,6 @@
    loadDllMap("/etc/mono/config", \%dllmapdata);
    loadDllMap("$pwd/debian/tmp/etc/mono/config", \%dllmapdata);
    loadDllMap($config_filename, \%dllmapdata);
-    
-   # load clideps overrides
-   verbose_print("Loading clideps-override...");
-   my %clideps_override;
-   open($fh, "cat $pwd/debian/$package.clideps-override 2> /dev/null |");
-   while (<$fh>) {
-     /(\S+)\s+(\S+)(?:\s+(\(\S+\s+\S+\)))?\n?/;
-     my ($type, $package, $version);
-     $type = $1;    
-     $package = $2; 
-     $version = $3 if defined($3);
-     if ($version) {
-       $clideps_override{$package} = $type." ".$version;
-     } else {
-       $clideps_override{$package} = $type;
-     }
-   }
-   close($fh);
    
    # parse modulerefs
    my (undef, $tmpfile) = File::Temp::tempfile("/tmp/".basename($0).".XXXX", UNLINK => 1);
@@ -485,36 +560,10 @@
        next;
      }
 
-     my $type = "depends";
-     my $pkg = $pkgref;
-     $pkgref =~ m/(\S+)(?:\s+(\(\S+\s+\S+\)))?/;
-     my $pkgname = $1;
-     my $ver = $2;
-     # hack for libc6, for ia64 and alpha the package name is libc6.1
-     if ($pkgname =~ m/^libc6/) {
-       $pkg = "libc6 $ver | libc6.1 $ver";
-     }
-     
-     if (defined($clideps_override{$pkgname})) {
-       verbose_print("Found clideps-overidde: $pkgname for: $package");
-
-       my $override = $clideps_override{$pkgname};
-       $override =~ m/(\S+)(?:\s+(\(\S+\s+\S+\)))?/;
-       if ($1 eq "suggests" ||
-           $1 eq "recommends") {
-           $type = $1;
-       } elsif ($1 eq "ignores") {
-       } else {
-         warning("Warning: unknown override type: $1 in: '$override' for: $package!");
-       }
-       
-       if (defined($2)) {
-         $pkg = "$pkgname $2";
-       } else {
-         $pkg = $pkgref;
-       }
-     }
-     push(@{$ret{$type}}, $pkg);
+     my %overriddenRef = resolveOverride($package, $pkgref);
+     push(@{$ret{depends}},    $overriddenRef{depends});
+     push(@{$ret{recommends}}, $overriddenRef{recommends});
+     push(@{$ret{suggests}},   $overriddenRef{suggests});
    } 
    close(F);
    

Added: mono/trunk/debian/libmono-system-web2.0-cil.clideps-override
===================================================================
--- mono/trunk/debian/libmono-system-web2.0-cil.clideps-override	2006-11-24 00:01:33 UTC (rev 2874)
+++ mono/trunk/debian/libmono-system-web2.0-cil.clideps-override	2006-11-24 00:09:52 UTC (rev 2875)
@@ -0,0 +1 @@
+suggests libmono-winforms2.0-cil

Modified: mono/trunk/debian/mono-gmcs.install
===================================================================
--- mono/trunk/debian/mono-gmcs.install	2006-11-24 00:01:33 UTC (rev 2874)
+++ mono/trunk/debian/mono-gmcs.install	2006-11-24 00:09:52 UTC (rev 2875)
@@ -4,6 +4,8 @@
 debian/tmp/usr/bin/ilasm2
 debian/tmp/usr/bin/resgen2
 debian/tmp/usr/bin/mono-service2
+debian/tmp/usr/bin/mkbundle2
 debian/tmp/usr/bin/xbuild
+debian/tmp/usr/bin/sgen
 debian/tmp/usr/lib/mono/2.0/*.exe*
 debian/tmp/usr/lib/mono/xbuild/

Modified: mono/trunk/debian/patches/00list
===================================================================
--- mono/trunk/debian/patches/00list	2006-11-24 00:01:33 UTC (rev 2874)
+++ mono/trunk/debian/patches/00list	2006-11-24 00:09:52 UTC (rev 2875)
@@ -1,3 +1,3 @@
 remove_broken_dllmap_from_mono-shlib-cop.dpatch
 console-no-utf8-bom.dpatch
-gmcs-static-anonmethods.dpatch
+#fix_directory_exists_reverts_r67043.dpatch

Added: mono/trunk/debian/patches/fix_directory_exists_reverts_r67043.dpatch
===================================================================
--- mono/trunk/debian/patches/fix_directory_exists_reverts_r67043.dpatch	2006-11-24 00:01:33 UTC (rev 2874)
+++ mono/trunk/debian/patches/fix_directory_exists_reverts_r67043.dpatch	2006-11-24 00:09:52 UTC (rev 2875)
@@ -0,0 +1,59 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## fix_directory_exists_reverts_r67043.dpatch by Mirco Bauer <meebey at meebey.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad mono-1.2~/mono/io-layer/io.c mono-1.2/mono/io-layer/io.c
+--- mono-1.2~/mono/io-layer/io.c	2006-11-02 19:09:50.000000000 +0100
++++ mono-1.2/mono/io-layer/io.c	2006-11-09 23:29:37.000000000 +0100
+@@ -3178,7 +3178,7 @@
+ guint32 GetFileAttributes (const gunichar2 *name)
+ {
+ 	gchar *utf8_name;
+-	struct stat buf, linkbuf;
++	struct stat buf;
+ 	int result;
+ 	guint32 ret;
+ 	
+@@ -3213,21 +3213,7 @@
+ 		return (INVALID_FILE_ATTRIBUTES);
+ 	}
+ 
+-	result = _wapi_lstat (utf8_name, &linkbuf);
+-	if (result != 0) {
+-		_wapi_set_last_path_error_from_errno (NULL, utf8_name);
+-		g_free (utf8_name);
+-		return (INVALID_FILE_ATTRIBUTES);
+-	}
+-	
+-	/* Don't treat symlinks to directories as directories.  See
+-	 * bug 79733
+-	 */
+-	if (S_ISDIR (buf.st_mode) && S_ISLNK (linkbuf.st_mode)) {
+-		ret = _wapi_stat_to_file_attributes (utf8_name, &linkbuf);
+-	} else {
+-		ret = _wapi_stat_to_file_attributes (utf8_name, &buf);
+-	}
++	ret = _wapi_stat_to_file_attributes (utf8_name, &buf);
+ 	
+ 	g_free (utf8_name);
+ 
+diff -urNad mono-1.2~/mono/metadata/file-io.c mono-1.2/mono/metadata/file-io.c
+--- mono-1.2~/mono/metadata/file-io.c	2006-11-02 19:09:50.000000000 +0100
++++ mono-1.2/mono/metadata/file-io.c	2006-11-09 23:31:17.000000000 +0100
+@@ -341,11 +341,9 @@
+ 		result = stat (filename, &linkbuf);
+ 		if (result != -1) {
+ 			buf = linkbuf;
++		} else {
++			buf.st_mode |= ~S_IFDIR; /* force it to be returned as regular file */
+ 		}
+-		/* force dangling symlinks or symlinks to directories
+-		 * to be returned as a regular file (see bug 79733)
+-		 */
+-		buf.st_mode |= ~S_IFDIR;
+ 	}
+ 
+ 	/* Sockets (0140000) != Directory (040000) + Regular file (0100000) */


Property changes on: mono/trunk/debian/patches/fix_directory_exists_reverts_r67043.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Modified: mono/trunk/debian/rules
===================================================================
--- mono/trunk/debian/rules	2006-11-24 00:01:33 UTC (rev 2874)
+++ mono/trunk/debian/rules	2006-11-24 00:09:52 UTC (rev 2875)
@@ -138,6 +138,10 @@
 	rm debian/mono-mcs/usr/bin/mono-service2
 	# delete xbuild from mono-mcs (this is already in mono-gmcs)
 	rm debian/mono-mcs/usr/bin/xbuild
+	# delete mkbundle2 from mono-mcs (this is already in mono-gmcs)
+	rm debian/mono-mcs/usr/bin/mkbundle2
+	# delete sgen from mono-mcs (this is already in mono-gmcs)
+	rm debian/mono-mcs/usr/bin/sgen
 	# delete Mono.Data.Tds from libmono1.0/2.0-cil (those are already in libmono-data-tds*-cil)
 	rm -r debian/libmono1.0-cil/usr/lib/mono/gac/Mono.Data.Tds/
 	rm -r debian/libmono2.0-cil/usr/lib/mono/gac/Mono.Data.Tds/
@@ -230,7 +234,8 @@
 	  -plibmono1.0-cil \
 	  -plibmono2.0-cil \
 	  -m $(MONO_API) internal-mono
-	debian/dh_clideps -i internal-mono -l debian/tmp
+	#debian/dh_clideps -i internal-mono -l debian/tmp
+	DH_VERBOSE=1 debian/dh_clideps -i internal-mono -l debian/tmp
 	# mono-gac needs special runtime dep, to prevent circular dep (mono-runtime <-> mono-gac)
 	debian/dh_clideps -pmono-gac -r internal-mono
 	dh_gencontrol -i -- -Vmono:upversion=$(UPVERSION) -Vmono:next-upversion=$(NEXT_UPVERSION)




More information about the Pkg-mono-svn-commits mailing list