Rename Dpkg::Source::Archiver to Dpkg::Source::Archive

diff --git a/scripts/Dpkg/Source/Archiver.pm b/scripts/Dpkg/Source/Archive.pm
similarity index 99%
rename from scripts/Dpkg/Source/Archiver.pm
rename to scripts/Dpkg/Source/Archive.pm
index 69fd1045d5b41d47a664921cd3b5e8daeb21717a..b378a96392f2af56e62f766884746bd67192b297 100644 (file)
--- a/scripts/Dpkg/Source/Archiver.pm
+++ b/scripts/Dpkg/Source/Archive.pm
@@ -14,7 +14,7 @@
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-package Dpkg::Source::Archiver;
+package Dpkg::Source::Archive;
 
 use strict;
 use warnings;

diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index 4d8c97d17572bc938528d0d0fd29e328d7909fa3..0221ca6d1bba6c7129136718d8e695c436dcd518 100644 (file)
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -105,7 +105,7 @@ nobase_dist_perllib_DATA = \
        Dpkg/Substvars.pm \
        Dpkg/Vars.pm \
        Dpkg/Version.pm \
-       Dpkg/Source/Archiver.pm \
+       Dpkg/Source/Archive.pm \
        Dpkg/Source/CompressedFile.pm \
        Dpkg/Source/Compressor.pm \
        Dpkg/Source/Patch.pm \

diff --git a/scripts/dpkg-source.pl b/scripts/dpkg-source.pl
index 22584dabab8639a2a2f2e837ee23a500e5a65c19..593370c5894ac4eeef1ee6bd5dbed306d23adbc5 100755 (executable)
--- a/scripts/dpkg-source.pl
+++ b/scripts/dpkg-source.pl
@@ -21,7 +21,7 @@ use Dpkg::Version qw(check_version);
 use Dpkg::Vars;
 use Dpkg::Changelog qw(parse_changelog);
 use Dpkg::Source::Compressor;
-use Dpkg::Source::Archiver;
+use Dpkg::Source::Archive;
 use Dpkg::Source::Patch;
 use Dpkg::IPC;
 
@@ -595,7 +595,7 @@ if ($opmode eq 'build') {
 
        my ($ntfh, $newtar) = tempfile("$tarname.new.XXXXXX",
                                       DIR => getcwd(), UNLINK => 0);
-       my $tar = Dpkg::Source::Archiver->new(filename => $newtar,
+       my $tar = Dpkg::Source::Archive->new(filename => $newtar,
                    compression => get_compression_from_filename($tarname),
                    compression_level => $comp_level);
        $tar->create(options => \@tar_ignore);
@@ -632,7 +632,7 @@ if ($opmode eq 'build') {
         }
 
         $expectprefix= $origdir; $expectprefix =~ s,^\./,,;
-       my $tar = Dpkg::Source::Archiver->new(filename => $origtargz);
+       my $tar = Dpkg::Source::Archive->new(filename => $origtargz);
        $tar->extract($expectprefix);
     }
 
@@ -878,7 +878,7 @@ if ($opmode eq 'build') {
        }
 
        printf(_g("%s: unpacking %s")."\n", $progname, $tarfile);
-       my $tar = Dpkg::Source::Archiver->new(filename => "$dscdir/$tarfile");
+       my $tar = Dpkg::Source::Archive->new(filename => "$dscdir/$tarfile");
        $tar->extract($target);
 
        # for the first tar file:

diff --git a/scripts/po/POTFILES.in b/scripts/po/POTFILES.in
index f8bdfa2934b9f23f95c1533a994d0f04fb70fe67..20397e69f5eb2cab5a51ff41a5141dbcfd2c021f 100644 (file)
--- a/scripts/po/POTFILES.in
+++ b/scripts/po/POTFILES.in
@@ -27,7 +27,7 @@ scripts/Dpkg/IPC.pm
 scripts/Dpkg/Shlibs.pm
 scripts/Dpkg/Shlibs/Objdump.pm
 scripts/Dpkg/Shlibs/SymbolFile.pm
-scripts/Dpkg/Source/Archiver.pm
+scripts/Dpkg/Source/Archive.pm
 scripts/Dpkg/Source/CompressedFile.pm
 scripts/Dpkg/Source/Compressor.pm
 scripts/Dpkg/Source/Patch.pm