[Reproducible-builds] [strip-nondeterminism] 01/02: Rename module from StripNondeterminism to File::StripNondeterminism
Andrew Ayer
agwa at andrewayer.name
Fri Sep 19 04:43:01 UTC 2014
This is an automated email from the git hooks/post-receive script.
agwa-guest pushed a commit to branch master
in repository strip-nondeterminism.
commit d6c569a451f35373ea32186df810df4e8b653ee9
Author: Andrew Ayer <agwa at andrewayer.name>
Date: Tue Sep 16 16:54:56 2014 -0700
Rename module from StripNondeterminism to File::StripNondeterminism
---
MANIFEST | 10 +++----
Makefile.PL | 2 +-
README | 4 +--
bin/dh_strip_nondeterminism | 4 +--
bin/strip-nondeterminism | 8 ++---
lib/{ => File}/StripNondeterminism.pm | 34 +++++++++++-----------
lib/{ => File}/StripNondeterminism/handlers/ar.pm | 2 +-
.../StripNondeterminism/handlers/gzip.pm | 2 +-
lib/{ => File}/StripNondeterminism/handlers/jar.pm | 14 ++++-----
.../StripNondeterminism/handlers/javadoc.pm | 2 +-
lib/{ => File}/StripNondeterminism/handlers/zip.pm | 2 +-
11 files changed, 42 insertions(+), 42 deletions(-)
diff --git a/MANIFEST b/MANIFEST
index c0c361b..2bcad57 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -4,8 +4,8 @@ Makefile.PL
README
bin/dh_strip_nondeterminism
bin/strip-nondeterminism
-lib/StripNondeterminism.pm
-lib/StripNondeterminism/handlers/ar.pm
-lib/StripNondeterminism/handlers/gzip.pm
-lib/StripNondeterminism/handlers/jar.pm
-lib/StripNondeterminism/handlers/zip.pm
+lib/File/StripNondeterminism.pm
+lib/File/StripNondeterminism/handlers/ar.pm
+lib/File/StripNondeterminism/handlers/gzip.pm
+lib/File/StripNondeterminism/handlers/jar.pm
+lib/File/StripNondeterminism/handlers/zip.pm
diff --git a/Makefile.PL b/Makefile.PL
index affb564..0a40613 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -7,7 +7,7 @@ my $MMVER = eval $ExtUtils::MakeMaker::VERSION;
WriteMakefile(
NAME => 'strip-nondeterminism',
AUTHOR => 'Andrew Ayer <agwa at andrewayer.name>',
- VERSION_FROM => 'lib/StripNondeterminism.pm',
+ VERSION_FROM => 'lib/File/StripNondeterminism.pm',
ABSTRACT => 'tool for stripping non-determinism from files',
EXE_FILES => [qw(bin/dh_strip_nondeterminism bin/strip-nondeterminism)],
PREREQ_PM => {
diff --git a/README b/README
index f1ce8b4..e0cbf6b 100644
--- a/README
+++ b/README
@@ -1,10 +1,10 @@
-StripNondeterminism is a Perl module for stripping bits of
+File::StripNondeterminism is a Perl module for stripping bits of
non-deterministic information, such as timestamps and file system
order, from files such as gzipped files, ZIP archives, and Jar files.
It can be used as a post-processing step to make a build reproducible,
when the build process itself cannot be made deterministic. It is used
as part of the Reproducible Builds project.
-strip-nondeterminism contains the StripNondeterminism Perl module, the
+strip-nondeterminism contains the File::StripNondeterminism Perl module, the
strip-nondeterminism command line utility, and the dh_strip_nondeterminism
Debhelper add-on.
diff --git a/bin/dh_strip_nondeterminism b/bin/dh_strip_nondeterminism
index 4adbf93..596c01f 100755
--- a/bin/dh_strip_nondeterminism
+++ b/bin/dh_strip_nondeterminism
@@ -9,7 +9,7 @@ dh_strip_nondeterminism - strip uninteresting, non-deterministic information fro
use strict;
use File::Find;
use Debian::Debhelper::Dh_Lib;
-use StripNondeterminism;
+use File::StripNondeterminism;
=head1 SYNOPSIS
@@ -54,7 +54,7 @@ sub testfile {
return if ($fn=~m/\Q$f\E/);
}
- my $normalizer = StripNondeterminism::get_normalizer_for_file($_);
+ my $normalizer = File::StripNondeterminism::get_normalizer_for_file($_);
if ($normalizer) {
push @nondeterministic_files, [$fn, $normalizer];
}
diff --git a/bin/strip-nondeterminism b/bin/strip-nondeterminism
index 38c68ca..e42c22f 100755
--- a/bin/strip-nondeterminism
+++ b/bin/strip-nondeterminism
@@ -22,7 +22,7 @@
use strict;
use warnings;
-use StripNondeterminism;
+use File::StripNondeterminism;
use Getopt::Long;
Getopt::Long::Configure(qw(no_ignore_case permute bundling));
@@ -42,7 +42,7 @@ if ($glop->{help}) {
}
if ($glop->{version}) {
- print "$cmd version $StripNondeterminism::VERSION\n";
+ print "$cmd version $File::StripNondeterminism::VERSION\n";
exit 0;
}
@@ -51,10 +51,10 @@ die $usage if @ARGV == 0;
for my $filename (@ARGV) {
my $normalizer;
if ($glop->{type}) {
- $normalizer = StripNondeterminism::get_normalizer_by_name($glop->{type});
+ $normalizer = File::StripNondeterminism::get_normalizer_by_name($glop->{type});
die $glop->{type} . ": Unknown file type\n" unless $normalizer;
} else {
- $normalizer = StripNondeterminism::get_normalizer_for_file($filename);
+ $normalizer = File::StripNondeterminism::get_normalizer_for_file($filename);
next unless $normalizer;
}
diff --git a/lib/StripNondeterminism.pm b/lib/File/StripNondeterminism.pm
similarity index 57%
rename from lib/StripNondeterminism.pm
rename to lib/File/StripNondeterminism.pm
index 5a225dd..ca1d75b 100644
--- a/lib/StripNondeterminism.pm
+++ b/lib/File/StripNondeterminism.pm
@@ -16,16 +16,16 @@
# You should have received a copy of the GNU General Public License
# along with strip-nondeterminism. If not, see <http://www.gnu.org/licenses/>.
#
-package StripNondeterminism;
+package File::StripNondeterminism;
use strict;
use warnings;
-use StripNondeterminism::handlers::ar;
-use StripNondeterminism::handlers::gzip;
-use StripNondeterminism::handlers::jar;
-use StripNondeterminism::handlers::javadoc;
-use StripNondeterminism::handlers::zip;
+use File::StripNondeterminism::handlers::ar;
+use File::StripNondeterminism::handlers::gzip;
+use File::StripNondeterminism::handlers::jar;
+use File::StripNondeterminism::handlers::javadoc;
+use File::StripNondeterminism::handlers::zip;
our($VERSION);
@@ -48,34 +48,34 @@ sub get_normalizer_for_file {
# ar
if (m/\.a$/ && _get_file_type($_) =~ m/ar archive/) {
- return \&StripNondeterminism::handlers::ar::normalize;
+ return \&File::StripNondeterminism::handlers::ar::normalize;
}
# gzip
if (m/\.gz$/ && _get_file_type($_) =~ m/gzip compressed data/) {
- return \&StripNondeterminism::handlers::gzip::normalize;
+ return \&File::StripNondeterminism::handlers::gzip::normalize;
}
# jar
if (m/\.jar$/ && _get_file_type($_) =~ m/Zip archive data/) {
- return \&StripNondeterminism::handlers::jar::normalize;
+ return \&File::StripNondeterminism::handlers::jar::normalize;
}
# javadoc
- if (m/\.html$/ && StripNondeterminism::handlers::javadoc::is_javadoc_file($_)) {
- return \&StripNondeterminism::handlers::javadoc::normalize;
+ if (m/\.html$/ && File::StripNondeterminism::handlers::javadoc::is_javadoc_file($_)) {
+ return \&File::StripNondeterminism::handlers::javadoc::normalize;
}
# zip
if (m/\.zip$/ && _get_file_type($_) =~ m/Zip archive data/) {
- return \&StripNondeterminism::handlers::zip::normalize;
+ return \&File::StripNondeterminism::handlers::zip::normalize;
}
return undef;
}
sub get_normalizer_by_name {
$_ = shift;
- return \&StripNondeterminism::handlers::ar::normalize if $_ eq 'ar';
- return \&StripNondeterminism::handlers::gzip::normalize if $_ eq 'gzip';
- return \&StripNondeterminism::handlers::jar::normalize if $_ eq 'jar';
- return \&StripNondeterminism::handlers::javadoc::normalize if $_ eq 'javadoc';
- return \&StripNondeterminism::handlers::zip::normalize if $_ eq 'zip';
+ return \&File::StripNondeterminism::handlers::ar::normalize if $_ eq 'ar';
+ return \&File::StripNondeterminism::handlers::gzip::normalize if $_ eq 'gzip';
+ return \&File::StripNondeterminism::handlers::jar::normalize if $_ eq 'jar';
+ return \&File::StripNondeterminism::handlers::javadoc::normalize if $_ eq 'javadoc';
+ return \&File::StripNondeterminism::handlers::zip::normalize if $_ eq 'zip';
return undef;
}
diff --git a/lib/StripNondeterminism/handlers/ar.pm b/lib/File/StripNondeterminism/handlers/ar.pm
similarity index 98%
rename from lib/StripNondeterminism/handlers/ar.pm
rename to lib/File/StripNondeterminism/handlers/ar.pm
index dfb41ee..e8bec23 100644
--- a/lib/StripNondeterminism/handlers/ar.pm
+++ b/lib/File/StripNondeterminism/handlers/ar.pm
@@ -18,7 +18,7 @@
# Copyright (C) 2007 Stefano Zacchiroli <zack at debian.org>
# Copyright (C) 2007 Filippo Giunchedi <filippo at debian.org>
-package StripNondeterminism::handlers::ar;
+package File::StripNondeterminism::handlers::ar;
use strict;
use warnings;
diff --git a/lib/StripNondeterminism/handlers/gzip.pm b/lib/File/StripNondeterminism/handlers/gzip.pm
similarity index 98%
rename from lib/StripNondeterminism/handlers/gzip.pm
rename to lib/File/StripNondeterminism/handlers/gzip.pm
index ca09ad0..f1a80b6 100644
--- a/lib/StripNondeterminism/handlers/gzip.pm
+++ b/lib/File/StripNondeterminism/handlers/gzip.pm
@@ -16,7 +16,7 @@
# You should have received a copy of the GNU General Public License
# along with strip-nondeterminism. If not, see <http://www.gnu.org/licenses/>.
#
-package StripNondeterminism::handlers::gzip;
+package File::StripNondeterminism::handlers::gzip;
use strict;
use warnings;
diff --git a/lib/StripNondeterminism/handlers/jar.pm b/lib/File/StripNondeterminism/handlers/jar.pm
similarity index 75%
rename from lib/StripNondeterminism/handlers/jar.pm
rename to lib/File/StripNondeterminism/handlers/jar.pm
index d795ec4..c574195 100644
--- a/lib/StripNondeterminism/handlers/jar.pm
+++ b/lib/File/StripNondeterminism/handlers/jar.pm
@@ -16,14 +16,14 @@
# You should have received a copy of the GNU General Public License
# along with strip-nondeterminism. If not, see <http://www.gnu.org/licenses/>.
#
-package StripNondeterminism::handlers::jar;
+package File::StripNondeterminism::handlers::jar;
use strict;
use warnings;
use Archive::Zip;
-use StripNondeterminism::handlers::zip;
-use StripNondeterminism::handlers::javadoc;
+use File::StripNondeterminism::handlers::zip;
+use File::StripNondeterminism::handlers::javadoc;
sub _jar_filename_cmp ($$) {
my ($a, $b) = @_;
@@ -41,16 +41,16 @@ sub _jar_normalize_member {
return if $member->isDirectory();
if ($member->fileName() =~ /\.html$/ &&
- StripNondeterminism::handlers::zip::peek_member($member, 1024) =~ /\<!-- Generated by javadoc/) {
+ File::StripNondeterminism::handlers::zip::peek_member($member, 1024) =~ /\<!-- Generated by javadoc/) {
# javadoc header should be within first 1kb of file
- StripNondeterminism::handlers::zip::normalize_member($member,
- \&StripNondeterminism::handlers::javadoc::normalize);
+ File::StripNondeterminism::handlers::zip::normalize_member($member,
+ \&File::StripNondeterminism::handlers::javadoc::normalize);
}
}
sub normalize {
my ($jar_filename) = @_;
- return StripNondeterminism::handlers::zip::normalize($jar_filename,
+ return File::StripNondeterminism::handlers::zip::normalize($jar_filename,
filename_cmp => \&_jar_filename_cmp,
member_normalizer => \&_jar_normalize_member);
}
diff --git a/lib/StripNondeterminism/handlers/javadoc.pm b/lib/File/StripNondeterminism/handlers/javadoc.pm
similarity index 97%
rename from lib/StripNondeterminism/handlers/javadoc.pm
rename to lib/File/StripNondeterminism/handlers/javadoc.pm
index 41b020d..095e98e 100644
--- a/lib/StripNondeterminism/handlers/javadoc.pm
+++ b/lib/File/StripNondeterminism/handlers/javadoc.pm
@@ -16,7 +16,7 @@
# You should have received a copy of the GNU General Public License
# along with strip-nondeterminism. If not, see <http://www.gnu.org/licenses/>.
#
-package StripNondeterminism::handlers::javadoc;
+package File::StripNondeterminism::handlers::javadoc;
use strict;
use warnings;
diff --git a/lib/StripNondeterminism/handlers/zip.pm b/lib/File/StripNondeterminism/handlers/zip.pm
similarity index 98%
rename from lib/StripNondeterminism/handlers/zip.pm
rename to lib/File/StripNondeterminism/handlers/zip.pm
index 4baa0d4..96378a6 100644
--- a/lib/StripNondeterminism/handlers/zip.pm
+++ b/lib/File/StripNondeterminism/handlers/zip.pm
@@ -16,7 +16,7 @@
# You should have received a copy of the GNU General Public License
# along with strip-nondeterminism. If not, see <http://www.gnu.org/licenses/>.
#
-package StripNondeterminism::handlers::zip;
+package File::StripNondeterminism::handlers::zip;
use strict;
use warnings;
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/strip-nondeterminism.git
More information about the Reproducible-builds
mailing list