From 635d915268d92cf14d9deb00792c8fb8737e9500 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20K=C4=99pie=C5=84?= Date: Fri, 3 Jan 2020 09:08:09 +0100 Subject: [PATCH 1/3] Prevent splitting GitLab identifiers across lines GitLab issue and merge request numbers placed in release notes (in the form of "#1234" for issues and "!5678" for merge requests) should not be split across two lines. Extend the shell pipeline generating doc/arm/notes.txt with a sed invocation which prevents such splitting. (cherry picked from commit 2d00143ab161aba573649c445603bab72ad82e25) --- doc/arm/Makefile.in | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/doc/arm/Makefile.in b/doc/arm/Makefile.in index f1d493567a..0a9f7d94d2 100644 --- a/doc/arm/Makefile.in +++ b/doc/arm/Makefile.in @@ -56,10 +56,16 @@ notes.pdf: notes-wrapper.xml ${NOTESXML} releaseinfo.xml pkgversion.xml notevers ${XSLTPROC} ${top_srcdir}/doc/xsl/pre-latex.xsl notes-wrapper.xml | \ ${DBLATEX} -c notes.conf -Pdoc.layout="mainmatter" -o notes.pdf - +# Produce notes.txt from notes.html using w3m, with some post-processing: +# +# - remove trailing spaces from every line, +# - remove empty lines from the end of the document, +# - prevent GitLab issue/MR identifiers from being split across two lines. notes.txt: notes.html ${W3M} -dump -cols 75 -O ascii -T text/html < notes.html | \ sed 's/ *$$//' | \ - sed -e :a -e '/^\n*$$/{$$d;N;};/\n$$/ba' > notes.txt + sed -e :a -e '/^\n*$$/{$$d;N;};/\n$$/ba' | \ + sed '/ [!#]$$/{N;s| \([!#]\)\(\n\s*\)\([0-9][0-9]*\)|\2\1\3|;};' > notes.txt # use xmllint to process include Bv9ARM.html: Bv9ARM-book.xml ${NOTESXML} releaseinfo.xml pkgversion.xml noteversion.xml From fbe12036df97de88f8d50fea86c0d0bc420a5661 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20K=C4=99pie=C5=84?= Date: Fri, 3 Jan 2020 09:08:09 +0100 Subject: [PATCH 2/3] Fix whitespace in release notes (cherry picked from commit b2f3eaf188b754ddef0b91644784831fb99d9f67) --- doc/arm/notes-9.14.9.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/arm/notes-9.14.9.xml b/doc/arm/notes-9.14.9.xml index ccbf1189ac..9f3cde2b5f 100644 --- a/doc/arm/notes-9.14.9.xml +++ b/doc/arm/notes-9.14.9.xml @@ -21,8 +21,8 @@ - Fixed several possible race conditions discovered by Thread - Sanitizer. + Fixed several possible race conditions discovered by + ThreadSanitizer. From 68620079395d3820809a9b5a5b303347efe4598b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20K=C4=99pie=C5=84?= Date: Fri, 3 Jan 2020 09:08:09 +0100 Subject: [PATCH 3/3] Fix minor CHANGES issues (cherry picked from commit 56f388cae19662be1b224fc154365d327a06e76c) --- CHANGES | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index f8e1c88bb5..346037b238 100644 --- a/CHANGES +++ b/CHANGES @@ -16,7 +16,7 @@ dropped because the recursive-clients quota was exceeded. [GL #1399] -5326. [bug] Add python dependancy on 'distutils.core' to configure. +5326. [bug] Add Python dependency on 'distutils.core' to configure. 'distutils.core' is required for installation. [GL #1397]