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

[Mirco Bauer]

Author: meebey-guest
Date: 2005-09-04 20:22:12 +0000 (Sun, 04 Sep 2005)
New Revision: 1980

Modified:
   cli-common/trunk/debian/changelog
   cli-common/trunk/debian/control
   cli-common/trunk/dh_clideps
   cli-common/trunk/dh_makeclilibs
Log:
- fixed internal-mono mode.
- 0.2.1 release.



Modified: cli-common/trunk/debian/changelog
===================================================================
--- cli-common/trunk/debian/changelog	2005-08-31 09:25:55 UTC (rev 1979)
+++ cli-common/trunk/debian/changelog	2005-09-04 20:22:12 UTC (rev 1980)
@@ -1,3 +1,14 @@
+cli-common (0.2.1) unstable; urgency=low
+
+  * Mirco 'meebey' Bauer
+    + Added mono/2.0 to MONO_PATH in dh_clideps and dh_makeclilibs for
+      internal-mono mode, this caused FTBFS.
+      (thanks to Sebastian Dröge <mail at slomosnail.de> for investigating)
+    + Using debian/tmp/usr/bin/monodis in dh_makeclilibs again.
+    + Updated to Standards Version 3.6.2.1 (no changes).
+
+ -- Debian Mono Group <pkg-mono-group at lists.alioth.debian.org>  Fri, 2 Sep 2005 18:35:20 +0200
+
 cli-common (0.2.0) unstable; urgency=low
 
   * Mirco 'meebey' Bauer

Modified: cli-common/trunk/debian/control
===================================================================
--- cli-common/trunk/debian/control	2005-08-31 09:25:55 UTC (rev 1979)
+++ cli-common/trunk/debian/control	2005-09-04 20:22:12 UTC (rev 1980)
@@ -4,14 +4,14 @@
 Maintainer: Debian Mono Group <pkg-mono-group at lists.alioth.debian.org>
 Uploaders: Mirco Bauer <meebey at meebey.net>
 Build-Depends-Indep: debhelper (>= 4.0.0), debiandoc-sgml, tetex-extra
-Standards-Version: 3.6.1
+Standards-Version: 3.6.2.1
 
 Package: cli-common
 Architecture: all
 Depends: debhelper (>= 4.0.0), mono-utils | cil-disassembler, mono-mcs | strong-name-tool
 Description: base of all CLI (.NET) packages
  This package must be installed if a CLI (Common Language Infrastructure)/.NET
- environment is desired.
+ packaging environment is desired.
  .
  It covers useful integration and information for CLI implementations in
  Debian GNU/Linux, including:

Modified: cli-common/trunk/dh_clideps
===================================================================
--- cli-common/trunk/dh_clideps	2005-08-31 09:25:55 UTC (rev 1979)
+++ cli-common/trunk/dh_clideps	2005-09-04 20:22:12 UTC (rev 1980)
@@ -71,7 +71,7 @@
     $clr = "mono";
     my $pwd=`pwd`;
     chomp $pwd;
-    $cli_parser = "MONO_PATH=$pwd/debian/tmp/usr/lib/mono $pwd/debian/tmp/usr/bin/monodis";
+    $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_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: cli-common/trunk/dh_makeclilibs
===================================================================
--- cli-common/trunk/dh_makeclilibs	2005-08-31 09:25:55 UTC (rev 1979)
+++ cli-common/trunk/dh_makeclilibs	2005-09-04 20:22:12 UTC (rev 1980)
@@ -127,7 +127,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";
-    $cli_parser = "$mono_path mono/dis/.libs/monodis";
+    $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.");
 } elsif (-x "/usr/bin/monodis") {