Merge branch 'master' of salsa.debian.org:installer-team/installation-guide

3 files changed, 46 insertions, 16 deletions

diff --git a/debian/archlist b/debian/archlist
index 7c41b5ad3..2e900ce18 100644
--- a/debian/archlist
+++ b/debian/archlist
@@ -10,7 +10,7 @@ armel	ARM softfloat
 armhf	ARM harffloat
 #hppa	PA-RISC (hppa)
 #ia64	IA-64
-mips	32-bit MIPS (big-endian)
+#mips	32-bit MIPS (big-endian)
 mips64el	64-bit MIPS (little-endian)
 mipsel	32-bit MIPS (little-endian)
 #powerpc	PowerPC
diff --git a/debian/changelog b/debian/changelog
index 7b7cf1c59..3a3c5485f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,34 @@
+installation-guide (20200110) UNRELEASED; urgency=medium
+
+  [ Holger Wansing ]
+  * Show a build version within the manual, parsed from debian/changelog.
+  * Also add the '#_preseed_V1' header, when building the example-preseed.txt
+    for the website, as it is already in the binary packages.
+  * Fix gawk warnings about invalid regexp escapes with latest gawk version.
+    Thanks to Mattia Rizzolo for the hint.
+  * Correct filename syntax for PDF and TXT formats, when building for the
+    website, to get valid filename suffixes.
+  * Update view of boot screen (add dark theme installer menu).
+  * Update copyright year to 2020.
+  * Drop mips from built archs.
+  * Remove docs on no-longer-existing 'print-server' task.
+
+  [ Changwoo Ryu ]
+  * Improve Korean pdf
+
+  [ Updated translations ]
+  * Dutch by Frans Spiesschaert
+  * French by Baptiste Jammet
+  * German by Holger Wansing
+  * Greek by galaxico
+  * Hungarian
+  * Italian by Luco Monducci
+  * Norwegian Nynorsk by Yngve Spjeld-Landro
+  * Portuguese by Miguel Figueiredo
+  * Swedish by Mattias Münster
+
+ -- Holger Wansing <hwansing@mailbox.org>  Fri, 10 Jan 2020 23:21:11 +0100
+
 installation-guide (20191229+rebuild1) unstable; urgency=medium
 
   * Re-upload to get built on buildd, no source change. Closes: #953783
diff --git a/debian/control b/debian/control
index 395c2e2c7..5a816b2e5 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Standards-Version: 4.1.4
 Vcs-Git: https://salsa.debian.org/installer-team/installation-guide.git
 Vcs-Browser: https://salsa.debian.org/installer-team/installation-guide
 Build-Depends: debhelper (>= 6)
-Build-Depends-Indep: docbook, docbook-xml, docbook-xsl, xsltproc, gawk, libhtml-parser-perl, w3m, poxml, dblatex, docbook-dsssl, ghostscript, texlive-xetex, lmodern, texlive-lang-cyrillic, texlive-lang-czechslovak, texlive-lang-european, texlive-lang-french, texlive-lang-german, texlive-lang-greek, texlive-lang-italian, texlive-lang-korean, texlive-lang-other, texlive-lang-portuguese, texlive-lang-spanish, fonts-wqy-microhei, fonts-vlgothic, fonts-nanum, fonts-nanum-coding, fonts-freefont-ttf
+Build-Depends-Indep: docbook, docbook-xml, docbook-xsl, xsltproc, gawk, libhtml-parser-perl, w3m, poxml, dblatex, docbook-dsssl, ghostscript, texlive-xetex, lmodern, texlive-lang-cyrillic, texlive-lang-czechslovak, texlive-lang-european, texlive-lang-french, texlive-lang-german, texlive-lang-greek, texlive-lang-italian, texlive-lang-korean, texlive-lang-other, texlive-lang-portuguese, texlive-lang-spanish, fonts-wqy-microhei, fonts-vlgothic, fonts-noto-cjk, fonts-freefont-ttf
 # This comment can also be used to generate a Build-Depends-Indep line, by
 # running the debian/genbuilddeps program. So put each build dep on its own
 # line, prefixed by " - " and to comment out a build dep, start the line
@@ -57,9 +57,8 @@ Build-Depends-Indep: docbook, docbook-xml, docbook-xsl, xsltproc, gawk, libhtml-
 #		Font for Chinese pdf.
 #	- fonts-vlgothic
 #		Font for Japanese pdf.
-#	- fonts-nanum
-#	- fonts-nanum-coding
-#		Fonts for Korean pdf.
+#	- fonts-noto-cjk
+#		Font for Korean pdf.
 #	- fonts-freefont-ttf
 
 Package: installation-guide-amd64
@@ -160,17 +159,17 @@ Description: Debian installation guide for i386
 # running on the Intel x86 architecture, in a variety of languages.
 # .
 # A shorter reference, the installation HOWTO, is included in an appendix.
-
-Package: installation-guide-mips
-Architecture: all
-Multi-Arch: foreign
-Depends: ${misc:Depends}
-Conflicts: installation-guide
-Description: Debian installation guide for mips
- This package contains the Debian installation guide for the big-endian
- 32bit MIPS architecture, in a variety of languages.
- .
- A shorter reference, the installation HOWTO, is included in an appendix.
+#
+#Package: installation-guide-mips
+#Architecture: all
+#Multi-Arch: foreign
+#Depends: ${misc:Depends}
+#Conflicts: installation-guide
+#Description: Debian installation guide for mips
+# This package contains the Debian installation guide for the big-endian
+# 32bit MIPS architecture, in a variety of languages.
+# .
+# A shorter reference, the installation HOWTO, is included in an appendix.
 
 Package: installation-guide-mips64el
 Architecture: all