[Pkg-cli-common-commits] [SCM] cli-common branch, master, updated. debian/0.8.1

[Mirco Bauer]

The following commit has been merged in the master branch:
commit b91dd79fabe80adba9865dc05dc7c3716c3d0d67
Author: Mirco Bauer <meebey at meebey.net>
Date:   Tue Jan 17 19:01:30 2012 +0100

    Imported Debian version 0.8.1

diff --git a/debian/changelog b/debian/changelog
index 7dbc1a8..e1ab454 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+cli-common (0.8.1) unstable; urgency=low
+ 
+  * Brown paper bag upload
+  * dh_clideps: Fix perl syntax errors which prevented interpretation of file
+    (Closes: #656188)
+
+ -- Iain Lane <laney at debian.org>  Tue, 17 Jan 2012 10:53:43 +0000
+
 cli-common (0.8) unstable; urgency=low
 
   * Upload to unstable
diff --git a/dh_clideps b/dh_clideps
index 6c938e5..cc9f208 100755
--- a/dh_clideps
+++ b/dh_clideps
@@ -659,7 +659,7 @@ sub resolveShlibRefs {
      foreach my $excluded_moduleref (@{$dh{MODULE_EXCLUDE}}) {
        # explicitly excluded modulerefs are never checked
        $excluded_moduleref =~ /^(i:)?(.*)/;
-       $exclude_pattern = "^$2(.dll)?\$";
+       my $exclude_pattern = qr/^$2(.dll)?$/;
        if (defined $1 && $1 eq "i:" && $moduleref =~ /$exclude_pattern/i) {
          # i: specified; case insensitive match
          verbose_print("Ignoring moduleref $moduleref (case insensitive)");
@@ -679,7 +679,7 @@ sub resolveShlibRefs {
      if (defined($target)) {
        $target = basename($target);
        verbose_print("Resolved moduleref via DLL map: $moduleref to: $target");
-     } elsif (defined($shlibdata{$name})) {
+     } elsif (defined($shlibdata{$moduleref})) {
        verbose_print("Resolved moduleref via direct match in shlibs");
      } elsif (resolvePrivateLibrary($package, $moduleref, $package)) {
        # There is no DllMap, but the package ships the private library alongside the assembly

-- 
cli-common