[Pkg-mono-svn-commits] rev 2013 - in cli-common/trunk: . debian

[Mirco Bauer]

Author: meebey-guest
Date: 2005-09-24 13:48:08 +0000 (Sat, 24 Sep 2005)
New Revision: 2013

Modified:
   cli-common/trunk/debian/changelog
   cli-common/trunk/dh_clideps
Log:
- 0.2.2 release



Modified: cli-common/trunk/debian/changelog
===================================================================
--- cli-common/trunk/debian/changelog	2005-09-21 19:57:14 UTC (rev 2012)
+++ cli-common/trunk/debian/changelog	2005-09-24 13:48:08 UTC (rev 2013)
@@ -1,10 +1,12 @@
 cli-common (0.2.2) unstable; urgency=low
 
-  * NOT RELEASED YET
   * Mirco 'meebey' Bauer
-    + fixed manpage of dh_makeclilibs, "internal-mono" not "--internal-mono".
+    + Fixed manpage of dh_makeclilibs, "internal-mono" not "--internal-mono".
+    + dh_clideps knows now 2.0.0.0 version of mscorlib.
+    + Fixed bug in dh_clideps, when .NET 1.0 and 2.0 were used in the same
+      package, the generated dependency was only for .NET 1.0 then.
 
- -- Debian Mono Group <pkg-mono-group at lists.alioth.debian.org>  Sun, 4 Sep 2005 22:38:57 +0200
+ -- Debian Mono Group <pkg-mono-group at lists.alioth.debian.org>  Sat, 24 Sep 2005 15:46:42 +0200
 
 cli-common (0.2.1) unstable; urgency=low
 

Modified: cli-common/trunk/dh_clideps
===================================================================
--- cli-common/trunk/dh_clideps	2005-09-21 19:57:14 UTC (rev 2012)
+++ cli-common/trunk/dh_clideps	2005-09-24 13:48:08 UTC (rev 2013)
@@ -197,6 +197,8 @@
                     $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!");
                   }
@@ -234,10 +236,10 @@
     my $deps;
     if (!defined($dh{R_FLAG}) && $found_exe) {
         if ($clr eq "mono") {
-          if ($needs_net_1_0) {
+          if ($needs_net_2_0) {
+            $deps = "mono-jit (>= 1.1.8.1-1)";
+          } elsif ($needs_net_1_0) {
             $deps = "mono-jit (>= 1.0)";
-          } elsif ($needs_net_2_0) {
-            $deps = "mono-jit (>= 1.1.8.1-1)";
           } else {
             $deps = "mono-jit (>= $cli_version)";
           }