[Pkg-cli-common-commits] [SCM] cli-common branch, master, updated. debian/0.7-2-gf303472

[Mirco Bauer]

The following commit has been merged in the master branch:
commit f303472da378d79ebf711b5febc6d34d42a45c06
Author: Mirco Bauer <meebey at meebey.net>
Date:   Wed Aug 5 19:29:21 2009 +0200

      * dh_makeclilibs:
        + Pass by default MONO_GAC_PREFIX=debian/tmp/usr so monodis can find
          libraries devided into multi-binary packages. (Closes: #498868)

diff --git a/debian/changelog b/debian/changelog
index 7537b24..7d291e8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,9 @@ cli-common (0.7) unstable; urgency=low
     dh_makeclilibs:
     + Fix cli-common-dev build-dep(-indep) detection logic. (Closes: #500329)
       (thanks to Chow Loong Jin <hyperair at gmail.com> for the patch)
+  * dh_makeclilibs:
+    + Pass by default MONO_GAC_PREFIX=debian/tmp/usr so monodis can find
+      libraries devided into multi-binary packages. (Closes: #498868)
   * mono.pub
     mono.snk:
     + Added the public and private key of Mono so libraries that don't have
@@ -28,7 +31,7 @@ cli-common (0.7) unstable; urgency=low
     + Add support for the "os" attribute in <dllmap> entries
       (http://www.mono-project.com/Config_DllMap).
 
- -- Mirco Bauer <meebey at debian.org>  Tue, 04 Aug 2009 05:50:09 +0200
+ -- Mirco Bauer <meebey at debian.org>  Wed, 05 Aug 2009 16:03:59 +0200
 
 cli-common (0.6.2) unstable; urgency=low
 
diff --git a/dh_makeclilibs b/dh_makeclilibs
index a66ae9d..65e22ab 100755
--- a/dh_makeclilibs
+++ b/dh_makeclilibs
@@ -200,7 +200,11 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
                warning "$libfile has no valid signature, ignoring";
                next dll;
             }
-            my $dis = `$cli_parser --assembly $libfile 2>&1`;
+
+            my $command = "LANG=C MONO_GAC_PREFIX=\$MONO_GAC_PREFIX:$tmp/usr $cli_parser --assembly $libfile 2>&1";
+            verbose_print("running CLI parser command: $command");
+
+            my $dis = `$command`;
             if ($dis =~ m/Name:\s+(\S+)/) {
                $library = $1;
                $dis =~ m/Version:\s+(\S+)/;

-- 
cli-common