[debhelper-devel] [debhelper] 02/02: Import Exporter's import rather than @ISA'ing Exporter

[Niels Thykier]

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

nthykier pushed a commit to branch master
in repository debhelper.

commit 5c27cdfad6025d3cc08edafd530e5e526d04cf7e
Author: Niels Thykier <niels at thykier.net>
Date:   Sat Jul 25 20:25:28 2015 +0200

    Import Exporter's import rather than @ISA'ing Exporter
    
    Signed-off-by: Niels Thykier <niels at thykier.net>
---
 Debian/Debhelper/Dh_Buildsystems.pm | 2 +-
 Debian/Debhelper/Dh_Lib.pm          | 5 ++---
 debian/changelog                    | 2 ++
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Debian/Debhelper/Dh_Buildsystems.pm b/Debian/Debhelper/Dh_Buildsystems.pm
index 7ea34c8..04b1be9 100644
--- a/Debian/Debhelper/Dh_Buildsystems.pm
+++ b/Debian/Debhelper/Dh_Buildsystems.pm
@@ -11,7 +11,7 @@ use warnings;
 use Debian::Debhelper::Dh_Lib;
 use File::Spec;
 
-use base 'Exporter';
+use Exporter qw(import);
 our @EXPORT=qw(&buildsystems_init &buildsystems_do &load_buildsystem &load_all_buildsystems);
 
 use constant BUILD_STEPS => qw(configure build test install clean);
diff --git a/Debian/Debhelper/Dh_Lib.pm b/Debian/Debhelper/Dh_Lib.pm
index 387f90a..3585791 100644
--- a/Debian/Debhelper/Dh_Lib.pm
+++ b/Debian/Debhelper/Dh_Lib.pm
@@ -8,9 +8,8 @@ package Debian::Debhelper::Dh_Lib;
 use strict;
 use warnings;
 
-use Exporter;
-use vars qw(@ISA @EXPORT %dh);
- at ISA=qw(Exporter);
+use Exporter qw(import);
+use vars qw(@EXPORT %dh);
 @EXPORT=qw(&init &doit &doit_noerror &complex_doit &verbose_print &error
             &nonquiet_print &print_and_doit &print_and_doit_noerror
             &warning &tmpdir &pkgfile &pkgext &pkgfilename &isnative
diff --git a/debian/changelog b/debian/changelog
index a6d0d21..9cf8f1c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,8 @@ debhelper (9.20150629) UNRELEASED; urgency=medium
   * Dh_Lib.pm: Apply patch from Guillem Jover to use the
     value of dpkg-architecture variables from the environment,
     if present.  (Closes: #793440)
+  * Dh_Buildsystems.pm/Dh_Lib.pm: Import Exporter's import
+    subroutine rather than adding Exporter to @ISA.
 
  -- Niels Thykier <niels at thykier.net>  Sun, 28 Jun 2015 15:08:19 +0200
 

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