Rename Dpkg::Source::Compressor into Dpkg::Compression::Compressor

scripts/Dpkg/Source/Compressor.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::Compressor;
+package Dpkg::Compression::Compressor;
 
 use strict;
 use warnings;
@@ -87,7 +87,7 @@ sub get_uncompress_cmdline {
 sub _sanity_check {
     my ($self, %opts) = @_;
     # Check for proper cleaning before new start
-    error(_g("Dpkg::Source::Compressor can only start one subprocess at a time"))
+    error(_g("Dpkg::Compression::Compressor can only start one subprocess at a time"))
 	    if $self->{"pid"};
     # Check options
     my $to = my $from = 0;

scripts/Dpkg/Source/CompressedFile.pm

@@ -19,7 +19,7 @@ use strict;
 use warnings;
 
 use Dpkg::Compression;
-use Dpkg::Source::Compressor;
+use Dpkg::Compression::Compressor;
 use Dpkg::Gettext;
 use Dpkg::ErrorHandling;
 use POSIX;
@@ -32,7 +32,7 @@ sub new {
 	"compression" => "auto"
     };
     bless $self, $class;
-    $self->{"compressor"} = Dpkg::Source::Compressor->new();
+    $self->{"compressor"} = Dpkg::Compression::Compressor->new();
     $self->{"add_comp_ext"} = $args{"add_compression_extension"} ||
 	    $args{"add_comp_ext"} || 0;
     $self->{"allow_sigpipe"} = 0;

scripts/Dpkg/Source/Patch.pm

@@ -20,7 +20,7 @@ use warnings;
 
 use Dpkg;
 use Dpkg::Source::CompressedFile;
-use Dpkg::Source::Compressor;
+use Dpkg::Compression::Compressor;
 use Dpkg::Compression;
 use Dpkg::Gettext;
 use Dpkg::IPC;

scripts/Makefile.am

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

scripts/dpkg-source.pl

@@ -42,7 +42,7 @@ use Dpkg::Substvars;
 use Dpkg::Version;
 use Dpkg::Vars;
 use Dpkg::Changelog::Parse;
-use Dpkg::Source::Compressor;
+use Dpkg::Compression::Compressor;
 use Dpkg::Source::Package;
 use Dpkg::Vendor qw(run_vendor_hook);
 
@@ -58,9 +58,9 @@ my $changelogformat;
 my @build_formats = ("1.0", "3.0 (quilt)", "3.0 (native)");
 my %options = (
     # Compression related
-    compression => $Dpkg::Source::Compressor::default_compression,
-    comp_level => $Dpkg::Source::Compressor::default_compression_level,
-    comp_ext => $comp_ext{$Dpkg::Source::Compressor::default_compression},
+    compression => $Dpkg::Compression::Compressor::default_compression,
+    comp_level => $Dpkg::Compression::Compressor::default_compression_level,
+    comp_ext => $comp_ext{$Dpkg::Compression::Compressor::default_compression},
     # Ignore files
     tar_ignore => [],
     diff_ignore_regexp => '',
@@ -129,13 +129,13 @@ while (@options) {
 	$options{'comp_ext'} = $comp_ext{$compression};
 	usageerr(_g("%s is not a supported compression"), $compression)
 	    unless $comp_supported{$compression};
-	Dpkg::Source::Compressor->set_default_compression($compression);
+	Dpkg::Compression::Compressor->set_default_compression($compression);
     } elsif (m/^-(?:z|-compression-level=)(.*)$/) {
 	my $comp_level = $1;
 	$options{'comp_level'} = $comp_level;
 	usageerr(_g("%s is not a compression level"), $comp_level)
 	    unless $comp_level =~ /^([1-9]|fast|best)$/;
-	Dpkg::Source::Compressor->set_default_compression_level($comp_level);
+	Dpkg::Compression::Compressor->set_default_compression_level($comp_level);
     } elsif (m/^-c(.*)$/) {
         $controlfile = $1;
     } elsif (m/^-l(.*)$/) {
@@ -449,7 +449,7 @@ See dpkg-source(1) for more info.") . "\n",
     $progname,
     $Dpkg::Source::Package::diff_ignore_default_regexp,
     join(' ', map { "-I$_" } @Dpkg::Source::Package::tar_ignore_default_pattern),
-    $Dpkg::Source::Compressor::default_compression, "@comp_supported",
-    $Dpkg::Source::Compressor::default_compression_level;
+    $Dpkg::Compression::Compressor::default_compression, "@comp_supported",
+    $Dpkg::Compression::Compressor::default_compression_level;
 }
 

scripts/po/POTFILES.in

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