Merge pull request #1891 from smoe/po4aUpdate

Update po4a -> 0.67

Author: SebKuzminsky

.github/workflows/ci.yml

@@ -1,6 +1,8 @@
 # po4a Version 0.57 in ubuntu 20 do not write translated adoc as
-# UTF-8.  Need at least version 0.62 to fix it.  Using version 0.66 to
-# also get fix for empty asciidoc table cells.
+# UTF-8.  Need at least version 0.62 to fix it.
+# Motivations to update:
+#   0.66 to also get fix for empty asciidoc table cells.
+#   0.67 for hard newlines ( +\n) in paragraphs
 name: Build CI
 
 on:
@@ -28,7 +30,7 @@ jobs:
       run: |
         ./scripts/travis-install-build-deps.sh
         sudo apt-get install -y eatmydata
-        curl -O http://snapshot.debian.org/archive/debian/20220716T154603Z/pool/main/p/po4a/po4a_0.67-2_all.deb
+        curl -O https://snapshot.debian.org/archive/debian/20220716T154603Z/pool/main/p/po4a/po4a_0.67-2_all.deb
         sudo apt install ./po4a_0.67-2_all.deb
         cd src
         eatmydata ./autogen.sh
@@ -53,7 +55,7 @@ jobs:
       run: |
         ./scripts/travis-install-build-deps.sh
         sudo apt-get install -y eatmydata
-        curl -O http://snapshot.debian.org/archive/debian/20220716T154603Z/pool/main/p/po4a/po4a_0.67-2_all.deb
+        curl -O https://snapshot.debian.org/archive/debian/20220716T154603Z/pool/main/p/po4a/po4a_0.67-2_all.deb
         sudo apt install ./po4a_0.67-2_all.deb
         cd src
         eatmydata ./autogen.sh
@@ -80,7 +82,7 @@ jobs:
         git fetch --recurse-submodules=no https://github.com/linuxcnc/linuxcnc refs/tags/*:refs/tags/*
         ./scripts/travis-install-build-deps.sh
         sudo apt-get install -y eatmydata
-        curl -O http://snapshot.debian.org/archive/debian/20220716T154603Z/pool/main/p/po4a/po4a_0.67-2_all.deb
+        curl -O https://snapshot.debian.org/archive/debian/20220716T154603Z/pool/main/p/po4a/po4a_0.67-2_all.deb
         sudo apt install ./po4a_0.67-2_all.deb
         codename=$(lsb_release -cs)
         dch --maintmaint --distribution $codename "GitHub test package."

src/configure.ac

@@ -1195,13 +1195,14 @@ if ( test "$BUILD_DOCS" = "yes" && test "$BUILD_DOCS_TRANSLATED_EXPLICIT" != "no
         # Version 0.62 correctly write UTF-8 into translated adocs
         # Version 0.65 support grouping several doc files into different POTs
         # Version 0.66 handle empty table cells in asciidoc
+        # Version 0.67 handle enforced linbreaks
         V=$(po4a --version| awk '/po4a version/ {print $3}')
-        if dpkg --compare-versions 0.62 gt "$V"; then
+        if dpkg --compare-versions 0.67 gt "$V"; then
             if test "$BUILD_DOCS_TRANSLATED_EXPLICIT" = "not_set"
             then
-                AC_MSG_WARN([po4a version too old, need version 0.62 or newer, not building translated docs])
+                AC_MSG_WARN([po4a version too old, need version 0.67 or newer, not building translated docs])
             else
-                AC_MSG_ERROR([po4a version too old, need version 0.62 or newer, not building translated docs])
+                AC_MSG_ERROR([po4a version too old, need version 0.67 or newer, not building translated docs])
             fi
 	    BUILD_DOCS_TRANSLATED=no
         fi