[dh-make-perl] 01/02: Add path component with architecture triplet to regexp in read_cache()

[Axel Beckert]

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

abe pushed a commit to branch master
in repository dh-make-perl.

commit 449f0138d2cb3a5510848dbc3215afdf05a096ea
Author: Axel Beckert <abe at deuxchevaux.org>
Date:   Mon Sep 19 23:47:45 2016 +0200

    Add path component with architecture triplet to regexp in read_cache()
    
    Fixes "dh-make-perl locate" not finding any XS or C-written modules
    anymore.
    
    Closes RT#117963
    
    Thanks Joenio Costa for the bug report!
---
 debian/changelog          | 7 ++++++-
 lib/Debian/AptContents.pm | 1 +
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index b99efd5..fb66cd4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,7 +19,12 @@ dh-make-perl (0.92) UNRELEASED; urgency=medium
   * debian/control: remove Homepage field which still pointed to MetaCPAN.
 
   [ Axel Beckert ]
-  * lib/Debian/AptContents.pm: Fix typo in code comment.
+  * lib/Debian/AptContents.pm:
+    + Add path component with architecture triplet to regexp in
+      read_cache(). Fixes "dh-make-perl locate" not finding any XS or
+      C-written modules anymore. (RT#117963) Thanks Joenio Costa for the
+      bug report!
+    + Fix typo in code comment.
 
  -- Christian Hofstaedtler <zeha at debian.org>  Sun, 17 Jul 2016 16:55:59 +0000
 
diff --git a/lib/Debian/AptContents.pm b/lib/Debian/AptContents.pm
index 201a8e1..bd27aff 100644
--- a/lib/Debian/AptContents.pm
+++ b/lib/Debian/AptContents.pm
@@ -233,6 +233,7 @@ sub read_cache {
                 next unless $file =~ s{
                     ^usr/
                     (?:share|lib)/
+                    (?:\S+-\S+-\S+/)?      # opt. arch. triplet, eg. x86_64-linux-gnu
                     (?:perl\d+/            # perl5/
                     | perl/(?:\d[\d.]+)/   # or perl/5.10/
                     )

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/dh-make-perl.git