[latex3-commits] [git/LaTeX3-latex3-l3build] master: Revert last two commits (ca505ba)

[Joseph Wright]

Repository : https://github.com/latex3/l3build
On branch  : master
Link       : https://github.com/latex3/l3build/commit/ca505bac42037e17a2256ba8128bc1567bce0270

>---------------------------------------------------------------

commit ca505bac42037e17a2256ba8128bc1567bce0270
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Mon Mar 16 17:16:28 2020 +0000

    Revert last two commits
    
    That method doesn't quite work.


>---------------------------------------------------------------

ca505bac42037e17a2256ba8128bc1567bce0270
 CHANGELOG.md      | 1 -
 l3build-check.lua | 3 +--
 l3build.dtx       | 8 +++-----
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9557e27..71f2d38 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,7 +9,6 @@ this project uses date-based 'snapshot' version identifiers.
 
 ### Changed
 - Suppress PDF compression in DVI route
-- Suppress PDF ID data in DVI route
 - Deafult to `dvips` for (p)TeX
 
 ## [2020-03-13]
diff --git a/l3build-check.lua b/l3build-check.lua
index 1b17928..21b6d3f 100644
--- a/l3build-check.lua
+++ b/l3build-check.lua
@@ -226,8 +226,7 @@ local function normalize_log(content,engine,errlevels)
      end
      -- Remove the \special line that in DVI mode keeps PDFs comparable
     if match(line, "^%.*\\special%{pdf: docinfo << /Creator") or
-      match(line, "^%.*\\special%{ps: /setdistillerparams") or
-      match(line, "^%.*\\special%{ps: <</........UUID") then
+      match(line, "^%.*\\special%{ps: /setdistillerparams") then
       return ""
     end
      -- Remove \special lines for DVI .pro files
diff --git a/l3build.dtx b/l3build.dtx
index 1828447..8b6aa95 100644
--- a/l3build.dtx
+++ b/l3build.dtx
@@ -2420,7 +2420,8 @@
 %
 % To make any PDF file produced comparable we need to suppress various
 % pieces of data. This works in concert with setting the epoch from the
-% environment side (as not all output can be controlled here).
+% environment side (as not all output can be controlled here). We are
+% somewhat stuck if \texttt{dvips} is being used so just hope for the best!
 % There is a limit to what can be done with the underlying PDF structure so
 % there is no point entirely suppressing \texttt{Producer}: simply avoid
 % any version numbers.
@@ -2452,10 +2453,7 @@
       \relax
   \fi
 \else
-  \ifx\XeTeXversion\@undefined
-    \special{ps: <</DocumentUUID (DocumentUUID)>> setpagedevice}
-    \special{ps: <</InstanceUUID (InstanceUUID)>> setpagedevice}
-  \else
+  \ifx\XeTeXversion\@undefined\else
     \special{%
       pdf: docinfo
         <<