Rename Dpkg::Source::CompressedFile into Dpkg::Compression::CompressedFile

scripts/Dpkg/Source/CompressedFile.pm

@@ -13,7 +13,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-package Dpkg::Source::CompressedFile;
+package Dpkg::Compression::CompressedFile;
 
 use strict;
 use warnings;

scripts/Dpkg/Index.pm

@@ -21,7 +21,7 @@ use warnings;
 use Dpkg::Gettext;
 use Dpkg::ErrorHandling;
 use Dpkg::Control;
-use Dpkg::Source::CompressedFile;
+use Dpkg::Compression::CompressedFile;
 
 use overload
     '@{}' => sub { return $_[0]->{'order'} },
@@ -155,7 +155,7 @@ parsed. Handles compressed files transparently based on their extensions.
 
 sub load {
     my ($self, $file) = @_;
-    my $cf = Dpkg::Source::CompressedFile->new(filename => $file);
+    my $cf = Dpkg::Compression::CompressedFile->new(filename => $file);
     my $fh = $cf->open_for_read();
     my $res = $self->parse($fh, $file);
     $cf->cleanup_after_open();
@@ -191,7 +191,7 @@ based on their extensions.
 
 sub save {
     my ($self, $file) = @_;
-    my $cf = Dpkg::Source::CompressedFile->new(filename => $file);
+    my $cf = Dpkg::Compression::CompressedFile->new(filename => $file);
     my $fh = $cf->open_for_write();
     $self->output($fh);
     $cf->cleanup_after_open();

scripts/Dpkg/Source/Archive.pm

@@ -29,7 +29,7 @@ use File::Basename qw(basename);
 use File::Spec;
 use Cwd;
 
-use base 'Dpkg::Source::CompressedFile';
+use base 'Dpkg::Compression::CompressedFile';
 
 sub create {
     my ($self, %opts) = @_;

scripts/Dpkg/Source/Patch.pm

@@ -19,7 +19,7 @@ use strict;
 use warnings;
 
 use Dpkg;
-use Dpkg::Source::CompressedFile;
+use Dpkg::Compression::CompressedFile;
 use Dpkg::Compression::Compressor;
 use Dpkg::Compression;
 use Dpkg::Gettext;
@@ -36,7 +36,7 @@ use Fcntl ':mode';
 #XXX: Needed for sub-second timestamps, require recent perl
 #use Time::HiRes qw(stat);
 
-use base 'Dpkg::Source::CompressedFile';
+use base 'Dpkg::Compression::CompressedFile';
 
 sub create {
     my ($self, %opts) = @_;

scripts/Makefile.am

@@ -61,6 +61,7 @@ nobase_dist_perllib_DATA = \
 	Dpkg/Changelog/Parse.pm \
 	Dpkg/Checksums.pm \
 	Dpkg/Compression.pm \
+	Dpkg/Compression/CompressedFile.pm \
 	Dpkg/Compression/Compressor.pm \
 	Dpkg/Conf.pm \
 	Dpkg/Control.pm \
@@ -82,7 +83,6 @@ nobase_dist_perllib_DATA = \
 	Dpkg/Shlibs/SymbolFile.pm \
 	Dpkg/Shlibs/Cppfilt.pm \
 	Dpkg/Source/Archive.pm \
-	Dpkg/Source/CompressedFile.pm \
 	Dpkg/Source/Functions.pm \
 	Dpkg/Source/Package.pm \
 	Dpkg/Source/Package/V1.pm \

scripts/dpkg-scanpackages.pl

@@ -28,7 +28,7 @@ use Dpkg::ErrorHandling;
 use Dpkg::Control;
 use Dpkg::Version;
 use Dpkg::Checksums;
-use Dpkg::Source::CompressedFile;
+use Dpkg::Compression::CompressedFile;
 use Dpkg::IPC;
 
 textdomain("dpkg-dev");
@@ -87,7 +87,7 @@ sub set_type_udeb()
 sub load_override
 {
     my $override = shift;
-    my $comp_file = Dpkg::Source::CompressedFile->new(filename => $override);
+    my $comp_file = Dpkg::Compression::CompressedFile->new(filename => $override);
     my $override_fh = $comp_file->open_for_read();
 
     while (<$override_fh>) {
@@ -135,7 +135,7 @@ sub load_override
 sub load_override_extra
 {
     my $extra_override = shift;
-    my $comp_file = Dpkg::Source::CompressedFile->new(filename => $extra_override);
+    my $comp_file = Dpkg::Compression::CompressedFile->new(filename => $extra_override);
     my $override_fh = $comp_file->open_for_read();
 
     while (<$override_fh>) {

scripts/dpkg-scansources.pl

@@ -27,7 +27,7 @@ use Dpkg::Gettext;
 use Dpkg::ErrorHandling;
 use Dpkg::Control;
 use Dpkg::Checksums;
-use Dpkg::Source::CompressedFile;
+use Dpkg::Compression::CompressedFile;
 use Dpkg::Compression;
 
 textdomain("dpkg-dev");
@@ -110,7 +110,7 @@ sub load_override {
     my $file = shift;
     local $_;
 
-    my $comp_file = Dpkg::Source::CompressedFile->new(filename => $file);
+    my $comp_file = Dpkg::Compression::CompressedFile->new(filename => $file);
     my $override_fh = $comp_file->open_for_read();
     while (<$override_fh>) {
     	s/#.*//;
@@ -176,7 +176,7 @@ sub load_src_override {
     }
 
     debug "source override file $file";
-    my $comp_file = Dpkg::Source::CompressedFile->new(filename => $file);
+    my $comp_file = Dpkg::Compression::CompressedFile->new(filename => $file);
     my $override_fh = $comp_file->open_for_read();
     while (<$override_fh>) {
     	s/#.*//;
@@ -207,7 +207,7 @@ sub load_src_override {
 sub load_override_extra
 {
     my $extra_override = shift;
-    my $comp_file = Dpkg::Source::CompressedFile->new(filename => $extra_override);
+    my $comp_file = Dpkg::Compression::CompressedFile->new(filename => $extra_override);
     my $override_fh = $comp_file->open_for_read();
 
     while (<$override_fh>) {

scripts/po/POTFILES.in

@@ -16,6 +16,7 @@ scripts/dpkg-source.pl
 scripts/changelog/debian.pl
 scripts/Dpkg/Arch.pm
 scripts/Dpkg/Compression.pm
+scripts/Dpkg/Compression/CompressedFile.pm
 scripts/Dpkg/Compression/Compressor.pm
 scripts/Dpkg/Changelog.pm
 scripts/Dpkg/Changelog/Debian.pm
@@ -38,7 +39,6 @@ scripts/Dpkg/Shlibs.pm
 scripts/Dpkg/Shlibs/Objdump.pm
 scripts/Dpkg/Shlibs/SymbolFile.pm
 scripts/Dpkg/Source/Archive.pm
-scripts/Dpkg/Source/CompressedFile.pm
 scripts/Dpkg/Source/Functions.pm
 scripts/Dpkg/Source/Patch.pm
 scripts/Dpkg/Source/Package.pm