ruby: add detection of Ruby 2.2

(cherry picked from commit 515e8b7b1a)
2026-06-12 22:24:47 +02:00 · 2015-06-10 23:20:46 +02:00
970 changed files with 64636 additions and 102611 deletions
@@ -1,9 +1,6 @@
 # files/directories excluded from tarballs

-.git*                  export-ignore
-debian-devel           export-ignore
-debian-stable          export-ignore
-weechat.spec           export-ignore
-.mailmap               export-ignore
-tests/ubuntu/          export-ignore
-tools/build-debian.sh  export-ignore
+.git*               export-ignore
+debian              export-ignore
+weechat.spec        export-ignore
+.mailmap            export-ignore
@@ -2,6 +2,7 @@

 *.a
 *.gmo
+*.html
 *.la
 *.lai
 *.lo
@@ -27,11 +28,7 @@ config.rpath
 config.status
 config.sub
 configure
-debian
-!tools/debian
-debian-devel/changelog
-debian-devel/*.log
-debian-stable/*.log
+debian/*.log
 depcomp
 insert-header.sin
 install-sh
@@ -53,4 +50,3 @@ weechat-*.cygport
 stamp*

 src/gui/curses/weechat
-src/gui/curses/weechat-curses
@@ -11,7 +11,7 @@ Sébastien Helleu <flashcode@flashtux.org> <flashcode>
 Sébastien Helleu <flashcode@flashtux.org> <uid67137>
 Nils Görs <weechatter@arcor.de>
 Ryuunosuke Ayanokouzi <i38w7i3@yahoo.co.jp>
-Krzysztof Korościk <soltys1@gmail.com> <soltys@szluug.org>
+Krzysztof Korościk <soltys@szluug.org>
 Marco Paolone <marcopaolone@gmail.com>
 <marcopaolone@gmail.com> <marco@DrB4tch.sitecomwl601>
 <mikaela.suomalainen@outlook.com> <mkaysi@outlook.com>
@@ -4,9 +4,6 @@ compiler:
    - gcc
    - clang

-sudo: required
-dist: trusty
-
 env:
    - BUILDTOOL="cmake" BUILDARGS=""
    - BUILDTOOL="cmake" BUILDARGS="-DENABLE_PYTHON3=ON"
@@ -16,18 +13,16 @@ env:
    - BUILDTOOL="autotools" BUILDARGS="--disable-gnutls"

 before_script:
-    # Workaround travis-ci/travis-ci#5326
-    - export PATH=$(echo $PATH | tr ':' "\n" | sed '/\/opt\/python/d' | tr "\n" ":" | sed "s|::|:|g")
    - echo 'APT::Install-Recommends "false";' | sudo tee -a /etc/apt/apt.conf
    - sudo apt-get update -qq
-    - sudo apt-get -y install devscripts equivs python-pip libenchant-dev autopoint cmake pkg-config libncursesw5-dev gem2deb libperl-dev python-dev python3-dev libaspell-dev liblua5.1-0-dev tcl8.5-dev guile-2.0-dev libv8-dev libcurl4-gnutls-dev libgcrypt11-dev libgnutls-dev zlib1g-dev curl libcpputest-dev
-    - sudo gem install asciidoctor
+    - sudo apt-get -y install devscripts equivs python-pip libenchant-dev autopoint asciidoc source-highlight xsltproc docbook-xsl docbook-xml cmake pkg-config libncursesw5-dev gem2deb libperl-dev python-dev python3-dev libaspell-dev liblua5.1-0-dev tcl8.5-dev guile-2.0-dev libv8-dev libcurl4-gnutls-dev libgcrypt11-dev libgnutls-dev zlib1g-dev curl
+    - curl -OL https://weechat.org/files/tests/ubuntu/precise/amd64/libcpputest-dev_3.4-3_amd64.deb
+    - sudo dpkg -i libcpputest-dev_3.4-3_amd64.deb
    - sudo pip install msgcheck pylint

 script:
-    - ./tools/build-test.sh
+    - ./scripts/build.sh
    - msgcheck po/*.po
-    - pylint --version
    - pylint doc/docgen.py

 after_success:
@@ -35,7 +35,6 @@ Alphabetically:
 * Elián Hanisch (m4v)
 * Emanuele Giaquinta
 * Esteban I. Ruiz Moreno (Exio)
-* Evgeny Shmarnev
 * Felix Eckhofer
 * Frank Zacharias
 * Gu1ll4um3r0m41n
@@ -47,7 +46,6 @@ Alphabetically:
 * JD Horelick (jdhore)
 * Jim Ramsay (lack)
 * Jiri Golembiovsky (GolemJ)
-* Juan Francisco Cantero Hurtado
 * Julien Louis (ptitlouis)
 * Karthik K
 * Koka El Kiwi (KiwiDash)
@@ -62,12 +60,10 @@ Alphabetically:
 * Matt Robinson
 * Max Anton Teufel
 * Murilo Opsfelder Araujo
-* Nick (SolitaryCipher)
 * Nicolas Cavigneaux
 * Nils Görs (nils_2)
 * nyuszika7h
 * Odin
-* Ondřej Súkup
 * Patrick Steinhardt
 * Paul Komkoff
 * Pavel Shevchuk (Stalwart)
@@ -79,16 +75,12 @@ Alphabetically:
 * Quentin Glidic (SardemFF7)
 * Quentin Pradet
 * Quico Noizeux
-* Raghavendra Prabhu
 * Rettub
-* Rob Campbell
 * Rudolf Polzer (divVerent)
 * Ryuunosuke Ayanokouzi
-* scumjr
 * Sergio Durigan Junior
-* Shane McCarron
 * Shawn Smith
-* Simmo Saan (sim642)
+* Simmo Saan
 * Simon Arlott
 * Simon Kuhnle
 * Stefano Pigozzi
@@ -96,12 +88,9 @@ Alphabetically:
 * Sven Knurr (Cthulhux)
 * Tim D. Smith
 * Tom Alsberg
-* Tomoe Mami
 * Tor Hveem (xt)
 * Valentin Lorentz (progval)
-* Vasco Almeida
 * Voroskoi
-* Wojciech Kwolek
 * Yannick Palanque

 == Contact
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2017 Sébastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2015 Sébastien Helleu <flashcode@flashtux.org>
 # Copyright (C) 2007-2008 Julien Louis <ptitlouis@sysif.net>
 # Copyright (C) 2008-2009 Emmanuel Bouthenot <kolter@openics.org>
 #
@@ -29,14 +29,14 @@ set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH})
 set(CMAKE_SKIP_RPATH ON)
 set(CMAKE_C_FLAGS   "${CMAKE_C_FLAGS} -Wall -Wextra -Werror-implicit-function-declaration")
 set(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Werror-implicit-function-declaration")
+if(PREFIX)
+  set(CMAKE_INSTALL_PREFIX ${PREFIX} CACHE PATH "Install path prefix" FORCE)
+endif()

 # version
-execute_process(COMMAND ${CMAKE_SOURCE_DIR}/version.sh devel-major OUTPUT_VARIABLE VERSION_MAJOR)
-execute_process(COMMAND ${CMAKE_SOURCE_DIR}/version.sh devel-minor OUTPUT_VARIABLE VERSION_MINOR)
-execute_process(COMMAND ${CMAKE_SOURCE_DIR}/version.sh devel-patch OUTPUT_VARIABLE VERSION_PATCH)
-string(REGEX REPLACE "\n" "" VERSION_MAJOR "${VERSION_MAJOR}")
-string(REGEX REPLACE "\n" "" VERSION_MINOR "${VERSION_MINOR}")
-string(REGEX REPLACE "\n" "" VERSION_PATCH "${VERSION_PATCH}")
+set(VERSION_MAJOR "1")
+set(VERSION_MINOR "2")
+set(VERSION_PATCH "")
 if(VERSION_PATCH STREQUAL "")
  set(VERSION ${VERSION_MAJOR}.${VERSION_MINOR})
 else()
@@ -99,7 +99,7 @@ option(ENABLE_SCRIPT     "Enable Script plugin (scripts manager)"    ON)
 option(ENABLE_SCRIPTS    "Enable script plugins (perl, python, ...)" ON)
 option(ENABLE_PERL       "Enable Perl scripting language"            ON)
 option(ENABLE_PYTHON     "Enable Python scripting language"          ON)
-option(ENABLE_PYTHON3    "Use Python 3.x if found (NOT recommended because many \"official\" scripts won't work)" OFF)
+option(ENABLE_PYTHON3    "Use Python 3.x if found (NOT recommended)" OFF)
 option(ENABLE_RUBY       "Enable Ruby scripting language"            ON)
 option(ENABLE_LUA        "Enable Lua scripting language"             ON)
 option(ENABLE_TCL        "Enable Tcl scripting language"             ON)
@@ -215,8 +215,7 @@ endif()
 add_subdirectory(src)
 add_subdirectory(doc)

-find_package(CppUTest)
-if(ENABLE_TESTS AND CPPUTEST_FOUND)
+if(ENABLE_TESTS)
  enable_testing()
  add_subdirectory(tests)
 endif()
@@ -225,7 +224,7 @@ configure_file(config.h.cmake config.h @ONLY)

 # set the git version in "config-git.h"
 add_custom_target(version_git ALL
-  COMMAND "${CMAKE_CURRENT_SOURCE_DIR}/tools/git-version.sh" "${CMAKE_CURRENT_SOURCE_DIR}" "${VERSION}" "config-git.h"
+  COMMAND "${CMAKE_CURRENT_SOURCE_DIR}/scripts/git-version.sh" "${CMAKE_CURRENT_SOURCE_DIR}" "${VERSION}" "config-git.h"
  WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}")

 configure_file(
@@ -237,7 +236,7 @@ add_custom_target(uninstall
  "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake")

 add_custom_target(dist
-  "${CMAKE_CURRENT_SOURCE_DIR}/tools/makedist.sh" "${VERSION}" "HEAD" "${CMAKE_CURRENT_BINARY_DIR}"
+  "${CMAKE_CURRENT_SOURCE_DIR}/makedist.sh" "${VERSION}" "HEAD" "${CMAKE_CURRENT_BINARY_DIR}"
  WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})

 # pkgconfig file
@@ -255,11 +254,11 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/weechat.cygport.in ${CMAKE_CURRENT_BI
 # install some files (only on Cygwin)
 if(CYGWIN)
  install(FILES
-    ${CMAKE_CURRENT_SOURCE_DIR}/AUTHORS.adoc
-    ${CMAKE_CURRENT_SOURCE_DIR}/ChangeLog.adoc
-    ${CMAKE_CURRENT_SOURCE_DIR}/Contributing.adoc
-    ${CMAKE_CURRENT_SOURCE_DIR}/README.adoc
-    ${CMAKE_CURRENT_SOURCE_DIR}/ReleaseNotes.adoc
+    ${CMAKE_CURRENT_SOURCE_DIR}/AUTHORS.asciidoc
+    ${CMAKE_CURRENT_SOURCE_DIR}/ChangeLog.asciidoc
+    ${CMAKE_CURRENT_SOURCE_DIR}/Contributing.asciidoc
+    ${CMAKE_CURRENT_SOURCE_DIR}/README.asciidoc
+    ${CMAKE_CURRENT_SOURCE_DIR}/ReleaseNotes.asciidoc
    DESTINATION ${SHAREDIR}/doc/${PROJECT_NAME})
 endif()

@@ -269,7 +268,7 @@ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/weechat.png DESTINATION ${SHAREDIR}/ic
 # packages
 set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Fast, light and extensible chat client")
 set(CPACK_PACKAGE_VENDOR "Sébastien Helleu")
-set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README.adoc")
+set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README.asciidoc")
 set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/COPYING")
 set(CPACK_PACKAGE_VERSION_MAJOR ${VERSION_MAJOR})
 set(CPACK_PACKAGE_VERSION_MINOR ${VERSION_MINOR})
@@ -9,8 +9,6 @@
 First, some basic things:

 * Use only English to communicate with developers.
-* Search in issues if the same problem or feature request has already been
-  reported (a duplicate is waste of time for you and the developers!).
 * If you can, please check if the problem has been fixed in development version
  (if you are using a stable release or old version).
 * Report only one bug or feature request per issue.
@@ -25,24 +23,24 @@ email to <security@weechat.org> instead.
 When reporting https://github.com/weechat/weechat/issues[issues] on GitHub,
 please include:

-* Your *WeeChat version*: the output of `/v` in WeeChat, for example:
-  _WeeChat 1.7-dev (git: v1.6-6-g997f47f)_. +
+* your *WeeChat version*: the output of `/v` in WeeChat, for example:
+  'WeeChat 1.0-dev (git: v0.4.3-475-gb174b3c)'. +
  If WeeChat does not start at all, please include the version displayed by
  `weechat --help` (or the version installed with your package manager).
-* Your *operating system*: its name and version (examples: Linux Debian Wheezy,
-  FreeBSD 10.0, Windows/Cygwin 64-bit, Windows/Ubuntu 64-bit...).
-* The *steps to reproduce*: if possible, please include a reproducible example:
+* your *operating system*: its name and version (examples: Linux Debian Wheezy,
+  FreeBSD 10.0, Windows/Cygwin 64-bit, ...).
+* the *steps to reproduce*: if possible, please include a reproducible example:
  explain the steps which led you to the problem. +
  It's even better if you can reproduce the problem with a new config (and no
  scripts loaded): try `weechat --dir /tmp/weechat` and check if you have the
  problem here.
-* The *gdb's backtrace* (only for a crash): if you can reproduce the crash
-  (or if you have a core file), please include the backtrace from gdb (look at
-  https://weechat.org/files/doc/devel/weechat_user.en.html#report_crashes[User's guide]
-  for more info).
+* the *gdb's backtrace* (only for a crash): if you can reproduce the crash
+(or if you have a core file), please include the backtrace from gdb (look at
+https://weechat.org/files/doc/devel/weechat_user.en.html#report_crashes[User's guide]
+for more info).

 [IMPORTANT]
-Most of times, the WeeChat crash log file (_weechat_crash_YYYYMMDD_xxx.log_) is
+Most of times, the WeeChat crash log file ('weechat_crash_YYYYMMDD_xxx.log') is
 *NOT USEFUL* to fix the bug, so please report this file *ONLY* if a developer
 asked you to send it (and be extremely careful, this file can contain personal
 data like passwords and contents of your chats).
@@ -63,8 +61,8 @@ instead.
 == Translations

 Pull requests on GitHub for fixes or new translations are welcome at any
-time, for https://github.com/weechat/weechat[WeeChat] and the web site
-https://github.com/weechat/weechat.org[weechat.org].
+time, for https://github.com/weechat/weechat[WeeChat] and
+the web site https://github.com/weechat/weechat.org[weechat.org].

 To start a translation in a new language (not yet supported), please look at
 https://weechat.org/files/doc/devel/weechat_dev.en.html#translations[translations]
@@ -80,7 +78,7 @@ https://github.com/weechat/weechat/milestones[milestones] on GitHub.
 Pull requests on GitHub are welcome for minor new features.

 For major new features, it's better to discuss about it in IRC
-(server: _chat.freenode.net_, channel _#weechat_).
+(server: 'chat.freenode.net', channel '#weechat').

 Before submitting any pull request, be sure you have read the
 https://weechat.org/files/doc/devel/weechat_dev.en.html#coding_rules[coding rules]
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2017 Sébastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2015 Sébastien Helleu <flashcode@flashtux.org>
 # Copyright (C) 2005 Julien Louis <ptitlouis@sysif.net>
 # Copyright (C) 2006-2009 Emmanuel Bouthenot <kolter@openics.org>
 #
@@ -23,7 +23,7 @@
 # (if needed, and only for a devel/rc version).
 BUILT_SOURCES = build-config-git.h
 build-config-git.h:
-	-$(abs_top_srcdir)/tools/git-version.sh "$(abs_top_srcdir)" "$(VERSION)" config-git.h
+	-$(abs_top_srcdir)/scripts/git-version.sh "$(abs_top_srcdir)" "$(VERSION)" config-git.h

 if TESTS
 tests_dir = tests
@@ -31,16 +31,17 @@ endif

 SUBDIRS = po doc intl src $(tests_dir)

-EXTRA_DIST = AUTHORS.adoc \
-             ChangeLog.adoc \
-             Contributing.adoc \
-             README.adoc \
-             ReleaseNotes.adoc \
+EXTRA_DIST = AUTHORS.asciidoc \
+             ChangeLog.asciidoc \
+             Contributing.asciidoc \
+             README.asciidoc \
+             ReleaseNotes.asciidoc \
             CMakeLists.txt \
             config.rpath \
             config.h.cmake \
+             makedist.sh \
             cmake/CMakeParseArguments.cmake \
-             cmake/FindAsciidoctor.cmake \
+             cmake/FindAsciidoc.cmake \
             cmake/FindAspell.cmake \
             cmake/FindCppUTest.cmake \
             cmake/FindENCHANT.cmake \
@@ -56,16 +57,15 @@ EXTRA_DIST = AUTHORS.adoc \
             cmake/FindPkgConfig.cmake \
             cmake/FindPython.cmake \
             cmake/FindRuby.cmake \
+             cmake/FindSourcehighlight.cmake \
             cmake/FindTCL.cmake \
             cmake/FindV8.cmake \
             cmake/FindZLIB.cmake \
             cmake/cmake_uninstall.cmake.in \
             po/CMakeLists.txt \
             po/srcfiles.cmake \
-             tools/build-test.sh \
-             tools/git-version.sh \
-             tools/makedist.sh \
-             version.sh \
+             scripts/build.sh \
+             scripts/git-version.sh \
             weechat.png \
             weechat.pc.in \
             weechat.cygport.in
@@ -4,35 +4,29 @@
 :lang: en


-image:https://travis-ci.org/weechat/weechat.svg?branch=master["Build Status", link="https://travis-ci.org/weechat/weechat"]
-image:https://img.shields.io/badge/diaspora*-follow-blue.svg["Diaspora*", link="https://diasp.eu/u/weechat"]
-image:https://img.shields.io/badge/google%2B-follow-blue.svg["Google+", link="https://plus.google.com/+WeeChat"]
-image:https://img.shields.io/badge/devel%20blog-follow-blue.svg["Devel blog", link="http://dev.weechat.org/"]
-image:https://img.shields.io/badge/slant-recommend-28acad.svg["Slant", link="http://www.slant.co/topics/1323/~irc-clients-for-linux"]
-image:https://img.shields.io/badge/paypal-donate%20%E2%9D%A4-yellow.svg["Paypal", link="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=4LSMSNLUAJWNS"]
-
 WeeChat (Wee Enhanced Environment for Chat) is a free chat client, fast and
 light, designed for many operating systems.
 It is highly customizable and extensible with scripts.

 Homepage: https://weechat.org/

+image:https://travis-ci.org/weechat/weechat.svg?branch=master["Build Status", link="https://travis-ci.org/weechat/weechat"]
+
 == Features

-* *Modular chat client*: WeeChat has a lightweight core and optional plugins. All plugins (including IRC) are independent and can be unloaded.
-* *Multi-platform*: WeeChat runs on GNU/Linux, *BSD, GNU/Hurd, Mac OS X and Windows (Bash/Ubuntu and Cygwin).
-* *Multi-protocols*: WeeChat is designed to support multiple protocols by plugins, like IRC.
-* *Standards-compliant*: the IRC plugin is compliant with RFCs 1459, 2810, 2811, 2812 and 2813.
-* *Small, fast and very light*: the core is and should stay as light and fast as possible.
-* *Customizable and extensible*: there are a lot of options to customize WeeChat, and it is extensible with C plugins and scripts (Perl, Python, Ruby, Lua, Tcl, Scheme and Javascript).
-* *Fully documented*: there is comprehensive documentation, which is translated into several languages.
-* *Developed from scratch*: WeeChat was built from scratch and is not based on any other client.
-* *Free software*: WeeChat is released under GPLv3.
+* Modular chat client with a lightweight core and optional plugins.
+* Multi-platform (GNU/Linux, *BSD, Mac OS X, QNX, Windows & other).
+* Multi-protocols architecture (mainly IRC).
+* Compliant with IRC RFCs 1459, 2810, 2811, 2812 and 2813.
+* Small, fast and very light.
+* Customizable and extensible with plugins (C, Perl, Python, Ruby, Lua, Tcl,
+  Guile, Javascript).
+* Fully documented and translated into several languages.
+* Developed from scratch.
+* Free software, released under GPLv3.

 image::https://weechat.org/media/images/screenshots/weechat/medium/weechat_2013-04-27_phlux_shadow.png[align="center"]

-Other screenshots are on https://weechat.org/about/screenshots/[this page].
-
 == Install

 === Dependencies
@@ -51,7 +45,8 @@ Following packages are optional:
 * for SSL: gnutls, ca-certificates
 * for spell checking: aspell
 * for scripting: python, perl, ruby, lua, tcl, guile, libv8 (javascript)
-* for building doc and man page: asciidoctor
+* for building doc: asciidoc, source-highlight
+  (for man page: xsltproc, docbook-xml, docbook-xsl)
 * for building tests: C++ compiler, CppUTest

 For a complete list of dependencies and versions recommended, please look at
@@ -62,14 +57,14 @@ https://weechat.org/files/doc/devel/weechat_user.en.html#dependencies[user's gui
 WeeChat can be built with http://cmake.org/[CMake] (recommended) or autotools.

 [NOTE]
-Only CMake is officially supported to build WeeChat. You should only use
-autotools if you are not able to use CMake. +
-Building with autotools requires more dependencies and is slower than with CMake.
+Only CMake is officially supported to build WeeChat. You should use autotools
+only if you are not able to use CMake. +
+Build with autotools requires more dependencies and is slower than with CMake.

 ----
 $ mkdir build
 $ cd build
-$ cmake .. -DCMAKE_INSTALL_PREFIX=/path/to/directory
+$ cmake .. -DPREFIX=/path/to/directory
 $ make
 $ make install     (as root for installation in system directories)
 ----
@@ -79,7 +74,7 @@ https://weechat.org/files/doc/devel/weechat_user.en.html#compile_with_autotools[

 == Copyright

-Copyright (C) 2003-2017 Sébastien Helleu <flashcode@flashtux.org>
+Copyright (C) 2003-2015 Sébastien Helleu <flashcode@flashtux.org>

 This file is part of WeeChat, the extensible chat client.

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2003-2017 Sébastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2015 Sébastien Helleu <flashcode@flashtux.org>
 # Copyright (C) 2005 Julien Louis <ptitlouis@sysif.net>
 # Copyright (C) 2005-2006 Emmanuel Bouthenot <kolter@openics.org>
 #
@@ -0,0 +1,55 @@
+#
+# Copyright (C) 2003-2015 Sébastien Helleu <flashcode@flashtux.org>
+#
+# This file is part of WeeChat, the extensible chat client.
+#
+# WeeChat is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# WeeChat is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+# - Find Asciidoc
+# This module finds if asciidoc (version 8 or newer) is installed.
+
+if(ASCIIDOC_FOUND)
+  # Already in cache, be silent
+  set(ASCIIDOC_FIND_QUIETLY TRUE)
+endif()
+
+find_program(
+  ASCIIDOC_EXECUTABLE asciidoc
+  PATHS /bin /usr/bin /usr/local/bin /usr/pkg/bin
+)
+
+find_program(
+  A2X_EXECUTABLE a2x
+  PATHS /bin /usr/bin /usr/local/bin /usr/pkg/bin
+)
+
+if(ASCIIDOC_EXECUTABLE AND A2X_EXECUTABLE)
+  execute_process(
+    COMMAND ${ASCIIDOC_EXECUTABLE} --version
+    OUTPUT_VARIABLE ASCIIDOC_VERSION
+    )
+
+  string(STRIP ${ASCIIDOC_VERSION} ASCIIDOC_VERSION)
+  string(REPLACE "asciidoc " "" ASCIIDOC_VERSION ${ASCIIDOC_VERSION})
+
+  if(ASCIIDOC_VERSION VERSION_EQUAL "8.0.0" OR ASCIIDOC_VERSION VERSION_GREATER "8.0.0")
+    set(ASCIIDOC_FOUND TRUE)
+  endif()
+
+  mark_as_advanced(
+    ASCIIDOC_EXECUTABLE
+    ASCIIDOC_VERSION
+    )
+endif()
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2017 Sébastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2015 Sébastien Helleu <flashcode@flashtux.org>
 #
 # This file is part of WeeChat, the extensible chat client.
 #
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2014-2017 Sébastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2014-2015 Sébastien Helleu <flashcode@flashtux.org>
 #
 # This file is part of WeeChat, the extensible chat client.
 #
@@ -18,9 +18,9 @@
 #

 # - Find CppUTest
-# This module finds if CppUTest is installed and determines where the include
-# files and libraries are. It also determines what the name of the library is.
-# This code sets the following variables:
+# This module finds if Guile is installed and determines where the include files
+# and libraries are. It also determines what the name of the library is. This
+# code sets the following variables:
 #
 # CPPUTEST_FOUND        = CppUTest is installed
 # CPPUTEST_INCLUDE_DIRS = CppUTest include directory
@@ -33,5 +33,5 @@ endif()

 find_package(PkgConfig)
 if(PKG_CONFIG_FOUND)
-  pkg_search_module(CPPUTEST cpputest)
+  pkg_search_module(CPPUTEST REQUIRED cpputest)
 endif()
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2017 Sébastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2015 Sébastien Helleu <flashcode@flashtux.org>
 #
 # This file is part of WeeChat, the extensible chat client.
 #
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2017 Sébastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2015 Sébastien Helleu <flashcode@flashtux.org>
 # Copyright (C) 2007 Julien Louis <ptitlouis@sysif.net>
 # Copyright (C) 2009 Emmanuel Bouthenot <kolter@openics.org>
 #
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2017 Sébastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2015 Sébastien Helleu <flashcode@flashtux.org>
 # Copyright (C) 2009 Emmanuel Bouthenot <kolter@openics.org>
 #
 # This file is part of WeeChat, the extensible chat client.
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2011-2017 Sébastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2011-2015 Sébastien Helleu <flashcode@flashtux.org>
 #
 # This file is part of WeeChat, the extensible chat client.
 #
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2017 Sébastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2015 Sébastien Helleu <flashcode@flashtux.org>
 #
 # This file is part of WeeChat, the extensible chat client.
 #
@@ -48,8 +48,9 @@ find_library(ICONV_LIBRARY

 if(ICONV_INCLUDE_PATH)
  if(ICONV_LIBRARY)
-    check_library_exists("${ICONV_LIBRARY}" libiconv_open "" LIBICONV_OPEN_FOUND)
-    check_library_exists("${ICONV_LIBRARY}" iconv_open "" ICONV_OPEN_FOUND)
+    string(REGEX REPLACE "/[^/]*$" "" ICONV_LIB_PATH "${ICONV_LIBRARY}")
+    check_library_exists(iconv libiconv_open ${ICONV_LIB_PATH} LIBICONV_OPEN_FOUND)
+    check_library_exists(iconv iconv_open ${ICONV_LIB_PATH} ICONV_OPEN_FOUND)
    if(LIBICONV_OPEN_FOUND OR ICONV_OPEN_FOUND)
       set(ICONV_FOUND TRUE)
    endif()
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2017 Sébastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2015 Sébastien Helleu <flashcode@flashtux.org>
 #
 # This file is part of WeeChat, the extensible chat client.
 #
@@ -35,5 +35,5 @@ endif()

 find_package(PkgConfig)
 if(PKG_CONFIG_FOUND)
-  pkg_search_module(LUA lua5.3 lua-5.3 lua53 lua5.2 lua-5.2 lua52 lua5.1 lua-5.1 lua51 lua-5.0 lua5.0 lua50 lua)
+  pkg_search_module(LUA lua5.2 lua-5.2 lua52 lua5.1 lua-5.1 lua51 lua-5.0 lua5.0 lua50 lua)
 endif()
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2017 Sébastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2015 Sébastien Helleu <flashcode@flashtux.org>
 #
 # This file is part of WeeChat, the extensible chat client.
 #
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2017 Sébastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2015 Sébastien Helleu <flashcode@flashtux.org>
 #
 # This file is part of WeeChat, the extensible chat client.
 #
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2017 Sébastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2015 Sébastien Helleu <flashcode@flashtux.org>
 # Copyright (C) 2009 Julien Louis <ptitlouis@sysif.net>
 #
 # This file is part of WeeChat, the extensible chat client.
@@ -35,7 +35,7 @@ endif()

 if(ENABLE_PYTHON3)
  find_program(PYTHON_EXECUTABLE
-    NAMES python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 python3 python2.7 python2.6 python2.5 python
+    NAMES python3.4 python3.3 python3.2 python3.1 python3.0 python3 python2.7 python2.6 python2.5 python
    PATHS /usr/bin /usr/local/bin /usr/pkg/bin
    )
 else()
@@ -57,7 +57,7 @@ if(PYTHON_EXECUTABLE)
    )

  execute_process(
-    COMMAND ${PYTHON_EXECUTABLE} -c "import sys; from distutils.sysconfig import *; sys.stdout.write(get_config_var('LIBS') + ' ' + get_config_var('LINKFORSHARED'))"
+    COMMAND ${PYTHON_EXECUTABLE} -c "import sys; from distutils.sysconfig import *; sys.stdout.write(get_config_var('LINKFORSHARED'))"
    OUTPUT_VARIABLE PYTHON_LFLAGS
    )

@@ -67,7 +67,7 @@ if(PYTHON_EXECUTABLE)
    )
  if(ENABLE_PYTHON3)
    find_library(PYTHON_LIBRARY
-      NAMES python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 python3 python2.7 python2.6 python2.5 python
+      NAMES python3.4 python3.3 python3.2 python3.1 python3.0 python3 python2.7 python2.6 python2.5 python
      HINTS ${PYTHON_POSSIBLE_LIB_PATH}
      )
  else()
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2017 Sébastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2015 Sébastien Helleu <flashcode@flashtux.org>
 #
 # This file is part of WeeChat, the extensible chat client.
 #
@@ -33,7 +33,7 @@ endif()

 find_package(PkgConfig)
 if(PKG_CONFIG_FOUND)
-  pkg_search_module(RUBY ruby-2.3 ruby-2.2 ruby-2.1 ruby-2.0 ruby-1.9 ruby-1.8)
+  pkg_search_module(RUBY ruby-2.2 ruby-2.1 ruby-2.0 ruby-1.9 ruby-1.8)
 endif()

 if(RUBY_FOUND)
@@ -41,7 +41,7 @@ if(RUBY_FOUND)
  mark_as_advanced(RUBY_LIB)
 else()
  find_program(RUBY_EXECUTABLE
-    NAMES ruby2.3.0 ruby230 ruby2.3 ruby23 ruby2.2.3 ruby223 ruby2.2.2 ruby222 ruby2.2.1 ruby221 ruby2.2.0 ruby220 ruby2.2 ruby22 ruby2.1.7 ruby217 ruby2.1.6 ruby216 ruby2.1.5 ruby215 ruby2.1.4 ruby214 ruby2.1.3 ruby213 ruby2.1.2 ruby212 ruby2.1.1 ruby211 ruby2.1.0 ruby210 ruby2.1 ruby21 ruby2.0 ruby20 ruby1.9.3 ruby193 ruby1.9.2 ruby192 ruby1.9.1 ruby191 ruby1.9 ruby19 ruby1.8 ruby18 ruby
+    NAMES ruby1.9.3 ruby193 ruby1.9.2 ruby192 ruby1.9.1 ruby191 ruby1.9 ruby19 ruby1.8 ruby18 ruby
    PATHS /usr/bin /usr/local/bin /usr/pkg/bin
    )
  if(RUBY_EXECUTABLE)
@@ -1,5 +1,6 @@
 #
-# Copyright (C) 2003-2017 Sébastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2015 Sébastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2009 Emmanuel Bouthenot <kolter@openics.org>
 #
 # This file is part of WeeChat, the extensible chat client.
 #
@@ -17,33 +18,22 @@
 # along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 #

-# - Find Asciidoctor
-# This module finds if asciidoctor (version 1.5.4 or newer) is installed.
+# - Find Source-Highlight
+# This module finds if source-highlight is installed.

-if(ASCIIDOCTOR_FOUND)
+if(SOURCEHIGHLIGHT_FOUND)
  # Already in cache, be silent
-  set(ASCIIDOCTOR_FIND_QUIETLY TRUE)
+  set(SOURCEHIGHLIGHT_FIND_QUIETLY TRUE)
 endif()

 find_program(
-  ASCIIDOCTOR_EXECUTABLE asciidoctor
+  SOURCEHIGHLIGHT_EXECUTABLE source-highlight
  PATHS /bin /usr/bin /usr/local/bin /usr/pkg/bin
 )

-if(ASCIIDOCTOR_EXECUTABLE)
-  execute_process(
-    COMMAND ${ASCIIDOCTOR_EXECUTABLE} --version
-    OUTPUT_VARIABLE ASCIIDOCTOR_VERSION
-    )
-
-  string(REGEX REPLACE "^Asciidoctor ([^ ]+) .*" "\\1" ASCIIDOCTOR_VERSION "${ASCIIDOCTOR_VERSION}")
-
-  if(ASCIIDOCTOR_VERSION VERSION_EQUAL "1.5.4" OR ASCIIDOCTOR_VERSION VERSION_GREATER "1.5.4")
-    set(ASCIIDOCTOR_FOUND TRUE)
-  endif()
-
+if(SOURCEHIGHLIGHT_EXECUTABLE)
+  set(SOURCEHIGHLIGHT_FOUND TRUE)
  mark_as_advanced(
-    ASCIIDOCTOR_EXECUTABLE
-    ASCIIDOCTOR_VERSION
+    SOURCEHIGHLIGHT_EXECUTABLE
    )
 endif()
@@ -1,6 +1,6 @@
 #
 # Copyright (C) 2008 Julien Louis <ptitlouis@sysif.net>
-# Copyright (C) 2008-2017 Sébastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2008-2015 Sébastien Helleu <flashcode@flashtux.org>
 #
 # This file is part of WeeChat, the extensible chat client.
 #
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2015-2017 Sébastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2015 Sébastien Helleu <flashcode@flashtux.org>
 #
 # This file is part of WeeChat, the extensible chat client.
 #
@@ -17,8 +17,8 @@
 # along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 #

-# - Find V8 (Google's Javascript engine)
-# This module finds if libv8 is installed and determines where
+# - Find Aspell
+# This module finds if libaspell is installed and determines where
 # the include files and libraries are.
 #
 # This code sets the following variables:
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2017 Sébastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2015 Sébastien Helleu <flashcode@flashtux.org>
 #
 # This file is part of WeeChat, the extensible chat client.
 #
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2017 Sébastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2015 Sébastien Helleu <flashcode@flashtux.org>
 # Copyright (C) 2005 Benoit Papillault <benoit.papillault@free.fr>
 # Copyright (C) 2005-2006 Julien Louis <ptitlouis@sysif.net>
 # Copyright (C) 2005-2009 Emmanuel Bouthenot <kolter@openics.org>
@@ -24,7 +24,7 @@
 # Process this file with autoconf to produce a configure script.

 AC_PREREQ(2.56)
-AC_INIT(WeeChat, m4_esyscmd([./version.sh devel-full | tr -d '\n']), flashcode@flashtux.org)
+AC_INIT(WeeChat, 1.2, flashcode@flashtux.org)
 AC_CONFIG_SRCDIR([configure.ac])
 AM_CONFIG_HEADER(config.h)
 AM_INIT_AUTOMAKE([foreign])
@@ -55,13 +55,10 @@ netbsd*)
 solaris*)
        LDFLAGS="$LDFLAGS -lsocket -lxnet"
        ;;
-darwin*)
-        LDFLAGS="$LDFLAGS -lresolv"
-        ;;
 esac

 # Gettext
-ALL_LINGUAS="cs de es fr hu it ja pl pt pt_BR ru tr"
+ALL_LINGUAS="cs de es fr hu it ja pl pt_BR ru tr"
 AM_GNU_GETTEXT
 AM_GNU_GETTEXT_VERSION([0.18])

@@ -149,7 +146,7 @@ AC_ARG_ENABLE(script,       [  --disable-script        turn off Script plugin (d
 AC_ARG_ENABLE(scripts,      [  --disable-scripts       turn off script plugins (perl, python, ...) (default=compiled if found)],enable_scripts=$enableval,enable_scripts=yes)
 AC_ARG_ENABLE(perl,         [  --disable-perl          turn off Perl script plugin (default=compiled if found)],enable_perl=$enableval,enable_perl=yes)
 AC_ARG_ENABLE(python,       [  --disable-python        turn off Python script plugin (default=compiled if found)],enable_python=$enableval,enable_python=yes)
-AC_ARG_ENABLE(python3,      [  --enable-python3        use Python 3.x if found (NOT recommended because many "official" scripts won't work) (default=off)],enable_python3=$enableval,enable_python3=no)
+AC_ARG_ENABLE(python3,      [  --enable-python3        use Python 3.x if found (NOT recommended) (default=off)],enable_python3=$enableval,enable_python3=no)
 AC_ARG_ENABLE(ruby,         [  --disable-ruby          turn off Ruby script plugin (default=compiled if found)],enable_ruby=$enableval,enable_ruby=yes)
 AC_ARG_ENABLE(lua,          [  --disable-lua           turn off Lua script plugin (default=compiled if found)],enable_lua=$enableval,enable_lua=yes)
 AC_ARG_ENABLE(tcl,          [  --disable-tcl           turn off Tcl script plugin (default=compiled if found)],enable_tcl=$enableval,enable_tcl=yes)
@@ -511,7 +508,7 @@ PYTHON_VERSION=

 if test "x$enable_python" = "xyes" ; then
    if test "x$enable_python3" = "xyes" ; then
-        AC_PATH_PROGS(PYTHON, python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 python3 python2.7 python2.6 python2.5 python2 python)
+        AC_PATH_PROGS(PYTHON, python3.4 python3.3 python3.2 python3.1 python3.0 python3 python2.7 python2.6 python2.5 python2 python)
    else
        AC_PATH_PROGS(PYTHON, python2.7 python2.6 python2.5 python2 python)
    fi
@@ -588,7 +585,7 @@ RUBY_VERSION=
 if test "x$enable_ruby" = "xyes" ; then
    RUBY_CFLAGS=""
    RUBY_LFLAGS=""
-    for v in "2.3" "2.2" "2.1" "2.0" "1.9" "1.8" ; do
+    for v in "2.1" "2.0" "1.9" "1.8" ; do
        pkgconfig_ruby_found=`$PKGCONFIG --exists ruby-$v 2>/dev/null`
        if test "x$?" = "x0" ; then
            RUBY_VERSION=`$PKGCONFIG --modversion ruby-$v`
@@ -768,7 +765,7 @@ if test "x$enable_tcl" = "xyes" ; then

    AC_MSG_CHECKING(for tclConfig.sh)
    tcl_found="no"
-    tcl_dirs="/usr/lib/tcl8.6 /usr/lib64/tcl8.6 /usr/lib/tcl8.5 /usr/lib64/tcl8.5 /lib /lib64 /usr/lib /usr/lib64 /usr/tcl/lib /usr/tcl/lib64 /usr/local/tcl-8.6/lib /usr/local/tcl-8.6/lib64 /usr/local/tcl-8.5/lib /usr/local/tcl-8.5/lib64 /usr/local/lib /usr/local/lib64 /usr/local/tcl/lib /usr/local/tcl/lib64 /opt/lib /opt/lib64"
+    tcl_dirs="/usr/lib/tcl8.5 /usr/lib64/tcl8.5 /lib /lib64 /usr/lib /usr/lib64 /usr/tcl/lib /usr/tcl/lib64 /usr/local/tcl-8.5/lib /usr/local/tcl-8.5/lib64 /usr/local/lib /usr/local/lib64 /usr/local/tcl/lib /usr/local/tcl/lib64 /opt/lib /opt/lib64"
    if test "x$tclconfig" != "x" ; then
      tcl_dirs="${tclconfig} ${tcl_dirs}"
    fi
@@ -991,10 +988,10 @@ AC_CACHE_CHECK([for flock() support], ac_cv_have_flock, [
 AC_LINK_IFELSE([AC_LANG_PROGRAM(
 [[ #include <sys/file.h>]],
 [[ flock(0, LOCK_SH); ]])],
-[ ac_cv_have_flock="yes" ],
-[ ac_cv_have_flock="no" ])])
+[ ac_have_flock="yes" ],
+[ ac_have_flock="no" ])])

-if test "x$ac_cv_have_flock" = "xyes"; then
+if test "x$ac_have_flock" = "xyes"; then
    enable_flock="yes"
    AC_DEFINE(HAVE_FLOCK)
 else
@@ -1021,9 +1018,9 @@ if test "x$debug" != "x0" ; then
        AC_LINK_IFELSE([AC_LANG_PROGRAM(
            [[ #include <execinfo.h> ]],
            [[ void *trace[128]; int n = backtrace(trace, 128); ]])],
-            [ ac_cv_have_backtrace="yes" ],
-            [ ac_cv_have_backtrace="no"  ])])
-    if test "x$ac_cv_have_backtrace" = "xyes"; then
+            [ ac_have_backtrace="yes" ],
+            [ ac_have_backtrace="no"  ])])
+    if test "x$ac_have_backtrace" = "xyes"; then
        enable_backtrace="yes"
        AC_DEFINE(HAVE_BACKTRACE,1,[glibc backtrace function])
    else
@@ -1040,10 +1037,10 @@ AC_CACHE_CHECK([for eat_newline_glitch support], ac_cv_have_eatnewlineglitch, [
 AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
 [[ #include <term.h> ]],
 [[ eat_newline_glitch = 0; ]])],
-[ ac_cv_have_eatnewlineglitch="yes" ],
-[ ac_cv_have_eatnewlineglitch="no" ])])
+[ ac_have_eatnewlineglitch="yes" ],
+[ ac_have_eatnewlineglitch="no" ])])

-if test "x$ac_cv_have_eatnewlineglitch" = "xyes"; then
+if test "x$ac_have_eatnewlineglitch" = "xyes"; then
    enable_eatnewlineglitch="yes"
    AC_DEFINE(HAVE_EAT_NEWLINE_GLITCH)
 else
@@ -1062,7 +1059,7 @@ if test "x$ac_found_zlib_header" = "xno" -o "x$ac_found_zlib_lib" = "xno" ; then
    AC_MSG_RESULT(no)
    AC_MSG_ERROR([
 *** zlib was not found. You may want to get it from http://zlib.net/
-*** or try to install zlib1g-dev with your software package manager.])
+*** or try to install libcurl-dev with your software package manager.])
 else
    AC_MSG_RESULT(yes)
    ZLIB_CFLAGS=`pkg-config zlib --cflags`
@@ -1131,35 +1128,54 @@ if test "x$enable_doc" = "xno"; then
 fi

 if test "x$enable_man" = "xyes" -o "x$enable_doc" = "xyes"; then
-    AC_CHECK_PROGS(ASCIIDOCTOR, [asciidoctor])
-    if test -n "$ASCIIDOCTOR"; 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' '1.5.[0-3]*)
-                AC_MSG_RESULT([${asciidoctor_version} (too old)])
-                not_found="$not_found asciidoctor"
+    DOC_ASCIIDOC8=""
+    AC_CHECK_PROGS(ASCIIDOC, [asciidoc])
+    AC_CHECK_PROGS(A2X, [a2x])
+    AC_CHECK_PROGS(SOURCEHIGHLIGHT, [source-highlight])
+    if test -z "$A2X"; then
+        not_found="$not_found a2x(from asciidoc)"
+    fi
+    if test -z "$SOURCEHIGHLIGHT"; then
+        not_found="$not_found source-highlight(needed by asciidoc)"
+    fi
+    if test -n "$ASCIIDOC"; then
+        AC_MSG_CHECKING([for asciidoc version])
+        asciidoc_version=`$ASCIIDOC --version 2>/dev/null`
+        case "${asciidoc_version}" in
+        asciidoc' '8*)
+                DOC_ASCIIDOC8="yes"
+                AC_MSG_RESULT([${asciidoc_version}])
+                if test "x$enable_man" = "xyes"; then
+                    if test -n "$A2X"; then
+                        msg_man="asciidoc(with a2x) $msg_man"
+                        AC_DEFINE(MAN)
+                    else
+                        enable_man="no"
+                    fi
+                fi
+                if test "x$enable_doc" = "xyes"; then
+                    if test -n "$SOURCEHIGHLIGHT"; then
+                        msg_doc="asciidoc(with source-highlight) $msg_doc"
+                        AC_DEFINE(DOC)
+                    else
+                        enable_doc="no"
+                    fi
+                fi
+                ;;
+        *)
+                AC_MSG_RESULT([${asciidoc_version} (too old)])
+                not_found="$not_found asciidoc"
                enable_man="no"
                enable_doc="no"
                ;;
-        *)
-                AC_MSG_RESULT([${asciidoctor_version}])
-                if test "x$enable_man" = "xyes"; then
-                    msg_man="asciidoctor(${asciidoctor_version}) $msg_man"
-                    AC_DEFINE(MAN)
-                fi
-                if test "x$enable_doc" = "xyes"; then
-                    msg_doc="asciidoctor(${asciidoctor_version}) $msg_doc"
-                    AC_DEFINE(DOC)
-                fi
-                ;;
        esac
    else
-        not_found="$not_found asciidoctor"
+        not_found="$not_found asciidoc"
        enable_man="no"
        enable_doc="no"
    fi
-    AC_SUBST(ASCIIDOCTOR)
+    AC_SUBST(ASCIIDOC)
+    AC_SUBST(A2X)
 fi

 # ------------------------------------------------------------------------------
@@ -1275,7 +1291,6 @@ AC_OUTPUT([Makefile
           doc/es/Makefile
           doc/ru/Makefile
           doc/ja/Makefile
-           doc/cs/Makefile
           src/Makefile
           src/core/Makefile
           src/plugins/Makefile
@@ -1,144 +0,0 @@
-Source: weechat-devel
-Section: net
-Priority: optional
-Maintainer: Sébastien Helleu <flashcode@flashtux.org>
-Build-Depends:
-    asciidoctor (>= 1.5.4),
-    debhelper (>= 9),
-    dh-exec,
-    cmake, pkg-config,
-    libncursesw5-dev,
-    gem2deb,
-    libperl-dev,
-    python-dev,
-    libaspell-dev,
-    liblua5.1-0-dev,
-    tcl8.6-dev,
-    guile-2.0-dev,
-    libv8-dev [amd64 armel armhf hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel],
-    libcurl4-gnutls-dev,
-    libgcrypt20-dev,
-    libgnutls28-dev,
-    zlib1g-dev
-Standards-Version: 3.9.8
-Homepage: https://weechat.org/
-Vcs-Git: https://anonscm.debian.org/git/users/kolter/weechat.git
-Vcs-Browser: https://anonscm.debian.org/git/users/kolter/weechat.git
-
-Package: weechat-devel
-Architecture: all
-Depends: ${misc:Depends}, weechat-devel-curses (>= ${source:Version})
-Suggests: weechat-devel-doc (= ${source:Version})
-Conflicts: weechat
-Description: Fast, light and extensible chat client
- WeeChat (Wee Enhanced Environment for Chat) is a fast and light chat client
- for many operating systems. Everything can be done with a keyboard.
- It is customizable and extensible with plugins/scripts, and includes:
-  - support of IRC protocol (native)
-  - support of XMPP/Jabber protocol (with additional script)
-  - nicklist
-  - smart hotlist
-  - horizontal and vertical split
-  - double charset support (decode/encode)
-  - FIFO pipe for remote control
-  - 256 colors support
-  - incremental text search
-  - dynamic filtering of buffer content
-  - Perl, Python, Ruby, Lua, Tcl, Scheme and Javascript scripting
-  - scripts manager
-  - spell checking
-  - highly customizable and extensible
-  - and much more!
-
-Package: weechat-devel-curses
-Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, weechat-devel-core (= ${binary:Version})
-Conflicts: weechat-curses
-Recommends: weechat-devel-plugins (= ${binary:Version})
-Suggests: weechat-devel-doc (= ${source:Version})
-Description: Fast, light and extensible chat client - console client
- WeeChat (Wee Enhanced Environment for Chat) is a fast and light chat client
- for many operating systems. Everything can be done with a keyboard.
- It is customizable and extensible with plugins/scripts, and includes:
-  - support of IRC protocol (native)
-  - support of XMPP/Jabber protocol (with additional script)
-  - nicklist
-  - smart hotlist
-  - horizontal and vertical split
-  - double charset support (decode/encode)
-  - FIFO pipe for remote control
-  - 256 colors support
-  - incremental text search
-  - dynamic filtering of buffer content
-  - Perl, Python, Ruby, Lua, Tcl, Scheme and Javascript scripting
-  - scripts manager
-  - spell checking
-  - highly customizable and extensible
-  - and much more!
- .
- This package provides the console client (ncurses).
-
-Package: weechat-devel-core
-Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Conflicts: weechat-core
-Suggests: weechat-devel-doc (= ${source:Version})
-Description: Fast, light and extensible chat client - core files
- WeeChat (Wee Enhanced Environment for Chat) is a fast and light chat client
- for many operating systems. Everything can be done with a keyboard.
- .
- This package provides core plugins and locales files for WeeChat. It
- currently ships the following plugins: alias, xfer, irc, charset and
- logger. It is useless without weechat-curses.
-
-Package: weechat-devel-plugins
-Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, weechat-devel-curses (= ${binary:Version})
-Conflicts: weechat-plugins
-Description: Fast, light and extensible chat client - plugins
- WeeChat (Wee Enhanced Environment for Chat) is a fast and light chat client
- for many operating systems. Everything can be done with a keyboard.
- .
- This package provides some plugins to enhance WeeChat. It currently
- ships the following plugins:
-  - Perl, Python, Ruby, Lua, Tcl, Scheme and Javascript scripting
-  - scripts manager
-  - Spell checking (thanks to aspell)
-  - FIFO pipe for remote control
-  - IRC proxy
-  - Trigger
-
-Package: weechat-devel-doc
-Section: doc
-Architecture: all
-Depends: ${misc:Depends}
-Conflicts: weechat-doc
-Description: Fast, light and extensible chat client - documentation
- WeeChat (Wee Enhanced Environment for Chat) is a fast and light chat client
- for many operating systems. Everything can be done with a keyboard.
- .
- This package contains the html documentation for WeeChat.
-
-Package: weechat-devel-dev
-Section: devel
-Architecture: all
-Depends: ${misc:Depends}
-Conflicts: weechat-dev
-Description: Fast, light and extensible chat client - development headers
- WeeChat (Wee Enhanced Environment for Chat) is a fast and light chat client
- for many operating systems. Everything can be done with a keyboard.
- .
- This package contains the headers needed to build plugins.
-
-Package: weechat-devel-dbg
-Section: debug
-Priority: extra
-Architecture: any
-Depends: ${misc:Depends}, weechat-devel-curses (= ${binary:Version}) |
- weechat-devel-core (= ${binary:Version}), weechat-devel-plugins (= ${binary:Version})
-Conflicts: weechat-dbg
-Description: Fast, light and extensible chat client - debugging symbols
- WeeChat (Wee Enhanced Environment for Chat) is a fast and light chat client
- for many operating systems. Everything can be done with a keyboard.
- .
- This package contains gdb debugging symbols for the WeeChat packages.
@@ -1 +0,0 @@
-../debian-stable/copyright
@@ -1 +0,0 @@
-../debian-stable/gbp.conf
@@ -1,33 +0,0 @@
-#!/usr/bin/make -f
-
-BUILDDIR = builddir
-
-$(BUILDDIR)/Makefile:
-	mkdir -p $(BUILDDIR)
-	cd $(BUILDDIR) && \
-	cmake .. \
-		-DCMAKE_INSTALL_PREFIX:FILEPATH=/usr \
-		-DENABLE_DOC:BOOL=ON \
-		-DENABLE_MAN:BOOL=ON \
-		-DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo \
-		-DCMAKE_C_FLAGS_RELWITHDEBINFO:STRING="$(CFLAGS) -D_FORTIFY_SOURCE=2" \
-		-DCMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO:STRING="$(LDFLAGS)" \
-		-DCMAKE_SKIP_RPATH:BOOL=ON \
-		-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON
-
-override_dh_auto_build: $(BUILDDIR)/Makefile
-	dh_auto_build
-
-override_dh_auto_configure:
-	# the package also has autotools buildsys and
-	# debhelper try to use it but that's not needed
-	echo
-
-override_dh_installchangelogs:
-	dh_installchangelogs ChangeLog.adoc
-
-override_dh_strip:
-	dh_strip --dbg-package=weechat-devel-dbg
-
-%:
-	dh $@ --parallel --builddirectory=$(BUILDDIR)
@@ -1 +0,0 @@
-../debian-stable/watch
@@ -1 +0,0 @@
-../debian-stable/weechat-core.docs
@@ -1 +0,0 @@
-../debian-stable/weechat-core.install
@@ -1 +0,0 @@
-../debian-stable/weechat-curses.dirs
@@ -1 +0,0 @@
-../debian-stable/weechat-curses.install
@@ -1 +0,0 @@
-../debian-stable/weechat-curses.links
@@ -1 +0,0 @@
-../debian-stable/weechat-curses.menu
@@ -1 +0,0 @@
-../debian-stable/weechat-dev.dirs
@@ -1 +0,0 @@
-../debian-stable/weechat-dev.install
@@ -1,10 +0,0 @@
-Document: weechat-dev-en
-Title: WeeChat developer's guide (English)
-Author: Sébastien Helleu
-Abstract: This manual describes WeeChat internals and
- how to contribute to WeeChat (English version).
-Section: Network/Communication
-
-Format: HTML
-Index: /usr/share/doc/weechat-devel-doc/html/weechat_dev.en.html
-Files: /usr/share/doc/weechat-devel-doc/html/weechat_dev.en.html
@@ -1,10 +0,0 @@
-Document: weechat-dev-fr
-Title: WeeChat developer's guide (French)
-Author: Sébastien Helleu
-Abstract: This manual describes WeeChat internals and
- how to contribute to WeeChat (French version).
-Section: Network/Communication
-
-Format: HTML
-Index: /usr/share/doc/weechat-devel-doc/html/weechat_dev.fr.html
-Files: /usr/share/doc/weechat-devel-doc/html/weechat_dev.fr.html
@@ -1,10 +0,0 @@
-Document: weechat-dev-ja
-Title: WeeChat developer's guide (Japanese)
-Author: Sébastien Helleu
-Abstract: This manual describes WeeChat internals and
- how to contribute to WeeChat (Japanese version).
-Section: Network/Communication
-
-Format: HTML
-Index: /usr/share/doc/weechat-devel-doc/html/weechat_dev.ja.html
-Files: /usr/share/doc/weechat-devel-doc/html/weechat_dev.ja.html
@@ -1,10 +0,0 @@
-Document: weechat-faq-de
-Title: WeeChat FAQ (German)
-Author: Sébastien Helleu
-Abstract: This document answers frequently asked questions
- about the WeeChat IRC client (German version).
-Section: Network/Communication
-
-Format: HTML
-Index: /usr/share/doc/weechat-devel-doc/html/weechat_faq.de.html
-Files: /usr/share/doc/weechat-devel-doc/html/weechat_faq.de.html
@@ -1,10 +0,0 @@
-Document: weechat-faq-en
-Title: WeeChat FAQ (English)
-Author: Sébastien Helleu
-Abstract: This document answers frequently asked questions
- about the WeeChat IRC client (English version).
-Section: Network/Communication
-
-Format: HTML
-Index: /usr/share/doc/weechat-devel-doc/html/weechat_faq.en.html
-Files: /usr/share/doc/weechat-devel-doc/html/weechat_faq.en.html
@@ -1,10 +0,0 @@
-Document: weechat-faq-fr
-Title: WeeChat FAQ (French)
-Author: Sébastien Helleu
-Abstract: This document answers frequently asked questions
- about the WeeChat IRC client (French version).
-Section: Network/Communication
-
-Format: HTML
-Index: /usr/share/doc/weechat-devel-doc/html/weechat_faq.fr.html
-Files: /usr/share/doc/weechat-devel-doc/html/weechat_faq.fr.html
@@ -1,10 +0,0 @@
-Document: weechat-faq-it
-Title: WeeChat FAQ (Italian)
-Author: Sébastien Helleu
-Abstract: This document answers frequently asked questions
- about the WeeChat IRC client (Italian version).
-Section: Network/Communication
-
-Format: HTML
-Index: /usr/share/doc/weechat-devel-doc/html/weechat_faq.it.html
-Files: /usr/share/doc/weechat-devel-doc/html/weechat_faq.it.html
@@ -1,10 +0,0 @@
-Document: weechat-faq-ja
-Title: WeeChat FAQ (Japanese)
-Author: Sébastien Helleu
-Abstract: This document answers frequently asked questions
- about the WeeChat IRC client (Japanese version).
-Section: Network/Communication
-
-Format: HTML
-Index: /usr/share/doc/weechat-devel-doc/html/weechat_faq.ja.html
-Files: /usr/share/doc/weechat-devel-doc/html/weechat_faq.ja.html
@@ -1,10 +0,0 @@
-Document: weechat-faq-pl
-Title: WeeChat FAQ (Polish)
-Author: Sébastien Helleu
-Abstract: This document answers frequently asked questions
- about the WeeChat IRC client (Polish version).
-Section: Network/Communication
-
-Format: HTML
-Index: /usr/share/doc/weechat-devel-doc/html/weechat_faq.pl.html
-Files: /usr/share/doc/weechat-devel-doc/html/weechat_faq.pl.html
@@ -1,10 +0,0 @@
-Document: weechat-plugin-en
-Title: WeeChat plugin API reference (English)
-Author: Sébastien Helleu
-Abstract: This document describes the API to create plugins
- for WeeChat (English version).
-Section: Network/Communication
-
-Format: HTML
-Index: /usr/share/doc/weechat-devel-doc/html/weechat_plugin_api.en.html
-Files: /usr/share/doc/weechat-devel-doc/html/weechat_plugin_api.en.html
@@ -1,10 +0,0 @@
-Document: weechat-plugin-fr
-Title: WeeChat plugin API reference (French)
-Author: Sébastien Helleu
-Abstract: This document describes the API to create plugins
- for WeeChat (French version).
-Section: Network/Communication
-
-Format: HTML
-Index: /usr/share/doc/weechat-devel-doc/html/weechat_plugin_api.fr.html
-Files: /usr/share/doc/weechat-devel-doc/html/weechat_plugin_api.fr.html
@@ -1,10 +0,0 @@
-Document: weechat-plugin-it
-Title: WeeChat plugin API reference (Italian)
-Author: Sébastien Helleu
-Abstract: This document describes the API to create plugins
- for WeeChat (Italian version).
-Section: Network/Communication
-
-Format: HTML
-Index: /usr/share/doc/weechat-devel-doc/html/weechat_plugin_api.it.html
-Files: /usr/share/doc/weechat-devel-doc/html/weechat_plugin_api.it.html
@@ -1,10 +0,0 @@
-Document: weechat-plugin-ja
-Title: WeeChat plugin API reference (Japanese)
-Author: Sébastien Helleu
-Abstract: This document describes the API to create plugins
- for WeeChat (Japanese version).
-Section: Network/Communication
-
-Format: HTML
-Index: /usr/share/doc/weechat-devel-doc/html/weechat_plugin_api.ja.html
-Files: /usr/share/doc/weechat-devel-doc/html/weechat_plugin_api.ja.html
@@ -1,9 +0,0 @@
-Document: weechat-quickstart-de
-Title: WeeChat quick start guide (German)
-Author: Sébastien Helleu
-Abstract: A short HowTo for new WeeChat users (German version).
-Section: Network/Communication
-
-Format: HTML
-Index: /usr/share/doc/weechat-devel-doc/html/weechat_quickstart.de.html
-Files: /usr/share/doc/weechat-devel-doc/html/weechat_quickstart.de.html
@@ -1,9 +0,0 @@
-Document: weechat-quickstart-en
-Title: WeeChat quick start guide (English)
-Author: Sébastien Helleu
-Abstract: A short HowTo for new WeeChat users (English version).
-Section: Network/Communication
-
-Format: HTML
-Index: /usr/share/doc/weechat-devel-doc/html/weechat_quickstart.en.html
-Files: /usr/share/doc/weechat-devel-doc/html/weechat_quickstart.en.html
@@ -1,9 +0,0 @@
-Document: weechat-quickstart-es
-Title: WeeChat quick start guide (Spanish)
-Author: Sébastien Helleu
-Abstract: A short HowTo for new WeeChat users (Spanish version).
-Section: Network/Communication
-
-Format: HTML
-Index: /usr/share/doc/weechat-devel-doc/html/weechat_quickstart.es.html
-Files: /usr/share/doc/weechat-devel-doc/html/weechat_quickstart.es.html
@@ -1,9 +0,0 @@
-Document: weechat-quickstart-fr
-Title: WeeChat quick start guide (French)
-Author: Sébastien Helleu
-Abstract: A short HowTo for new WeeChat users (French version).
-Section: Network/Communication
-
-Format: HTML
-Index: /usr/share/doc/weechat-devel-doc/html/weechat_quickstart.fr.html
-Files: /usr/share/doc/weechat-devel-doc/html/weechat_quickstart.fr.html
@@ -1,9 +0,0 @@
-Document: weechat-quickstart-it
-Title: WeeChat quick start guide (Italian)
-Author: Sébastien Helleu
-Abstract: A short HowTo for new WeeChat users (Italian version).
-Section: Network/Communication
-
-Format: HTML
-Index: /usr/share/doc/weechat-devel-doc/html/weechat_quickstart.it.html
-Files: /usr/share/doc/weechat-devel-doc/html/weechat_quickstart.it.html
@@ -1,9 +0,0 @@
-Document: weechat-quickstart-ja
-Title: WeeChat quick start guide (Japanese)
-Author: Sébastien Helleu
-Abstract: A short HowTo for new WeeChat users (Japanese version).
-Section: Network/Communication
-
-Format: HTML
-Index: /usr/share/doc/weechat-devel-doc/html/weechat_quickstart.ja.html
-Files: /usr/share/doc/weechat-devel-doc/html/weechat_quickstart.ja.html
@@ -1,9 +0,0 @@
-Document: weechat-quickstart-pl
-Title: WeeChat quick start guide (Polish)
-Author: Sébastien Helleu
-Abstract: A short HowTo for new WeeChat users (Polish version).
-Section: Network/Communication
-
-Format: HTML
-Index: /usr/share/doc/weechat-devel-doc/html/weechat_quickstart.pl.html
-Files: /usr/share/doc/weechat-devel-doc/html/weechat_quickstart.pl.html
@@ -1,9 +0,0 @@
-Document: weechat-quickstart-ru
-Title: WeeChat quick start guide (Russian)
-Author: Sébastien Helleu
-Abstract: A short HowTo for new WeeChat users (Russian version).
-Section: Network/Communication
-
-Format: HTML
-Index: /usr/share/doc/weechat-devel-doc/html/weechat_quickstart.ru.html
-Files: /usr/share/doc/weechat-devel-doc/html/weechat_quickstart.ru.html
@@ -1,10 +0,0 @@
-Document: weechat-relay-protocol-en
-Title: WeeChat Relay protocol (English)
-Author: Sébastien Helleu
-Abstract: This manual describes WeeChat Relay Protocol, used by
- remote GUI to communicate with Relay plugin (English version).
-Section: Network/Communication
-
-Format: HTML
-Index: /usr/share/doc/weechat-devel-doc/html/weechat_relay_protocol.en.html
-Files: /usr/share/doc/weechat-devel-doc/html/weechat_relay_protocol.en.html
@@ -1,10 +0,0 @@
-Document: weechat-relay-protocol-fr
-Title: WeeChat Relay protocol (French)
-Author: Sébastien Helleu
-Abstract: This manual describes WeeChat Relay Protocol, used by
- remote GUI to communicate with Relay plugin (French version).
-Section: Network/Communication
-
-Format: HTML
-Index: /usr/share/doc/weechat-devel-doc/html/weechat_relay_protocol.fr.html
-Files: /usr/share/doc/weechat-devel-doc/html/weechat_relay_protocol.fr.html
@@ -1,10 +0,0 @@
-Document: weechat-relay-protocol-ja
-Title: WeeChat Relay protocol (Japanese)
-Author: Sébastien Helleu
-Abstract: This manual describes WeeChat Relay Protocol, used by
- remote GUI to communicate with Relay plugin (Japanese version).
-Section: Network/Communication
-
-Format: HTML
-Index: /usr/share/doc/weechat-devel-doc/html/weechat_relay_protocol.ja.html
-Files: /usr/share/doc/weechat-devel-doc/html/weechat_relay_protocol.ja.html
@@ -1,10 +0,0 @@
-Document: weechat-scripting-de
-Title: WeeChat scripting guide (German)
-Author: Sébastien Helleu
-Abstract: This document describes the API to create scripts
- for WeeChat (German version).
-Section: Network/Communication
-
-Format: HTML
-Index: /usr/share/doc/weechat-devel-doc/html/weechat_scripting.de.html
-Files: /usr/share/doc/weechat-devel-doc/html/weechat_scripting.de.html
@@ -1,10 +0,0 @@
-Document: weechat-scripting-en
-Title: WeeChat scripting guide (English)
-Author: Sébastien Helleu
-Abstract: This document describes the API to create scripts
- for WeeChat (English version).
-Section: Network/Communication
-
-Format: HTML
-Index: /usr/share/doc/weechat-devel-doc/html/weechat_scripting.en.html
-Files: /usr/share/doc/weechat-devel-doc/html/weechat_scripting.en.html
@@ -1,10 +0,0 @@
-Document: weechat-scripting-fr
-Title: WeeChat scripting guide (French)
-Author: Sébastien Helleu
-Abstract: This document describes the API to create scripts
- for WeeChat (French version).
-Section: Network/Communication
-
-Format: HTML
-Index: /usr/share/doc/weechat-devel-doc/html/weechat_scripting.fr.html
-Files: /usr/share/doc/weechat-devel-doc/html/weechat_scripting.fr.html
@@ -1,10 +0,0 @@
-Document: weechat-scripting-it
-Title: WeeChat scripting guide (Italian)
-Author: Sébastien Helleu
-Abstract: This document describes the API to create scripts
- for WeeChat (Italian version).
-Section: Network/Communication
-
-Format: HTML
-Index: /usr/share/doc/weechat-devel-doc/html/weechat_scripting.it.html
-Files: /usr/share/doc/weechat-devel-doc/html/weechat_scripting.it.html
@@ -1,10 +0,0 @@
-Document: weechat-scripting-ja
-Title: WeeChat scripting guide (Japanese)
-Author: Sébastien Helleu
-Abstract: This document describes the API to create scripts
- for WeeChat (Japanese version).
-Section: Network/Communication
-
-Format: HTML
-Index: /usr/share/doc/weechat-devel-doc/html/weechat_scripting.ja.html
-Files: /usr/share/doc/weechat-devel-doc/html/weechat_scripting.ja.html
@@ -1,10 +0,0 @@
-Document: weechat-scripting-pl
-Title: WeeChat scripting guide (Polish)
-Author: Sébastien Helleu
-Abstract: This document describes the API to create scripts
- for WeeChat (Polish version).
-Section: Network/Communication
-
-Format: HTML
-Index: /usr/share/doc/weechat-devel-doc/html/weechat_scripting.pl.html
-Files: /usr/share/doc/weechat-devel-doc/html/weechat_scripting.pl.html
@@ -1,10 +0,0 @@
-Document: weechat-tester-de
-Title: WeeChat tester's guide (German)
-Author: Sébastien Helleu
-Abstract: This document describes how to test and report
- bugs against the WeeChat IRC Client (German version).
-Section: Network/Communication
-
-Format: HTML
-Index: /usr/share/doc/weechat-devel-doc/html/weechat_tester.de.html
-Files: /usr/share/doc/weechat-devel-doc/html/weechat_tester.de.html
@@ -1,10 +0,0 @@
-Document: weechat-tester-en
-Title: WeeChat tester's guide (English)
-Author: Sébastien Helleu
-Abstract: This document describes how to test and report
- bugs against the WeeChat IRC Client (English version).
-Section: Network/Communication
-
-Format: HTML
-Index: /usr/share/doc/weechat-devel-doc/html/weechat_tester.en.html
-Files: /usr/share/doc/weechat-devel-doc/html/weechat_tester.en.html
@@ -1,10 +0,0 @@
-Document: weechat-tester-fr
-Title: WeeChat tester's guide (French)
-Author: Sébastien Helleu
-Abstract: This document describes how to test and report
- bugs against the WeeChat IRC Client (French version).
-Section: Network/Communication
-
-Format: HTML
-Index: /usr/share/doc/weechat-devel-doc/html/weechat_tester.fr.html
-Files: /usr/share/doc/weechat-devel-doc/html/weechat_tester.fr.html
@@ -1,10 +0,0 @@
-Document: weechat-tester-it
-Title: WeeChat tester's guide (Italian)
-Author: Sébastien Helleu
-Abstract: This document describes how to test and report
- bugs against the WeeChat IRC Client (Italian version).
-Section: Network/Communication
-
-Format: HTML
-Index: /usr/share/doc/weechat-devel-doc/html/weechat_tester.it.html
-Files: /usr/share/doc/weechat-devel-doc/html/weechat_tester.it.html
@@ -1,10 +0,0 @@
-Document: weechat-tester-ja
-Title: WeeChat tester's guide (Japanese)
-Author: Sébastien Helleu
-Abstract: This document describes how to test and report
- bugs against the WeeChat IRC Client (Japanese version).
-Section: Network/Communication
-
-Format: HTML
-Index: /usr/share/doc/weechat-devel-doc/html/weechat_tester.ja.html
-Files: /usr/share/doc/weechat-devel-doc/html/weechat_tester.ja.html
@@ -1,10 +0,0 @@
-Document: weechat-tester-pl
-Title: WeeChat tester's guide (Polish)
-Author: Sébastien Helleu
-Abstract: This document describes how to test and report
- bugs against the WeeChat IRC Client (Polish version).
-Section: Network/Communication
-
-Format: HTML
-Index: /usr/share/doc/weechat-devel-doc/html/weechat_tester.pl.html
-Files: /usr/share/doc/weechat-devel-doc/html/weechat_tester.pl.html
@@ -1,10 +0,0 @@
-Document: weechat-user-de
-Title: WeeChat user's guide (German)
-Author: Sébastien Helleu
-Abstract: This manual describes how to use the WeeChat
- IRC client (German version).
-Section: Network/Communication
-
-Format: HTML
-Index: /usr/share/doc/weechat-devel-doc/html/weechat_user.de.html
-Files: /usr/share/doc/weechat-devel-doc/html/weechat_user.de.html
@@ -1,10 +0,0 @@
-Document: weechat-user-en
-Title: WeeChat user's guide (English)
-Author: Sébastien Helleu
-Abstract: This manual describes how to use the WeeChat
- IRC client (English version).
-Section: Network/Communication
-
-Format: HTML
-Index: /usr/share/doc/weechat-devel-doc/html/weechat_user.en.html
-Files: /usr/share/doc/weechat-devel-doc/html/weechat_user.en.html
@@ -1,10 +0,0 @@
-Document: weechat-user-fr
-Title: WeeChat user's guide (French)
-Author: Sébastien Helleu
-Abstract: This manual describes how to use the WeeChat
- IRC client (French version).
-Section: Network/Communication
-
-Format: HTML
-Index: /usr/share/doc/weechat-devel-doc/html/weechat_user.fr.html
-Files: /usr/share/doc/weechat-devel-doc/html/weechat_user.fr.html
@@ -1,10 +0,0 @@
-Document: weechat-user-it
-Title: WeeChat user's guide (Italian)
-Author: Sébastien Helleu
-Abstract: This manual describes how to use the WeeChat
- IRC client (Italian version).
-Section: Network/Communication
-
-Format: HTML
-Index: /usr/share/doc/weechat-devel-doc/html/weechat_user.it.html
-Files: /usr/share/doc/weechat-devel-doc/html/weechat_user.it.html
@@ -1,10 +0,0 @@
-Document: weechat-user-ja
-Title: WeeChat user's guide (Japanese)
-Author: Sébastien Helleu
-Abstract: This manual describes how to use the WeeChat
- IRC client (Japanese version).
-Section: Network/Communication
-
-Format: HTML
-Index: /usr/share/doc/weechat-devel-doc/html/weechat_user.ja.html
-Files: /usr/share/doc/weechat-devel-doc/html/weechat_user.ja.html
@@ -1,10 +0,0 @@
-Document: weechat-user-pl
-Title: WeeChat user's guide (Polish)
-Author: Sébastien Helleu
-Abstract: This manual describes how to use the WeeChat
- IRC client (Polish version).
-Section: Network/Communication
-
-Format: HTML
-Index: /usr/share/doc/weechat-devel-doc/html/weechat_user.pl.html
-Files: /usr/share/doc/weechat-devel-doc/html/weechat_user.pl.html
@@ -1 +0,0 @@
-usr/share/doc/weechat/*.html usr/share/doc/weechat-devel-doc/html
@@ -1 +0,0 @@
-usr/share/doc/weechat-devel-doc/html usr/share/doc/weechat-devel/html
@@ -1 +0,0 @@
-../debian-stable/weechat-plugins.dirs
@@ -1 +0,0 @@
-../debian-stable/weechat-plugins.install
@@ -1 +0,0 @@
-../debian-stable/weechat.xpm
@@ -1 +0,0 @@
-9
@@ -1,2 +0,0 @@
-[DEFAULT]
-debian-branch = unstable
@@ -1,4 +0,0 @@
-AUTHORS.adoc
-Contributing.adoc
-README.adoc
-ReleaseNotes.adoc
@@ -1,12 +1,3 @@
-weechat (1.1.1-1) unstable; urgency=medium
-
-  Since version 1.1, there is a new format for regexp replacement in
-  triggers. This format is incompatible with version 1.0. The existing
-  triggers will not be automatically updated.
-  See http://www.weechat.org/files/releasenotes/ReleaseNotes-1.1.html
-
- -- Emmanuel Bouthenot <kolter@debian.org>  Sun, 25 Jan 2015 20:41:50 +0100
-
 weechat (0.3.1-1) unstable; urgency=low

  This release introduces important changes with the usage of SSL. There
@@ -1,66 +1,3 @@
-weechat (1.5-1) unstable; urgency=medium
-
-  * New upstream release
-  * Remove patch to build ruby plugin against ruby2.3
-  * Bump Standards-Version to 3.9.8
-
- -- Emmanuel Bouthenot <kolter@debian.org>  Tue, 03 May 2016 09:29:42 +0200
-
-weechat (1.4-2) unstable; urgency=medium
-
-  * Fix Vcs-(Git|Browser) fields to use secure URIs
-  * Enable hardening=+all build
-  * Add a patch to build ruby plugin against ruby2.3 (fix FTBFS). Thanks
-    to Christian Hofstaedtler for the patch (Closes: #816312)
-  * Build Tcl plugin against Tcl 8.6 (Closes: #812320)
-  * Bump Standards-Version to 3.9.7
-
- -- Emmanuel Bouthenot <kolter@debian.org>  Fri, 04 Mar 2016 15:58:54 +0100
-
-weechat (1.4-1) unstable; urgency=medium
-
-  * New upstream release
-    - Update copyright (new year)
-    - Refresh XPM menu icon following upstream changes
-
- -- Emmanuel Bouthenot <kolter@debian.org>  Fri, 15 Jan 2016 15:16:11 +0100
-
-weechat (1.3-1) unstable; urgency=medium
-
-  * New upstream release
-    - Remove backported patch to fix FTBFS with ruby 2.2
-  * Use dh-exec to build javascript plugin only on architectures which v8
-    engine supports. Thanks to Mateusz Łukasik for the patch
-    (Closes: #794584)
-
- -- Emmanuel Bouthenot <kolter@debian.org>  Wed, 19 Aug 2015 18:34:17 +0200
-
-weechat (1.2-2) unstable; urgency=medium
-
-  * Add patch (backported from upstream) to fix a FTBFS while building
-    against ruby 2.2 (Closes: #791836)
-
- -- Emmanuel Bouthenot <kolter@debian.org>  Thu, 16 Jul 2015 18:23:55 +0200
-
-weechat (1.2-1) unstable; urgency=medium
-
-  * New upstream release
-    - Enable build of javascript plugin (using v8 engine)
-
- -- Emmanuel Bouthenot <kolter@debian.org>  Mon, 11 May 2015 18:00:01 +0200
-
-weechat (1.1.1-1) unstable; urgency=medium
-
-  * New upstream release (Closes: #776105)
-    - Add a new entry in News.Debian about new format for regex replacement
-      in triggers
-  * Update debian/{control,copyright,watch} to use https links with the
-    upstream project resources
-  * Bump Standards-Version to 3.9.6
-  * Update year in debian/copyright
-
- -- Emmanuel Bouthenot <kolter@debian.org>  Sun, 25 Jan 2015 20:27:04 +0100
-
 weechat (1.0.1-1) unstable; urgency=medium

  * New upstream release
@@ -3,9 +3,12 @@ Section: net
 Priority: optional
 Maintainer: Emmanuel Bouthenot <kolter@debian.org>
 Build-Depends:
-    asciidoctor (>= 1.5.4),
+    asciidoc (>= 8.5),
+    source-highlight,
+    xsltproc,
+    docbook-xsl,
+    docbook-xml,
    debhelper (>= 9),
-    dh-exec,
    cmake, pkg-config,
    libncursesw5-dev,
    gem2deb,
@@ -13,17 +16,17 @@ Build-Depends:
    python-dev,
    libaspell-dev,
    liblua5.1-0-dev,
-    tcl8.6-dev,
+    tcl8.5-dev,
    guile-2.0-dev,
-    libv8-dev [amd64 armel armhf hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel],
+    libv8-dev,
    libcurl4-gnutls-dev,
    libgcrypt20-dev,
    libgnutls28-dev,
    zlib1g-dev
-Standards-Version: 3.9.8
+Standards-Version: 3.9.5
 Homepage: https://weechat.org/
-Vcs-Git: https://anonscm.debian.org/git/users/kolter/weechat.git
-Vcs-Browser: https://anonscm.debian.org/git/users/kolter/weechat.git
+Vcs-Git: git://anonscm.debian.org/users/kolter/weechat.git
+Vcs-Browser: http://anonscm.debian.org/gitweb/?p=users/kolter/weechat.git

 Package: weechat
 Architecture: all
@@ -4,14 +4,14 @@ Upstream-Contact: Sébastien Helleu <flashcode@flashtux.org>
 Source: https://weechat.org/

 Files: *
-Copyright: 2003-2017, Sébastien Helleu <flashcode@flashtux.org>
+Copyright: 2003-2015, Sébastien Helleu <flashcode@flashtux.org>
           2005-2009, Emmanuel Bouthenot <kolter@openics.org>
           2008-2009, Dmitry Kobylin <fnfal@academ.tsc.ru>
 License: GPL-3+

 Files: debian/*
 Copyright: 2005-2008, Julien Louis <ptitlouis@sysif.net>
-           2008-2016, Emmanuel Bouthenot <kolter@openics.org>
+           2008-2014, Emmanuel Bouthenot <kolter@openics.org>
 License: GPL-3+

 License: GPL-3+
@@ -0,0 +1,5 @@
+[DEFAULT]
+upstream-branch = upstream
+debian-branch = unstable
+upstream-tag = v%(version)s
+compression = xz
--- a/Show More
+++ b/Show More
				`@@ -1 +0,0 @@`
				`usr/share/doc/weechat/*.html usr/share/doc/weechat-devel-doc/html`
				`@@ -1 +0,0 @@`
				`usr/share/doc/weechat-devel-doc/html usr/share/doc/weechat-devel/html`