Package: release.debian.org
User: release.debian.org@packages.debian.org
Usertags: unblock
X-Debbugs-Cc: reproducible-builds@lists.alioth.debian.org
Dear release team,
Chris updated strip-nd in unstable.
Keep in mind that even if it is made as a non-native source package, we
are upstream for it.
These are the relevant changes:
strip-nondeterminism (0.031-1) unstable; urgency=medium
* Don't test for stat(2) blksize and blocks; they are filesystem-specific and
we are already checking the pre- and post-processing contents anyway.
(Closes: #854937)
-- Chris Lamb <lamby@debian.org> Mon, 13 Feb 2017 17:41:27 +1300
strip-nondeterminism (0.030-1) unstable; urgency=medium
* Print log entry when fixing a file. (Closes: #777239)
* Run our entire testsuite in autopkgtests; `perl -MExtUtils::Command::MM
-MTest::Harness` was ignoring all but the first argument. (Closes: #852517)
* Use error() from Dh_Lib.pm over manual die().
* Add watch file with cryptographic signature verification.
* Add documentation regarding uploading a signed tarball.
* Add myself to AUTHORS and debian/copyright.
-- Chris Lamb <lamby@debian.org> Thu, 09 Feb 2017 22:11:16 +1300
Now, I don't know whether he aimed these changes for stretch or not, but
I do believe they would make a good addition.
Either way I'll leave the decision to you, you can find attached a
debdiff between testing and unstable.
--
regards,
Mattia Rizzolo
GPG Key: 66AE 2B4A FCCF 3F52 DA18 4D18 4B04 3FCD B944 4540 .''`.
more about me: https://mapreri.org : :' :
Launchpad user: https://launchpad.net/~mapreri `. `'`
Debian QA page: https://qa.debian.org/developer.php?login=mattia `-
diffstat for strip-nondeterminism-0.029 strip-nondeterminism-0.031
Makefile.PL | 5 ++
README | 10 +++++
bin/dh_strip_nondeterminism | 8 +++-
bin/strip-nondeterminism | 9 +++-
debian/changelog | 20 ++++++++++
debian/copyright | 1
debian/tests/control | 2 -
debian/upstream/signing-key.asc | 76 ++++++++++++++++++++++++++++++++++++++++
debian/watch | 2 +
lib/File/StripNondeterminism.pm | 2 -
t/fixtures.t | 4 +-
11 files changed, 129 insertions(+), 10 deletions(-)
diff -Nru strip-nondeterminism-0.029/bin/dh_strip_nondeterminism strip-nondeterminism-0.031/bin/dh_strip_nondeterminism
--- strip-nondeterminism-0.029/bin/dh_strip_nondeterminism 2016-12-22 11:52:33.000000000 +0100
+++ strip-nondeterminism-0.031/bin/dh_strip_nondeterminism 2017-02-13 05:40:46.000000000 +0100
@@ -79,10 +79,13 @@
$File::StripNondeterminism::canonical_time = str2time($dh{DATE});
}
+ verbose_print("Using $File::StripNondeterminism::canonical_time as canonical time");
+
foreach (@nondeterministic_files) {
my ($path, $normalize) = @$_;
+ verbose_print("Normalizing $path");
eval { $normalize->($path); 1 }
- or die "dh_strip_nondeterminism: $path: $@";
+ or error("$path: $@");
}
}
@@ -92,8 +95,9 @@
This program is a part of debhelper.
-=head1 AUTHOR
+=head1 AUTHORS
Andrew Ayer <agwa@andrewayer.name>
+Chris Lamb <lamby@debian.org>
=cut
diff -Nru strip-nondeterminism-0.029/bin/strip-nondeterminism strip-nondeterminism-0.031/bin/strip-nondeterminism
--- strip-nondeterminism-0.029/bin/strip-nondeterminism 2016-12-22 11:52:33.000000000 +0100
+++ strip-nondeterminism-0.031/bin/strip-nondeterminism 2017-02-13 05:40:46.000000000 +0100
@@ -29,9 +29,9 @@
my $cmd = $0;
$cmd =~ s/.*\///;
my $usage
- = "Usage: $cmd [-t|--type FILETYPE] [-T|--timestamp SECONDS] [--clamp-timestamp] FILENAME\n";
+ = "Usage: $cmd [-v|--verbose] [-t|--type FILETYPE] [-T|--timestamp SECONDS] [--clamp-timestamp] FILENAME\n";
-my ($filetype, $timestamp, $clamp_timestamp, $want_help, $want_version);
+my ($filetype, $timestamp, $clamp_timestamp, $want_help, $verbose, $want_version);
my $getopt = Getopt::Long::Parser->new;
$getopt->configure(qw(no_ignore_case permute bundling));
$getopt->getoptions(
@@ -39,6 +39,7 @@
'timestamp|T=i', \$timestamp,
'clamp-timestamp!', \$clamp_timestamp,
'help|h', \$want_help,
+ 'verbose|v', \$verbose,
'version|V', \$want_version
) or die $usage;
@@ -73,6 +74,7 @@
next unless $normalizer;
}
+ print "Normalizing $filename\n" if $verbose;
eval { $normalizer->($filename); 1 }
or die "strip-nondeterminism: $filename: $@";
}
@@ -126,9 +128,10 @@
=back
-=head1 AUTHOR
+=head1 AUTHORS
Andrew Ayer
+Chris Lamb
=head1 COPYRIGHT
diff -Nru strip-nondeterminism-0.029/debian/changelog strip-nondeterminism-0.031/debian/changelog
--- strip-nondeterminism-0.029/debian/changelog 2016-12-27 13:54:57.000000000 +0100
+++ strip-nondeterminism-0.031/debian/changelog 2017-02-13 05:41:27.000000000 +0100
@@ -1,3 +1,23 @@
+strip-nondeterminism (0.031-1) unstable; urgency=medium
+
+ * Don't test for stat(2) blksize and blocks; they are filesystem-specific and
+ we are already checking the pre- and post-processing contents anyway.
+ (Closes: #854937)
+
+ -- Chris Lamb <lamby@debian.org> Mon, 13 Feb 2017 17:41:27 +1300
+
+strip-nondeterminism (0.030-1) unstable; urgency=medium
+
+ * Print log entry when fixing a file. (Closes: #777239)
+ * Run our entire testsuite in autopkgtests; `perl -MExtUtils::Command::MM
+ -MTest::Harness` was ignoring all but the first argument. (Closes: #852517)
+ * Use error() from Dh_Lib.pm over manual die().
+ * Add watch file with cryptographic signature verification.
+ * Add documentation regarding uploading a signed tarball.
+ * Add myself to AUTHORS and debian/copyright.
+
+ -- Chris Lamb <lamby@debian.org> Thu, 09 Feb 2017 22:11:16 +1300
+
strip-nondeterminism (0.029-2) unstable; urgency=medium
[ Chris Lamb ]
diff -Nru strip-nondeterminism-0.029/debian/copyright strip-nondeterminism-0.031/debian/copyright
--- strip-nondeterminism-0.029/debian/copyright 2016-12-27 13:54:57.000000000 +0100
+++ strip-nondeterminism-0.031/debian/copyright 2017-02-13 05:41:27.000000000 +0100
@@ -4,6 +4,7 @@
Files: *
Copyright: Copyright (C) 2014 Andrew Ayer
+ Copyright (C) 2017 Chris Lamb
License: GPL-3+
Files: lib/File/StripNondeterminism/handlers/ar.pm
diff -Nru strip-nondeterminism-0.029/debian/tests/control strip-nondeterminism-0.031/debian/tests/control
--- strip-nondeterminism-0.029/debian/tests/control 2016-12-27 13:53:42.000000000 +0100
+++ strip-nondeterminism-0.031/debian/tests/control 2017-02-13 05:41:27.000000000 +0100
@@ -1,2 +1,2 @@
-Test-Command: mkdir -p "${ADTTMP}" && cp -rv t/ bin/ "${ADTTMP}" && cd "${ADTTMP}" && perl -MExtUtils::Command::MM -MTest::Harness t/*.t
+Test-Command: mkdir -p "${ADTTMP}" && cp -rv t/ bin/ "${ADTTMP}" && cd "${ADTTMP}" && for X in t/*.t; do perl -MExtUtils::Command::MM -MTest::Harness ${X} || return ${?}; done
Restrictions: allow-stderr
diff -Nru strip-nondeterminism-0.029/debian/upstream/signing-key.asc strip-nondeterminism-0.031/debian/upstream/signing-key.asc
--- strip-nondeterminism-0.029/debian/upstream/signing-key.asc 1970-01-01 01:00:00.000000000 +0100
+++ strip-nondeterminism-0.031/debian/upstream/signing-key.asc 2017-02-13 05:41:27.000000000 +0100
@@ -0,0 +1,76 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+xNfR
+=qega
+-----END PGP PUBLIC KEY BLOCK-----
diff -Nru strip-nondeterminism-0.029/debian/watch strip-nondeterminism-0.031/debian/watch
--- strip-nondeterminism-0.029/debian/watch 1970-01-01 01:00:00.000000000 +0100
+++ strip-nondeterminism-0.031/debian/watch 2017-02-13 05:41:27.000000000 +0100
@@ -0,0 +1,2 @@
+version=3
+opts=pgpsigurlmangle=s/$/.asc/ http://reproducible.alioth.debian.org/releases/strip-nondeterminism/strip-nondeterminism-(.+).tar.bz2
diff -Nru strip-nondeterminism-0.029/lib/File/StripNondeterminism.pm strip-nondeterminism-0.031/lib/File/StripNondeterminism.pm
--- strip-nondeterminism-0.029/lib/File/StripNondeterminism.pm 2016-12-22 11:52:33.000000000 +0100
+++ strip-nondeterminism-0.031/lib/File/StripNondeterminism.pm 2017-02-13 05:40:46.000000000 +0100
@@ -34,7 +34,7 @@
our($VERSION, $canonical_time, $clamp_time);
-$VERSION = '0.029'; # 0.029
+$VERSION = '0.031'; # 0.031
sub init {
$ENV{'TZ'} = 'UTC';
diff -Nru strip-nondeterminism-0.029/Makefile.PL strip-nondeterminism-0.031/Makefile.PL
--- strip-nondeterminism-0.029/Makefile.PL 2016-12-22 11:52:33.000000000 +0100
+++ strip-nondeterminism-0.031/Makefile.PL 2017-02-13 05:40:46.000000000 +0100
@@ -6,7 +6,10 @@
WriteMakefile(
NAME => 'File::StripNondeterminism',
- AUTHOR => 'Andrew Ayer <agwa@andrewayer.name>',
+ AUTHOR => [
+ 'Andrew Ayer <agwa@andrewayer.name>',
+ 'Chris Lamb <lamby@debian.org>'
+ ],
VERSION_FROM => 'lib/File/StripNondeterminism.pm',
ABSTRACT => 'tool for stripping nondeterminism from files',
EXE_FILES => [qw(bin/dh_strip_nondeterminism bin/strip-nondeterminism)],
diff -Nru strip-nondeterminism-0.029/README strip-nondeterminism-0.031/README
--- strip-nondeterminism-0.029/README 2016-12-22 11:52:33.000000000 +0100
+++ strip-nondeterminism-0.031/README 2017-02-13 05:40:46.000000000 +0100
@@ -8,3 +8,13 @@
strip-nondeterminism contains the File::StripNondeterminism Perl module, the
strip-nondeterminism command line utility, and the dh_strip_nondeterminism
Debhelper add-on.
+
+After releasing, please upload a signed tarball:
+
+ $ VERSION=FIXME
+
+ $ git archive --format=tar --prefix=strip-nondeterminism-${VERSION}/ ${VERSION} | bzip2 -9 > strip-nondeterminism-${VERSION}.tar.bz2
+
+ $ gpg --detach-sig --armor --output=strip-nondeterminism-${VERSION}.tar.bz2.asc < strip-nondeterminism-${VERSION}.tar.bz2
+
+ $ scp strip-nondeterminism-${VERSION}* alioth.debian.org:/home/groups/reproducible/htdocs/releases/strip-nondeterminism
diff -Nru strip-nondeterminism-0.029/t/fixtures.t strip-nondeterminism-0.031/t/fixtures.t
--- strip-nondeterminism-0.029/t/fixtures.t 2016-12-22 11:52:33.000000000 +0100
+++ strip-nondeterminism-0.031/t/fixtures.t 2017-02-13 05:40:46.000000000 +0100
@@ -42,8 +42,8 @@
# 8 => "atime (last access time in seconds since the epoch)",
# 9 => "mtime (last modified time in seconds since the epoch)",
# 10 => "ctime (inode change time in seconds since the epoch)",
- 11 => "blksize (preferred I/O size in bytes for interacting with the file)",
- 12 => "blocks (actual number of system-specific blocks allocated on disk)",
+ # 11 => "blksize (preferred I/O size in bytes for interacting with the file)",
+ # 12 => "blocks (actual number of system-specific blocks allocated on disk)",
);
File::StripNondeterminism::init();
Attachment:
signature.asc
Description: PGP signature