[Pkg-cli-common-commits] [SCM] cli-common branch, master, updated. debian/0.7.1-6-g8fb37e2

[Mirco Bauer]

The following commit has been merged in the master branch:
commit 767c020cbd2e0f217251cb9580eba87371cd9736
Author: Mirco Bauer <meebey at meebey.net>
Date:   Thu Mar 24 23:03:47 2011 +0100

    Fixed minimum build-dep version check in dh_clideps and dh_makeclilibs (closes: #597440)

diff --git a/dh_clideps b/dh_clideps
index f4f880e..37d2880 100755
--- a/dh_clideps
+++ b/dh_clideps
@@ -158,7 +158,7 @@ if (defined($dh{INTERNAL_MONO_FLAG}) ||
   open(FILE, 'debian/control');
   my $srcblock = <FILE>;
   close(FILE);
-  if ($srcblock =~ m/Build-Depends(?:\-Indep)?\:[^:]*cli\-common\-dev\s*\(>=\s*([^\)]+)\)/ &&
+  if ($srcblock =~ m/Build-Depends(?:\-Indep)?\:(?:.*\n\s+)*.*cli\-common\-dev\s*\(>=\s*([^\)]+)\)/ &&
       system("dpkg", "--compare-versions", $1, ">=", "0.4.4") != 0) {
     warning("Warning! No Build-Depends(-Indep) on cli-common-dev (>= 0.4.4)!");
   }
diff --git a/dh_makeclilibs b/dh_makeclilibs
index 7ee5ae3..96bd72a 100755
--- a/dh_makeclilibs
+++ b/dh_makeclilibs
@@ -155,7 +155,7 @@ if (defined($dh{INTERNAL_MONO_FLAG}) ||
   open(FILE, 'debian/control');
   my $srcblock = <FILE>;
   close(FILE);
-  if ($srcblock =~ m/Build-Depends(?:\-Indep)?\:[^:]*cli\-common\-dev\s*\(>=\s*([^\)]+)\)/ &&
+  if ($srcblock =~ m/Build-Depends(?:\-Indep)?\:(?:.*\n\s+)*.*cli\-common\-dev\s*\(>=\s*([^\)]+)\)/ &&
       system("dpkg", "--compare-versions", $1, ">=", "0.4.4") != 0) {
     warning("Warning! No Build-Depends(-Indep) on cli-common-dev (>= 0.4.4)!");
   }

-- 
cli-common