[Git][reproducible-builds/strip-nondeterminism][debian] 4 commits: Update the Javadoc handler to handle "dc.created" meta headers too for OpenJDK…

Wed Nov 7 12:18:52 CET 2018

Chris Lamb pushed to branch debian at Reproducible Builds / strip-nondeterminism


Commits:
f7454848 by Emmanuel Bourg at 2018-11-07T11:11:46Z
Update the Javadoc handler to handle "dc.created" meta headers too for OpenJDK 11. (Closes: #913132)

Signed-off-by: Chris Lamb <lamby at debian.org>

- - - - -
9c7e0949 by Chris Lamb at 2018-11-07T11:16:59Z
Release version 0.044

- - - - -
d39aa4ae by Chris Lamb at 2018-11-07T11:17:25Z
Merge tag '0.044' into debian

Release version 0.044

* tag '0.044':
  Release version 0.044
  Update the Javadoc handler to handle "dc.created" meta headers too for OpenJDK 11. (Closes: #913132)

- - - - -
4044ed55 by Chris Lamb at 2018-11-07T11:17:55Z
Update changelog for 0.044-1 release

- - - - -


5 changed files:

- debian/changelog
- lib/File/StripNondeterminism.pm
- lib/File/StripNondeterminism/handlers/javadoc.pm
- + t/fixtures/javadoc/java11.html.in
- + t/fixtures/javadoc/java11.html.out


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+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 <lamby at debian.org>  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.


=====================================
lib/File/StripNondeterminism.pm
=====================================
@@ -25,7 +25,7 @@ use POSIX qw(tzset);
 
 our($VERSION, $canonical_time, $clamp_time);
 
-$VERSION = '0.043'; # 0.043
+$VERSION = '0.044'; # 0.044
 
 sub init() {
 	$ENV{'TZ'} = 'UTC';


=====================================
lib/File/StripNondeterminism/handlers/javadoc.pm
=====================================
@@ -59,14 +59,14 @@ sub normalize {
 			  unless $line
 			  =~ /^\s*$/; # elide lines that are now whitespace-only
 			$modified = 1;
-		} elsif ($line =~ /\<META NAME="date" CONTENT="[^"]*"\>/i) {
+		} elsif ($line =~ /\<META NAME="(date|dc.created)" CONTENT="[^"]*"\>/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/\<META NAME="date" CONTENT="[^"]*"\>//gi;
+				$line =~ s/\<META NAME="(?:date|dc.created)" CONTENT="[^"]*"\>//gi;
 			}
 			print $tempfile $line
 			  unless $line


=====================================
t/fixtures/javadoc/java11.html.in
=====================================
@@ -0,0 +1,11 @@
+<!DOCTYPE HTML>
+<!-- NewPage -->
+<html lang="en">
+<head>
+<!-- Generated by javadoc (11.0.1) on Wed Nov 07 09:50:23 CET 2018 -->
+<title>Generated Documentation (Untitled)</title>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<meta name="dc.created" content="2018-11-07">
+<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
+<link rel="stylesheet" type="text/css" href="jquery/jquery-ui.css" title="Style">
+<script type="text/javascript" src="script.js"></script>


=====================================
t/fixtures/javadoc/java11.html.out
=====================================
@@ -0,0 +1,10 @@
+<!DOCTYPE HTML>
+<!-- NewPage -->
+<html>
+<head>
+<title>Generated Documentation (Untitled)</title>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<meta name="dc.created" content="2015-02-05">
+<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
+<link rel="stylesheet" type="text/css" href="jquery/jquery-ui.css" title="Style">
+<script type="text/javascript" src="script.js"></script>



View it on GitLab: https://salsa.debian.org/reproducible-builds/strip-nondeterminism/compare/35da3ce72ed8d946e6599c8d403041978dd0e44e...4044ed558251f6c31c0d90034d115513361a4b72

-- 
View it on GitLab: https://salsa.debian.org/reproducible-builds/strip-nondeterminism/compare/35da3ce72ed8d946e6599c8d403041978dd0e44e...4044ed558251f6c31c0d90034d115513361a4b72
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.reproducible-builds.org/pipermail/rb-commits/attachments/20181107/ea7cbbe0/attachment.html>
