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

[lintian] 02/05: c/shared-libs: Correct the path to the multiarch-dirs data file



This is an automated email from the git hooks/post-receive script.

nthykier pushed a commit to branch master
in repository lintian.

commit 86f22f19847c08fd8f3344ce7421ea98d35fe2b6
Author: Niels Thykier <niels@thykier.net>
Date:   Sun Sep 22 10:19:40 2013 +0200

    c/shared-libs: Correct the path to the multiarch-dirs data file
    
    The data file was renamed in 2.5.17 (commit 37774bb) and since then
    the check has errored out if the data was needed.
    
    Signed-off-by: Niels Thykier <niels@thykier.net>
---
 checks/shared-libs.pm |    2 +-
 debian/changelog      |   11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/checks/shared-libs.pm b/checks/shared-libs.pm
index 54f4d85..1a073c4 100644
--- a/checks/shared-libs.pm
+++ b/checks/shared-libs.pm
@@ -50,7 +50,7 @@ my %stack_arches = map { $_ => 1 }qw(
 );
 
 my $ldconfig_dirs = Lintian::Data->new('shared-libs/ldconfig-dirs');
-my $MA_DIRS = Lintian::Data->new('binaries/multiarch-dirs', qr/\s++/);
+my $MA_DIRS = Lintian::Data->new('common/multiarch-dirs', qr/\s++/);
 
 sub run {
     my ($pkg, $type, $info, $proc, $group) = @_;
diff --git a/debian/changelog b/debian/changelog
index 5ef0bc3..b938453 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,13 @@ lintian (2.5.19) UNRELEASED; urgency=low
   * checks/files.pm:
     + [NT] Only open .pc files if they are regular files.
       This fixes a possible DoS introduced in 2.5.17.
+  * checks/shared-libs.pm:
+    + [NT] Correct the name of the multiarch-dirs data file,
+      which was renamed in 2.5.17.
+
+  * debian/changelog:
+    + [NT] Mention in the 2.5.17 entry that multiarch-dirs
+      data file was renamed.
 
  -- Niels Thykier <niels@thykier.net>  Sat, 21 Sep 2013 23:36:46 +0200
 
@@ -248,6 +255,10 @@ lintian (2.5.17) unstable; urgency=low
   * checks/source-copyright.pm:
     + [NT] Avoid accidental use of an experimental feature.
 
+  * data/{binaries => common}/multiarch-dirs:
+    + [BR] Moved multiarch-dirs from binaries to common, since
+      it is used from multiple checks.
+
   * debian/control:
     + [NT] Add Build-Depends on aspell, aspell-en and
       libtest-spelling-perl.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/lintian/lintian.git


Reply to: