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

[Mirco Bauer]

Author: meebey-guest
Date: 2005-10-02 15:49:15 +0000 (Sun, 02 Oct 2005)
New Revision: 2053

Modified:
   mono/trunk/debian/changelog
   mono/trunk/debian/dh_clideps
   mono/trunk/debian/dh_makeclilibs
Log:
- synced cli-common



Modified: mono/trunk/debian/changelog
===================================================================
--- mono/trunk/debian/changelog	2005-10-02 15:48:09 UTC (rev 2052)
+++ mono/trunk/debian/changelog	2005-10-02 15:49:15 UTC (rev 2053)
@@ -9,6 +9,7 @@
       - Should fix problems with amd64 and ia64 build.
         (Closes: #330982, thanks to David Mosberger-Tang
          <David.Mosberger at acm.org> for the patch)
+    + Synced dh_makeclilibs and dh_clideps from cli-common.
 
  -- Debian Mono Group <pkg-mono-group at lists.alioth.debian.org>  Sun, 2 Oct 2005 17:17:19 +0200
 

Modified: mono/trunk/debian/dh_clideps
===================================================================
--- mono/trunk/debian/dh_clideps	2005-10-02 15:48:09 UTC (rev 2052)
+++ mono/trunk/debian/dh_clideps	2005-10-02 15:49:15 UTC (rev 2053)
@@ -71,7 +71,7 @@
     $clr = "mono";
     my $pwd=`pwd`;
     chomp $pwd;
-    $cli_parser = "MONO_PATH=$pwd/debian/tmp/usr/lib/mono/1.0:$pwd/debian/tmp/usr/lib/mono/2.0 $pwd/debian/tmp/usr/bin/monodis";
+    $cli_parser = "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 $pwd/debian/tmp/usr/bin/monodis";
     $cli_version = `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") {

Modified: mono/trunk/debian/dh_makeclilibs
===================================================================
--- mono/trunk/debian/dh_makeclilibs	2005-10-02 15:48:09 UTC (rev 2052)
+++ mono/trunk/debian/dh_makeclilibs	2005-10-02 15:49:15 UTC (rev 2053)
@@ -126,7 +126,7 @@
 
 if (defined($ARGV[0]) && $ARGV[0] eq "internal-mono") {
     $clr = "mono";
-    my $mono_path = "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/1.0:debian/tmp/usr/lib/mono/2.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";
     verbose_print("Will use build Mono (debian/tmp/usr/bin/monodis) for CIL parsing.");