From: John Darrington <john@darrington.wattle.id.au>
Date: Sat, 19 Dec 2020 16:14:22 +0000 (+0100)
Subject: Fix reproducibility issues when generating .eps files
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1706024e6b33698826007ff096bde6e2dc10a79f;p=pspp

Fix reproducibility issues when generating .eps files
---

diff --git a/doc/doc-make.in b/doc/doc-make.in
index 333dce8382..07eca7ba72 100644
--- a/doc/doc-make.in
+++ b/doc/doc-make.in
@@ -65,8 +65,8 @@ $(top_srcdir)/doc/screenshots/%-hc.xwd: src/ui/gui/psppire $(top_srcdir)/doc/scr
 	convert $< $@
 
 %.eps: %.xwd
-	convert $< $@
-
+	convert $< $@,tmp.eps
+	sed -e '/^%%CreationDate: /d' -e '/^%%Title: /s|$(top_srcdir)/||'  $@,tmp.eps > $@
 
 $(src_ui_gui_psppiredir)/%.ui: $(top_srcdir)/src/ui/gui/%.ui
 	@$(MKDIR_P) ${dir $@}
diff --git a/doc/screenshots/autorecode-ad.png b/doc/screenshots/autorecode-ad.png
index cad7dd1ad9..f5836803df 100644
Binary files a/doc/screenshots/autorecode-ad.png and b/doc/screenshots/autorecode-ad.png differ
diff --git a/doc/screenshots/autorecode-hc.eps b/doc/screenshots/autorecode-hc.eps
index ce084c07bd..68a3c5c3d9 100644
--- a/doc/screenshots/autorecode-hc.eps
+++ b/doc/screenshots/autorecode-hc.eps
@@ -1,7 +1,6 @@
 %!PS-Adobe-3.0 EPSF-3.0
 %%Creator: (ImageMagick)
-%%Title: (/home/jdarrington/pspp-screenshots/doc/screenshots/autorecode-hc.eps)
-%%CreationDate: (2020-11-28T21:14:26+01:00)
+%%Title: (doc/screenshots/autorecode-hc.eps,tmp.eps)
 %%BoundingBox: -0 -0 592 296
 %%HiResBoundingBox: 0 0 592 296
 %%DocumentData: Clean7Bit
diff --git a/doc/screenshots/autorecode-hc.png b/doc/screenshots/autorecode-hc.png
index f63983aeb1..1168264001 100644
Binary files a/doc/screenshots/autorecode-hc.png and b/doc/screenshots/autorecode-hc.png differ
diff --git a/doc/screenshots/chisquare-ad.png b/doc/screenshots/chisquare-ad.png
index 0d0cc0ac53..dde0baec4c 100644
Binary files a/doc/screenshots/chisquare-ad.png and b/doc/screenshots/chisquare-ad.png differ
diff --git a/doc/screenshots/chisquare-hc.eps b/doc/screenshots/chisquare-hc.eps
index 0ff0bae28a..6bb78c4387 100644
--- a/doc/screenshots/chisquare-hc.eps
+++ b/doc/screenshots/chisquare-hc.eps
@@ -1,7 +1,6 @@
 %!PS-Adobe-3.0 EPSF-3.0
 %%Creator: (ImageMagick)
-%%Title: (/home/jdarrington/pspp-screenshots/doc/screenshots/chisquare-hc.eps)
-%%CreationDate: (2020-11-28T21:14:43+01:00)
+%%Title: (doc/screenshots/chisquare-hc.eps,tmp.eps)
 %%BoundingBox: -0 -0 635 314
 %%HiResBoundingBox: 0 0 635 314
 %%DocumentData: Clean7Bit
diff --git a/doc/screenshots/chisquare-hc.png b/doc/screenshots/chisquare-hc.png
index ebac00ad57..ed2afad6ab 100644
Binary files a/doc/screenshots/chisquare-hc.png and b/doc/screenshots/chisquare-hc.png differ
diff --git a/doc/screenshots/compute-ad.png b/doc/screenshots/compute-ad.png
index cf868f4ac7..765d67a724 100644
Binary files a/doc/screenshots/compute-ad.png and b/doc/screenshots/compute-ad.png differ
diff --git a/doc/screenshots/compute-hc.eps b/doc/screenshots/compute-hc.eps
index 68418f66f2..221c081af8 100644
--- a/doc/screenshots/compute-hc.eps
+++ b/doc/screenshots/compute-hc.eps
@@ -1,7 +1,6 @@
 %!PS-Adobe-3.0 EPSF-3.0
 %%Creator: (ImageMagick)
