[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[SCM] Debian package checker branch, master, updated. 2.3.0-55-gaf42478



The following commit has been merged in the master branch:
commit af42478e50a652f46915710c88e2097d4a07e652
Author: Russ Allbery <rra@debian.org>
Date:   Sat Jan 2 10:27:57 2010 -0800

    Fix parsing of Depends for weak-library-dev-dependency
    
    * checks/control-file:
      + [RA] Fix parsing of dependencies for weak-library-dev-dependency
        when the content of Depends begins with a newline.  Thanks, Julien
        Cristau.  (Closes: #563370)

diff --git a/checks/control-file b/checks/control-file
index ac2caa8..66b34a7 100644
--- a/checks/control-file
+++ b/checks/control-file
@@ -281,6 +281,8 @@ for my $i (0 .. $#descriptions) {
 # version.
 sub check_dev_depends {
 	my ($package, $depends, @packages) = @_;
+	$depends =~ s/^\s+//;
+	$depends =~ s/\s+$//;
 	for my $target (@packages) {
 		next unless ($target =~ /^lib[\w.+-]+\d/
 			     and $target !~ /-(?:dev|docs?)$/);
diff --git a/debian/changelog b/debian/changelog
index 98dbf4d..afab1df 100755
--- a/debian/changelog
+++ b/debian/changelog
@@ -24,6 +24,10 @@ lintian (2.3.1) UNRELEASED; urgency=low
       the Lintian part of #523436)
     + [RA] Warn if the version of the latest NEWS.Debian entry doesn't
       appear in the changelog.  Thanks, Christoph Berg.  (Closes: #550594)
+  * checks/control-file:
+    + [RA] Fix parsing of dependencies for weak-library-dev-dependency
+      when the content of Depends begins with a newline.  Thanks, Julien
+      Cristau.  (Closes: #563370)
   * checks/cruft:
     + [RA] Fix the regex to properly ignore CMakeCache.txt in the debian
       directory.  Thanks, Aaron M. Ucko.  (Closes: #553264)
diff --git a/t/tests/control-file-library-dev/debian/debian/control.in b/t/tests/control-file-library-dev/debian/debian/control.in
index 2d78161..359adac 100644
--- a/t/tests/control-file-library-dev/debian/debian/control.in
+++ b/t/tests/control-file-library-dev/debian/debian/control.in
@@ -88,3 +88,17 @@ Description: {$description} (arch: all dev package)
  This is a test package designed to exercise some feature or tag of
  Lintian.  It is part of the Lintian test suite and may do very odd
  things.  It should not be installed like a regular package.
+
+Package: libcontrol-baz-dev
+Section: libdevel
+Architecture: {$architecture}
+Depends:
+ libcontrol-file-baz9-4 (= $\{binary:Version\}),
+ $\{misc:Depends\},
+ $\{shlibs:Depends\}
+Description: {$description} (dev whitespace)
+ Test proper parsing of leading whitespace in Depends
+ .
+ This is a test package designed to exercise some feature or tag of
+ Lintian.  It is part of the Lintian test suite and may do very odd
+ things.  It should not be installed like a regular package.

-- 
Debian package checker


Reply to: