From 83f7cae0178074e5e4f913168b4b42c7be90af13 Mon Sep 17 00:00:00 2001
From: Cyril Brulebois <kibi@debian.org>
Date: Sun, 7 Jun 2020 22:49:01 +0000
Subject: Partially work around buggy sitemap generation on buster (#924172).

wml versions found in stretch and buster seem to behave differently when
the input file is not in the current directory. To mitigate this, turn
the ../english/sitemap.wml input file into sitemap.wml in the wml calls
(Chinese and non-Chinese cases), and add symlinks from all (other)
language directories.

Unfortunately, this generates sitemaps that are only partially translated.
They seem to be well-formed though, and very similar to the English
sitemap generated with wml from stretch. Which seems to be a net win over
the status quo.

Also, the missing translations don't seem to be a regression due to the
deployment of this workaround.
---
 albanian/sitemap.wml   | 1 +
 arabic/sitemap.wml     | 1 +
 armenian/sitemap.wml   | 1 +
 bulgarian/sitemap.wml  | 1 +
 catalan/sitemap.wml    | 1 +
 chinese/sitemap.wml    | 1 +
 croatian/sitemap.wml   | 1 +
 czech/sitemap.wml      | 1 +
 danish/sitemap.wml     | 1 +
 dutch/sitemap.wml      | 1 +
 english/Makefile       | 4 ++--
 esperanto/sitemap.wml  | 1 +
 finnish/sitemap.wml    | 1 +
 french/sitemap.wml     | 1 +
 galician/sitemap.wml   | 1 +
 german/sitemap.wml     | 1 +
 greek/sitemap.wml      | 1 +
 hebrew/sitemap.wml     | 1 +
 hungarian/sitemap.wml  | 1 +
 indonesian/sitemap.wml | 1 +
 italian/sitemap.wml    | 1 +
 japanese/sitemap.wml   | 1 +
 korean/sitemap.wml     | 1 +
 lithuanian/sitemap.wml | 1 +
 norwegian/sitemap.wml  | 1 +
 persian/sitemap.wml    | 1 +
 polish/sitemap.wml     | 1 +
 portuguese/sitemap.wml | 1 +
 romanian/sitemap.wml   | 1 +
 russian/sitemap.wml    | 1 +
 slovak/sitemap.wml     | 1 +
 slovene/sitemap.wml    | 1 +
 spanish/sitemap.wml    | 1 +
 swedish/sitemap.wml    | 1 +
 tamil/sitemap.wml      | 1 +
 turkish/sitemap.wml    | 1 +
 ukrainian/sitemap.wml  | 1 +
 vietnamese/sitemap.wml | 1 +
 38 files changed, 39 insertions(+), 2 deletions(-)
 create mode 120000 albanian/sitemap.wml
 create mode 120000 arabic/sitemap.wml
 create mode 120000 armenian/sitemap.wml
 create mode 120000 bulgarian/sitemap.wml
 create mode 120000 catalan/sitemap.wml
 create mode 120000 chinese/sitemap.wml
 create mode 120000 croatian/sitemap.wml
 create mode 120000 czech/sitemap.wml
 create mode 120000 danish/sitemap.wml
 create mode 120000 dutch/sitemap.wml
 create mode 120000 esperanto/sitemap.wml
 create mode 120000 finnish/sitemap.wml
 create mode 120000 french/sitemap.wml
 create mode 120000 galician/sitemap.wml
 create mode 120000 german/sitemap.wml
 create mode 120000 greek/sitemap.wml
 create mode 120000 hebrew/sitemap.wml
 create mode 120000 hungarian/sitemap.wml
 create mode 120000 indonesian/sitemap.wml
 create mode 120000 italian/sitemap.wml
 create mode 120000 japanese/sitemap.wml
 create mode 120000 korean/sitemap.wml
 create mode 120000 lithuanian/sitemap.wml
 create mode 120000 norwegian/sitemap.wml
 create mode 120000 persian/sitemap.wml
 create mode 120000 polish/sitemap.wml
 create mode 120000 portuguese/sitemap.wml
 create mode 120000 romanian/sitemap.wml
 create mode 120000 russian/sitemap.wml
 create mode 120000 slovak/sitemap.wml
 create mode 120000 slovene/sitemap.wml
 create mode 120000 spanish/sitemap.wml
 create mode 120000 swedish/sitemap.wml
 create mode 120000 tamil/sitemap.wml
 create mode 120000 turkish/sitemap.wml
 create mode 120000 ukrainian/sitemap.wml
 create mode 120000 vietnamese/sitemap.wml

diff --git a/albanian/sitemap.wml b/albanian/sitemap.wml
new file mode 120000
index 00000000000..1c70b6bd571
--- /dev/null
+++ b/albanian/sitemap.wml
@@ -0,0 +1 @@
+../english/sitemap.wml
\ No newline at end of file
diff --git a/arabic/sitemap.wml b/arabic/sitemap.wml
new file mode 120000
index 00000000000..1c70b6bd571
--- /dev/null
+++ b/arabic/sitemap.wml
@@ -0,0 +1 @@
+../english/sitemap.wml
\ No newline at end of file
diff --git a/armenian/sitemap.wml b/armenian/sitemap.wml
new file mode 120000
index 00000000000..1c70b6bd571
--- /dev/null
+++ b/armenian/sitemap.wml
@@ -0,0 +1 @@
+../english/sitemap.wml
\ No newline at end of file
diff --git a/bulgarian/sitemap.wml b/bulgarian/sitemap.wml
new file mode 120000
index 00000000000..1c70b6bd571
--- /dev/null
+++ b/bulgarian/sitemap.wml
@@ -0,0 +1 @@
+../english/sitemap.wml
\ No newline at end of file
diff --git a/catalan/sitemap.wml b/catalan/sitemap.wml
new file mode 120000
index 00000000000..1c70b6bd571
--- /dev/null
+++ b/catalan/sitemap.wml
@@ -0,0 +1 @@
+../english/sitemap.wml
\ No newline at end of file
diff --git a/chinese/sitemap.wml b/chinese/sitemap.wml
new file mode 120000
index 00000000000..1c70b6bd571
--- /dev/null
+++ b/chinese/sitemap.wml
@@ -0,0 +1 @@
+../english/sitemap.wml
\ No newline at end of file
diff --git a/croatian/sitemap.wml b/croatian/sitemap.wml
new file mode 120000
index 00000000000..1c70b6bd571
--- /dev/null
+++ b/croatian/sitemap.wml
@@ -0,0 +1 @@
+../english/sitemap.wml
\ No newline at end of file
diff --git a/czech/sitemap.wml b/czech/sitemap.wml
new file mode 120000
index 00000000000..1c70b6bd571
--- /dev/null
+++ b/czech/sitemap.wml
@@ -0,0 +1 @@
+../english/sitemap.wml
\ No newline at end of file
diff --git a/danish/sitemap.wml b/danish/sitemap.wml
new file mode 120000
index 00000000000..1c70b6bd571
--- /dev/null
+++ b/danish/sitemap.wml
@@ -0,0 +1 @@
+../english/sitemap.wml
\ No newline at end of file
diff --git a/dutch/sitemap.wml b/dutch/sitemap.wml
new file mode 120000
index 00000000000..1c70b6bd571
--- /dev/null
+++ b/dutch/sitemap.wml
@@ -0,0 +1 @@
+../english/sitemap.wml
\ No newline at end of file
diff --git a/english/Makefile b/english/Makefile
index 48a8a6367c6..f8211bbba4e 100644
--- a/english/Makefile
+++ b/english/Makefile
@@ -50,11 +50,11 @@ ifeq "$(LANGUAGE)" "zh"
 	@echo -n "Processing $(<F): "
 	$(subst :.zh,:sitemap.zh,$(WML)) \
           $(shell egrep '^-D (CUR_|CHAR)' .wmlrc) \
-            $(shell echo $(ENGLISHDIR) | sed s,./,,)/sitemap.wml
+            sitemap.wml
 	@$(GENERATE_ZH_VARIANTS) sitemap html
 else
 	$(WML) $(shell egrep '^-D (CUR_|CHAR)' .wmlrc) \
-          $(shell echo $(ENGLISHDIR) | sed s,./,,)/sitemap.wml
+          sitemap.wml
 endif
 
 ifneq "$(LANGUAGE)" "en"
diff --git a/esperanto/sitemap.wml b/esperanto/sitemap.wml
new file mode 120000
index 00000000000..1c70b6bd571
--- /dev/null
+++ b/esperanto/sitemap.wml
@@ -0,0 +1 @@
+../english/sitemap.wml
\ No newline at end of file
diff --git a/finnish/sitemap.wml b/finnish/sitemap.wml
new file mode 120000
index 00000000000..1c70b6bd571
--- /dev/null
+++ b/finnish/sitemap.wml
@@ -0,0 +1 @@
+../english/sitemap.wml
\ No newline at end of file
diff --git a/french/sitemap.wml b/french/sitemap.wml
new file mode 120000
index 00000000000..1c70b6bd571
--- /dev/null
+++ b/french/sitemap.wml
@@ -0,0 +1 @@
+../english/sitemap.wml
\ No newline at end of file
diff --git a/galician/sitemap.wml b/galician/sitemap.wml
new file mode 120000
index 00000000000..1c70b6bd571
--- /dev/null
+++ b/galician/sitemap.wml
@@ -0,0 +1 @@
+../english/sitemap.wml
\ No newline at end of file
diff --git a/german/sitemap.wml b/german/sitemap.wml
new file mode 120000
index 00000000000..1c70b6bd571
--- /dev/null
+++ b/german/sitemap.wml
@@ -0,0 +1 @@
+../english/sitemap.wml
\ No newline at end of file
diff --git a/greek/sitemap.wml b/greek/sitemap.wml
new file mode 120000
index 00000000000..1c70b6bd571
--- /dev/null
+++ b/greek/sitemap.wml
@@ -0,0 +1 @@
+../english/sitemap.wml
\ No newline at end of file
diff --git a/hebrew/sitemap.wml b/hebrew/sitemap.wml
new file mode 120000
index 00000000000..1c70b6bd571
--- /dev/null
+++ b/hebrew/sitemap.wml
@@ -0,0 +1 @@
+../english/sitemap.wml
\ No newline at end of file
diff --git a/hungarian/sitemap.wml b/hungarian/sitemap.wml
new file mode 120000
index 00000000000..1c70b6bd571
--- /dev/null
+++ b/hungarian/sitemap.wml
@@ -0,0 +1 @@
+../english/sitemap.wml
\ No newline at end of file
diff --git a/indonesian/sitemap.wml b/indonesian/sitemap.wml
new file mode 120000
index 00000000000..1c70b6bd571
--- /dev/null
+++ b/indonesian/sitemap.wml
@@ -0,0 +1 @@
+../english/sitemap.wml
\ No newline at end of file
diff --git a/italian/sitemap.wml b/italian/sitemap.wml
new file mode 120000
index 00000000000..1c70b6bd571
--- /dev/null
+++ b/italian/sitemap.wml
@@ -0,0 +1 @@
+../english/sitemap.wml
\ No newline at end of file
diff --git a/japanese/sitemap.wml b/japanese/sitemap.wml
new file mode 120000
index 00000000000..1c70b6bd571
--- /dev/null
+++ b/japanese/sitemap.wml
@@ -0,0 +1 @@
+../english/sitemap.wml
\ No newline at end of file
diff --git a/korean/sitemap.wml b/korean/sitemap.wml
new file mode 120000
index 00000000000..1c70b6bd571
--- /dev/null
+++ b/korean/sitemap.wml
@@ -0,0 +1 @@
+../english/sitemap.wml
\ No newline at end of file
diff --git a/lithuanian/sitemap.wml b/lithuanian/sitemap.wml
new file mode 120000
index 00000000000..1c70b6bd571
--- /dev/null
+++ b/lithuanian/sitemap.wml
@@ -0,0 +1 @@
+../english/sitemap.wml
\ No newline at end of file
diff --git a/norwegian/sitemap.wml b/norwegian/sitemap.wml
new file mode 120000
index 00000000000..1c70b6bd571
--- /dev/null
+++ b/norwegian/sitemap.wml
@@ -0,0 +1 @@
+../english/sitemap.wml
\ No newline at end of file
diff --git a/persian/sitemap.wml b/persian/sitemap.wml
new file mode 120000
index 00000000000..1c70b6bd571
--- /dev/null
+++ b/persian/sitemap.wml
@@ -0,0 +1 @@
+../english/sitemap.wml
\ No newline at end of file
diff --git a/polish/sitemap.wml b/polish/sitemap.wml
new file mode 120000
index 00000000000..1c70b6bd571
--- /dev/null
+++ b/polish/sitemap.wml
@@ -0,0 +1 @@
+../english/sitemap.wml
\ No newline at end of file
diff --git a/portuguese/sitemap.wml b/portuguese/sitemap.wml
new file mode 120000
index 00000000000..1c70b6bd571
--- /dev/null
+++ b/portuguese/sitemap.wml
@@ -0,0 +1 @@
+../english/sitemap.wml
\ No newline at end of file
diff --git a/romanian/sitemap.wml b/romanian/sitemap.wml
new file mode 120000
index 00000000000..1c70b6bd571
--- /dev/null
+++ b/romanian/sitemap.wml
@@ -0,0 +1 @@
+../english/sitemap.wml
\ No newline at end of file
diff --git a/russian/sitemap.wml b/russian/sitemap.wml
new file mode 120000
index 00000000000..1c70b6bd571
--- /dev/null
+++ b/russian/sitemap.wml
@@ -0,0 +1 @@
+../english/sitemap.wml
\ No newline at end of file
diff --git a/slovak/sitemap.wml b/slovak/sitemap.wml
new file mode 120000
index 00000000000..1c70b6bd571
--- /dev/null
+++ b/slovak/sitemap.wml
@@ -0,0 +1 @@
+../english/sitemap.wml
\ No newline at end of file
diff --git a/slovene/sitemap.wml b/slovene/sitemap.wml
new file mode 120000
index 00000000000..1c70b6bd571
--- /dev/null
+++ b/slovene/sitemap.wml
@@ -0,0 +1 @@
+../english/sitemap.wml
\ No newline at end of file
diff --git a/spanish/sitemap.wml b/spanish/sitemap.wml
new file mode 120000
index 00000000000..1c70b6bd571
--- /dev/null
+++ b/spanish/sitemap.wml
@@ -0,0 +1 @@
+../english/sitemap.wml
\ No newline at end of file
diff --git a/swedish/sitemap.wml b/swedish/sitemap.wml
new file mode 120000
index 00000000000..1c70b6bd571
--- /dev/null
+++ b/swedish/sitemap.wml
@@ -0,0 +1 @@
+../english/sitemap.wml
\ No newline at end of file
diff --git a/tamil/sitemap.wml b/tamil/sitemap.wml
new file mode 120000
index 00000000000..1c70b6bd571
--- /dev/null
+++ b/tamil/sitemap.wml
@@ -0,0 +1 @@
+../english/sitemap.wml
\ No newline at end of file
diff --git a/turkish/sitemap.wml b/turkish/sitemap.wml
new file mode 120000
index 00000000000..1c70b6bd571
--- /dev/null
+++ b/turkish/sitemap.wml
@@ -0,0 +1 @@
+../english/sitemap.wml
\ No newline at end of file
diff --git a/ukrainian/sitemap.wml b/ukrainian/sitemap.wml
new file mode 120000
index 00000000000..1c70b6bd571
--- /dev/null
+++ b/ukrainian/sitemap.wml
@@ -0,0 +1 @@
+../english/sitemap.wml
\ No newline at end of file
diff --git a/vietnamese/sitemap.wml b/vietnamese/sitemap.wml
new file mode 120000
index 00000000000..1c70b6bd571
--- /dev/null
+++ b/vietnamese/sitemap.wml
@@ -0,0 +1 @@
+../english/sitemap.wml
\ No newline at end of file
-- 
cgit v1.2.3