-%%Title: (/home/jdarrington/pspp-screenshots/doc/screenshots/compute-hc.eps)
-%%CreationDate: (2020-11-28T21:15:00+01:00)
+%%Title: (doc/screenshots/compute-hc.eps,tmp.eps)
 %%BoundingBox: -0 -0 947 343
 %%HiResBoundingBox: 0 0 947 343
 %%DocumentData: Clean7Bit
diff --git a/doc/screenshots/compute-hc.png b/doc/screenshots/compute-hc.png
index d29c182134..7d9e46f54f 100644
Binary files a/doc/screenshots/compute-hc.png and b/doc/screenshots/compute-hc.png differ
diff --git a/doc/screenshots/count-ad.png b/doc/screenshots/count-ad.png
index ada3b75d04..7e89f8c234 100644
Binary files a/doc/screenshots/count-ad.png and b/doc/screenshots/count-ad.png differ
diff --git a/doc/screenshots/count-define-ad.png b/doc/screenshots/count-define-ad.png
index 11032736a6..49d385870a 100644
Binary files a/doc/screenshots/count-define-ad.png and b/doc/screenshots/count-define-ad.png differ
diff --git a/doc/screenshots/count-define-hc.eps b/doc/screenshots/count-define-hc.eps
index 4c32ded820..57f829ecbf 100644
--- a/doc/screenshots/count-define-hc.eps
+++ b/doc/screenshots/count-define-hc.eps
@@ -1,7 +1,6 @@
 %!PS-Adobe-3.0 EPSF-3.0
 %%Creator: (ImageMagick)
-%%Title: (/home/jdarrington/pspp-screenshots/doc/screenshots/count-define-hc.eps)
-%%CreationDate: (2020-11-28T21:14:55+01:00)
+%%Title: (doc/screenshots/count-define-hc.eps,tmp.eps)
 %%BoundingBox: -0 -0 370 356
 %%HiResBoundingBox: 0 0 370 356
 %%DocumentData: Clean7Bit
diff --git a/doc/screenshots/count-define-hc.png b/doc/screenshots/count-define-hc.png
index d6e6d25a75..9c6569bb93 100644
Binary files a/doc/screenshots/count-define-hc.png and b/doc/screenshots/count-define-hc.png differ
diff --git a/doc/screenshots/count-hc.eps b/doc/screenshots/count-hc.eps
index b5e772024b..cdf20b63f1 100644
--- a/doc/screenshots/count-hc.eps
+++ b/doc/screenshots/count-hc.eps
@@ -1,7 +1,6 @@
 %!PS-Adobe-3.0 EPSF-3.0
 %%Creator: (ImageMagick)
-%%Title: (/home/jdarrington/pspp-screenshots/doc/screenshots/count-hc.eps)
-%%CreationDate: (2020-11-28T21:14:49+01:00)
+%%Title: (doc/screenshots/count-hc.eps,tmp.eps)
 %%BoundingBox: -0 -0 450 244
 %%HiResBoundingBox: 0 0 450 244
 %%DocumentData: Clean7Bit
diff --git a/doc/screenshots/count-hc.png b/doc/screenshots/count-hc.png
index e7ca791778..d01c9173b0 100644
Binary files a/doc/screenshots/count-hc.png and b/doc/screenshots/count-hc.png differ
diff --git a/doc/screenshots/define-groups-t-ad.png b/doc/screenshots/define-groups-t-ad.png
index a36e358d48..2d724b6c6b 100644
Binary files a/doc/screenshots/define-groups-t-ad.png and b/doc/screenshots/define-groups-t-ad.png differ
diff --git a/doc/screenshots/define-groups-t-hc.eps b/doc/screenshots/define-groups-t-hc.eps
index d5d38da557..3b03ccae03 100644
--- a/doc/screenshots/define-groups-t-hc.eps
+++ b/doc/screenshots/define-groups-t-hc.eps
@@ -1,7 +1,6 @@
 %!PS-Adobe-3.0 EPSF-3.0
 %%Creator: (ImageMagick)
