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

[lintian] 01/01: c/cruft.pm: New tag mentions-deprecated-usr-lib-perl5-directory



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

abe pushed a commit to branch ppt-lc-mover
in repository lintian.

commit 9cbf465dd5a8cc4c2600e0fb0753c9730ba535d9
Author: Axel Beckert <abe@deuxchevaux.org>
Date:   Thu Aug 13 22:50:18 2015 +0200

    c/cruft.pm: New tag mentions-deprecated-usr-lib-perl5-directory
    
    Based on pkg-perl-tools' usr-lib-perl5-mentioned (multiple authors).
---
 checks/cruft.desc                      | 10 ++++++++++
 checks/cruft.pm                        | 19 +++++++++++++++++++
 debian/changelog                       |  2 ++
 t/tests/cruft-perl/debian/debian/rules |  5 +++++
 t/tests/cruft-perl/desc                |  6 ++++++
 t/tests/cruft-perl/tags                |  1 +
 6 files changed, 43 insertions(+)

diff --git a/checks/cruft.desc b/checks/cruft.desc
index cb0381b..7ee24cf 100644
--- a/checks/cruft.desc
+++ b/checks/cruft.desc
@@ -828,3 +828,13 @@ Severity: wishlist
 Certainty: certain
 Info: debian/pycompat is not used by any modern Python helper.  It should be
  safe to remove this file.
+
+# Imported from pkg-perl-tools
+Tag: mentions-deprecated-usr-lib-perl5-directory
+Severity: important
+Certainty: possible
+Info: As of Perl 5.20, the vendorarch directory is /usr/lib/&lt;triplet&gt;/perl5,
+ but this package still uses usr/lib/perl5 in some of the files under debian/.
+ Please replace that with the value of $Config{vendorarch} configuration
+ parameter, e.g.
+  $(shell perl -MConfig -wE'say substring($$Config{vendorarch},1)')
diff --git a/checks/cruft.pm b/checks/cruft.pm
index b5922d5..cdb3c50 100644
--- a/checks/cruft.pm
+++ b/checks/cruft.pm
@@ -661,6 +661,25 @@ sub find_cruft {
             tag 'debian-upstream-obsolete-path', $name;
         }
 
+        # Find mentioning of usr/lib/perl5 inside the packaging
+        if ($name =~ m{^debian/}) {
+            my $short = $entry->basename();
+
+            # Skip symlinks and other nasty stuff as well as
+            # debian/changelog
+            if (   $short ne 'changelog'
+                && $entry->is_file
+                && $entry->is_open_ok) {
+                my $contents = $entry->file_contents;
+
+                # ignore comments
+                $contents =~ s/#.*$//m;
+                if ($contents =~ m{usr/lib/perl5}) {
+                    tag('mentions-deprecated-usr-lib-perl5-directory', $short);
+                }
+            }
+        }
+
         if (   $basename eq 'doxygen.png'
             or $basename eq 'doxygen.sty') {
             unless ($source_pkg eq 'doxygen') {
diff --git a/debian/changelog b/debian/changelog
index efe4b12..96f57fa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,8 @@ lintian (2.5.36) UNRELEASED; urgency=medium
       Remove line number before running the detection.
     + [BR] Avoid another gfdl false positive in oidentd, sdlbasic,
       smbc package.
+    + [AB] Add new tag mentions-deprecated-usr-lib-perl5-directory based
+      on pkg-perl-tools' usr-lib-perl5-mentioned (multiple authors).
   * checks/description.*:
     + [AB] Add new tag perl-module-name-not-mentioned-in-description based
       on pkg-perl-tools' no-module-name-in-description by Damyan Ivanov.
diff --git a/t/tests/cruft-perl/debian/debian/rules b/t/tests/cruft-perl/debian/debian/rules
new file mode 100755
index 0000000..b039fd4
--- /dev/null
+++ b/t/tests/cruft-perl/debian/debian/rules
@@ -0,0 +1,5 @@
+#!/usr/bin/make -f
+
+%:
+	echo This file mentions /usr/lib/perl5/. qed.
+	dh $@
diff --git a/t/tests/cruft-perl/desc b/t/tests/cruft-perl/desc
new file mode 100644
index 0000000..4920b77
--- /dev/null
+++ b/t/tests/cruft-perl/desc
@@ -0,0 +1,6 @@
+Testname: cruft-perl
+Sequence: 6000
+Version: 1.0
+Description: Misc errors related to Perl
+Test-For:
+ mentions-deprecated-usr-lib-perl5-directory
diff --git a/t/tests/cruft-perl/tags b/t/tests/cruft-perl/tags
new file mode 100644
index 0000000..e1a3b90
--- /dev/null
+++ b/t/tests/cruft-perl/tags
@@ -0,0 +1 @@
+E: cruft-perl source: mentions-deprecated-usr-lib-perl5-directory rules

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


Reply to: