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

Mirco Bauer meebey-guest at costa.debian.org
Fri Apr 14 20:55:34 UTC 2006 

Author: meebey-guest
Date: 2006-04-14 20:55:31 +0000 (Fri, 14 Apr 2006)
New Revision: 2440

Modified:
   mono/trunk/debian/changelog
   mono/trunk/debian/control
   mono/trunk/debian/dh_clideps
   mono/trunk/debian/dh_makeclilibs
Log:
- mono-runtime



Modified: mono/trunk/debian/changelog
===================================================================
--- mono/trunk/debian/changelog	2006-04-14 20:44:15 UTC (rev 2439)
+++ mono/trunk/debian/changelog	2006-04-14 20:55:31 UTC (rev 2440)
@@ -1,8 +1,13 @@
-mono (1.1.13.6-1pre1) unstable; urgency=low
+mono (1.1.13.6-2) unstable; urgency=low
 
-  * NOT RELEASED YET
   * Dylan R. E. Moonfire
     + Included the late-GAC install hooks.
+  * Mirco 'meebey' Bauer:
+    + synced dh_clideps and dh_makeclilibs from cli-common 0.4.0
+    + debian/control:
+      - New meta package mono-runtime.
+      - Removed libmono-$version provides of libmono0, not needed anymore.
+        The shlibs file uses now libmono0.
 
  -- Debian Mono Group <pkg-mono-group at lists.alioth.debian.org>  Sun, 09 Apr 2006 14:07:23 -0500
 

Modified: mono/trunk/debian/control
===================================================================
--- mono/trunk/debian/control	2006-04-14 20:44:15 UTC (rev 2439)
+++ mono/trunk/debian/control	2006-04-14 20:55:31 UTC (rev 2440)
@@ -19,6 +19,19 @@
  This package contains base configuration files and configures the
  system to run CIL executables like native applications.
 
+Package: mono-runtime
+Provides: cli-runtime
+Architecture: i386 powerpc amd64 ia64 arm armeb
+Depends: mono-jit (= ${Source-Version}), mono-gac (= ${Source-Version})
+Description: Mono runtime
+ Mono is a platform for running and developing applications based on the
+ ECMA/ISO Standards. Mono is an open source effort led by Novell.
+ Mono provides a complete CLR (Common Language Runtime) including compiler and
+ runtime, which can produce and execute CIL (Common Intermediate Language)
+ bytecode (aka assemblies), and a class library.
+ .
+ This package is a meta package and pulls the VM and the GAC in.
+
 Package: mono-jit
 Provides: cli-virtual-machine
 Architecture: i386 powerpc amd64 ia64 arm armeb
@@ -67,12 +80,12 @@
  development components of Mono.
 
 Package: mono-utils
+Provides: cil-disassembler
 Section: devel
 Architecture: i386 powerpc amd64 ia64 arm armeb
 Replaces: mono-mcs (<= 1.1.6-4)
 Depends: ${shlibs:Depends}, ${misc:Depends}, libmono-corlib1.0-cil
 Suggests: libmono-corlib2.0-cil
-Provides: cil-disassembler
 Description: Mono utilities
  Mono is a platform for running and developing applications based on the
  ECMA/ISO Standards. Mono is an open source effort led by Novell.
@@ -88,7 +101,6 @@
 Architecture: i386 powerpc amd64 ia64 arm armeb
 Replaces: libmono-dev (<= 1.1.6-4)
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Provides: libmono-${mono:upversion}
 Description: libraries for the Mono JIT
  Shared libraries for Mono, used for embedding/hosting of the JIT.
  The package also contains libmono-profiler-cov used for optimisation work.

Modified: mono/trunk/debian/dh_clideps
===================================================================
--- mono/trunk/debian/dh_clideps	2006-04-14 20:44:15 UTC (rev 2439)
+++ mono/trunk/debian/dh_clideps	2006-04-14 20:55:31 UTC (rev 2440)
@@ -34,8 +34,8 @@
 if there are no .config files associated with the the .exe/.dll file
 which refers to the particular shared library (by its SONAME).
 
-If you use this program, your package should build-depend on cli-common
-(>= 0.2.0).
+If you use this program, your package should build-depend on cli-common-dev
+(>= 0.4.0).
 
 =head1 OPTIONS
 