-%%Title: (/home/jdarrington/pspp-screenshots/doc/screenshots/define-groups-t-hc.eps)
-%%CreationDate: (2020-11-28T21:15:30+01:00)
+%%Title: (doc/screenshots/define-groups-t-hc.eps,tmp.eps)
 %%BoundingBox: -0 -0 446 151
 %%HiResBoundingBox: 0 0 446 151
 %%DocumentData: Clean7Bit
diff --git a/doc/screenshots/define-groups-t-hc.png b/doc/screenshots/define-groups-t-hc.png
index 4d0f34a83c..59b670e504 100644
Binary files a/doc/screenshots/define-groups-t-hc.png and b/doc/screenshots/define-groups-t-hc.png differ
diff --git a/doc/screenshots/descriptives-ad.png b/doc/screenshots/descriptives-ad.png
index 7c1c5d5d1c..05e4bb9dab 100644
Binary files a/doc/screenshots/descriptives-ad.png and b/doc/screenshots/descriptives-ad.png differ
diff --git a/doc/screenshots/descriptives-hc.eps b/doc/screenshots/descriptives-hc.eps
index 9b98e3180b..65013f64df 100644
--- a/doc/screenshots/descriptives-hc.eps
+++ b/doc/screenshots/descriptives-hc.eps
@@ -1,7 +1,6 @@
 %!PS-Adobe-3.0 EPSF-3.0
 %%Creator: (ImageMagick)
-%%Title: (/home/jdarrington/pspp-screenshots/doc/screenshots/descriptives-hc.eps)
-%%CreationDate: (2020-11-28T21:15:06+01:00)
+%%Title: (doc/screenshots/descriptives-hc.eps,tmp.eps)
 %%BoundingBox: -0 -0 516 302
 %%HiResBoundingBox: 0 0 516 302
 %%DocumentData: Clean7Bit
diff --git a/doc/screenshots/descriptives-hc.png b/doc/screenshots/descriptives-hc.png
index 07436b3f64..f199cf377a 100644
Binary files a/doc/screenshots/descriptives-hc.png and b/doc/screenshots/descriptives-hc.png differ
diff --git a/doc/screenshots/frequencies-ad.png b/doc/screenshots/frequencies-ad.png
index 97873aa4d0..f3d84f9c3d 100644
Binary files a/doc/screenshots/frequencies-ad.png and b/doc/screenshots/frequencies-ad.png differ
diff --git a/doc/screenshots/frequencies-hc.eps b/doc/screenshots/frequencies-hc.eps
index a770abd33c..4f978d4255 100644
--- a/doc/screenshots/frequencies-hc.eps
+++ b/doc/screenshots/frequencies-hc.eps
@@ -1,7 +1,6 @@
 %!PS-Adobe-3.0 EPSF-3.0
 %%Creator: (ImageMagick)
-%%Title: (/home/jdarrington/pspp-screenshots/doc/screenshots/frequencies-hc.eps)
-%%CreationDate: (2020-11-28T21:15:36+01:00)
+%%Title: (doc/screenshots/frequencies-hc.eps,tmp.eps)
 %%BoundingBox: -0 -0 637 260
 %%HiResBoundingBox: 0 0 637 260
 %%DocumentData: Clean7Bit
diff --git a/doc/screenshots/frequencies-hc.png b/doc/screenshots/frequencies-hc.png
index 85faf38ef4..fedf9ee95d 100644
Binary files a/doc/screenshots/frequencies-hc.png and b/doc/screenshots/frequencies-hc.png differ
diff --git a/doc/screenshots/independent-samples-t-ad.png b/doc/screenshots/independent-samples-t-ad.png
index 5f6742880e..ee1e40e51d 100644
Binary files a/doc/screenshots/independent-samples-t-ad.png and b/doc/screenshots/independent-samples-t-ad.png differ
diff --git a/doc/screenshots/independent-samples-t-hc.eps b/doc/screenshots/independent-samples-t-hc.eps
index 62a24a0032..12ebc3abf1 100644
--- a/doc/screenshots/independent-samples-t-hc.eps
+++ b/doc/screenshots/independent-samples-t-hc.eps
@@ -1,7 +1,6 @@
 %!PS-Adobe-3.0 EPSF-3.0
 %%Creator: (ImageMagick)
-%%Title: (/home/jdarrington/pspp-screenshots/doc/screenshots/independent-samples-t-hc.eps)
-%%CreationDate: (2020-11-28T21:15:21+01:00)
+%%Title: (doc/screenshots/independent-samples-t-hc.eps,tmp.eps)
 %%BoundingBox: -0 -0 578 203
 %%HiResBoundingBox: 0 0 578 203
 %%DocumentData: Clean7Bit
diff --git a/doc/screenshots/independent-samples-t-hc.png b/doc/screenshots/independent-samples-t-hc.png
index 398838d406..c52999cf98 100644
Binary files a/doc/screenshots/independent-samples-t-hc.png and b/doc/screenshots/independent-samples-t-hc.png differ
diff --git a/doc/screenshots/one-sample-t-ad.png b/doc/screenshots/one-sample-t-ad.png
index de4ecaf342..1e84bbe7a0 100644
Binary files a/doc/screenshots/one-sample-t-ad.png and b/doc/screenshots/one-sample-t-ad.png differ
diff --git a/doc/screenshots/one-sample-t-hc.eps b/doc/screenshots/one-sample-t-hc.eps
index f0111ed2bd..71f5e8de6a 100644
--- a/doc/screenshots/one-sample-t-hc.eps
+++ b/doc/screenshots/one-sample-t-hc.eps
@@ -1,7 +1,6 @@
 %!PS-Adobe-3.0 EPSF-3.0
 %%Creator: (ImageMagick)
-%%Title: (/home/jdarrington/pspp-screenshots/doc/screenshots/one-sample-t-hc.eps)
-%%CreationDate: (2020-11-28T21:15:14+01:00)
+%%Title: (doc/screenshots/one-sample-t-hc.eps,tmp.eps)
 %%BoundingBox: -0 -0 558 241
 %%HiResBoundingBox: 0 0 558 241
 %%DocumentData: Clean7Bit
diff --git a/doc/screenshots/one-sample-t-hc.png b/doc/screenshots/one-sample-t-hc.png
index c6c5688883..0bbda19365 100644
Binary files a/doc/screenshots/one-sample-t-hc.png and b/doc/screenshots/one-sample-t-hc.png differ
diff --git a/doc/screenshots/reliability-ad.png b/doc/screenshots/reliability-ad.png
index 21c1a4da78..7137a64874 100644
Binary files a/doc/screenshots/reliability-ad.png and b/doc/screenshots/reliability-ad.png differ
diff --git a/doc/screenshots/reliability-hc.eps b/doc/screenshots/reliability-hc.eps
index 7d2a87bb64..9949a0690f 100644
--- a/doc/screenshots/reliability-hc.eps
+++ b/doc/screenshots/reliability-hc.eps
@@ -1,7 +1,6 @@
 %!PS-Adobe-3.0 EPSF-3.0
 %%Creator: (ImageMagick)
-%%Title: (/home/jdarrington/pspp-screenshots/doc/screenshots/reliability-hc.eps)
-%%CreationDate: (2020-11-28T21:15:41+01:00)
+%%Title: (doc/screenshots/reliability-hc.eps,tmp.eps)
 %%BoundingBox: -0 -0 570 222
 %%HiResBoundingBox: 0 0 570 222
 %%DocumentData: Clean7Bit
