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

[SCM] Debian package checker branch, master, updated. 2.5.6-140-ge6d2f22



The following commit has been merged in the master branch:
commit 85d6b97c695382295fbd99c47a39c7fa167cc929
Author: Jakub Wilk <jwilk@debian.org>
Date:   Mon May 14 23:00:16 2012 +0200

    missing-dependency-on-numpy-abi: add support for Python 3
    
    Signed-off-by: Niels Thykier <niels@thykier.net>

diff --git a/checks/binaries b/checks/binaries
index a820461..4855852 100644
--- a/checks/binaries
+++ b/checks/binaries
@@ -337,7 +337,8 @@ foreach my $file (@{$info->sorted_index}) {
     }
 
     # Python extension using Numpy C ABI?
-    if ($file =~ m,usr/lib/(?:pyshared/)?python2\.\d+/.*(?<!_d)\.so$,) {
+    if ($file =~ m,usr/lib/(?:pyshared/)?python2\.\d+/.*(?<!_d)\.so$, or
+            ($file =~ m,usr/lib/python3/.+\.cpython-\d+([a-z]+)\.so$, and $1 !~ /d/)) {
         if ($strings =~ m,module compiled against ABI version %x but this version of numpy is %x,) {
             $uses_numpy_c_abi = 1;
         }
@@ -463,10 +464,10 @@ if ($uses_numpy_c_abi and $pkg ) {
     # relation.  Also, we do not allow versions for -abi as it is a virtual package.
     tag 'missing-dependency-on-numpy-abi'
         unless
-            $depends->matches (qr/^python-numpy-abi\d+$/, VISIT_OR_CLAUSE_FULL) or (
+            $depends->matches (qr/^python3?-numpy-abi\d+$/, VISIT_OR_CLAUSE_FULL) or (
             $depends->matches (qr/^python-numpy \(>[>=][^\|]+$/, VISIT_OR_CLAUSE_FULL) and
             $depends->matches (qr/^python-numpy \(<[<=][^\|]+$/, VISIT_OR_CLAUSE_FULL)) or
-            $pkg eq 'python-numpy';
+            $pkg =~ m,^python3?-numpy$,;
 }
 
 }
diff --git a/checks/binaries.desc b/checks/binaries.desc
index fe5fed7..7579484 100644
--- a/checks/binaries.desc
+++ b/checks/binaries.desc
@@ -220,7 +220,7 @@ Info: This package includes a Python extension module, which uses Numpy via its
  binary interface. Such packages must depend on python-numpy-abi<i>N</i>.
  .
  If the package is using debhelper, this problem is usually due to a
- missing dh_numpy call in <tt>debian/rules</tt>.
+ missing dh_numpy (or dh_numpy3) call in <tt>debian/rules</tt>.
 Ref: /usr/share/doc/python-numpy/README.DebianMaints
 
 Tag: debug-file-should-use-detached-symbols
diff --git a/debian/changelog b/debian/changelog
index e946734..dd1759a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -62,6 +62,8 @@ lintian (2.5.7) UNRELEASED; urgency=low
     + [NT] Add ELF hardening checks.  Thanks to Kees Cook for
       report and the patches.  (Closes: 650536)
     + [NT] Replace architecture tables with data files.
+    + [JW] Check for missing Python3 numpy ABI dependency.
+      (Closes: #671024)
   * checks/changelog-file:
     + [NT] Output the correct line number for the "line-too-long"
       tag.  Thanks to Arno Töll for the report.  (Closes: #657402)

-- 
Debian package checker


Reply to: