From c5f6aad66f6ef36d987e323ca89075e03501af22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Helleu?= Date: Fri, 13 May 2016 08:04:14 +0200 Subject: [PATCH] core: require asciidoctor 1.5.4 instead of 1.5.0 (issue #722) --- cmake/FindAsciidoctor.cmake | 4 ++-- configure.ac | 2 +- doc/de/weechat_user.de.asciidoc | 2 +- doc/en/weechat_user.en.asciidoc | 2 +- doc/fr/weechat_user.fr.asciidoc | 2 +- doc/it/weechat_user.it.asciidoc | 2 +- doc/ja/weechat_user.ja.asciidoc | 2 +- doc/pl/weechat_user.pl.asciidoc | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/cmake/FindAsciidoctor.cmake b/cmake/FindAsciidoctor.cmake index 5bf75060e..7ab5a960a 100644 --- a/cmake/FindAsciidoctor.cmake +++ b/cmake/FindAsciidoctor.cmake @@ -18,7 +18,7 @@ # # - Find Asciidoctor -# This module finds if asciidoctor (version 1.5.0 or newer) is installed. +# This module finds if asciidoctor (version 1.5.4 or newer) is installed. if(ASCIIDOCTOR_FOUND) # Already in cache, be silent @@ -38,7 +38,7 @@ if(ASCIIDOCTOR_EXECUTABLE) string(REGEX REPLACE "^Asciidoctor ([^ ]+) .*" "\\1" ASCIIDOCTOR_VERSION "${ASCIIDOCTOR_VERSION}") - if(ASCIIDOCTOR_VERSION VERSION_EQUAL "1.5.0" OR ASCIIDOCTOR_VERSION VERSION_GREATER "1.5.0") + if(ASCIIDOCTOR_VERSION VERSION_EQUAL "1.5.4" OR ASCIIDOCTOR_VERSION VERSION_GREATER "1.5.4") set(ASCIIDOCTOR_FOUND TRUE) endif() diff --git a/configure.ac b/configure.ac index dcc615c9e..47e6422ef 100644 --- a/configure.ac +++ b/configure.ac @@ -1133,7 +1133,7 @@ if test "x$enable_man" = "xyes" -o "x$enable_doc" = "xyes"; then AC_MSG_CHECKING([for asciidoctor version]) asciidoctor_version=`$ASCIIDOCTOR --version 2>/dev/null | head -n 1 | cut -d" " -f2` case "${asciidoctor_version}" in - Asciidoctor' '0.*) + Asciidoctor' '0.*|Asciidoctor' '1.5.[0-3]*) AC_MSG_RESULT([${asciidoctor_version} (too old)]) not_found="$not_found asciidoctor" enable_man="no" diff --git a/doc/de/weechat_user.de.asciidoc b/doc/de/weechat_user.de.asciidoc index c6510ee11..fca268a0b 100644 --- a/doc/de/weechat_user.de.asciidoc +++ b/doc/de/weechat_user.de.asciidoc @@ -119,7 +119,7 @@ zu kompilieren und welche Pakete optional genutzt werden können. | tcl-dev | ≥ 8.5 | | Tcl Erweiterung | guile-2.0-dev | ≥ 2.0 | | Guile (scheme) Erweiterung | libv8-dev | ≤ 3.24.3 | | Javascript Erweiterung -| asciidoctor | ≥ 1.5.0 | | Zum Erstellen der man page und der Dokumentation +| asciidoctor | ≥ 1.5.4 | | Zum Erstellen der man page und der Dokumentation | libcpputest-dev | ≥ 3.4 | | Testlauf | C++ compiler | | | Testlauf, javascript Erweiterung |=== diff --git a/doc/en/weechat_user.en.asciidoc b/doc/en/weechat_user.en.asciidoc index e2ee467c5..49e297aae 100644 --- a/doc/en/weechat_user.en.asciidoc +++ b/doc/en/weechat_user.en.asciidoc @@ -112,7 +112,7 @@ compile WeeChat. | tcl-dev | ≥ 8.5 | | Tcl plugin | guile-2.0-dev | ≥ 2.0 | | Guile (scheme) plugin | libv8-dev | ≤ 3.24.3 | | Javascript plugin -| asciidoctor | ≥ 1.5.0 | | Build man page and documentation +| asciidoctor | ≥ 1.5.4 | | Build man page and documentation | libcpputest-dev | ≥ 3.4 | | Run tests | C++ compiler | | | Run tests, javascript plugin |=== diff --git a/doc/fr/weechat_user.fr.asciidoc b/doc/fr/weechat_user.fr.asciidoc index 91fa42993..8e044d3d5 100644 --- a/doc/fr/weechat_user.fr.asciidoc +++ b/doc/fr/weechat_user.fr.asciidoc @@ -115,7 +115,7 @@ compiler WeeChat. | tcl-dev | ≥ 8.5 | | Extension tcl | guile-2.0-dev | ≥ 2.0 | | Extension guile (scheme) | libv8-dev | ≤ 3.24.3 | | Extension javascript -| asciidoctor | ≥ 1.5.0 | | Construction de la page man et de la documentation +| asciidoctor | ≥ 1.5.4 | | Construction de la page man et de la documentation | libcpputest-dev | ≥ 3.4 | | Lancement des tests | C++ compiler | | | Lancement des tests, extension javascript |=== diff --git a/doc/it/weechat_user.it.asciidoc b/doc/it/weechat_user.it.asciidoc index f0f17e413..08ea8ed41 100644 --- a/doc/it/weechat_user.it.asciidoc +++ b/doc/it/weechat_user.it.asciidoc @@ -133,7 +133,7 @@ compilare WeeChat. | guile-2.0-dev | ≥ 2.0 | | Plugin guile (scheme) | libv8-dev | ≤ 3.24.3 | | Plugin Javascript // TRANSLATION MISSING -| asciidoctor | ≥ 1.5.0 | | Build man page and documentation +| asciidoctor | ≥ 1.5.4 | | Build man page and documentation // TRANSLATION MISSING | libcpputest-dev | ≥ 3.4 | | Run tests // TRANSLATION MISSING diff --git a/doc/ja/weechat_user.ja.asciidoc b/doc/ja/weechat_user.ja.asciidoc index f1d3eac84..e8a18cb5f 100644 --- a/doc/ja/weechat_user.ja.asciidoc +++ b/doc/ja/weechat_user.ja.asciidoc @@ -117,7 +117,7 @@ OS X では、http://brew.sh/[Homebrew] を使ってください: | tcl-dev | 8.5 以上 | | tcl プラグイン | guile-2.0-dev | 2.0 以上 | | guile (scheme) プラグイン | libv8-dev | 3.24.3 以下 | | javascript プラグイン -| asciidoctor | 1.5.0 以上 | | man ページと文書のビルド +| asciidoctor | 1.5.4 以上 | | man ページと文書のビルド | libcpputest-dev | 3.4 以上 | | テストの実行 | C++ コンパイラ | | | テスト実行、javascript プラグイン |=== diff --git a/doc/pl/weechat_user.pl.asciidoc b/doc/pl/weechat_user.pl.asciidoc index bac8d0592..758f7ac09 100644 --- a/doc/pl/weechat_user.pl.asciidoc +++ b/doc/pl/weechat_user.pl.asciidoc @@ -117,7 +117,7 @@ WeeChat. | tcl-dev | ≥ 8.5 | | Wtyczka tcl | guile-2.0-dev | ≥ 2.0 | | Wtyczka guile (scheme) | libv8-dev | ≤ 3.24.3 | | Wtyczka javascript -| asciidoctor | ≥ 1.5.0 | | Tworzenie strony man i dokumentacji +| asciidoctor | ≥ 1.5.4 | | Tworzenie strony man i dokumentacji | libcpputest-dev | ≥ 3.4 | | Uruchamianie testów | C++ compiler | | | Uruchamianie testów, wtyczka javascript |===