@@ -50,9 +50,9 @@
 
 =item B<-r>
 
-Don't set a strong versioned dependency on mono-jit or other CLR packages.
-This option can be used to specify a relaxed dependency on the VM
-by-hand in the control file, eg. "mono-jit | cli-virtual-machine".
+Don't set a strong versioned dependency on mono-runtime or other CLR packages.
+This option can be used to specify a relaxed dependency on the VM/CLR
+by-hand in the control file, eg. "mono-runtime | cli-runtime".
 
 =item B<internal-mono>                             
 
@@ -91,8 +91,8 @@
   open(FILE, 'debian/control');
   my @filedata = <FILE>;
   close(FILE);
-  if (!($filedata[0] =~ /Build-Depends(-Indep)?: .*cli-common \(>= 0\.2\.0\)/)) {
-      warning("Warning! No Build-Depends(-Indep) on cli-common (>= 0.2.0)!");
+  if (!($filedata[0] =~ /Build-Depends(-Indep)?: .*cli-common-dev \(>= 0\.4\.0\)/)) {
+      warning("Warning! No Build-Depends(-Indep) on cli-common-dev (>= 0.4.0)!");
   }
 }
 
@@ -218,9 +218,10 @@
           }
        }
     }
+    
     # now filter the dupes coming from shlibs
     if (defined($dh{D_FLAG})) {
-       if (open($fh, "< debian/$package.substvars" )) {
+       if (open($fh, "< $pwd/debian/$package.substvars" )) {
           while (<$fh>) {
              if (/^shlibs:Depends=(.*)\n?/) {
                 for (split(/\s*,\s*/, $1)) {
@@ -229,7 +230,7 @@
              }
           }
        } else {
-          verbose_print("Could not read debian/$package.substvars");
+          verbose_print("Could not read $pwd/debian/$package.substvars");
        }
     }
 
@@ -237,17 +238,22 @@
     if (!defined($dh{R_FLAG}) && $found_exe) {
         if ($clr eq "mono") {
           if ($needs_net_2_0) {
-            $deps = "mono-jit (>= 1.1.8.1-1)";
+            $deps = "mono-runtime (>= 1.1.8.1)";
           } elsif ($needs_net_1_0) {
-            $deps = "mono-jit (>= 1.0)";
+            $deps = "mono-runtime (>= 1.0)";
           } else {
-            $deps = "mono-jit (>= $cli_version)";
+            $deps = "mono-runtime (>= $cli_version)";
           }
         } elsif ($clr eq "pnet") {
           $deps = "pnet-interpreter (>= $cli_version)";
         }
     }
     
+    if (-f "$tmp/usr/share/cli-common/packages.d/$package.installcligac") {
+    	$deps .= ", " if defined $deps && $deps ne '';
+        $deps .= "cli-common (>= 0.4.0)";
+    }
+    
     $deps .= join(", ", "",
         sort {
             # beautify the sort order, requested by meebey
@@ -302,7 +308,7 @@
 
 L<debhelper(7)>
 
-This program is a part of cli-common.
+This program is a part of cli-common-dev.
 
 =head1 AUTHOR
 

Modified: mono/trunk/debian/dh_makeclilibs
===================================================================
--- mono/trunk/debian/dh_makeclilibs	2006-04-14 20:44:15 UTC (rev 2439)
+++ mono/trunk/debian/dh_makeclilibs	2006-04-14 20:55:31 UTC (rev 2440)
@@ -147,8 +147,8 @@
   open(FILE, 'debian/control');
   my @filedata = <FILE>;
   close FILE;
-  if (!($filedata[0] =~ /Build-Depends(-Indep)?: .*cli-common \(>= 0\.2\.0\)/)) {
-      warning("Warning! No Build-Depends(-Indep) on cli-common (>= 0.2.0)!");
+  if (!($filedata[0] =~ /Build-Depends(-Indep)?: .*cli-common-dev \(>= 0\.4\.0\)/)) {
+      warning("Warning! No Build-Depends(-Indep) on cli-common-dev (>= 0.4.0)!");
   }
 }
 
@@ -283,7 +283,7 @@
 
 L<debhelper(7)>
 
-This program is a part of cli-common.
+This program is a part of cli-common-dev.
 
 =head1 KNOWN BUGS

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