[Pkg-cli-common-commits] [SCM] cli-common branch, master, updated. debian/0.7.1-6-g8fb37e2

[Mirco Bauer]

The following commit has been merged in the master branch:
commit edc2d38ed02d9146ad2846c74ae7bbf5d80ac01f
Author: Mirco Bauer <meebey at meebey.net>
Date:   Wed Mar 16 21:16:10 2011 +0100

    Added .NET 4.0 support (requires mono-runtime >= 2.10.1)

diff --git a/debian/control b/debian/control
index 866c610..21b0bbb 100644
--- a/debian/control
+++ b/debian/control
@@ -37,8 +37,8 @@ Architecture: all
 Replaces: cli-common (<< 0.4.0)
 Depends: debhelper (>= 7.0.8),
  perl-modules,
- mono-utils (>= 2.0) | cil-disassembler,
- mono-devel (>= 2.0) | strong-name-tool,
+ mono-utils (>= 2.10.1) | cil-disassembler,
+ mono-devel (>= 2.10.1) | strong-name-tool,
  libxml-dom-perl
 Description: common files for building CLI packages
  This package must be installed if a CLI (Common Language Infrastructure)
diff --git a/dh_clideps b/dh_clideps
index e349f2f..f4f880e 100755
--- a/dh_clideps
+++ b/dh_clideps
@@ -221,6 +221,7 @@ close($fh);
 our $needs_net_1_0;
 our $needs_net_2_0;
 our $needs_net_2_1;
+our $needs_net_4_0;
 
 foreach my $package (@{$dh{DOPACKAGES}}) {
   my $tmp = tmpdir($package);
@@ -231,6 +232,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
   $needs_net_1_0 = 0;
   $needs_net_2_0 = 0;
   $needs_net_2_1 = 0;
+  $needs_net_4_0 = 0;
   
   # for idempotency
   delsubstvar($package, "cli:Depends");
@@ -265,7 +267,9 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
   my $vm_ref = "";
   if (!defined($dh{R_FLAG}) && $found_exe) {
     if ($clr eq "mono") {
-      if ($needs_net_2_1) {
+      if ($needs_net_4_0) {
+        $vm_ref = "mono-runtime (>= 2.10.1), ";
+      } elsif ($needs_net_2_1) {
         $vm_ref = "mono-runtime (>= 1.2.6), ";
       } elsif ($needs_net_2_0) {
         $vm_ref = "mono-runtime (>= 1.1.8.1), ";
@@ -519,6 +523,8 @@ sub resolveClilibRefs {
           $needs_net_2_0 = 1;
         } elsif ($ver eq "2.1.0.0") {
           $needs_net_2_1 = 1;
+        } elsif ($ver eq "4.0.0.0") {
+          $needs_net_4_0 = 1;
         } else {
           warning("Warning: Unknown mscorlib version: $ver!");
         }
diff --git a/dh_makeclilibs b/dh_makeclilibs
index 65e22ab..7ee5ae3 100755
--- a/dh_makeclilibs
+++ b/dh_makeclilibs
@@ -134,9 +134,9 @@ my $sn = 'sn';
 if (defined($dh{INTERNAL_MONO_FLAG}) ||
     (defined($ARGV[0]) && $ARGV[0] eq "internal-mono")) {
     $clr = "mono";
-    my $mono_path = "LD_LIBRARY_PATH=debian/tmp/usr/lib MONO_PATH=debian/tmp/usr/lib/mono/1.0:debian/tmp/usr/lib/mono/2.0";
+    my $mono_path = "LD_LIBRARY_PATH=debian/tmp/usr/lib MONO_PATH=debian/tmp/usr/lib/mono/4.0";
     $cli_parser = "$mono_path debian/tmp/usr/bin/monodis";
-    $sn = "$mono_path debian/tmp/usr/bin/mono debian/tmp/usr/lib/mono/1.0/sn.exe";
+    $sn = "$mono_path debian/tmp/usr/bin/mono debian/tmp/usr/lib/mono/4.0/sn.exe";
     verbose_print("Will use build Mono (debian/tmp/usr/bin/monodis) for CIL parsing.");
 } elsif (-x "/usr/bin/monodis") {
     $clr = "mono";

-- 
cli-common