[Pkg-cli-common-commits] [SCM] cli-common branch, master, updated. debian/0.8_xamarin1-3-g860d3f5

[Christopher James Halse Rogers]

The following commit has been merged in the master branch:
commit 649dad7c1730c3982199fce1a2d2eff497f3bae5
Author: Christopher James Halse Rogers <raof at ubuntu.com>
Date:   Sun Jul 31 21:10:52 2011 +1000

    dh_clideps: Search all binary packages to resolve private libraries, not just the currently active ones.
    
    Fixes dependency resolution when an arch-dep package ships a private library for an arch-indep package and
    dh_clideps is called with -i

diff --git a/dh_clideps b/dh_clideps
index b378bf9..e4b5bc1 100755
--- a/dh_clideps
+++ b/dh_clideps
@@ -152,6 +152,7 @@ my $cli_version = `$cli --version 2>&1`;
 my $cli_parser;
 my $cli_parser_paths;
 my $pwd = `pwd`;
+my @allpackages = getpackages();
 chomp $pwd;
 
 my $mono_gac_prefix = "";
@@ -696,7 +697,8 @@ sub resolveShlibRefs {
        if(!resolvePrivateLibrary($package, $fullTarget, $package)) {
          # Private library can't be found in the current package.  Try to resolve it
          # in the other binary packages, and add a strong dependency if we find it.
-         foreach my $binary_package (@{$dh{DOPACKAGES}}) {
+         foreach my $binary_package (@allpackages) {
+	   verbose_print("Checking $binary_package for $fullTarget");
            if(resolvePrivateLibrary($package, $fullTarget, $binary_package)) {
              verbose_print("Found private library in $binary_package");
              $pkgref = $binary_package . " (= \${binary:Version})";

-- 
cli-common