diff -pruN 0.042-1/bin/dh_strip_nondeterminism 0.044-1/bin/dh_strip_nondeterminism --- 0.042-1/bin/dh_strip_nondeterminism 2018-06-14 20:09:49.000000000 +0000 +++ 0.044-1/bin/dh_strip_nondeterminism 2018-11-07 11:16:59.000000000 +0000 @@ -11,7 +11,6 @@ use B; use File::Find; use Debian::Debhelper::Dh_Lib; use File::StripNondeterminism; -use Date::Parse; =head1 SYNOPSIS @@ -81,13 +80,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) find(\&testfile,$tmp); next unless @nondeterministic_files; - $File::StripNondeterminism::canonical_time - = eval { get_source_date_epoch() }; - if (not defined $File::StripNondeterminism::canonical_time) { - # Hack for old versions of debhelper - isnative($package); # Sets $dh{DATE} as a side-effect - $File::StripNondeterminism::canonical_time = str2time($dh{DATE}); - } + $File::StripNondeterminism::canonical_time = get_source_date_epoch(); verbose_print("Using $File::StripNondeterminism::canonical_time as canonical time"); diff -pruN 0.042-1/debian/changelog 0.044-1/debian/changelog --- 0.042-1/debian/changelog 2018-06-14 20:14:21.000000000 +0000 +++ 0.044-1/debian/changelog 2018-11-07 11:17:51.000000000 +0000 @@ -1,3 +1,29 @@ +strip-nondeterminism (0.044-1) unstable; urgency=medium + + [ Emmanuel Bourg ] + * Update the Javadoc handler to handle "dc.created" meta headers too for + OpenJDK 11. (Closes: #913132) + + -- Chris Lamb Wed, 07 Nov 2018 11:17:51 +0000 + +strip-nondeterminism (0.043-2) unstable; urgency=medium + + * Fix d/watch after the move off alioth.debian.org. + * Use the new debhelper-compat(=11) notation and drop d/compat. + + -- Mattia Rizzolo Sat, 13 Oct 2018 13:02:00 +0200 + +strip-nondeterminism (0.043-1) unstable; urgency=medium + + [ Guillem Jover ] + * Remove old Date::Parse backwards-compatibility code. (Closes: #910257) + + [ Chris Lamb ] + * Bump Standards-Version to 4.2.1. + * debian/rules: Correct spelling/grammar in comment. + + -- Chris Lamb Thu, 04 Oct 2018 10:32:11 +0100 + strip-nondeterminism (0.042-1) unstable; urgency=medium [ Evgueni Souleimanov ] diff -pruN 0.042-1/debian/compat 0.044-1/debian/compat --- 0.042-1/debian/compat 2018-06-14 20:14:21.000000000 +0000 +++ 0.044-1/debian/compat 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -11 diff -pruN 0.042-1/debian/control 0.044-1/debian/control --- 0.042-1/debian/control 2018-06-14 20:14:21.000000000 +0000 +++ 0.044-1/debian/control 2018-11-07 11:17:51.000000000 +0000 @@ -2,7 +2,7 @@ Source: strip-nondeterminism Section: devel Priority: optional Build-Depends: - debhelper (>= 11~), + debhelper-compat (= 11), dpkg-dev (>= 1.17.14), Build-Depends-Indep: libarchive-cpio-perl , @@ -16,7 +16,7 @@ Uploaders: Mattia Rizzolo , Chris Lamb , Rules-Requires-Root: no -Standards-Version: 4.1.4 +Standards-Version: 4.2.1 Homepage: https://reproducible-builds.org/ Vcs-Git: https://salsa.debian.org/reproducible-builds/strip-nondeterminism.git Vcs-Browser: https://salsa.debian.org/reproducible-builds/strip-nondeterminism @@ -68,9 +68,8 @@ Description: file non-deterministic info Package: dh-strip-nondeterminism Architecture: all Depends: - debhelper, + debhelper (>= 9.20151004), libfile-stripnondeterminism-perl (= ${binary:Version}), - libtimedate-perl, ${misc:Depends}, ${perl:Depends}, Multi-Arch: foreign diff -pruN 0.042-1/debian/rules 0.044-1/debian/rules --- 0.042-1/debian/rules 2018-06-14 20:14:21.000000000 +0000 +++ 0.044-1/debian/rules 2018-11-07 11:17:51.000000000 +0000 @@ -4,7 +4,7 @@ dh $@ # Remove the auto-generated Makefile to prevent dh_auto_clean from failing -# if the Makefile contain paths referring to an old version of Perl. +# if the Makefile contains paths referring to an old version of Perl. override_dh_auto_clean: rm -rf Makefile MYMETA.* cover_db/ blib/ dh_auto_clean diff -pruN 0.042-1/debian/watch 0.044-1/debian/watch --- 0.042-1/debian/watch 2018-06-14 20:14:21.000000000 +0000 +++ 0.044-1/debian/watch 2018-11-07 11:17:51.000000000 +0000 @@ -1,2 +1,3 @@ -version=3 -opts=pgpsigurlmangle=s/$/.asc/ https://reproducible.alioth.debian.org/releases/strip-nondeterminism/strip-nondeterminism-(.+).tar.bz2 +version=4 +opts=pgpmode=auto \ +https://reproducible-builds.org/_lfs/releases/@PACKAGE@/@PACKAGE@@ANY_VERSION@@ARCHIVE_EXT@ diff -pruN 0.042-1/lib/File/StripNondeterminism/handlers/javadoc.pm 0.044-1/lib/File/StripNondeterminism/handlers/javadoc.pm --- 0.042-1/lib/File/StripNondeterminism/handlers/javadoc.pm 2018-06-14 20:09:49.000000000 +0000 +++ 0.044-1/lib/File/StripNondeterminism/handlers/javadoc.pm 2018-11-07 11:16:59.000000000 +0000 @@ -59,14 +59,14 @@ sub normalize { unless $line =~ /^\s*$/; # elide lines that are now whitespace-only $modified = 1; - } elsif ($line =~ /\/i) { + } elsif ($line =~ /\/i) { if (defined $File::StripNondeterminism::canonical_time) { my $date = strftime('%Y-%m-%d', gmtime($File::StripNondeterminism::canonical_time)); $line - =~ s/\<(META NAME="date" CONTENT)="[^"]*"\>/<$1="$date">/gi; + =~ s/\<(META NAME="(?:date|dc.created)" CONTENT)="[^"]*"\>/<$1="$date">/gi; } else { - $line =~ s/\//gi; + $line =~ s/\//gi; } print $tempfile $line unless $line diff -pruN 0.042-1/lib/File/StripNondeterminism.pm 0.044-1/lib/File/StripNondeterminism.pm --- 0.042-1/lib/File/StripNondeterminism.pm 2018-06-14 20:09:49.000000000 +0000 +++ 0.044-1/lib/File/StripNondeterminism.pm 2018-11-07 11:16:59.000000000 +0000 @@ -25,7 +25,7 @@ use POSIX qw(tzset); our($VERSION, $canonical_time, $clamp_time); -$VERSION = '0.042'; # 0.042 +$VERSION = '0.044'; # 0.044 sub init() { $ENV{'TZ'} = 'UTC'; diff -pruN 0.042-1/t/fixtures/javadoc/java11.html.in 0.044-1/t/fixtures/javadoc/java11.html.in --- 0.042-1/t/fixtures/javadoc/java11.html.in 1970-01-01 00:00:00.000000000 +0000 +++ 0.044-1/t/fixtures/javadoc/java11.html.in 2018-11-07 11:16:59.000000000 +0000 @@ -0,0 +1,11 @@ + + + + + +Generated Documentation (Untitled) + + + + + diff -pruN 0.042-1/t/fixtures/javadoc/java11.html.out 0.044-1/t/fixtures/javadoc/java11.html.out --- 0.042-1/t/fixtures/javadoc/java11.html.out 1970-01-01 00:00:00.000000000 +0000 +++ 0.044-1/t/fixtures/javadoc/java11.html.out 2018-11-07 11:16:59.000000000 +0000 @@ -0,0 +1,10 @@ + + + + +Generated Documentation (Untitled) + + + + +