[devscripts] 01/01: uscan: Import catfile from File::Spec::Functions

[James McCoy]

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

jamessan pushed a commit to branch master
in repository devscripts.

commit 825ad90b393f9fefd85971e2c62a9d32f533e5cd
Author: James McCoy <jamessan at debian.org>
Date:   Mon May 2 19:42:24 2016 -0400

    uscan: Import catfile from File::Spec::Functions
    
    File::Spec is intended to be used as an object (i.e.,
    File::Spec->catfile) so importing the catfile function isn't the correct
    way to use the API.  File::Spec::Functions is provided to use the
    non-object interface.
    
    Closes: #823218
    Signed-off-by: James McCoy <jamessan at debian.org>
---
 debian/changelog | 8 ++++++++
 scripts/uscan.pl | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 6f655a9..b3e9a21 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+devscripts (2.16.5) UNRELEASED; urgency=medium
+
+  * uscan:
+    + Import catfile from File::Spec::Functions to fix use of unqualified
+      name.  Thanks to Craig Small for the patch.  (Closes: #823218)
+
+ -- James McCoy <jamessan at debian.org>  Mon, 02 May 2016 19:41:06 -0400
+
 devscripts (2.16.4) unstable; urgency=medium
 
   * mk-build-deps:
diff --git a/scripts/uscan.pl b/scripts/uscan.pl
index f5cab9d..2439c19 100755
--- a/scripts/uscan.pl
+++ b/scripts/uscan.pl
@@ -1691,7 +1691,7 @@ use Dpkg::Changelog::Parse qw(changelog_parse);
 use Dpkg::IPC;
 use File::Basename;
 use File::Copy qw/copy/;
-use File::Spec qw/catfile/;
+use File::Spec::Functions qw/catfile/;
 use File::Temp qw/tempfile tempdir/;
 use List::Util qw/first/;
 use filetest 'access';

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