diff options
| -rw-r--r-- | scripts/Dpkg/Compression/CompressedFile.pm (renamed from scripts/Dpkg/Source/CompressedFile.pm) | 2 | ||||
| -rw-r--r-- | scripts/Dpkg/Index.pm | 6 | ||||
| -rw-r--r-- | scripts/Dpkg/Source/Archive.pm | 2 | ||||
| -rw-r--r-- | scripts/Dpkg/Source/Patch.pm | 4 | ||||
| -rw-r--r-- | scripts/Makefile.am | 2 | ||||
| -rwxr-xr-x | scripts/dpkg-scanpackages.pl | 6 | ||||
| -rwxr-xr-x | scripts/dpkg-scansources.pl | 8 | ||||
| -rw-r--r-- | scripts/po/POTFILES.in | 2 |
8 files changed, 16 insertions, 16 deletions
diff --git a/scripts/Dpkg/Source/CompressedFile.pm b/scripts/Dpkg/Compression/CompressedFile.pm index 52fd8ee87..c7eae1352 100644 --- a/scripts/Dpkg/Source/CompressedFile.pm +++ b/scripts/Dpkg/Compression/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; diff --git a/scripts/Dpkg/Index.pm b/scripts/Dpkg/Index.pm index a3dd69a23..d2e86dc99 100644 --- a/scripts/Dpkg/Index.pm +++ b/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(); diff --git a/scripts/Dpkg/Source/Archive.pm b/scripts/Dpkg/Source/Archive.pm index be1c1bd56..3d0dcce96 100644 --- a/scripts/Dpkg/Source/Archive.pm +++ b/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) = @_; diff --git a/scripts/Dpkg/Source/Patch.pm b/scripts/Dpkg/Source/Patch.pm index 68e6f507d..e1b3dc24f 100644 --- a/scripts/Dpkg/Source/Patch.pm +++ b/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) = @_; diff --git a/scripts/Makefile.am b/scripts/Makefile.am index a71f8eba5..f2be4f5ed 100644 --- a/scripts/Makefile.am +++ b/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 \ diff --git a/scripts/dpkg-scanpackages.pl b/scripts/dpkg-scanpackages.pl index 28df3efd0..7f4d23656 100755 --- a/scripts/dpkg-scanpackages.pl +++ b/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>) { diff --git a/scripts/dpkg-scansources.pl b/scripts/dpkg-scansources.pl index 04dc83aec..5dab85c7d 100755 --- a/scripts/dpkg-scansources.pl +++ b/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>) { diff --git a/scripts/po/POTFILES.in b/scripts/po/POTFILES.in index 87a4de3e8..889cd1509 100644 --- a/scripts/po/POTFILES.in +++ b/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 |