diff --git a/doc/screenshots/reliability-hc.png b/doc/screenshots/reliability-hc.png
index ab0332e33f..32fe0d98c9 100644
Binary files a/doc/screenshots/reliability-hc.png and b/doc/screenshots/reliability-hc.png differ
diff --git a/doc/screenshots/sort-ad.png b/doc/screenshots/sort-ad.png
index 6b7d1f5c83..e22d50b8c6 100644
Binary files a/doc/screenshots/sort-ad.png and b/doc/screenshots/sort-ad.png differ
diff --git a/doc/screenshots/sort-hc.eps b/doc/screenshots/sort-hc.eps
index 455df6b504..86fc2f6103 100644
--- a/doc/screenshots/sort-hc.eps
+++ b/doc/screenshots/sort-hc.eps
@@ -1,7 +1,6 @@
 %!PS-Adobe-3.0 EPSF-3.0
 %%Creator: (ImageMagick)
-%%Title: (/home/jdarrington/pspp-screenshots/doc/screenshots/sort-hc.eps)
-%%CreationDate: (2020-11-28T21:16:01+01:00)
+%%Title: (doc/screenshots/sort-hc.eps,tmp.eps)
 %%BoundingBox: -0 -0 431 190
 %%HiResBoundingBox: 0 0 431 190
 %%DocumentData: Clean7Bit
diff --git a/doc/screenshots/sort-hc.png b/doc/screenshots/sort-hc.png
index 9d2b57c4bc..cdfc6b351e 100644
Binary files a/doc/screenshots/sort-hc.png and b/doc/screenshots/sort-hc.png differ
diff --git a/doc/screenshots/sort-simple-ad.png b/doc/screenshots/sort-simple-ad.png
index ee58e1e4f6..c3a8e99008 100644
Binary files a/doc/screenshots/sort-simple-ad.png and b/doc/screenshots/sort-simple-ad.png differ
diff --git a/doc/screenshots/sort-simple-hc.eps b/doc/screenshots/sort-simple-hc.eps
index 057f8b36b1..57bd2071f9 100644
--- a/doc/screenshots/sort-simple-hc.eps
+++ b/doc/screenshots/sort-simple-hc.eps
@@ -1,7 +1,6 @@
 %!PS-Adobe-3.0 EPSF-3.0
 %%Creator: (ImageMagick)
-%%Title: (/home/jdarrington/pspp-screenshots/doc/screenshots/sort-simple-hc.eps)
-%%CreationDate: (2020-11-28T21:15:55+01:00)
+%%Title: (doc/screenshots/sort-simple-hc.eps,tmp.eps)
 %%BoundingBox: -0 -0 400 200
 %%HiResBoundingBox: 0 0 400 200
 %%DocumentData: Clean7Bit
diff --git a/doc/screenshots/sort-simple-hc.png b/doc/screenshots/sort-simple-hc.png
index 8b70d2a5e0..e8cdd7c507 100644
Binary files a/doc/screenshots/sort-simple-hc.png and b/doc/screenshots/sort-simple-hc.png differ
diff --git a/doc/screenshots/split-status-bar-ad.png b/doc/screenshots/split-status-bar-ad.png
index e720c03c1f..f0585a6a4f 100644
Binary files a/doc/screenshots/split-status-bar-ad.png and b/doc/screenshots/split-status-bar-ad.png differ
diff --git a/doc/screenshots/split-status-bar-hc.eps b/doc/screenshots/split-status-bar-hc.eps
index 18a4f31e1e..956f7df42c 100644
--- a/doc/screenshots/split-status-bar-hc.eps
+++ b/doc/screenshots/split-status-bar-hc.eps
@@ -1,7 +1,6 @@
 %!PS-Adobe-3.0 EPSF-3.0
 %%Creator: (ImageMagick)
-%%Title: (/home/jdarrington/pspp-screenshots/doc/screenshots/split-status-bar-hc.eps)
-%%CreationDate: (2020-11-28T21:15:48+01:00)
+%%Title: (doc/screenshots/split-status-bar-hc.eps,tmp.eps)
 %%BoundingBox: -0 -0 700 100
 %%HiResBoundingBox: 0 0 700 100
 %%DocumentData: Clean7Bit
diff --git a/doc/screenshots/split-status-bar-hc.png b/doc/screenshots/split-status-bar-hc.png
index 0680b10266..5655d15741 100644
Binary files a/doc/screenshots/split-status-bar-hc.png and b/doc/screenshots/split-status-bar-hc.png differ