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

[Mirco Bauer]

Author: meebey-guest
Date: 2006-10-01 10:50:36 +0000 (Sun, 01 Oct 2006)
New Revision: 2750

Modified:
   cli-common/trunk/debian/changelog
   cli-common/trunk/dh_clideps
Log:
- bugfix and 0.4.6 release



Modified: cli-common/trunk/debian/changelog
===================================================================
--- cli-common/trunk/debian/changelog	2006-09-30 10:56:22 UTC (rev 2749)
+++ cli-common/trunk/debian/changelog	2006-10-01 10:50:36 UTC (rev 2750)
@@ -1,6 +1,17 @@
+cli-common (0.4.6) unstable; urgency=low
+
+  * Mirco 'meebey' Bauer
+    + dh_clideps:
+      - Don't parse symlinks that point to CLI assemblies.
+      - Added support for MONO_PATH using -l parameter.
+      - Only use the basename of DLL map targets.
+        (else the shlibs lookup will fail) 
+
+ -- Debian Mono Group <pkg-mono-group at lists.alioth.debian.org>  Sun, 24 Sep 2006 20:06:14 +0200
+
 cli-common (0.4.5) unstable; urgency=low
 
-  * Mirco 'meebey Bauer
+  * Mirco 'meebey' Bauer
     + debian/control:
       - Really added libxml-dom-perl dependency to cli-common-dev.
 

Modified: cli-common/trunk/dh_clideps
===================================================================
--- cli-common/trunk/dh_clideps	2006-09-30 10:56:22 UTC (rev 2749)
+++ cli-common/trunk/dh_clideps	2006-10-01 10:50:36 UTC (rev 2750)
@@ -57,7 +57,7 @@
 
 =item B<-l>directory[:directory:directory:..]
 
-Before mondis is run, MONO_GAC_PREFIX have added to it the specified directory (or
+Before mondis is run, MONO_GAC_PREFIX and MONO_PATH are set to the specified directory (or
 directories -- separate with colons). This is useful for multi-binary packages where a library is
 built in one package and another package contains binaries linked against said library. Relative
 paths will be made absolute for the benefit of monodis.
@@ -74,11 +74,15 @@
 Suppose that your source package produces libfoo1.0-cil and libbar1.0-cil
 binary packages.
 In your rules file, first run dh_makeclilibs, then dh_clideps:
-
+  (MONO_GAC_PREFIX example)
   dh_makeclilibs -V
   dh_clideps -l debian/libfoo1.0-cil/usr:debian/libbar1.0-cil/usr
 or
-  dh_clideps -l debian/tmp
+  (MONO_PATH example)
+  dh_clideps -l debian/foo-application/usr/lib/foo-application
+or
+  (MONO_GAC_PREFIX example)
+  dh_clideps -l debian/tmp/usr
 
 =cut
 
@@ -95,17 +99,16 @@
 my $mono_gac_prefix = "";
 my $mono_path = "";
 if ($dh{L_PARAMS}) { 
-  my @paths = ();
   my @mono_paths = ();
   my @mono_gac_prefixes = ();
   # Add to existing paths, if set.
-  push(@paths, $ENV{'MONO_GAC_PREFIX'}) if exists $ENV{'MONO_GAC_PREFIX'};
-  push(@paths, $ENV{'MONO_PATH'}) if exists $ENV{'MONO_PATH'};
+  push(@mono_gac_prefixes, $ENV{'MONO_GAC_PREFIX'}) if exists $ENV{'MONO_GAC_PREFIX'};
+  push(@mono_paths,        $ENV{'MONO_PATH'}) if exists $ENV{'MONO_PATH'};
   foreach (split(/:/, $dh{L_PARAMS})) {
     # Force the path absolute.
     my $full_path;
     if (m:^/:) {
-      $full_path = @paths, $_;
+      $full_path = $_;
     } else {
       $full_path = getcwd()."/$_";
     }
@@ -114,23 +117,26 @@
       push(@mono_gac_prefixes, $full_path);
     } else {
       # it's a Mono PATH
-      pusg(@mono_paths, $full_path);
+      push(@mono_paths, $full_path);
     }
   }
   $mono_gac_prefix .= ":" . join(':', @mono_gac_prefixes);
-  $mono_paths .= ":" . join(':', @mono_paths);
+  $mono_path       .= ":" . join(':', @mono_paths);
+} else {
+  $mono_gac_prefix = $ENV{'MONO_GAC_PREFIX'} if exists $ENV{'MONO_GAC_PREFIX'};
+  $mono_path       = $ENV{'MONO_PATH'} if exists $ENV{'MONO_PATH'};
 }
 
 if (defined($ARGV[0]) && $ARGV[0] eq "internal-mono") {
     $clr = "mono";
     $cli_parser = "$pwd/debian/tmp/usr/bin/monodis";
-    $cli_parser_paths = "LD_LIBRARY_PATH=$pwd/debian/tmp/usr/lib MONO_PATH=$pwd/debian/tmp/usr/lib/mono/1.0:$pwd/debian/tmp/usr/lib/mono/2.0 MONO_GAC_PREFIX=$mono_gac_prefix MONO_PATH=$mono_paths ";
+    $cli_parser_paths = "LD_LIBRARY_PATH=$pwd/debian/tmp/usr/lib MONO_PATH=$mono_path:$pwd/debian/tmp/usr/lib/mono/1.0:$pwd/debian/tmp/usr/lib/mono/2.0 MONO_GAC_PREFIX=$mono_gac_prefix ";
     $cli_version = `LD_LIBRARY_PATH=$pwd/debian/tmp/usr/lib $pwd/debian/tmp/usr/bin/mono --version 2>&1`;
     verbose_print("Will use built Mono (debian/tmp/usr/bin/monodis) for CIL parsing.");
 } elsif (-x "/usr/bin/monodis") {
     $clr = "mono";
     $cli_parser = "/usr/bin/monodis";
-    $cli_parser_paths = "MONO_GAC_PREFIX=$mono_gac_prefix MONO_PATH=$mono_paths ";
+    $cli_parser_paths = "MONO_PATH=$mono_path MONO_GAC_PREFIX=$mono_gac_prefix ";
     verbose_print("Will use Mono (/usr/bin/monodis) for CIL parsing.");
 } elsif (-x "/usr/bin/ildasm") {
     $clr = "pnet";