Version 1.3-rc2

irc: add option irc.network.channel_encode (issue #218 , issue #482 )
This is a workaround (disabled by default) to join and chat on ISO encoded channels (or another charset different from UTF-8). This option may be removed in future if a better solution is implemented.
2026-06-12 14:14:48 +02:00 · 2015-08-14 21:37:58 +02:00 · 2015-08-14 21:25:27 +02:00 · 2015-08-14 20:02:56 +02:00 · 2015-08-14 18:59:10 +02:00 · 2015-08-14 18:00:59 +02:00
964 changed files with 415397 additions and 157789 deletions
@@ -0,0 +1,7 @@
+# files/directories excluded from tarballs
+
+.git*               export-ignore
+debian              export-ignore
+weechat.spec        export-ignore
+.mailmap            export-ignore
+tests/ubuntu/       export-ignore
@@ -1,7 +1,6 @@
 # ignored files for Git

 *.a
-*.css
 *.gmo
 *.html
 *.la
@@ -14,12 +13,16 @@
 *.so
 *.so.0
 *.so.0.0.0
+*.1

 ABOUT-NLS
 autom4te*
 build*/*
+compile
 config.guess
-config.h*
+config.h
+config.h.in*
+config-git.h
 config.log
 config.rpath
 config.status
@@ -41,12 +44,9 @@ POTFILES
 remove-potcdate.sed
 Rules-quot
 weechat.pc
-doc/de/build/*
-doc/en/build/*
-doc/fr/build/*
+weechat-*.cygport

 *stamp
 stamp*

-src/gui/curses/weechat-curses
-src/gui/gtk/weechat-gtk
+src/gui/curses/weechat
@@ -0,0 +1,19 @@
+# Map author and committer names and email addresses to canonical real names
+# and email addresses.
+#
+# For example with these commands:
+#   git shortlog -nse
+#   git shortlog -se | cut -f2 | sort
+
+Sébastien Helleu <flashcode@flashtux.org>
+Sébastien Helleu <flashcode@flashtux.org> <flashcode@krypton>
+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 <soltys@szluug.org>
+Marco Paolone <marcopaolone@gmail.com>
+<marcopaolone@gmail.com> <marco@DrB4tch.sitecomwl601>
+<mikaela.suomalainen@outlook.com> <mkaysi@outlook.com>
+<simon@arlott.org> <sa.me.uk>
+<Simon.Kuhnle@cs.fau.de> <simon@blarzwurst.de>
@@ -0,0 +1,33 @@
+language: c
+
+compiler:
+    - gcc
+    - clang
+
+env:
+    - BUILDTOOL="cmake" BUILDARGS=""
+    - BUILDTOOL="cmake" BUILDARGS="-DENABLE_PYTHON3=ON"
+    - BUILDTOOL="cmake" BUILDARGS="-DENABLE_GNUTLS=OFF"
+    - BUILDTOOL="autotools" BUILDARGS=""
+    - BUILDTOOL="autotools" BUILDARGS="--enable-python3"
+    - BUILDTOOL="autotools" BUILDARGS="--disable-gnutls"
+
+before_script:
+    - 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 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
+    - sudo dpkg -i ./tests/ubuntu/precise/libcpputest-dev_3.4-3_amd64.deb
+    - sudo pip install msgcheck pylint
+
+script:
+    - ./scripts/build.sh
+    - msgcheck po/*.po
+    - pylint doc/docgen.py
+
+after_success:
+    - weechat --help
+    - weechat-curses --help
+    - weechat -r "/debug libs;/quit"
+
+matrix:
+    fast_finish: true
@@ -1,49 +0,0 @@
-WeeChat Authors
-===============
-
-Developers
----------
-
-* General code
-
-** Sébastien Helleu <flashcode@flashtux.org>
-*** Web: http://www.weechat.org/
-*** IRC: 'FlashCode' on irc.freenode.net
-
-
-* Scripts plugins, debian packager
-
-** Emmanuel Bouthenot <kolter@openics.org>
-*** IRC: 'kolter' on irc.freenode.net
-
-
-Contributors
------------
-
-* Julien Louis <ptitlouis@sysif.net>, IRC: 'ptitlouis'
-* Rudolf Polzer <rpolzer-rp@durchnull.de>, IRC: 'divVerent'
-* Jiri Golembiovsky <golemj@gmail.com>, IRC: 'GolemJ'
-* Jim Ramsay <i.am@jimramsay.com>, IRC: 'lack'
-* Odin <odin@dtdm.org>, IRC: 'Odin'
-* Pistos, IRC: 'pistos'
-* Gwenn, IRC: 'gwenn'
-* Voroskoi, IRC: 'voroskoi'
-* Frank Zacharias
-* Pavel Shevchuk, IRC: 'Stalwart'
-* soltys
-* Nils Görs
-* rettub
-* m4v
-* Marco Paolone
-* Dmitry Kobylin
-* Dominik Honnef
-
-
-Contact
-------
-
-Whole team is connected to IRC:
-server: 'irc.freenode.net', channels: '#weechat' (english) and '#weechat-fr' (french)
-
-
-See README file for license detail.
@@ -0,0 +1,100 @@
+= WeeChat Authors
+:author: Sébastien Helleu
+:email: flashcode@flashtux.org
+:lang: en
+
+
+== Developers
+
+* General code
+** Sébastien Helleu (FlashCode) <flashcode@flashtux.org>
+* Scripts plugins, debian packager
+** Emmanuel Bouthenot (kolter) <kolter@openics.org>
+
+== Contributors
+
+Alphabetically:
+
+* Ailin Nemui (Nei)
+* Aleksey V Zapparov
+* Alex Tarkovsky
+* Anders Bergh
+* Andrew Potter (talisein)
+* Antoine Pietri (seirl)
+* Arvydas Sidorenko
+* Asakura
+* Bazerka
+* Benoit Papillault (benoit)
+* Christian Heinz
+* Christopher O'Neill (deltafire)
+* David Flatz
+* Dmitry Kobylin
+* Dominik Honnef
+* Eduardo Elias
+* Elizabeth Myers (Elizacat)
+* Elián Hanisch (m4v)
+* Emanuele Giaquinta
+* Esteban I. Ruiz Moreno (Exio)
+* Felix Eckhofer
+* Frank Zacharias
+* Gu1ll4um3r0m41n
+* Guido Berhoerster
+* Gwenn
+* Hasan Kiran (turgay)
+* Ivan Sichmann Freitas
+* Jason A. Donenfeld (zx2c4)
+* JD Horelick (jdhore)
+* Jim Ramsay (lack)
+* Jiri Golembiovsky (GolemJ)
+* Julien Louis (ptitlouis)
+* Karthik K
+* Koka El Kiwi (KiwiDash)
+* Krzysztof Koroscik (soltys)
+* Kyle Fuller (kylef)
+* Leonid Evdokimov
+* Lázaro A.
+* Maarten de Vries
+* Mantas Mikulėnas (grawity)
+* Marco Paolone
+* Mateusz Poszwa
+* Matt Robinson
+* Max Anton Teufel
+* Murilo Opsfelder Araujo
+* Nicolas Cavigneaux
+* Nils Görs (nils_2)
+* nyuszika7h
+* Odin
+* Ondřej Súkup
+* Patrick Steinhardt
+* Paul Komkoff
+* Pavel Shevchuk (Stalwart)
+* Peter Boström (pbos)
+* Phillip Sz
+* Pierre Carru
+* Piotr Szymaniak
+* Pistos
+* Quentin Glidic (SardemFF7)
+* Quentin Pradet
+* Quico Noizeux
+* Rettub
+* Rudolf Polzer (divVerent)
+* Ryuunosuke Ayanokouzi
+* Sergio Durigan Junior
+* Shawn Smith
+* Simmo Saan
+* Simon Arlott
+* Simon Kuhnle
+* Stefano Pigozzi
+* Stfn
+* Sven Knurr (Cthulhux)
+* Tim D. Smith
+* Tom Alsberg
+* Tor Hveem (xt)
+* Valentin Lorentz (progval)
+* Voroskoi
+* Yannick Palanque
+
+== Contact
+
+See https://weechat.org/files/doc/devel/weechat_user.en.html#support[user's guide]
+or https://weechat.org/dev/support
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2010 Sebastien 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>
 #
@@ -19,130 +19,274 @@
 # along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 #

-PROJECT(weechat C)
-
 cmake_minimum_required(VERSION 2.4)

-SET(CMAKE_VERBOSE_MAKEFILE OFF)
-SET(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH})
-SET(CMAKE_SKIP_RPATH ON)
-SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -W -Werror-implicit-function-declaration")
-IF(PREFIX)
-  SET(CMAKE_INSTALL_PREFIX ${PREFIX} CACHE PATH "Install path prefix" FORCE)
-ENDIF(PREFIX)
+project(weechat C)

-SET(VERSION_MAJOR "0")
-SET(VERSION_MINOR "3")
-SET(VERSION_PATCH "3-rc1")
-SET(VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH})
-SET(LICENSE "GPL3")
-SET(PKG_STRING "${PROJECT_NAME} ${VERSION}")
-STRING(REPLACE "\";\"" "\ " PKG_STRING ${PKG_STRING})
+# CMake options
+set(CMAKE_VERBOSE_MAKEFILE OFF)
+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(DEFINED LIBDIR)
-  SET(LIBDIR ${LIBDIR}/${PROJECT_NAME})
-ELSE(DEFINED LIBDIR)
-  SET(LIBDIR ${CMAKE_INSTALL_PREFIX}/lib/${PROJECT_NAME})
-ENDIF(DEFINED LIBDIR)
+# version
+set(VERSION_MAJOR "1")
+set(VERSION_MINOR "3-rc2")
+set(VERSION_PATCH "")
+if(VERSION_PATCH STREQUAL "")
+  set(VERSION ${VERSION_MAJOR}.${VERSION_MINOR})
+else()
+  set(VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH})
+endif()

-IF(NOT DEFINED SHAREDIR)
-  SET(SHAREDIR ${CMAKE_INSTALL_PREFIX}/share)
-ENDIF(NOT DEFINED SHAREDIR)
+# license
+set(LICENSE "GPL3")

-IF(NOT DEFINED LOCALEDIR)
-  SET(LOCALEDIR ${SHAREDIR}/locale)
-ENDIF(NOT DEFINED LOCALEDIR)
+# add definitions for version and license
+if(COMMAND cmake_policy)
+  cmake_policy(SET CMP0005 NEW)
+  add_definitions(-DWEECHAT_VERSION="${VERSION}" -DWEECHAT_LICENSE="${LICENSE}")
+else()
+  add_definitions(-DWEECHAT_VERSION='"${VERSION}"' -DWEECHAT_LICENSE='"${LICENSE}"')
+endif()

-IF(DEFINED INCLUDEDIR)
-  SET(INCLUDEDIR ${INCLUDEDIR}/${PROJECT_NAME})
-ELSE(DEFINED INCLUDEDIR)
-  SET(INCLUDEDIR ${CMAKE_INSTALL_PREFIX}/include/${PROJECT_NAME})
-ENDIF(DEFINED INCLUDEDIR)
+# package string
+set(PKG_STRING "${PROJECT_NAME} ${VERSION}")
+string(REPLACE "\";\"" "\ " PKG_STRING ${PKG_STRING})

-OPTION(DISABLE_NCURSES       "Disable Ncurses interface")
-OPTION(ENABLE_GTK            "Enable GTK interface")
-OPTION(DISABLE_NLS           "Disable Native Language Support")
-OPTION(DISABLE_GCRYPT        "Disable libgcrypt support")
-OPTION(DISABLE_GNUTLS        "Disable SSLv3/TLS connection support")
-OPTION(DISABLE_LARGEFILE     "Disable Large File Support")
-OPTION(DISABLE_ALIAS         "Disable Alias plugin")
-OPTION(DISABLE_ASPELL        "Disable Aspell plugin")
-OPTION(DISABLE_CHARSET       "Disable Charset plugin")
-OPTION(ENABLE_DEMO           "Enable Demo plugin")
-OPTION(DISABLE_FIFO          "Disable FIFO plugin")
-OPTION(DISABLE_IRC           "Disable IRC plugin")
-OPTION(DISABLE_LOGGER        "Disable Logger plugin")
-OPTION(ENABLE_RELAY          "Enable Relay plugin")
-OPTION(DISABLE_SCRIPTS       "Disable script plugins")
-OPTION(DISABLE_PERL          "Disable Perl scripting language")
-OPTION(DISABLE_PYTHON        "Disable Python scripting language")
-OPTION(DISABLE_RUBY          "Disable Ruby scripting language")
-OPTION(DISABLE_LUA           "Disable Lua scripting language")
-OPTION(DISABLE_TCL           "Disable Tcl scripting language")
-OPTION(DISABLE_XFER          "Disable Xfer plugin (file transfer and direct chat)")
-OPTION(DISABLE_DOC           "Disable Doc")
+if(DEFINED LIBDIR)
+  set(LIBDIR ${LIBDIR}/${PROJECT_NAME})
+else()
+  set(LIBDIR ${CMAKE_INSTALL_PREFIX}/lib/${PROJECT_NAME})
+endif()

-IF(NOT DISABLE_NLS)
-  ADD_SUBDIRECTORY( po )
-ENDIF(NOT DISABLE_NLS)
+if(NOT DEFINED SHAREDIR)
+  set(SHAREDIR ${CMAKE_INSTALL_PREFIX}/share)
+endif()

-ADD_SUBDIRECTORY( src )
-ADD_SUBDIRECTORY( doc )
+if(NOT DEFINED MANDIR)
+  set(MANDIR ${SHAREDIR}/man)
+endif()

-CONFIGURE_FILE(config.h.cmake config.h @ONLY)
+if(NOT DEFINED LOCALEDIR)
+  set(LOCALEDIR ${SHAREDIR}/locale)
+endif()

-CONFIGURE_FILE(
-  "${CMAKE_CURRENT_SOURCE_DIR}/cmake/makedist.sh.in"
-  "${CMAKE_CURRENT_BINARY_DIR}/makedist.sh" IMMEDIATE
-  @ONLY)
+if(DEFINED INCLUDEDIR)
+  set(INCLUDEDIR ${INCLUDEDIR}/${PROJECT_NAME})
+else()
+  set(INCLUDEDIR ${CMAKE_INSTALL_PREFIX}/include/${PROJECT_NAME})
+endif()

-CONFIGURE_FILE(
+option(ENABLE_NCURSES    "Enable Ncurses interface"                  ON)
+option(ENABLE_NLS        "Enable Native Language Support"            ON)
+option(ENABLE_GNUTLS     "Enable SSLv3/TLS support"                  ON)
+option(ENABLE_LARGEFILE  "Enable Large File Support"                 ON)
+option(ENABLE_ALIAS      "Enable Alias plugin"                       ON)
+option(ENABLE_ASPELL     "Enable Aspell plugin"                      ON)
+option(ENABLE_ENCHANT    "Enable Enchant lib for Aspell plugin"      OFF)
+option(ENABLE_CHARSET    "Enable Charset plugin"                     ON)
+option(ENABLE_EXEC       "Enable Exec plugin"                        ON)
+option(ENABLE_FIFO       "Enable FIFO plugin"                        ON)
+option(ENABLE_IRC        "Enable IRC plugin"                         ON)
+option(ENABLE_LOGGER     "Enable Logger plugin"                      ON)
+option(ENABLE_RELAY      "Enable Relay plugin"                       ON)
+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)" 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)
+option(ENABLE_GUILE      "Enable Scheme (guile) scripting language"  ON)
+option(ENABLE_JAVASCRIPT "Enable JavaScript scripting language"      ON)
+option(ENABLE_TRIGGER    "Enable Trigger plugin"                     ON)
+option(ENABLE_XFER       "Enable Xfer plugin"                        ON)
+option(ENABLE_MAN        "Enable build of man page"                  OFF)
+option(ENABLE_DOC        "Enable build of documentation"             OFF)
+option(ENABLE_TESTS      "Enable tests"                              OFF)
+
+# option WEECHAT_HOME
+if(NOT DEFINED WEECHAT_HOME OR "${WEECHAT_HOME}" STREQUAL "")
+  set(WEECHAT_HOME "~/.weechat")
+endif()
+set(WEECHAT_HOME "${WEECHAT_HOME}" CACHE
+  STRING "WeeChat home directory for config, logs, scripts.. (default is \"~/.weechat\")"
+  FORCE)
+mark_as_advanced(CLEAR WEECHAT_HOME)
+
+# option CA_FILE
+if(NOT DEFINED CA_FILE OR "${CA_FILE}" STREQUAL "")
+  set(CA_FILE "/etc/ssl/certs/ca-certificates.crt")
+endif()
+set(CA_FILE "${CA_FILE}" CACHE
+  STRING "File containing the certificate authorities (default is \"/etc/ssl/certs/ca-certificates.crt\"). This is the default value of option \"weechat.network.gnutls_ca_file\"."
+  FORCE)
+mark_as_advanced(CLEAR CA_FILE)
+
+if(COMMAND cmake_policy)
+  if(POLICY CMP0003)
+    cmake_policy(SET CMP0003 NEW)
+  endif()
+  if(POLICY CMP0017)
+    cmake_policy(SET CMP0017 NEW)
+  endif()
+endif()
+
+add_definitions(-DHAVE_CONFIG_H)
+
+include(CheckIncludeFiles)
+include(CheckFunctionExists)
+include(CheckSymbolExists)
+
+check_include_files("langinfo.h" HAVE_LANGINFO_CODESET)
+check_include_files("sys/resource.h" HAVE_SYS_RESOURCE_H)
+
+check_function_exists(mallinfo HAVE_MALLINFO)
+
+check_symbol_exists("eat_newline_glitch" "term.h" HAVE_EAT_NEWLINE_GLITCH)
+
+# Check for Large File Support
+if(ENABLE_LARGEFILE)
+  add_definitions(-D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -D_LARGE_FILES)
+endif()
+
+# Check for Gettext
+if(ENABLE_NLS)
+  find_package(Gettext)
+  if(GETTEXT_FOUND)
+    add_definitions(-DENABLE_NLS)
+  endif()
+endif()
+
+# Check for libgcrypt
+find_package(GCRYPT REQUIRED)
+add_definitions(-DHAVE_GCRYPT)
+list(APPEND EXTRA_LIBS ${GCRYPT_LDFLAGS})
+
+# Check for GnuTLS
+if(ENABLE_GNUTLS)
+  find_package(GnuTLS)
+  if(GNUTLS_FOUND)
+    string(REGEX REPLACE "/[^/]*$" "" GNUTLS_LIBRARY_PATH "${GNUTLS_LIBRARY}")
+    add_definitions(-DHAVE_GNUTLS)
+    include_directories(${GNUTLS_INCLUDE_PATH})
+    set(CMAKE_C_LINK_FLAGS "${CMAKE_C_LINK_FLAGS} -L${GNUTLS_LIBRARY_PATH}")
+    list(APPEND EXTRA_LIBS gnutls)
+  endif()
+endif()
+
+# Check for zlib
+find_package(ZLIB REQUIRED)
+add_definitions(-DHAVE_ZLIB)
+
+# Check for iconv
+find_package(Iconv)
+if(ICONV_FOUND)
+  add_definitions(-DHAVE_ICONV)
+endif()
+
+# Check for CURL
+find_package(CURL REQUIRED)
+
+# weechat_gui_common MUST be the first lib in the list
+set(STATIC_LIBS weechat_gui_common)
+
+find_library(DL_LIBRARY
+  NAMES dl
+  PATHS /lib /usr/lib /usr/libexec /usr/local/lib /usr/local/libexec
+)
+list(APPEND STATIC_LIBS weechat_plugins)
+if(DL_LIBRARY)
+  string(REGEX REPLACE "/[^/]*$" "" DL_LIBRARY_PATH "${DL_LIBRARY}")
+  set(CMAKE_C_LINK_FLAGS "${CMAKE_C_LINK_FLAGS} -L${DL_LIBRARY_PATH}")
+  list(APPEND EXTRA_LIBS dl)
+endif()
+
+if(ENABLE_NLS)
+  add_subdirectory(po)
+endif()
+
+add_subdirectory(src)
+add_subdirectory(doc)
+
+find_package(CppUTest)
+if(ENABLE_TESTS AND CPPUTEST_FOUND)
+  enable_testing()
+  add_subdirectory(tests)
+endif()
+
+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}/scripts/git-version.sh" "${CMAKE_CURRENT_SOURCE_DIR}" "${VERSION}" "config-git.h"
+  WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}")
+
+configure_file(
  "${CMAKE_CURRENT_SOURCE_DIR}/cmake/cmake_uninstall.cmake.in"
  "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
  IMMEDIATE @ONLY)

-ADD_CUSTOM_TARGET(uninstall
+add_custom_target(uninstall
  "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake")

-ADD_CUSTOM_TARGET(dist
-  "${CMAKE_BINARY_DIR}/makedist.sh"
-  DEPENDS doc
-  WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
+add_custom_target(dist
+  "${CMAKE_CURRENT_SOURCE_DIR}/makedist.sh" "${VERSION}" "HEAD" "${CMAKE_CURRENT_BINARY_DIR}"
+  WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})

 # pkgconfig file
-SET(PACKAGE "${PROJECT_NAME}")
-SET(prefix "${CMAKE_INSTALL_PREFIX}")
-SET(exec_prefix "\${prefix}")
-SET(libdir "\${exec_prefix}/lib")
-SET(includedir "\${prefix}/include")
-CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/weechat.pc.in ${CMAKE_CURRENT_BINARY_DIR}/weechat.pc @ONLY)
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat.pc DESTINATION ${LIBDIR}/../pkgconfig)
+set(PACKAGE "${PROJECT_NAME}")
+set(prefix "${CMAKE_INSTALL_PREFIX}")
+set(exec_prefix "\${prefix}")
+set(libdir "\${exec_prefix}/lib")
+set(includedir "\${prefix}/include")
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/weechat.pc.in ${CMAKE_CURRENT_BINARY_DIR}/weechat.pc @ONLY)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat.pc DESTINATION ${LIBDIR}/../pkgconfig)
+
+# cygport file (used to build Cygwin packages)
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/weechat.cygport.in ${CMAKE_CURRENT_BINARY_DIR}/weechat-${VERSION}-1.cygport @ONLY)
+
+# install some files (only on Cygwin)
+if(CYGWIN)
+  install(FILES
+    ${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()
+
+# icon
+install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/weechat.png DESTINATION ${SHAREDIR}/icons/hicolor/32x32/apps)

 # packages
-SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Fast, light and extensible chat client")
-SET(CPACK_PACKAGE_VENDOR "Sebastien Helleu")
-SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README")
-SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/COPYING")
-SET(CPACK_PACKAGE_VERSION_MAJOR ${VERSION_MAJOR})
-SET(CPACK_PACKAGE_VERSION_MINOR ${VERSION_MINOR})
-SET(CPACK_PACKAGE_VERSION_PATCH ${VERSION_PATCH})
+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.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})
+set(CPACK_PACKAGE_VERSION_PATCH ${VERSION_PATCH})

 # binary package
-SET(CPACK_GENERATOR "STGZ;TGZ;TBZ2")
-SET(CPACK_PACKAGE_FILE_NAME weechat-binary-${VERSION})
+set(CPACK_GENERATOR "STGZ;TGZ;TBZ2")
+set(CPACK_PACKAGE_FILE_NAME weechat-binary-${VERSION})

 # source package
-SET(CPACK_SOURCE_GENERATOR "TGZ;TBZ2")
-SET(CPACK_SOURCE_PACKAGE_FILE_NAME weechat-${VERSION})
-SET(CPACK_SOURCE_IGNORE_FILES "/\\\\.git" "/build/" "/m4/"
+set(CPACK_SOURCE_GENERATOR "TGZ;TBZ2")
+set(CPACK_SOURCE_PACKAGE_FILE_NAME weechat-${VERSION})
+set(CPACK_SOURCE_IGNORE_FILES "/\\\\.git" "/build/" "/m4/"
  "/autom4te\\\\.cache/" "/ABOUT-NLS$" "/config\\\\.guess$" "/config\\\\.h$"
  "/config\\\\.h.in$" "/config\\\\.log$" "/config\\\\.rpath$"
  "/config\\\\.status$" "/config\\\\.sub$" "/configure$" "/depcomp$"
  "/install-sh$" "/missing$" "/intl/" "/libtool$" "/\\\\.libs/"
  "/ltmain\\\\.sh$" "/\\\\.deps/" "/html/" "/html1/" "/Makefile$"
  "/Makefile\\\\.in$" "stamp" "/po/.*\\\\.header$" "\\\\.gmo$" "~$" "\\\\.o$"
-  "\\\\.lo$" "\\\\.a$" "\\\\.la$" "\\\\.lai$" "\\\\.Plo$" "/weechat-curses$"
-  "/weechat-gtk$"
+  "\\\\.lo$" "\\\\.a$" "\\\\.la$" "\\\\.lai$" "\\\\.Plo$" "/weechat$"
 )

-INCLUDE(CPack)
+include(CPack)
@@ -0,0 +1,86 @@
+= Contributing to WeeChat
+:author: Sébastien Helleu
+:email: flashcode@flashtux.org
+:lang: en
+
+
+== Reporting bugs
+
+First, some basic things:
+
+* Use only English to communicate with 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.
+
+=== Security reports
+
+Please *DO NOT* file a GitHub issue for security related problems, but send an
+email to <security@weechat.org> instead.
+
+=== Required info
+
+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.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, ...).
+* 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).
+
+[IMPORTANT]
+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).
+
+=== Scripts related issues
+
+If you are using scripts, they can cause problems/crashes. To check if the
+problem is related to one script, try to unload them one by one (using
+command `/script unload <name>`).
+
+Many issues reported are in fact related to bugs in scripts, so please first
+check that before reporting any issue on WeeChat itself.
+
+If you think the problem comes from a specific script, please report the issue
+in the https://github.com/weechat/scripts/issues[scripts git repository]
+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].
+
+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]
+in Developer's guide.
+
+== Feature requests
+
+WeeChat is under active development, so your idea may already have been
+implemented, or scheduled for a future version (you can check in
+https://weechat.org/dev[roadmap] or
+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').
+
+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]
+in Developer's guide, which contains info about styles used, naming convention
+and other useful info.
@@ -1,36 +0,0 @@
-WeeChat Installation instructions
-=================================
-
-You can build WeeChat with cmake (recommended way) or autotools.
-
-
-With cmake
----------
-
------------------------------------------------------------------
-mkdir build
-cd build
-cmake .. -DPREFIX=/where/you/want/install -DCMAKE_BUILD_TYPE=Debug
-make
-make install     (as root for installation in system directories)
------------------------------------------------------------------
-
-
-With autotools
--------------
-
----------------------------------------------------------------------
-./autogen.sh     (for cloned git repository only, not .tar.XX package)
-./configure --prefix=/where/you/want/install
-make
-make install     (as root for installation in system directories)
----------------------------------------------------------------------
-
-
-If you want to report bugs/crashes to developers, please:
-
- compile with debug info (type "Debug" for cmake build, default for autotools),
- enable core files (for bash shell, add "ulimit -c unlimited" to your ~/.bashrc).
-
-
-See AUTHORS for support, feel free to contact us for any problem.
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2010 Sebastien 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>
 #
@@ -19,39 +19,64 @@
 # along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 #

-if DOC
-doc_dir = doc
+# This target will update file config-git.h with output of command "git describe"
+# (if needed, and only for a devel/rc version).
+BUILT_SOURCES = build-config-git.h
+build-config-git.h:
+	-$(abs_top_srcdir)/scripts/git-version.sh "$(abs_top_srcdir)" "$(VERSION)" config-git.h
+
+if TESTS
+tests_dir = tests
 endif

-SUBDIRS = po $(doc_dir) intl src
+SUBDIRS = po doc intl src $(tests_dir)

-EXTRA_DIST = CMakeLists.txt \
+EXTRA_DIST = AUTHORS.asciidoc \
+             ChangeLog.asciidoc \
+             Contributing.asciidoc \
+             README.asciidoc \
+             ReleaseNotes.asciidoc \
+             CMakeLists.txt \
             config.rpath \
             config.h.cmake \
-             cmake/cmake_uninstall.cmake.in \
+             makedist.sh \
+             cmake/CMakeParseArguments.cmake \
             cmake/FindAsciidoc.cmake \
             cmake/FindAspell.cmake \
-             cmake/FindGcrypt.cmake \
+             cmake/FindCppUTest.cmake \
+             cmake/FindENCHANT.cmake \
+             cmake/FindGCRYPT.cmake \
             cmake/FindGettext.cmake \
             cmake/FindGnuTLS.cmake \
+             cmake/FindGuile.cmake \
             cmake/FindIconv.cmake \
             cmake/FindLua.cmake \
             cmake/FindNcurses.cmake \
+             cmake/FindPackageHandleStandardArgs.cmake \
             cmake/FindPerl.cmake \
             cmake/FindPkgConfig.cmake \
             cmake/FindPython.cmake \
             cmake/FindRuby.cmake \
             cmake/FindSourcehighlight.cmake \
             cmake/FindTCL.cmake \
-             cmake/makedist.sh.in \
+             cmake/FindV8.cmake \
+             cmake/FindZLIB.cmake \
+             cmake/cmake_uninstall.cmake.in \
             po/CMakeLists.txt \
             po/srcfiles.cmake \
-             weechat.spec \
-             weechat_icon_32.png \
+             scripts/build.sh \
+             scripts/git-version.sh \
+             weechat.png \
             weechat.pc.in \
-             UPGRADE_0.3
+             weechat.cygport.in

 ACLOCAL_AMFLAGS = -I m4

 pkgconfigdir   = $(libdir)/pkgconfig
 pkgconfig_DATA = weechat.pc
+
+icondir   = $(datadir)/icons/hicolor/32x32/apps
+icon_DATA = weechat.png
+
+clean-local:
+	$(RM) config-git.h
@@ -1,258 +0,0 @@
-WeeChat News
-============
-Sébastien Helleu <flashcode@flashtux.org>
-v0.3.3-dev, 2010-07-06
-
-
-Version 0.3.3 (under dev!)
--------------------------
-
-Important release notes:
-
-* if you are using `/upgrade` from a previous release, then you must reconnect
-  to IRC servers in order to use new command /wallchops.
-* option 'irc.network.lag_min_show' is now in milliseconds, you should set new
-  value: your current value multiplied by 1000 (new default value is 500).
-
-Version 0.3.2 (2010-04-18)
--------------------------
-
-If you are using `/upgrade` from a previous release, then you must execute this
-command on all IRC servers/channels/private buffers and xfer DCC chats (not
-needed on WeeChat core buffer or buffers from other plugins/scripts): +
-`/buffer set highlight_words $nick`
-
-Version 0.3.1.1 (2010-01-31)
----------------------------
-
-This version fixes crashs with SSL connection and purge of old DCC chats.
-
-All users of version 0.2.2 should upgrade to this version.
-
-Version 0.3.1 (2010-01-23)
--------------------------
-
-IRC commands /ame and /amsg are now aliases, if you are upgrading from version
-0.3.0, you must create aliases with following commands: +
-`/alias aaway allserv /away` +
-`/alias ame allchan /me` +
-`/alias amsg allchan /amsg *` +
-`/alias anick allserv /nick`
-
-Version 0.3.0 (2009-09-06)
--------------------------
-
-This version brings major changes, especially for configuration files and plugin
-API.
-
-For more information about this version, please read file 'UPGRADE_0.3'.
-
-Version 0.2.6.3 (2009-06-13)
----------------------------
-
-This version fixes gnutls detection.
-
-Version 0.2.6.2 (2009-04-18)
----------------------------
-
-This version fixes a bug with charset decoding (like 'iso2022jp').
-
-Version 0.2.6.1 (2009-03-14)
----------------------------
-
-This version fixes a major bug: crash with some special chars in IRC messages.
-
-Version 0.2.6 (2007-09-06)
--------------------------
-
-No release note.
-
-Version 0.2.5 (2007-06-07)
--------------------------
-
-No release note.
-
-Version 0.2.4 (2007-03-29)
--------------------------
-
-No release note.
-
-Version 0.2.3 (2007-01-10)
--------------------------
-
-This version fixes several major bugs of version 0.2.2.
-
-All users of version 0.2.2 should upgrade to this version.
-
-Version 0.2.2 (2007-01-06)
--------------------------
-
-Important release notes:
-
-* new charset plugin:
-** for users of any previous version, all your charset settings in weechat.rc
-   will be LOST! You should save your weechat.rc to keep your values and set
-   them again with new 'charset' plugin.
-** for ISO users: history of channels may be without accents (after `/upgrade`),
-   this is not recoverable, but this is not a bug. All new messages should be
-   ok.
-** be careful, now default encode is UTF-8 for all channels (before it was
-   terminal charset). If you still want to send messages as 'ISO-8859-1', you
-   should send either global encode or server specific encode to 'ISO-8859-1':
-*** for global encode: `/setp charset.global.encode = "ISO-8859-1"`
-*** for server encode (on server buffer): `/charset encode ISO-8859-1`
-* new keys for topic scroll:
-** new keys for scrolling topic: F9/F10
-** key F10 was used for `infobar_clear` in previous WeeChat versions,
-   you have to manually rebind this key (except for new WeeChat users):
-*** `/key <press alt-k then F10> scroll_topic_right` (which gives something
-    like: `/key meta2-21~ scroll_topic_right`).
-
-Version 0.2.1 (2006-10-01)
--------------------------
-
-No release note.
-
-Version 0.2.0 (2006-08-19)
--------------------------
-
-Important release notes:
-
-* if you upgraded with `/upgrade` in WeeChat, you should `/disconnect` and then
-  `/reconnect` on each server, to display properly channel/user modes.
-* if you're using plugins, you should remove some old plugins libraries in
-  WeeChat system library directory (commonly '/usr/local/lib/weechat/plugins'):
-  remove `lib*` files (like `libperl.*`, `libpython.*`, ..) and keep only new
-  libraries (`perl.*`, `python.*`, ..).
-
-Version 0.1.9 (2006-05-25)
--------------------------
-
-Important release notes:
-
-* please close all DCC chat buffers before using /upgrade command, otherwise you
-  may experience problems with DCC chats.
-* some changes in script API: now timer handlers functions takes exactly
-  0 (zero) argument (in version 0.1.8, two arguments were mandatory but not
-  used: server and args).
-
-Version 0.1.8 (2006-03-18)
--------------------------
-
-Important release notes:
-
-* it is recommended for users of version 0.1.7 (or any older), to
-  replace values in setup file ('~/.weechat/weechat.rc'):
-** option: log_path: replace '~/.weechat/logs' by '%h/logs'
-** option: plugins_path: replace '~/.weechat/plugins' by '%h/plugins' +
-   '%h' is replaced by WeeChat home (default: '~/.weechat', may be overriden
-   by new command line arg `--dir`).
-* after installing 0.1.8 (or with `/upgrade`), issue both commands (if you
-  didn't redefine these keys (alt-home/end):
-** `/key unbind meta-meta2-1~`
-** `/key unbind meta-meta2-4~`
-** then launch again WeeChat (or issue `/upgrade`).
-* Keys alt-home/end were used for nicklist scroll, they're now replaced by
-  alt-F11/F12.
-
-Version 0.1.7 (2006-01-14)
--------------------------
-
-Important release notes:
-
-* Ruby script plugin has been added but is experimental in this release.
-  You're warned!
-* `/away` command was changed to be RFC 2812 compliant. Now argument is required
-  to set away, and no argument means remove away ("back"). Option
-  'irc_default_msg_away' has been removed.
-
-Version 0.1.6 (2005-11-11)
--------------------------
-
-Important release notes:
-
-* incompatibility with some old scripts: now all handlers have to return a code
-  for completion, and to do some actions about message to ignore (please look at
-  documentation for detail).
-* on OpenBSD, the new option 'plugins_extension' should be set to '.so.0.0'
-  since the plugins names are ending by '.so.0.0' and not '.so'.
-* with new and full UTF-8 support, the option 'look_charset_internal' should be
-  set to blank for most cases. Forces it only if your locale is not properly
-  detected by WeeChat (you can set 'UTF-8' or 'ISO-8859-15' for example,
-  depending on your locale). WeeChat is looking for 'UTF-8' in your locale name
-  at startup.
-
-Version 0.1.5 (2005-09-24)
--------------------------
-
-No release note.
-
-Version 0.1.4 (2005-07-30)
--------------------------
-
-No release note.
-
-Version 0.1.3 (2005-07-02)
--------------------------
-
-No release note.
-
-Version 0.1.2 (2005-05-21)
--------------------------
-
-No release note.
-
-Version 0.1.1 (2005-03-20)
--------------------------
-
-No release note.
-
-Version 0.1.0 (2005-02-12)
--------------------------
-
-No release note.
-
-Version 0.0.9 (2005-01-01)
--------------------------
-
-No release note.
-
-Version 0.0.8 (2004-10-30)
--------------------------
-
-No release note.
-
-Version 0.0.7 (2004-08-08)
--------------------------
-
-No release note.
-
-Version 0.0.6 (2004-06-05)
--------------------------
-
-No release note.
-
-Version 0.0.5 (2004-02-07)
--------------------------
-
-No release note.
-
-Version 0.0.4 (2004-01-01)
--------------------------
-
-No release note.
-
-Version 0.0.3 (2003-11-03)
--------------------------
-
-No release note.
-
-Version 0.0.2 (2003-10-05)
--------------------------
-
-No release note.
-
-Version 0.0.1 (2003-09-27)
--------------------------
-
-No release note.
@@ -1,45 +0,0 @@
-WeeChat Readme
-==============
-
-
-WeeChat (Wee Enhanced Environment for Chat) is a fast and light chat
-environment for many operating systems. Everything can be done with a keyboard.
-It is customizable and extensible with scripts.
-
-
-Features
--------
-
-* chat client with multi-protocols/servers connection
-* many GUI (curses, Gtk, Qt) (1)
-* small, fast and very light
-* customizable and extensible with plugins (C, Perl, Python, Ruby, Lua, Tcl)
-* compliant with IRC RFCs 1459, 2810, 2811, 2812 and 2813
-* developed from scratch
-* multi-platform (GNU/Linux, *BSD, Mac OS X, QNX, Windows & other) (2)
-* free software, released under GPLv3
-
-NOTE: (1) only Curses interface is available today
-      +
-      (2) Windows version is under construction
-
-
-Copyright
---------
-
-Copyright (C) 2003-2010 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/>.
@@ -0,0 +1,92 @@
+= WeeChat
+:author: Sébastien Helleu
+:email: flashcode@flashtux.org
+:lang: en
+
+
+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 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"]
+
+== Install
+
+=== Dependencies
+
+Following packages are *required*:
+
+* CMake
+* libncurses
+* libcurl
+* zlib
+* libgcrypt
+
+Following packages are optional:
+
+* for i18n: gettext
+* for SSL: gnutls, ca-certificates
+* for spell checking: aspell
+* for scripting: python, perl, ruby, lua, tcl, guile, libv8 (javascript)
+* 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
+https://weechat.org/files/doc/devel/weechat_user.en.html#dependencies[user's guide].
+
+=== Compile
+
+WeeChat can be built with http://cmake.org/[CMake] (recommended) or autotools.
+
+[NOTE]
+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
+$ make
+$ make install     (as root for installation in system directories)
+----
+
+For more information or installation with autotools, please look at
+https://weechat.org/files/doc/devel/weechat_user.en.html#compile_with_autotools[user's guide].
+
+== Copyright
+
+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/>.
@@ -1,83 +0,0 @@
-WeeChat Upgrade to 0.3.x
-========================
-Sébastien Helleu <flashcode@flashtux.org>
-v0.3.0, 2009-09-06
-
-
-This document lists major changes introduced in version 0.3.0 and not compatible
-with versions 0.2.x.
-
-
-Upgrade to version 0.3.x
------------------------
-
-It is *NOT POSSIBLE* to use command `/upgrade` from a version 0.2.x to 0.3.x.
-You have to quit your old WeeChat, then run new version.
-
-Of course, command `/upgrade` is working fine once you'll be with 0.3.x to
-upgrade to another 0.3.x (unless this command is broken again, please look
-at release notes (file 'NEWS') for version you're currently installing).
-
-
-Configuration files
-------------------
-
-Changes with previous versions
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-New configuration files (`*.conf`) are not compatible with old files (`*.rc`).
-
-Name of options is similar to old versions, but there is now one configuration
-file by plugin, and one file for WeeChat core.
-
-There is *no automatic conversion* for your old options to new configuration files,
-so you'll have to setup again your IRC servers and all other options.
-
-In WeeChat, option names are now with format: `plugin.section.option` (for
-WeeChat core, `plugin` is `weechat`).
-
-Examples:
-
-* WeeChat options: `weechat.xxx.yyy`
-* IRC options: `irc.xxx.yyy`
-
-You should read quickstart guide to be familiar with basic commands and syntax
-(some commands like `/server` have changed): http://www.weechat.org/doc
-
-
-List of configuration files
-~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-* Old configuration files:
-** weechat.rc
-** plugins.rc
-* New configuration files are now (with default plugins):
-** weechat.conf
-** alias.conf
-** aspell.conf
-** charset.conf
-** irc.conf
-** jabber.conf
-** logger.conf
-** plugins.conf
-** relay.conf
-** xfer.conf
-
-
-Plugin API
----------
-
-Plugin API has been rewritten and is not compatible with previous versions.
-Accordingly, scripts and plugins must have been designed for version 0.3.x to
-be loaded into WeeChat.
-
-There is no migration script today to convert old script to new API.
-Therefore, if you plan to use old script, you'll have to wait for new version
-or you can convert script yourself and send us new version ;)
-
-You can download scripts for new API on plugins page:
-http://www.weechat.org/plugins
-
-More information about new API is available on wiki:
-http://wiki.flashtux.org/wiki/WeeChat_0.3.0
-and http://wiki.flashtux.org/wiki/WeeChat_0.3.0_API
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2003-2010 Sebastien 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>
 #
@@ -23,8 +23,9 @@
 ###
 ### common stuff
 ###
-OK="\\033[70G[\\033[1;32mOK\\033[1;00m]"
-FAIL="\\033[70G[\\033[1;31mFAILED\\033[1;00m]"
+
+DIR=$(cd $(dirname "$0"); pwd)
+cd $DIR

 AUTOGEN_LOG=autogen.log

@@ -40,44 +41,30 @@ err ()

 run ()
 {
-    echo -n "Running \"$@\""
+    echo -n "Running \"$@\"..."
    eval $@ >$AUTOGEN_LOG 2>&1
    if [ $? = 0 ] ; then
-        echo -e $OK
+        echo " OK"
    else
-        echo -e $FAIL
+        echo " FAILED"
        err
    fi
 }

-###
-### cleanning part
-###
-#  remove autotools stuff
-run "rm -rf config"
+# remove autotools stuff
 run "rm -f config.h.in"
 run "rm -f aclocal.m4 configure config.log config.status"
 run "rm -rf autom4te*.cache"
+
 # remove libtool stuff
 run "rm -f libtool"
+
 # remove gettext stuff
 run "rm -f ABOUT-NLS"
 run "rm -rf intl"

-###
-### configuration part
-###
-# create the config directory
-run "mkdir -p config/m4"
-run "mkdir intl"
-
-# execute autotools cmds
-run "autopoint -f"
-run "libtoolize --automake --force --copy"
-run "aclocal --force -I config/m4"
-run "autoheader"
-run "autoconf"
-run "automake --add-missing --copy --gnu"
+# execute autoreconf cmds
+run "autoreconf -fvi"

 # ending
 rm -f $AUTOGEN_LOG
@@ -0,0 +1,138 @@
+# CMAKE_PARSE_ARGUMENTS(<prefix> <options> <one_value_keywords> <multi_value_keywords> args...)
+#
+# CMAKE_PARSE_ARGUMENTS() is intended to be used in macros or functions for
+# parsing the arguments given to that macro or function.
+# It processes the arguments and defines a set of variables which hold the
+# values of the respective options.
+#
+# The <options> argument contains all options for the respective macro,
+# i.e. keywords which can be used when calling the macro without any value
+# following, like e.g. the OPTIONAL keyword of the install() command.
+#
+# The <one_value_keywords> argument contains all keywords for this macro
+# which are followed by one value, like e.g. DESTINATION keyword of the
+# install() command.
+#
+# The <multi_value_keywords> argument contains all keywords for this macro
+# which can be followed by more than one value, like e.g. the TARGETS or
+# FILES keywords of the install() command.
+#
+# When done, CMAKE_PARSE_ARGUMENTS() will have defined for each of the
+# keywords listed in <options>, <one_value_keywords> and
+# <multi_value_keywords> a variable composed of the given <prefix>
+# followed by "_" and the name of the respective keyword.
+# These variables will then hold the respective value from the argument list.
+# For the <options> keywords this will be TRUE or FALSE.
+#
+# All remaining arguments are collected in a variable
+# <prefix>_UNPARSED_ARGUMENTS, this can be checked afterwards to see whether
+# your macro was called with unrecognized parameters.
+#
+# As an example here a my_install() macro, which takes similar arguments as the
+# real install() command:
+#
+#   function(MY_INSTALL)
+#     set(options OPTIONAL FAST)
+#     set(oneValueArgs DESTINATION RENAME)
+#     set(multiValueArgs TARGETS CONFIGURATIONS)
+#     cmake_parse_arguments(MY_INSTALL "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN} )
+#     ...
+#
+# Assume my_install() has been called like this:
+#   my_install(TARGETS foo bar DESTINATION bin OPTIONAL blub)
+#
+# After the cmake_parse_arguments() call the macro will have set the following
+# variables:
+#   MY_INSTALL_OPTIONAL = TRUE
+#   MY_INSTALL_FAST = FALSE (this option was not used when calling my_install()
+#   MY_INSTALL_DESTINATION = "bin"
+#   MY_INSTALL_RENAME = "" (was not used)
+#   MY_INSTALL_TARGETS = "foo;bar"
+#   MY_INSTALL_CONFIGURATIONS = "" (was not used)
+#   MY_INSTALL_UNPARSED_ARGUMENTS = "blub" (no value expected after "OPTIONAL"
+#
+# You can the continue and process these variables.
+#
+# Keywords terminate lists of values, e.g. if directly after a one_value_keyword
+# another recognized keyword follows, this is interpreted as the beginning of
+# the new option.
+# E.g. my_install(TARGETS foo DESTINATION OPTIONAL) would result in
+# MY_INSTALL_DESTINATION set to "OPTIONAL", but MY_INSTALL_DESTINATION would
+# be empty and MY_INSTALL_OPTIONAL would be set to TRUE therefor.
+
+#=============================================================================
+# Copyright 2010 Alexander Neundorf <neundorf@kde.org>
+#
+# Distributed under the OSI-approved BSD License (the "License");
+# see accompanying file Copyright.txt for details.
+#
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the License for more information.
+#=============================================================================
+# (To distribute this file outside of CMake, substitute the full
+#  License text for the above reference.)
+
+
+if(__CMAKE_PARSE_ARGUMENTS_INCLUDED)
+  return()
+endif()
+set(__CMAKE_PARSE_ARGUMENTS_INCLUDED TRUE)
+
+
+function(CMAKE_PARSE_ARGUMENTS prefix _optionNames _singleArgNames _multiArgNames)
+  # first set all result variables to empty/FALSE
+  foreach(arg_name ${_singleArgNames} ${_multiArgNames})
+    set(${prefix}_${arg_name})
+  endforeach(arg_name)
+
+  foreach(option ${_optionNames})
+    set(${prefix}_${option} FALSE)
+  endforeach(option)
+
+  set(${prefix}_UNPARSED_ARGUMENTS)
+
+  set(insideValues FALSE)
+  set(currentArgName)
+
+  # now iterate over all arguments and fill the result variables
+  foreach(currentArg ${ARGN})
+    list(FIND _optionNames "${currentArg}" optionIndex)  # ... then this marks the end of the arguments belonging to this keyword
+    list(FIND _singleArgNames "${currentArg}" singleArgIndex)  # ... then this marks the end of the arguments belonging to this keyword
+    list(FIND _multiArgNames "${currentArg}" multiArgIndex)  # ... then this marks the end of the arguments belonging to this keyword
+
+    if(${optionIndex} EQUAL -1  AND  ${singleArgIndex} EQUAL -1  AND  ${multiArgIndex} EQUAL -1)
+      if(insideValues)
+        if("${insideValues}" STREQUAL "SINGLE")
+          set(${prefix}_${currentArgName} ${currentArg})
+          set(insideValues FALSE)
+        elseif("${insideValues}" STREQUAL "MULTI")
+          list(APPEND ${prefix}_${currentArgName} ${currentArg})
+        endif()
+      else(insideValues)
+        list(APPEND ${prefix}_UNPARSED_ARGUMENTS ${currentArg})
+      endif(insideValues)
+    else()
+      if(NOT ${optionIndex} EQUAL -1)
+        set(${prefix}_${currentArg} TRUE)
+        set(insideValues FALSE)
+      elseif(NOT ${singleArgIndex} EQUAL -1)
+        set(currentArgName ${currentArg})
+        set(${prefix}_${currentArgName})
+        set(insideValues "SINGLE")
+      elseif(NOT ${multiArgIndex} EQUAL -1)
+        set(currentArgName ${currentArg})
+        set(${prefix}_${currentArgName})
+        set(insideValues "MULTI")
+      endif()
+    endif()
+
+  endforeach(currentArg)
+
+  # propagate the result variables to the caller:
+  foreach(arg_name ${_singleArgNames} ${_multiArgNames} ${_optionNames})
+    set(${prefix}_${arg_name}  ${${prefix}_${arg_name}} PARENT_SCOPE)
+  endforeach(arg_name)
+  set(${prefix}_UNPARSED_ARGUMENTS ${${prefix}_UNPARSED_ARGUMENTS} PARENT_SCOPE)
+
+endfunction(CMAKE_PARSE_ARGUMENTS _options _singleArgs _multiArgs)
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2010 Sebastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2015 Sébastien Helleu <flashcode@flashtux.org>
 #
 # This file is part of WeeChat, the extensible chat client.
 #
@@ -20,27 +20,36 @@
 # - Find Asciidoc
 # This module finds if asciidoc (version 8 or newer) is installed.

-IF (ASCIIDOC_FOUND)
+if(ASCIIDOC_FOUND)
  # Already in cache, be silent
-  SET(ASCIIDOC_FIND_QUIETLY TRUE)
-ENDIF (ASCIIDOC_FOUND)
+  set(ASCIIDOC_FIND_QUIETLY TRUE)
+endif()

-FIND_PROGRAM(
+find_program(
  ASCIIDOC_EXECUTABLE asciidoc
  PATHS /bin /usr/bin /usr/local/bin /usr/pkg/bin
 )

-IF(ASCIIDOC_EXECUTABLE)
-  EXECUTE_PROCESS(
+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
    )
-  
-  IF(${ASCIIDOC_VERSION} MATCHES "asciidoc 8.*")
-    SET(ASCIIDOC_FOUND TRUE)
-  ENDIF(${ASCIIDOC_VERSION} MATCHES "asciidoc 8.*")
-  
-  MARK_AS_ADVANCED(
+
+  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(ASCIIDOC_EXECUTABLE)
+endif()
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2010 Sebastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2015 Sébastien Helleu <flashcode@flashtux.org>
 #
 # This file is part of WeeChat, the extensible chat client.
 #
@@ -26,26 +26,33 @@
 #  ASPELL_INCLUDE_PATH = path to where aspell.h can be found
 #  ASPELL_LIBRARY = path to where libaspell.so* can be found

-IF (ASPELL_FOUND)
+if(ASPELL_FOUND)
  # Already in cache, be silent
  SET(ASPELL_FIND_QUIETLY TRUE)
-ENDIF (ASPELL_FOUND)
+endif()

-FIND_PATH(ASPELL_INCLUDE_PATH
+find_path(ASPELL_INCLUDE_PATH
  NAMES aspell.h
  PATHS /usr/include /usr/local/include /usr/pkg/include
 )

-FIND_LIBRARY(ASPELL_LIBRARY
+find_library(ASPELL_LIBRARY
  NAMES aspell aspell-15
  PATHS /lib /usr/lib /usr/local/lib /usr/pkg/lib
 )

-IF (ASPELL_INCLUDE_PATH AND ASPELL_LIBRARY)
-   SET(ASPELL_FOUND TRUE)
-ENDIF (ASPELL_INCLUDE_PATH AND ASPELL_LIBRARY)
+if(ASPELL_INCLUDE_PATH AND ASPELL_LIBRARY)
+  set(ASPELL_FOUND TRUE)

-MARK_AS_ADVANCED(
+  # check if function aspell_version_string() exists
+  set(CMAKE_REQUIRED_INCLUDES ${ASPELL_INCLUDE_PATH})
+  set(CMAKE_REQUIRED_LIBRARIES ${ASPELL_LIBRARY})
+  check_symbol_exists(aspell_version_string "aspell.h" HAVE_ASPELL_VERSION_STRING)
+  set(CMAKE_REQUIRED_INCLUDES)
+  set(CMAKE_REQUIRED_LIBRARIES)
+endif()
+
+mark_as_advanced(
  ASPELL_INCLUDE_PATH
  ASPELL_LIBRARY
  )
@@ -1,6 +1,5 @@
 #
-# Copyright (C) 2005 Benoit Papillault <benoit.papillault@free.fr>
-# Copyright (C) 2005-2010 Sebastien 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,14 +17,21 @@
 # along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 #

-INCLUDES = -DLOCALEDIR=\"$(datadir)/locale\"
+# - 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:
+#
+# CPPUTEST_FOUND        = CppUTest is installed
+# CPPUTEST_INCLUDE_DIRS = CppUTest include directory
+# CPPUTEST_LIBRARIES    = Link options to compile with CppUTest

-bin_PROGRAMS = weechat-wxwidgets
+if(CPPUTEST_FOUND)
+   # Already in cache, be silent
+   set(CPPUTEST_FIND_QUIETLY TRUE)
+endif()

-weechat_wxwidgets_LDADD = ../lib_weechat_gui_common.a \
-                       ../../common/lib_weechat_main.a \
-                       ../../irc/lib_weechat_irc.a \
-                       ../../plugins/lib_weechat_plugins.a $(PLUGINS_LIBS)
-
-weechat_wxwidgets_SOURCES = gui-display.c \
-                            gui-input.c
+find_package(PkgConfig)
+if(PKG_CONFIG_FOUND)
+  pkg_search_module(CPPUTEST cpputest)
+endif()
@@ -0,0 +1,51 @@
+# - Try to find the Enchant spell checker
+# Once done this will define
+#
+#  ENCHANT_FOUND - system has ENCHANT
+#  ENCHANT_INCLUDE_DIR - the ENCHANT include directory
+#  ENCHANT_LIBRARIES - Link these to use ENCHANT
+#  ENCHANT_DEFINITIONS - Compiler switches required for using ENCHANT
+
+# Copyright (c) 2006, Zack Rusin, <zack@kde.org>
+#
+# Redistribution and use is allowed according to the terms of the BSD license.
+# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+
+
+if(ENCHANT_INCLUDE_DIR AND ENCHANT_LIBRARIES)
+
+  # in cache already
+  set(ENCHANT_FOUND TRUE)
+
+else()
+  if(NOT WIN32)
+    # use pkg-config to get the directories and then use these values
+    # in the FIND_PATH() and FIND_LIBRARY() calls
+    find_package(PkgConfig)
+    pkg_check_modules(PC_ENCHANT enchant)
+    set(ENCHANT_DEFINITIONS ${PC_ENCHANT_CFLAGS_OTHER})
+  endif()
+
+  find_path(ENCHANT_INCLUDE_DIR
+            NAMES enchant++.h
+            HINTS ${PC_ENCHANT_INCLUDEDIR}
+                  ${PC_ENCHANT_INCLUDE_DIRS}
+            PATH_SUFFIXES enchant )
+
+  find_library(ENCHANT_LIBRARIES NAMES enchant
+               HINTS ${PC_ENCHANT_LIBDIR}
+                      ${PC_ENCHANT_LIBRARY_DIRS} )
+
+  include(FindPackageHandleStandardArgs)
+  find_package_handle_standard_args(ENCHANT  DEFAULT_MSG  ENCHANT_INCLUDE_DIR ENCHANT_LIBRARIES )
+
+  mark_as_advanced(ENCHANT_INCLUDE_DIR ENCHANT_LIBRARIES)
+
+  # check if function enchant_get_version() exists
+  set(CMAKE_REQUIRED_INCLUDES ${ENCHANT_INCLUDE_DIR})
+  set(CMAKE_REQUIRED_LIBRARIES ${ENCHANT_LIBRARIES})
+  check_symbol_exists(enchant_get_version "enchant.h" HAVE_ENCHANT_GET_VERSION)
+  set(CMAKE_REQUIRED_INCLUDES)
+  set(CMAKE_REQUIRED_LIBRARIES)
+
+endif()
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2010 Sebastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2015 Sébastien Helleu <flashcode@flashtux.org>
 #
 # This file is part of WeeChat, the extensible chat client.
 #
@@ -27,24 +27,27 @@
 #  GCRYPT_LDFLAGS = ldflags to use to compile
 #

-FIND_PROGRAM(LIBGCRYPT_CONFIG_EXECUTABLE NAMES libgcrypt-config)
+find_program(LIBGCRYPT_CONFIG_EXECUTABLE NAMES libgcrypt-config)

 set(GCRYPT_LDFLAGS)
 set(GCRYPT_CFLAGS)

-IF(LIBGCRYPT_CONFIG_EXECUTABLE)
+if(LIBGCRYPT_CONFIG_EXECUTABLE)

-   EXEC_PROGRAM(${LIBGCRYPT_CONFIG_EXECUTABLE} ARGS --libs RETURN_VALUE _return_VALUE OUTPUT_VARIABLE GCRYPT_LDFLAGS)
-   EXEC_PROGRAM(${LIBGCRYPT_CONFIG_EXECUTABLE} ARGS --cflags RETURN_VALUE _return_VALUE OUTPUT_VARIABLE GCRYPT_CFLAGS)
-   
-   IF(${GCRYPT_CFLAGS} MATCHES "\n")
-      SET(GCRYPT_CFLAGS " ")
-   ENDIF(${GCRYPT_CFLAGS} MATCHES "\n")
-   
-   IF(GCRYPT_LDFLAGS AND GCRYPT_CFLAGS)
-      SET(GCRYPT_FOUND TRUE)
-   ENDIF(GCRYPT_LDFLAGS AND GCRYPT_CFLAGS)
+   exec_program(${LIBGCRYPT_CONFIG_EXECUTABLE} ARGS --libs RETURN_VALUE _return_VALUE OUTPUT_VARIABLE GCRYPT_LDFLAGS)
+   exec_program(${LIBGCRYPT_CONFIG_EXECUTABLE} ARGS --cflags RETURN_VALUE _return_VALUE OUTPUT_VARIABLE GCRYPT_CFLAGS)

-ENDIF(LIBGCRYPT_CONFIG_EXECUTABLE)
+   if(${GCRYPT_CFLAGS} MATCHES "\n")
+      set(GCRYPT_CFLAGS " ")
+   endif()

-MARK_AS_ADVANCED(GCRYPT_CFLAGS GCRYPT_LDFLAGS)
+endif()
+
+# handle the QUIETLY and REQUIRED arguments and set GCRYPT_FOUND to TRUE if
+# all listed variables are TRUE
+include(${CMAKE_HOME_DIRECTORY}/cmake/FindPackageHandleStandardArgs.cmake)
+find_package_handle_standard_args(GCRYPT REQUIRED_VARS GCRYPT_LDFLAGS GCRYPT_CFLAGS)
+
+if(GCRYPT_FOUND)
+  mark_as_advanced(GCRYPT_CFLAGS GCRYPT_LDFLAGS)
+endif()
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2010 Sebastien 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>
 #
@@ -27,46 +27,45 @@
 #
 #  GETTEXT_FOUND = is gettext usable on system?

-IF(GETTEXT_FOUND)
+if(GETTEXT_FOUND)
   # Already in cache, be silent
-   SET(GETTEXT_FIND_QUIETLY TRUE)
-ENDIF(GETTEXT_FOUND)
+   set(GETTEXT_FIND_QUIETLY TRUE)
+endif()

-INCLUDE(CheckIncludeFiles)
-INCLUDE(CheckLibraryExists)
-INCLUDE(CheckFunctionExists)
+include(CheckIncludeFiles)
+include(CheckLibraryExists)
+include(CheckFunctionExists)

-FIND_PATH(LIBINTL_INCLUDE
+find_path(LIBINTL_INCLUDE
  NAMES libintl.h
  PATH /usr/local/include /usr/pkg/include /usr/include
 )

-SET(CMAKE_REQUIRED_INCLUDES ${LIBINTL_INCLUDE})
+set(CMAKE_REQUIRED_INCLUDES ${LIBINTL_INCLUDE})

-CHECK_INCLUDE_FILES(libintl.h HAVE_LIBINTL_H)
+check_include_files(libintl.h HAVE_LIBINTL_H)

-IF(HAVE_LIBINTL_H)
-
-  CHECK_FUNCTION_EXISTS(dgettext LIBC_HAS_DGETTEXT)
-  IF(LIBC_HAS_DGETTEXT)
-    SET(GETTEXT_FOUND TRUE)
-  ELSE(LIBC_HAS_DGETTEXT)
-    FIND_LIBRARY(LIBINTL_LIBRARY NAMES intl
+if(HAVE_LIBINTL_H)
+  check_function_exists(dgettext LIBC_HAS_DGETTEXT)
+  if(LIBC_HAS_DGETTEXT)
+    set(GETTEXT_FOUND TRUE)
+  else()
+    find_library(LIBINTL_LIBRARY NAMES intl
      PATHS
      /usr/local/lib
      /usr/lib
      )
-    IF(LIBINTL_LIBRARY)
-      IF(${CMAKE_SYSTEM_NAME} STREQUAL "OpenBSD")
-        SET(CMAKE_REQUIRED_LIBRARIES "iconv")
-        CHECK_LIBRARY_EXISTS(${LIBINTL_LIBRARY} "libintl_dgettext" "" LIBINTL_HAS_DGETTEXT)
-      ELSE(${CMAKE_SYSTEM_NAME} STREQUAL "OpenBSD")
-        CHECK_LIBRARY_EXISTS(${LIBINTL_LIBRARY} "dgettext" "" LIBINTL_HAS_DGETTEXT)
-      ENDIF(${CMAKE_SYSTEM_NAME} STREQUAL "OpenBSD")
-      
-      IF(LIBINTL_HAS_DGETTEXT)
-        SET(GETTEXT_FOUND TRUE)
-      ENDIF(LIBINTL_HAS_DGETTEXT)
-    ENDIF(LIBINTL_LIBRARY)
-  ENDIF(LIBC_HAS_DGETTEXT)
-ENDIF(HAVE_LIBINTL_H)
+    if(LIBINTL_LIBRARY)
+      if(${CMAKE_SYSTEM_NAME} STREQUAL "OpenBSD")
+        set(CMAKE_REQUIRED_LIBRARIES "iconv")
+        check_library_exists(${LIBINTL_LIBRARY} "libintl_dgettext" "" LIBINTL_HAS_DGETTEXT)
+      else()
+        check_library_exists(${LIBINTL_LIBRARY} "dgettext" "" LIBINTL_HAS_DGETTEXT)
+      endif()
+
+      if(LIBINTL_HAS_DGETTEXT)
+        set(GETTEXT_FOUND TRUE)
+      endif()
+    endif()
+  endif()
+endif()
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2010 Sebastien 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.
@@ -29,45 +29,45 @@
 #  GNUTLS_CFLAGS = cflags to use to compile
 #  GNUTLS_LDFLAGS = ldflags to use to compile

-IF(GNUTLS_INCLUDE_PATH AND GNUTLS_LIBRARY)
+if(GNUTLS_INCLUDE_PATH AND GNUTLS_LIBRARY)
   # Already in cache, be silent
   set(GNUTLS_FIND_QUIETLY TRUE)
-ENDIF(GNUTLS_INCLUDE_PATH AND GNUTLS_LIBRARY)
+endif()

-FIND_PROGRAM(PKG_CONFIG_EXECUTABLE NAMES pkg-config)
+find_program(PKG_CONFIG_EXECUTABLE NAMES pkg-config)

-EXECUTE_PROCESS(COMMAND ${PKG_CONFIG_EXECUTABLE} --variable=prefix gnutls
+execute_process(COMMAND ${PKG_CONFIG_EXECUTABLE} --variable=prefix gnutls
   OUTPUT_VARIABLE GNUTLS_PREFIX
 )

-EXECUTE_PROCESS(COMMAND ${PKG_CONFIG_EXECUTABLE} --cflags gnutls
+execute_process(COMMAND ${PKG_CONFIG_EXECUTABLE} --cflags gnutls
   OUTPUT_VARIABLE GNUTLS_CFLAGS
 )
-STRING(REGEX REPLACE "[\r\n]" "" GNUTLS_CFLAGS "${GNUTLS_FLAGS}")
+string(REGEX REPLACE "[\r\n]" "" GNUTLS_CFLAGS "${GNUTLS_CFLAGS}")

-EXECUTE_PROCESS(COMMAND ${PKG_CONFIG_EXECUTABLE} --libs gnutls
+execute_process(COMMAND ${PKG_CONFIG_EXECUTABLE} --libs gnutls
   OUTPUT_VARIABLE GNUTLS_LDFLAGS
 )
-STRING(REGEX REPLACE "[\r\n]" "" GNUTLS_LDFLAGS "${GNUTLS_LDFLAGS}")
+string(REGEX REPLACE "[\r\n]" "" GNUTLS_LDFLAGS "${GNUTLS_LDFLAGS}")

-SET(GNUTLS_POSSIBLE_INCLUDE_PATH "${GNUTLS_PREFIX}/include")
-SET(GNUTLS_POSSIBLE_LIB_DIR "${GNUTLS_PREFIX}/lib")
+set(GNUTLS_POSSIBLE_INCLUDE_PATH "${GNUTLS_PREFIX}/include")
+set(GNUTLS_POSSIBLE_LIB_DIR "${GNUTLS_PREFIX}/lib")

-FIND_PATH(GNUTLS_INCLUDE_PATH
+find_path(GNUTLS_INCLUDE_PATH
  NAMES gnutls/gnutls.h
  PATHS GNUTLS_POSSIBLE_INCLUDE_PATH
 )

-FIND_LIBRARY(GNUTLS_LIBRARY
+find_library(GNUTLS_LIBRARY
  NAMES gnutls
  PATHS GNUTLS_POSSIBLE_LIB_DIR
 )

-IF (GNUTLS_INCLUDE_PATH AND GNUTLS_LIBRARY)
-  SET(GNUTLS_FOUND TRUE)
-ENDIF (GNUTLS_INCLUDE_PATH AND GNUTLS_LIBRARY)
+if(GNUTLS_INCLUDE_PATH AND GNUTLS_LIBRARY)
+  set(GNUTLS_FOUND TRUE)
+endif()

-MARK_AS_ADVANCED(
+mark_as_advanced(
  GNUTLS_INCLUDE_PATH
  GNUTLS_LIBRARY
  GNUTLS_CFLAGS
@@ -0,0 +1,45 @@
+#
+# Copyright (C) 2011-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 Guile
+# 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:
+#
+# GUILE_FOUND        = Guile is installed
+# GUILE_INCLUDE_DIRS = Guile include directory
+# GUILE_LIBRARIES    = Link options to compile Guile
+
+if(GUILE_FOUND)
+   # Already in cache, be silent
+   set(GUILE_FIND_QUIETLY TRUE)
+endif()
+
+find_package(PkgConfig)
+if(PKG_CONFIG_FOUND)
+  pkg_search_module(GUILE guile-2.0)
+  if(GUILE_FOUND)
+    # check if variable "scm_install_gmp_memory_functions" exists
+    set(CMAKE_REQUIRED_INCLUDES ${GUILE_INCLUDE_DIRS})
+    set(CMAKE_REQUIRED_LIBRARIES ${GUILE_LDFLAGS})
+    check_symbol_exists(scm_install_gmp_memory_functions "libguile.h" HAVE_GUILE_GMP_MEMORY_FUNCTIONS)
+    set(CMAKE_REQUIRED_INCLUDES)
+    set(CMAKE_REQUIRED_LIBRARIES)
+  endif()
+endif()
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2010 Sebastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2015 Sébastien Helleu <flashcode@flashtux.org>
 #
 # This file is part of WeeChat, the extensible chat client.
 #
@@ -28,44 +28,45 @@
 #
 #  ICONV_FOUND = is iconv usable on system?

-IF(ICONV_FOUND)
+if(ICONV_FOUND)
   # Already in cache, be silent
   set(ICONV_FIND_QUIETLY TRUE)
-ENDIF(ICONV_FOUND)
+endif()

-INCLUDE(CheckLibraryExists)
-INCLUDE(CheckFunctionExists)
+include(CheckLibraryExists)
+include(CheckFunctionExists)

-FIND_PATH(ICONV_INCLUDE_PATH
+find_path(ICONV_INCLUDE_PATH
  NAMES iconv.h
  PATHS /usr/include /usr/local/include /usr/pkg/include
 )

-FIND_LIBRARY(ICONV_LIBRARY
+find_library(ICONV_LIBRARY
  NAMES iconv
  PATHS /lib /usr/lib /usr/local/lib /usr/pkg/lib
 )

-IF(ICONV_INCLUDE_PATH)
-  IF(ICONV_LIBRARY)
-    STRING(REGEX REPLACE "/[^/]*$" "" ICONV_LIB_PATH "${ICONV_LIBRARY}")
-    CHECK_LIBRARY_EXISTS(iconv libiconv_open ${ICONV_LIB_PATH} ICONV_FOUND)
-    IF(NOT ICONV_FOUND)
-      CHECK_LIBRARY_EXISTS(iconv iconv_open ${ICONV_LIB_PATH} ICONV_FOUND)
-    ENDIF(NOT ICONV_FOUND)
-  ELSE(ICONV_LIBRARY)
-    CHECK_FUNCTION_EXISTS(iconv_open ICONV_FOUND)
-  ENDIF(ICONV_LIBRARY)
-ENDIF(ICONV_INCLUDE_PATH)
+if(ICONV_INCLUDE_PATH)
+  if(ICONV_LIBRARY)
+    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()
+  else()
+    check_function_exists(iconv_open ICONV_FOUND)
+  endif()
+endif()

 include(CheckCSourceCompiles)

-IF(ICONV_LIBRARY)
-  SET(CMAKE_REQUIRED_LIBRARIES ${ICONV_LIBRARY})
-  SET(CMAKE_REQUIRED_INCLUDES ${ICONV_INCLUDE_PATH})
-ENDIF(ICONV_LIBRARY)
+if(ICONV_LIBRARY)
+  set(CMAKE_REQUIRED_LIBRARIES ${ICONV_LIBRARY})
+  set(CMAKE_REQUIRED_INCLUDES ${ICONV_INCLUDE_PATH})
+endif()

-SET(CMAKE_REQUIRED_FLAGS -Werror)
+set(CMAKE_REQUIRED_FLAGS -Werror)
 check_c_source_compiles("
  #include <iconv.h>
  int main(){
@@ -78,7 +79,8 @@ check_c_source_compiles("
    return 0;
  }
 " ICONV_2ARG_IS_CONST)
-MARK_AS_ADVANCED(
+
+mark_as_advanced(
  ICONV_INCLUDE_PATH
  ICONV_LIBRARY
  ICONV_FOUND
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2010 Sebastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2015 Sébastien Helleu <flashcode@flashtux.org>
 #
 # This file is part of WeeChat, the extensible chat client.
 #
@@ -28,60 +28,12 @@
 #
 #  LUA_FOUND = is liblua usable on system?

-IF(LUA_FOUND)
+if(LUA_FOUND)
   # Already in cache, be silent
-   SET(LUA_FIND_QUIETLY TRUE)
-ENDIF(LUA_FOUND)
+   set(LUA_FIND_QUIETLY TRUE)
+endif()

-FIND_PATH(
-        LUA51_INCLUDE_PATH lua.h
-        PATHS /usr/include /usr/local/include /usr/pkg/include
-        PATH_SUFFIXES lua51 lua5.1 lua-5.1
-)
-
-FIND_LIBRARY(
-        LUA51_LIBRARY NAMES lua51 lua5.1 lua-5.1 lua
-        PATHS /lib /usr/lib /usr/local/lib /usr/pkg/lib
-        PATH_SUFFIXES lua51 lua5.1 lua-5.1
-)
-
-IF(LUA51_INCLUDE_PATH AND LUA51_LIBRARY)
-  SET(LUA_INCLUDE_PATH "${LUA51_INCLUDE_PATH}")
-  SET(LUA_LIBRARY "${LUA51_LIBRARY}")
-  SET(LUA_VERSION "5.1")
-  SET(LUA_FOUND TRUE)
-ELSE(LUA51_INCLUDE_PATH AND LUA51_LIBRARY)
-  FIND_PATH(
-        LUA50_INCLUDE_PATH lua.h
-        PATHS /usr/include /usr/local/include /usr/pkg/include
-        PATH_SUFFIXES lua50 lua5.0 lua-5.0 lua
-  )
-
-  FIND_LIBRARY(
-        LUA50_LIBRARY NAMES lua50 lua5.0 lua-5.0 lua
-        PATHS /lib /usr/lib /usr/local/lib /usr/pkg/lib
-        PATH_SUFFIXES lua50 lua5.0 lua-5.0 lua
-  )
-
-  FIND_LIBRARY(
-        LUALIB50_LIBRARY NAMES lualib50 lualib5.0 lualib-5.0 lualib
-        PATHS /lib /usr/lib /usr/local/lib /usr/pkg/lib
-        PATH_SUFFIXES lua50 lua5.0 lua-5.0 lua
-  )
-
-  IF(LUA50_INCLUDE_PATH AND LUA50_LIBRARY AND LUALIB50_LIBRARY)
-    SET(LUA_INCLUDE_PATH "${LUA50_INCLUDE_PATH}")
-    SET(LUA_LIBRARY "${LUA50_LIBRARY}")
-    SET(LUALIB_LIBRARY "${LUALIB50_LIBRARY}")
-    SET(LUA_VERSION "5.0")
-    SET(LUA_FOUND TRUE)
-  ENDIF(LUA50_INCLUDE_PATH AND LUA50_LIBRARY AND LUALIB50_LIBRARY)
-ENDIF(LUA51_INCLUDE_PATH AND LUA51_LIBRARY)
-
-
-MARK_AS_ADVANCED(
-  LUA_INCLUDE_PATH
-  LUA_LIBRARY
-  LUALIB_LIBRARY
-#  LUA_VERSION
-)
+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)
+endif()
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2010 Sebastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2015 Sébastien Helleu <flashcode@flashtux.org>
 #
 # This file is part of WeeChat, the extensible chat client.
 #
@@ -17,39 +17,41 @@
 # along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 #

-IF(NCURSES_FOUND)
-  SET(NCURSES_FIND_QUIETLY TRUE)
-ENDIF(NCURSES_FOUND)
+if(NCURSES_FOUND)
+  set(NCURSES_FIND_QUIETLY TRUE)
+endif()

-FIND_PATH(NCURSES_INCLUDE_PATH
+find_path(NCURSES_INCLUDE_PATH
  NAMES ncurses.h curses.h
-  PATHS /usr/include /usr/local/include /usr/pkg/include
+  PATHS /usr/include/ncursesw /usr/include/ncurses /usr/include
+  /usr/local/include/ncursesw /usr/local/include/ncurses /usr/local/include
+  /usr/pkg/include/ncursesw /usr/pkg/include/ncurses /usr/pkg/include
 )

-FIND_LIBRARY(NCURSESW_LIBRARY
+find_library(NCURSESW_LIBRARY
  NAMES ncursesw
  PATHS /lib /usr/lib /usr/local/lib /usr/pkg/lib
 )

-IF (NCURSESW_LIBRARY)
-  SET(NCURSES_LIBRARY ${NCURSESW_LIBRARY})
-ELSE(NCURSESW_LIBRARY)
-  FIND_LIBRARY(NCURSES_LIBRARY
+if(NCURSESW_LIBRARY)
+  set(NCURSES_LIBRARY ${NCURSESW_LIBRARY})
+else()
+  find_library(NCURSES_LIBRARY
    NAMES ncurses
    PATHS /lib /usr/lib /usr/local/lib /usr/pkg/lib
  )
-  IF (NCURSES_LIBRARY)
-    MESSAGE("*** WARNING:\n"
+  if(NCURSES_LIBRARY)
+    message("*** WARNING:\n"
      "*** ncursesw library not found! Falling back to \"ncurses\"\n"
      "*** Be careful, UTF-8 display may not work properly if your locale is UTF-8.")
-  ENDIF(NCURSES_LIBRARY)
-ENDIF(NCURSESW_LIBRARY)
+  endif()
+endif()

-IF (NCURSES_INCLUDE_PATH AND NCURSES_LIBRARY)
-  SET(NCURSES_FOUND TRUE)
-ENDIF(NCURSES_INCLUDE_PATH AND NCURSES_LIBRARY)
+if(NCURSES_INCLUDE_PATH AND NCURSES_LIBRARY)
+  set(NCURSES_FOUND TRUE)
+endif()

-MARK_AS_ADVANCED(
+mark_as_advanced(
  NCURSES_INCLUDE_PATH
  NCURSES_LIBRARY
 )
@@ -0,0 +1,260 @@
+# FIND_PACKAGE_HANDLE_STANDARD_ARGS(<name> ... )
+#
+# This function is intended to be used in FindXXX.cmake modules files.
+# It handles the REQUIRED, QUIET and version-related arguments to FIND_PACKAGE().
+# It also sets the <UPPERCASED_NAME>_FOUND variable.
+# The package is considered found if all variables <var1>... listed contain
+# valid results, e.g. valid filepaths.
+#
+# There are two modes of this function. The first argument in both modes is
+# the name of the Find-module where it is called (in original casing).
+#
+# The first simple mode looks like this:
+#    FIND_PACKAGE_HANDLE_STANDARD_ARGS(<name> (DEFAULT_MSG|"Custom failure message") <var1>...<varN> )
+# If the variables <var1> to <varN> are all valid, then <UPPERCASED_NAME>_FOUND
+# will be set to TRUE.
+# If DEFAULT_MSG is given as second argument, then the function will generate
+# itself useful success and error messages. You can also supply a custom error message
+# for the failure case. This is not recommended.
+#
+# The second mode is more powerful and also supports version checking:
+#    FIND_PACKAGE_HANDLE_STANDARD_ARGS(NAME [REQUIRED_VARS <var1>...<varN>]
+#                                           [VERSION_VAR   <versionvar>
+#                                           [CONFIG_MODE]
+#                                           [FAIL_MESSAGE "Custom failure message"] )
+#
+# As above, if <var1> through <varN> are all valid, <UPPERCASED_NAME>_FOUND
+# will be set to TRUE.
+# After REQUIRED_VARS the variables which are required for this package are listed.
+# Following VERSION_VAR the name of the variable can be specified which holds
+# the version of the package which has been found. If this is done, this version
+# will be checked against the (potentially) specified required version used
+# in the find_package() call. The EXACT keyword is also handled. The default
+# messages include information about the required version and the version
+# which has been actually found, both if the version is ok or not.
+# Use the option CONFIG_MODE if your FindXXX.cmake module is a wrapper for
+# a find_package(... NO_MODULE) call, in this case all the information
+# provided by the config-mode of find_package() will be evaluated
+# automatically.
+# Via FAIL_MESSAGE a custom failure message can be specified, if this is not
+# used, the default message will be displayed.
+#
+# Example for mode 1:
+#
+#    FIND_PACKAGE_HANDLE_STANDARD_ARGS(LibXml2  DEFAULT_MSG  LIBXML2_LIBRARY LIBXML2_INCLUDE_DIR)
+#
+# LibXml2 is considered to be found, if both LIBXML2_LIBRARY and
+# LIBXML2_INCLUDE_DIR are valid. Then also LIBXML2_FOUND is set to TRUE.
+# If it is not found and REQUIRED was used, it fails with FATAL_ERROR,
+# independent whether QUIET was used or not.
+# If it is found, success will be reported, including the content of <var1>.
+# On repeated Cmake runs, the same message won't be printed again.
+#
+# Example for mode 2:
+#
+#    FIND_PACKAGE_HANDLE_STANDARD_ARGS(BISON  REQUIRED_VARS BISON_EXECUTABLE
+#                                             VERSION_VAR BISON_VERSION)
+# In this case, BISON is considered to be found if the variable(s) listed
+# after REQUIRED_VAR are all valid, i.e. BISON_EXECUTABLE in this case.
+# Also the version of BISON will be checked by using the version contained
+# in BISON_VERSION.
+# Since no FAIL_MESSAGE is given, the default messages will be printed.
+#
+# Another example for mode 2:
+#
+#    FIND_PACKAGE(Automoc4 QUIET NO_MODULE HINTS /opt/automoc4)
+#    FIND_PACKAGE_HANDLE_STANDARD_ARGS(Automoc4  CONFIG_MODE)
+# In this case, FindAutmoc4.cmake wraps a call to FIND_PACKAGE(Automoc4 NO_MODULE)
+# and adds an additional search directory for automoc4.
+# The following FIND_PACKAGE_HANDLE_STANDARD_ARGS() call produces a proper
+# success/error message.
+
+#=============================================================================
+# Copyright 2007-2009 Kitware, Inc.
+#
+# Distributed under the OSI-approved BSD License (the "License");
+# see accompanying file Copyright.txt for details.
+#
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the License for more information.
+#=============================================================================
+# (To distribute this file outside of CMake, substitute the full
+#  License text for the above reference.)
+
+INCLUDE(FindPackageMessage)
+INCLUDE(CMakeParseArguments)
+
+# internal helper macro
+MACRO(_FPHSA_FAILURE_MESSAGE _msg)
+  IF (${_NAME}_FIND_REQUIRED)
+    MESSAGE(FATAL_ERROR "${_msg}")
+  ELSE (${_NAME}_FIND_REQUIRED)
+    IF (NOT ${_NAME}_FIND_QUIETLY)
+      MESSAGE(STATUS "${_msg}")
+    ENDIF (NOT ${_NAME}_FIND_QUIETLY)
+  ENDIF (${_NAME}_FIND_REQUIRED)
+ENDMACRO(_FPHSA_FAILURE_MESSAGE _msg)
+
+
+# internal helper macro to generate the failure message when used in CONFIG_MODE:
+MACRO(_FPHSA_HANDLE_FAILURE_CONFIG_MODE)
+  # <name>_CONFIG is set, but FOUND is false, this means that some other of the REQUIRED_VARS was not found:
+  IF(${_NAME}_CONFIG)
+    _FPHSA_FAILURE_MESSAGE("${FPHSA_FAIL_MESSAGE}: missing: ${MISSING_VARS} (found ${${_NAME}_CONFIG} ${VERSION_MSG})")
+  ELSE(${_NAME}_CONFIG)
+    # If _CONSIDERED_CONFIGS is set, the config-file has been found, but no suitable version.
+    # List them all in the error message:
+    IF(${_NAME}_CONSIDERED_CONFIGS)
+      SET(configsText "")
+      LIST(LENGTH ${_NAME}_CONSIDERED_CONFIGS configsCount)
+      MATH(EXPR configsCount "${configsCount} - 1")
+      FOREACH(currentConfigIndex RANGE ${configsCount})
+        LIST(GET ${_NAME}_CONSIDERED_CONFIGS ${currentConfigIndex} filename)
+        LIST(GET ${_NAME}_CONSIDERED_VERSIONS ${currentConfigIndex} version)
+        SET(configsText "${configsText}    ${filename} (version ${version})\n")
+      ENDFOREACH(currentConfigIndex)
+      _FPHSA_FAILURE_MESSAGE("${FPHSA_FAIL_MESSAGE} ${VERSION_MSG}, checked the following files:\n${configsText}")
+
+    ELSE(${_NAME}_CONSIDERED_CONFIGS)
+      # Simple case: No Config-file was found at all:
+      _FPHSA_FAILURE_MESSAGE("${FPHSA_FAIL_MESSAGE}: found neither ${_NAME}Config.cmake nor ${_NAME_LOWER}-config.cmake ${VERSION_MSG}")
+    ENDIF(${_NAME}_CONSIDERED_CONFIGS)
+  ENDIF(${_NAME}_CONFIG)
+ENDMACRO(_FPHSA_HANDLE_FAILURE_CONFIG_MODE)
+
+
+FUNCTION(FIND_PACKAGE_HANDLE_STANDARD_ARGS _NAME _FIRST_ARG)
+
+# set up the arguments for CMAKE_PARSE_ARGUMENTS and check whether we are in
+# new extended or in the "old" mode:
+  SET(options CONFIG_MODE)
+  SET(oneValueArgs FAIL_MESSAGE VERSION_VAR)
+  SET(multiValueArgs REQUIRED_VARS)
+  SET(_KEYWORDS_FOR_EXTENDED_MODE  ${options} ${oneValueArgs} ${multiValueArgs} )
+  LIST(FIND _KEYWORDS_FOR_EXTENDED_MODE "${_FIRST_ARG}" INDEX)
+
+  IF(${INDEX} EQUAL -1)
+    SET(FPHSA_FAIL_MESSAGE ${_FIRST_ARG})
+    SET(FPHSA_REQUIRED_VARS ${ARGN})
+    SET(FPHSA_VERSION_VAR)
+  ELSE(${INDEX} EQUAL -1)
+
+    CMAKE_PARSE_ARGUMENTS(FPHSA "${options}" "${oneValueArgs}" "${multiValueArgs}"  ${_FIRST_ARG} ${ARGN})
+
+    IF(FPHSA_UNPARSED_ARGUMENTS)
+      MESSAGE(FATAL_ERROR "Unknown keywords given to FIND_PACKAGE_HANDLE_STANDARD_ARGS(): \"${FPHSA_UNPARSED_ARGUMENTS}\"")
+    ENDIF(FPHSA_UNPARSED_ARGUMENTS)
+
+    IF(NOT FPHSA_FAIL_MESSAGE)
+      SET(FPHSA_FAIL_MESSAGE  "DEFAULT_MSG")
+    ENDIF(NOT FPHSA_FAIL_MESSAGE)
+  ENDIF(${INDEX} EQUAL -1)
+
+# now that we collected all arguments, process them
+
+  IF("${FPHSA_FAIL_MESSAGE}" STREQUAL "DEFAULT_MSG")
+    SET(FPHSA_FAIL_MESSAGE "Could NOT find ${_NAME}")
+  ENDIF("${FPHSA_FAIL_MESSAGE}" STREQUAL "DEFAULT_MSG")
+
+  # In config-mode, we rely on the variable <package>_CONFIG, which is set by find_package()
+  # when it successfully found the config-file, including version checking:
+  IF(FPHSA_CONFIG_MODE)
+    LIST(INSERT FPHSA_REQUIRED_VARS 0 ${_NAME}_CONFIG)
+    LIST(REMOVE_DUPLICATES FPHSA_REQUIRED_VARS)
+    SET(FPHSA_VERSION_VAR ${_NAME}_VERSION)
+  ENDIF(FPHSA_CONFIG_MODE)
+
+  IF(NOT FPHSA_REQUIRED_VARS)
+    MESSAGE(FATAL_ERROR "No REQUIRED_VARS specified for FIND_PACKAGE_HANDLE_STANDARD_ARGS()")
+  ENDIF(NOT FPHSA_REQUIRED_VARS)
+
+  LIST(GET FPHSA_REQUIRED_VARS 0 _FIRST_REQUIRED_VAR)
+
+  STRING(TOUPPER ${_NAME} _NAME_UPPER)
+  STRING(TOLOWER ${_NAME} _NAME_LOWER)
+
+  # collect all variables which were not found, so they can be printed, so the
+  # user knows better what went wrong (#6375)
+  SET(MISSING_VARS "")
+  SET(DETAILS "")
+  SET(${_NAME_UPPER}_FOUND TRUE)
+  # check if all passed variables are valid
+  FOREACH(_CURRENT_VAR ${FPHSA_REQUIRED_VARS})
+    IF(NOT ${_CURRENT_VAR})
+      SET(${_NAME_UPPER}_FOUND FALSE)
+      SET(MISSING_VARS "${MISSING_VARS} ${_CURRENT_VAR}")
+    ELSE(NOT ${_CURRENT_VAR})
+      SET(DETAILS "${DETAILS}[${${_CURRENT_VAR}}]")
+    ENDIF(NOT ${_CURRENT_VAR})
+  ENDFOREACH(_CURRENT_VAR)
+
+
+  # version handling:
+  SET(VERSION_MSG "")
+  SET(VERSION_OK TRUE)
+  SET(VERSION ${${FPHSA_VERSION_VAR}} )
+  IF (${_NAME}_FIND_VERSION)
+
+    IF(VERSION)
+
+      IF(${_NAME}_FIND_VERSION_EXACT)       # exact version required
+        IF (NOT "${${_NAME}_FIND_VERSION}" VERSION_EQUAL "${VERSION}")
+          SET(VERSION_MSG "Found unsuitable version \"${VERSION}\", but required is exact version \"${${_NAME}_FIND_VERSION}\"")
+          SET(VERSION_OK FALSE)
+        ELSE (NOT "${${_NAME}_FIND_VERSION}" VERSION_EQUAL "${VERSION}")
+          SET(VERSION_MSG "(found suitable exact version \"${VERSION}\")")
+        ENDIF (NOT "${${_NAME}_FIND_VERSION}" VERSION_EQUAL "${VERSION}")
+
+      ELSE(${_NAME}_FIND_VERSION_EXACT)     # minimum version specified:
+        IF ("${${_NAME}_FIND_VERSION}" VERSION_GREATER "${VERSION}")
+          SET(VERSION_MSG "Found unsuitable version \"${VERSION}\", but required is at least \"${${_NAME}_FIND_VERSION}\"")
+          SET(VERSION_OK FALSE)
+        ELSE ("${${_NAME}_FIND_VERSION}" VERSION_GREATER "${VERSION}")
+          SET(VERSION_MSG "(found suitable version \"${VERSION}\", required is \"${${_NAME}_FIND_VERSION}\")")
+        ENDIF ("${${_NAME}_FIND_VERSION}" VERSION_GREATER "${VERSION}")
+      ENDIF(${_NAME}_FIND_VERSION_EXACT)
+
+    ELSE(VERSION)
+
+      # if the package was not found, but a version was given, add that to the output:
+      IF(${_NAME}_FIND_VERSION_EXACT)
+         SET(VERSION_MSG "(Required is exact version \"${${_NAME}_FIND_VERSION}\")")
+      ELSE(${_NAME}_FIND_VERSION_EXACT)
+         SET(VERSION_MSG "(Required is at least version \"${${_NAME}_FIND_VERSION}\")")
+      ENDIF(${_NAME}_FIND_VERSION_EXACT)
+
+    ENDIF(VERSION)
+  ELSE (${_NAME}_FIND_VERSION)
+    IF(VERSION)
+      SET(VERSION_MSG "(found version \"${VERSION}\")")
+    ENDIF(VERSION)
+  ENDIF (${_NAME}_FIND_VERSION)
+
+  IF(VERSION_OK)
+    SET(DETAILS "${DETAILS}[v${VERSION}(${${_NAME}_FIND_VERSION})]")
+  ELSE(VERSION_OK)
+    SET(${_NAME_UPPER}_FOUND FALSE)
+  ENDIF(VERSION_OK)
+
+
+  # print the result:
+  IF (${_NAME_UPPER}_FOUND)
+    FIND_PACKAGE_MESSAGE(${_NAME} "Found ${_NAME}: ${${_FIRST_REQUIRED_VAR}} ${VERSION_MSG}" "${DETAILS}")
+  ELSE (${_NAME_UPPER}_FOUND)
+
+    IF(FPHSA_CONFIG_MODE)
+      _FPHSA_HANDLE_FAILURE_CONFIG_MODE()
+    ELSE(FPHSA_CONFIG_MODE)
+      IF(NOT VERSION_OK)
+        _FPHSA_FAILURE_MESSAGE("${FPHSA_FAIL_MESSAGE}: ${VERSION_MSG} (found ${${_FIRST_REQUIRED_VAR}})")
+      ELSE(NOT VERSION_OK)
+        _FPHSA_FAILURE_MESSAGE("${FPHSA_FAIL_MESSAGE} (missing: ${MISSING_VARS}) ${VERSION_MSG}")
+      ENDIF(NOT VERSION_OK)
+    ENDIF(FPHSA_CONFIG_MODE)
+
+  ENDIF (${_NAME_UPPER}_FOUND)
+
+  SET(${_NAME_UPPER}_FOUND ${${_NAME_UPPER}_FOUND} PARENT_SCOPE)
+
+ENDFUNCTION(FIND_PACKAGE_HANDLE_STANDARD_ARGS _FIRST_ARG)
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2010 Sebastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2015 Sébastien Helleu <flashcode@flashtux.org>
 #
 # This file is part of WeeChat, the extensible chat client.
 #
@@ -28,58 +28,57 @@
 #  PERL_CFLAGS = perl compiler options for compiling
 #  PERL_LFLAGS = perl compiler options for linking

-IF(PERL_FOUND)
+if(PERL_FOUND)
   # Already in cache, be silent
-   SET(PERL_FIND_QUIETLY TRUE)
-ENDIF(PERL_FOUND)
+   set(PERL_FIND_QUIETLY TRUE)
+endif()

-FIND_PROGRAM(PERL_EXECUTABLE
+find_program(PERL_EXECUTABLE
  NAMES perl perl5
  PATHS /usr/bin /usr/local/bin /usr/pkg/bin
  )

-IF(PERL_EXECUTABLE)
+if(PERL_EXECUTABLE)

-  EXECUTE_PROCESS(
+  execute_process(
    COMMAND ${PERL_EXECUTABLE} -MConfig -e "print \"\$Config{archlibexp}/CORE\""
    OUTPUT_VARIABLE PERL_INTERNAL_DIR
    )

-  EXECUTE_PROCESS(
+  execute_process(
    COMMAND ${PERL_EXECUTABLE} -MExtUtils::Embed -e ccopts
    OUTPUT_VARIABLE PERL_CFLAGS
    )

-  EXECUTE_PROCESS(
+  execute_process(
    COMMAND ${PERL_EXECUTABLE} -MExtUtils::Embed -e ldopts
    OUTPUT_VARIABLE PERL_LFLAGS
    )
-  
+
  # remove the new lines from the output by replacing them with empty strings
-  STRING(REPLACE "\n" "" PERL_INTERNAL_DIR "${PERL_INTERNAL_DIR}")
-  STRING(REPLACE "\n" "" PERL_CFLAGS "${PERL_CFLAGS}")
-  STRING(REPLACE "\n" "" PERL_LFLAGS "${PERL_LFLAGS}")
-  
-  FIND_PATH(PERL_INCLUDE_PATH
+  string(REPLACE "\n" "" PERL_INTERNAL_DIR "${PERL_INTERNAL_DIR}")
+  string(REPLACE "\n" "" PERL_CFLAGS "${PERL_CFLAGS}")
+  string(REPLACE "\n" "" PERL_LFLAGS "${PERL_LFLAGS}")
+
+  find_path(PERL_INCLUDE_PATH
    NAMES perl.h
    PATHS ${PERL_INTERNAL_DIR}
    )

-  FIND_LIBRARY(PERL_LIBRARY
+  find_library(PERL_LIBRARY
    NAMES perl
    PATHS /usr/lib /usr/local/lib /usr/pkg/lib ${PERL_INTERNAL_DIR}
    )
-  
-  IF(PERL_LIBRARY AND PERL_INCLUDE_PATH)
-    SET(PERL_FOUND TRUE)
-  ENDIF(PERL_LIBRARY AND PERL_INCLUDE_PATH)
-  
-  MARK_AS_ADVANCED(
+
+  if(PERL_LIBRARY AND PERL_INCLUDE_PATH)
+    set(PERL_FOUND TRUE)
+  endif()
+
+  mark_as_advanced(
    PERL_EXECUTABLE
    PERL_INCLUDE_PATH
    PERL_LIBRARY
    PERL_CFLAGS
    PERL_LFLAGS
    )
-ENDIF(PERL_EXECUTABLE)
-
+endif()
@@ -151,7 +151,7 @@ endmacro(_pkgconfig_invoke_dyn)
 # Splits given arguments into options and a package list
 macro(_pkgconfig_parse_options _result _is_req)
  set(${_is_req} 0)
-  
+
  foreach(_pkg ${ARGN})
    if (_pkg STREQUAL "REQUIRED")
      set(${_is_req} 1)
@@ -198,7 +198,7 @@ macro(_pkg_check_modules_internal _is_required _is_silent _prefix)
        message(STATUS "checking for modules '${_pkg_check_modules_list}'")
      endif(_pkg_check_modules_cnt EQUAL 1)
    endif(NOT ${_is_silent})
-    
+
    set(_pkg_check_modules_packages)
    set(_pkg_check_modules_failed)

@@ -225,7 +225,7 @@ macro(_pkg_check_modules_internal _is_required _is_silent _prefix)
      if (_pkg_check_modules_pkg_op STREQUAL "=")
        list(APPEND _pkg_check_modules_exist_query --exact-version)
      endif(_pkg_check_modules_pkg_op STREQUAL "=")
-      
+
      if (_pkg_check_modules_pkg_op STREQUAL "<=")
        list(APPEND _pkg_check_modules_exist_query --max-version)
      endif(_pkg_check_modules_pkg_op STREQUAL "<=")
@@ -272,7 +272,7 @@ macro(_pkg_check_modules_internal _is_required _is_silent _prefix)
    else(_pkg_check_modules_failed)
      # when we are here, we checked whether requested modules
      # exist. Now, go through them and set variables
-      
+
      _pkgconfig_set(${_prefix}_FOUND 1)
      list(LENGTH _pkg_check_modules_packages pkg_count)

@@ -284,7 +284,7 @@ macro(_pkg_check_modules_internal _is_required _is_silent _prefix)
        else(pkg_count EQUAL 1)
          set(_pkg_check_prefix "${_prefix}_${_pkg_check_modules_pkg}")
        endif(pkg_count EQUAL 1)
-        
+
        _pkgconfig_invoke(${_pkg_check_modules_pkg} "${_pkg_check_prefix}" VERSION    ""   --modversion )
        _pkgconfig_invoke(${_pkg_check_modules_pkg} "${_pkg_check_prefix}" PREFIX     ""   --variable=prefix )
        _pkgconfig_invoke(${_pkg_check_modules_pkg} "${_pkg_check_prefix}" INCLUDEDIR ""   --variable=includedir )
@@ -350,7 +350,7 @@ macro(pkg_search_module _prefix _module0)
        message(SEND_ERROR "None of the required '${_pkg_modules_alt}' found")
      endif(${_pkg_is_required})
    endif(NOT ${_prefix}_FOUND)
-    
+
    _pkgconfig_set(__pkg_config_checked_${_prefix} ${PKG_CONFIG_VERSION})
  endif(NOT DEFINED __pkg_config_checked_${_prefix} OR __pkg_config_checked_${_prefix} LESS ${PKG_CONFIG_VERSION} OR NOT ${_prefix}_FOUND)
 endmacro(pkg_search_module)
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2010 Sebastien 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.
@@ -28,56 +28,76 @@
 #  PYTHON_LIBRARY = path to where libpython.so* can be found
 #  PYTHON_LFLAGS = python compiler options for linking

-IF(PYTHON_FOUND)
+if(PYTHON_FOUND)
   # Already in cache, be silent
-   SET(PYTHON_FIND_QUIETLY TRUE)
-ENDIF(PYTHON_FOUND)
+   set(PYTHON_FIND_QUIETLY TRUE)
+endif()

-FIND_PROGRAM(PYTHON_EXECUTABLE
-  NAMES python python2.6 python2.5 python2.4 python2.3 python2.2
-  PATHS /usr/bin /usr/local/bin /usr/pkg/bin
-  )
+if(ENABLE_PYTHON3)
+  find_program(PYTHON_EXECUTABLE
+    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()
+  find_program(PYTHON_EXECUTABLE
+    NAMES python2.7 python2.6 python2.5 python
+    PATHS /usr/bin /usr/local/bin /usr/pkg/bin
+    )
+endif()

-IF(PYTHON_EXECUTABLE)
-  EXECUTE_PROCESS(
-    COMMAND ${PYTHON_EXECUTABLE} -c "from distutils.sysconfig import *; print get_config_var('CONFINCLUDEPY')"
+if(PYTHON_EXECUTABLE)
+  execute_process(
+    COMMAND ${PYTHON_EXECUTABLE} -c "import sys; from distutils.sysconfig import *; sys.stdout.write(get_config_var('INCLUDEPY'))"
    OUTPUT_VARIABLE PYTHON_INC_DIR
    )
-  
-  EXECUTE_PROCESS(
-    COMMAND ${PYTHON_EXECUTABLE} -c "from distutils.sysconfig import *; print get_config_var('LIBPL')"
+
+  execute_process(
+    COMMAND ${PYTHON_EXECUTABLE} -c "import sys; from distutils.sysconfig import *; sys.stdout.write(get_config_var('LIBPL'))"
    OUTPUT_VARIABLE PYTHON_POSSIBLE_LIB_PATH
    )
-  
-  EXECUTE_PROCESS(
-    COMMAND ${PYTHON_EXECUTABLE} -c "from distutils.sysconfig import *; print get_config_var('LINKFORSHARED')"
+
+  execute_process(
+    COMMAND ${PYTHON_EXECUTABLE} -c "import sys; from distutils.sysconfig import *; sys.stdout.write(get_config_var('LINKFORSHARED'))"
    OUTPUT_VARIABLE PYTHON_LFLAGS
    )
-  
-  # remove the new lines from the output by replacing them with empty strings
-  STRING(REPLACE "\n" "" PYTHON_INC_DIR "${PYTHON_INC_DIR}")
-  STRING(REPLACE "\n" "" PYTHON_POSSIBLE_LIB_PATH "${PYTHON_POSSIBLE_LIB_PATH}")
-  STRING(REPLACE "\n" "" PYTHON_LFLAGS "${PYTHON_LFLAGS}")
-  
-  FIND_PATH(PYTHON_INCLUDE_PATH
-    NAMES Python.h
-    PATHS ${PYTHON_INC_DIR}
-    )
-  
-  FIND_LIBRARY(PYTHON_LIBRARY
-    NAMES python python2.6 python2.5 python2.4 python2.3 python2.2
-    PATHS ${PYTHON_POSSIBLE_LIB_PATH}
-    )

-  IF(PYTHON_LIBRARY AND PYTHON_INCLUDE_PATH)
-    SET(PYTHON_FOUND TRUE)
-  ENDIF(PYTHON_LIBRARY AND PYTHON_INCLUDE_PATH)
-  
-  MARK_AS_ADVANCED(
+  find_path(PYTHON_INCLUDE_PATH
+    NAMES Python.h
+    HINTS ${PYTHON_INC_DIR}
+    )
+  if(ENABLE_PYTHON3)
+    find_library(PYTHON_LIBRARY
+      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()
+    find_library(PYTHON_LIBRARY
+      NAMES python2.7 python2.6 python2.5 python
+      HINTS ${PYTHON_POSSIBLE_LIB_PATH}
+      )
+  endif()
+
+  if(PYTHON_LIBRARY AND PYTHON_INCLUDE_PATH)
+    execute_process(
+      COMMAND ${PYTHON_EXECUTABLE} -c "import sys; sys.stdout.write(sys.version[:3])"
+      OUTPUT_VARIABLE PYTHON_VERSION
+      )
+    execute_process(
+      COMMAND ${PYTHON_EXECUTABLE} -c "import sys; sys.stdout.write(str(sys.version_info < (2,5)))"
+      OUTPUT_VARIABLE PYTHON_OLD_VERSION
+      )
+    if(${PYTHON_OLD_VERSION} STREQUAL "True")
+      message("Python >= 2.5 is needed to build python plugin, version found: ${PYTHON_VERSION}")
+    else()
+      set(PYTHON_FOUND TRUE)
+    endif()
+  endif()
+
+  mark_as_advanced(
    PYTHON_EXECUTABLE
    PYTHON_INCLUDE_PATH
    PYTHON_LIBRARY
    PYTHON_LFLAGS
    )
-  
-ENDIF(PYTHON_EXECUTABLE)
+
+endif()
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2010 Sebastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2015 Sébastien Helleu <flashcode@flashtux.org>
 #
 # This file is part of WeeChat, the extensible chat client.
 #
@@ -22,78 +22,62 @@
 # and libraries are. It also determines what the name of the library is. This
 # code sets the following variables:
 #
-#  RUBY_EXECUTABLE   = full path to the ruby binary
-#  RUBY_INCLUDE_PATH = path to where ruby.h can be found
-#  RUBY_LIBRARY = path to where libruby.so* can be found
+#  RUBY_INCLUDE_DIRS = C flags to compile with ruby
+#  RUBY_LIBRARY_DIRS = linker flags to compile with ruby (found with pkg-config)
+#  RUBY_LIB          = ruby library (found without pkg-config)

-IF(RUBY_FOUND)
+if(RUBY_FOUND)
   # Already in cache, be silent
-   SET(RUBY_FIND_QUIETLY TRUE)
-ENDIF(RUBY_FOUND)
+   set(RUBY_FIND_QUIETLY TRUE)
+endif()

-FIND_PROGRAM(RUBY_EXECUTABLE
-  NAMES ruby ruby1.9 ruby19 ruby1.8 ruby18 ruby1.6 ruby16
-  PATHS /usr/bin /usr/local/bin /usr/pkg/bin
-  )
+find_package(PkgConfig)
+if(PKG_CONFIG_FOUND)
+  pkg_search_module(RUBY ruby-2.2 ruby-2.1 ruby-2.0 ruby-1.9 ruby-1.8)
+endif()

-IF(RUBY_EXECUTABLE)
-  EXECUTE_PROCESS(
-    COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "puts Config::CONFIG['rubyhdrdir'] || Config::CONFIG['archdir']"
-    OUTPUT_VARIABLE RUBY_ARCH_DIR
+if(RUBY_FOUND)
+  set(RUBY_LIB "")
+  mark_as_advanced(RUBY_LIB)
+else()
+  find_program(RUBY_EXECUTABLE
+    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
    )
-
-  EXECUTE_PROCESS(
-    COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "puts Config::CONFIG['arch']"
-    OUTPUT_VARIABLE RUBY_ARCH
-    )
-
-  EXECUTE_PROCESS(
-    COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "puts Config::CONFIG['libdir']"
-    OUTPUT_VARIABLE RUBY_POSSIBLE_LIB_PATH
-    )
-  
-  EXECUTE_PROCESS(
-    COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "puts Config::CONFIG['rubylibdir']"
-    OUTPUT_VARIABLE RUBY_RUBY_LIB_PATH
-    )
-
-  EXECUTE_PROCESS(
-    COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "puts Config::CONFIG['ruby_version']"
-    OUTPUT_VARIABLE RUBY_VERSION
-    )
-  
-  # remove the new lines from the output by replacing them with empty strings
-  STRING(REPLACE "\n" "" RUBY_ARCH_DIR "${RUBY_ARCH_DIR}")
-  STRING(REPLACE "\n" "" RUBY_POSSIBLE_LIB_PATH "${RUBY_POSSIBLE_LIB_PATH}")
-  STRING(REPLACE "\n" "" RUBY_RUBY_LIB_PATH "${RUBY_RUBY_LIB_PATH}")
-  STRING(REPLACE "\n" "" RUBY_ARCH "${RUBY_ARCH}")
-  STRING(REPLACE "\n" "" RUBY_VERSION "${RUBY_VERSION}")
-  
-  FIND_PATH(RUBY_INCLUDE_PATH
-    NAMES ruby.h
-    PATHS ${RUBY_ARCH_DIR}
-    )
-
-  SET(RUBY_ARCH
-    "${RUBY_INCLUDE_PATH}/${RUBY_ARCH}")
-
-  FIND_LIBRARY(RUBY_LIBRARY
-    NAMES ruby ruby1.6 ruby16 ruby1.8 ruby18 ruby1.9 ruby19
-    PATHS ${RUBY_POSSIBLE_LIB_PATH} ${RUBY_RUBY_LIB_PATH}
-    )
-
-  IF(RUBY_LIBRARY AND RUBY_INCLUDE_PATH)
-    SET(RUBY_FOUND TRUE)
-  ENDIF(RUBY_LIBRARY AND RUBY_INCLUDE_PATH)
-  
-  IF(${RUBY_VERSION} STREQUAL "1.9.0")
-    SET(RUBY_FOUND FALSE)
-  ENDIF(${RUBY_VERSION} STREQUAL "1.9.0")
-  
-  MARK_AS_ADVANCED(
-    RUBY_EXECUTABLE
-    RUBY_LIBRARY
-    RUBY_ARCH
-    RUBY_INCLUDE_PATH
-    )
-ENDIF(RUBY_EXECUTABLE)
+  if(RUBY_EXECUTABLE)
+    execute_process(
+      COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print RbConfig::CONFIG['rubyhdrdir'] || RbConfig::CONFIG['archdir']"
+      OUTPUT_VARIABLE RUBY_ARCH_DIR
+      )
+    execute_process(
+      COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print RbConfig::CONFIG['arch']"
+      OUTPUT_VARIABLE RUBY_ARCH
+      )
+    execute_process(
+      COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print RbConfig::CONFIG['libdir']"
+      OUTPUT_VARIABLE RUBY_POSSIBLE_LIB_PATH
+      )
+    execute_process(
+      COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print RbConfig::CONFIG['rubylibdir']"
+      OUTPUT_VARIABLE RUBY_RUBY_LIB_PATH
+      )
+    find_path(RUBY_INCLUDE_DIRS
+      NAMES ruby.h
+      PATHS ${RUBY_ARCH_DIR}
+      )
+    set(RUBY_INCLUDE_ARCH "${RUBY_INCLUDE_DIRS}/${RUBY_ARCH}")
+    find_library(RUBY_LIB
+      NAMES ruby-1.9.3 ruby1.9.3 ruby193 ruby-1.9.2 ruby1.9.2 ruby192 ruby-1.9.1 ruby1.9.1 ruby191 ruby1.9 ruby19 ruby1.8 ruby18 ruby
+      PATHS ${RUBY_POSSIBLE_LIB_PATH} ${RUBY_RUBY_LIB_PATH}
+      )
+    if(RUBY_LIB AND RUBY_INCLUDE_DIRS)
+      set(RUBY_FOUND TRUE)
+    endif()
+    set(RUBY_INCLUDE_DIRS "${RUBY_INCLUDE_DIRS};${RUBY_INCLUDE_ARCH}")
+    mark_as_advanced(
+      RUBY_INCLUDE_DIRS
+      RUBY_LIBRARY_DIRS
+      RUBY_LIB
+      )
+  endif()
+endif()
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2010 Sebastien 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.
@@ -21,19 +21,19 @@
 # - Find Source-Highlight
 # This module finds if source-highlight is installed.

-IF (SOURCEHIGHLIGHT_FOUND)
+if(SOURCEHIGHLIGHT_FOUND)
  # Already in cache, be silent
-  SET(SOURCEHIGHLIGHT_FIND_QUIETLY TRUE)
-ENDIF (SOURCEHIGHLIGHT_FOUND)
+  set(SOURCEHIGHLIGHT_FIND_QUIETLY TRUE)
+endif()

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

-IF(SOURCEHIGHLIGHT_EXECUTABLE)
-  SET(SOURCEHIGHLIGHT_FOUND TRUE)
-  MARK_AS_ADVANCED(
+if(SOURCEHIGHLIGHT_EXECUTABLE)
+  set(SOURCEHIGHLIGHT_FOUND TRUE)
+  mark_as_advanced(
    SOURCEHIGHLIGHT_EXECUTABLE
    )
-ENDIF(SOURCEHIGHLIGHT_EXECUTABLE)
+endif()
@@ -1,6 +1,6 @@
 #
 # Copyright (C) 2008 Julien Louis <ptitlouis@sysif.net>
-# Copyright (C) 2008-2010 Sebastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2008-2015 Sébastien Helleu <flashcode@flashtux.org>
 #
 # This file is part of WeeChat, the extensible chat client.
 #
@@ -51,128 +51,111 @@
 #      this point it is safer you ask directly where the *source* tree is
 #      and dig from there.

-IF(TCL_FOUND)
-  SET(TCL_FIND_QUIETLY TRUE)
-ENDIF(TCL_FOUND)
+if(TCL_FOUND)
+  set(TCL_FIND_QUIETLY TRUE)
+endif()

-INCLUDE(CMakeFindFrameworks)
-INCLUDE(FindTclsh)
+include(CMakeFindFrameworks)
+include(FindTclsh)

-GET_FILENAME_COMPONENT(TCL_TCLSH_PATH "${TCL_TCLSH}" PATH)
-GET_FILENAME_COMPONENT(TCL_TCLSH_PATH_PARENT "${TCL_TCLSH_PATH}" PATH)
-STRING(REGEX REPLACE
+get_filename_component(TCL_TCLSH_PATH "${TCL_TCLSH}" PATH)
+get_filename_component(TCL_TCLSH_PATH_PARENT "${TCL_TCLSH_PATH}" PATH)
+string(REGEX REPLACE
  "^.*tclsh([0-9]\\.*[0-9]).*$" "\\1" TCL_TCLSH_VERSION "${TCL_TCLSH}")

-GET_FILENAME_COMPONENT(TCL_INCLUDE_PATH_PARENT "${TCL_INCLUDE_PATH}" PATH)
+get_filename_component(TCL_INCLUDE_PATH_PARENT "${TCL_INCLUDE_PATH}" PATH)

-GET_FILENAME_COMPONENT(TCL_LIBRARY_PATH "${TCL_LIBRARY}" PATH)
-GET_FILENAME_COMPONENT(TCL_LIBRARY_PATH_PARENT "${TCL_LIBRARY_PATH}" PATH)
-STRING(REGEX REPLACE
+get_filename_component(TCL_LIBRARY_PATH "${TCL_LIBRARY}" PATH)
+get_filename_component(TCL_LIBRARY_PATH_PARENT "${TCL_LIBRARY_PATH}" PATH)
+string(REGEX REPLACE
  "^.*tcl([0-9]\\.*[0-9]).*$" "\\1" TCL_VERSION "${TCL_LIBRARY}")

-SET(TCL_POSSIBLE_LIB_PATHS
+set(TCL_POSSIBLE_LIB_PATHS
  "${TCL_INCLUDE_PATH_PARENT}/lib"
+  "${TCL_INCLUDE_PATH_PARENT}/lib64"
  "${TCL_LIBRARY_PATH}"
  "${TCL_TCLSH_PATH_PARENT}/lib"
+  "${TCL_TCLSH_PATH_PARENT}/lib64"
  /usr/lib
+  /usr/lib64
  /usr/local/lib
+  /usr/local/lib64
  )

-IF(WIN32)
-  GET_FILENAME_COMPONENT(
+if(WIN32)
+  get_filename_component(
    ActiveTcl_CurrentVersion
    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\ActiveState\\ActiveTcl;CurrentVersion]"
    NAME)
-  SET(TCLTK_POSSIBLE_LIB_PATHS ${TCLTK_POSSIBLE_LIB_PATHS}
+  set(TCLTK_POSSIBLE_LIB_PATHS ${TCLTK_POSSIBLE_LIB_PATHS}
    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\ActiveState\\ActiveTcl\\${ActiveTcl_CurrentVersion}]/lib"
    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.6;Root]/lib"
    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.5;Root]/lib"
-    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.4;Root]/lib"
-    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.3;Root]/lib"
-    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.2;Root]/lib"
-    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.0;Root]/lib"
    "$ENV{ProgramFiles}/Tcl/Lib"
    "C:/Program Files/Tcl/lib"
    "C:/Tcl/lib"
    )
-ENDIF(WIN32)
+endif()

-FIND_LIBRARY(TCL_LIBRARY
+find_library(TCL_LIBRARY
  NAMES
-  tcl
-  tcl${TCL_VERSION} tcl${TCL_TCLSH_VERSION}
  tcl86 tcl8.6
  tcl85 tcl8.5
-  tcl84 tcl8.4
-  tcl83 tcl8.3
-  tcl82 tcl8.2
-  tcl80 tcl8.0
+  tcl
+  tcl${TCL_VERSION} tcl${TCL_TCLSH_VERSION}
  PATHS ${TCL_POSSIBLE_LIB_PATHS}
  )

-CMAKE_FIND_FRAMEWORKS(Tcl)
+cmake_find_frameworks(Tcl)

-SET(TCL_FRAMEWORK_INCLUDES)
-IF(Tcl_FRAMEWORKS)
-  IF(NOT TCL_INCLUDE_PATH)
-    FOREACH(dir ${Tcl_FRAMEWORKS})
-      SET(TCL_FRAMEWORK_INCLUDES ${TCL_FRAMEWORK_INCLUDES} ${dir}/Headers)
-    ENDFOREACH(dir)
-  ENDIF(NOT TCL_INCLUDE_PATH)
-ENDIF(Tcl_FRAMEWORKS)
+set(TCL_FRAMEWORK_INCLUDES)
+if(Tcl_FRAMEWORKS)
+  if(NOT TCL_INCLUDE_PATH)
+    foreach(dir ${Tcl_FRAMEWORKS})
+      set(TCL_FRAMEWORK_INCLUDES ${TCL_FRAMEWORK_INCLUDES} ${dir}/Headers)
+    endforeach(dir)
+  endif()
+endif()

-SET(TCL_POSSIBLE_INCLUDE_PATHS
+set(TCL_POSSIBLE_INCLUDE_PATHS
  "${TCL_LIBRARY_PATH_PARENT}/include"
  "${TCL_INCLUDE_PATH}"
  ${TCL_FRAMEWORK_INCLUDES}
  "${TCL_TCLSH_PATH_PARENT}/include"
+  /usr/include/tcl8.6
+  /usr/include/tcl8.5
  /usr/include
  /usr/local/include
  /usr/include/tcl${TCL_VERSION}
-  /usr/include/tcl8.6
-  /usr/include/tcl8.5
-  /usr/include/tcl8.4
-  /usr/include/tcl8.3
-  /usr/include/tcl8.2
-  /usr/include/tcl8.0
  /usr/local/include/tcl${TCL_VERSION}
  /usr/local/include/tcl8.6
  /usr/local/include/tcl8.5
-  /usr/local/include/tcl8.4
-  /usr/local/include/tcl8.3
-  /usr/local/include/tcl8.2
-  /usr/local/include/tcl8.0
  )

-
-IF(WIN32)
-  SET(TCLTK_POSSIBLE_INCLUDE_PATHS ${TCLTK_POSSIBLE_INCLUDE_PATHS}
+if(WIN32)
+  set(TCLTK_POSSIBLE_INCLUDE_PATHS ${TCLTK_POSSIBLE_INCLUDE_PATHS}
    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\ActiveState\\ActiveTcl\\${ActiveTcl_CurrentVersion}]/include"
    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.6;Root]/include"
    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.5;Root]/include"
-    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.4;Root]/include"
-    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.3;Root]/include"
-    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.2;Root]/include"
-    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.0;Root]/include"
    "$ENV{ProgramFiles}/Tcl/include"
    "C:/Program Files/Tcl/include"
    "C:/Tcl/include"
    )
-ENDIF(WIN32)
+endif()

-FIND_PATH(TCL_INCLUDE_PATH
+find_path(TCL_INCLUDE_PATH
  NAMES tcl.h
  PATHS ${TCL_POSSIBLE_INCLUDE_PATHS}
  )

-IF(TCL_LIBRARY AND TCL_INCLUDE_PATH)
-  SET(TCL_VERSION ${TCL_VERSION})
-  SET(TCL_LIBARY ${TCL_LIBRARY})
-  SET(TCL_INCLUDE_PATH ${TCL_INCLUDE_PATH})
-  SET(TCL_FOUND TRUE)
-ENDIF(TCL_LIBRARY AND TCL_INCLUDE_PATH)
+if(TCL_LIBRARY AND TCL_INCLUDE_PATH)
+  set(TCL_VERSION ${TCL_VERSION})
+  set(TCL_LIBARY ${TCL_LIBRARY})
+  set(TCL_INCLUDE_PATH ${TCL_INCLUDE_PATH})
+  set(TCL_FOUND TRUE)
+endif()

-MARK_AS_ADVANCED(
+mark_as_advanced(
  TCL_INCLUDE_PATH
  TCL_LIBRARY
  TCL_VERSION
@@ -0,0 +1,49 @@
+#
+# Copyright (C) 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 V8 (Google's Javascript engine)
+# This module finds if libv8 is installed and determines where
+# the include files and libraries are.
+#
+# This code sets the following variables:
+#
+#  V8_INCLUDE_DIR = path to where v8.h can be found
+#  V8_LIBRARY = path to where libv8.so* can be found
+
+if(V8_FOUND)
+  # Already in cache, be silent
+  SET(V8_FIND_QUIETLY TRUE)
+endif()
+
+set(V8_INC_PATHS
+  /usr/include
+  ${CMAKE_INCLUDE_PATH}
+)
+find_path(V8_INCLUDE_DIR v8.h PATHS ${V8_INC_PATHS})
+find_library(V8_LIBRARY
+  NAMES v8
+  PATHS /lib /usr/lib /usr/local/lib /usr/pkg/lib
+)
+
+find_package_handle_standard_args(V8 DEFAULT_MSG V8_LIBRARY V8_INCLUDE_DIR)
+
+mark_as_advanced(
+  V8_INCLUDE_DIR
+  V8_LIBRARY
+)
@@ -0,0 +1,77 @@
+# - Find zlib
+# Find the native ZLIB includes and library.
+# Once done this will define
+#
+#  ZLIB_INCLUDE_DIRS   - where to find zlib.h, etc.
+#  ZLIB_LIBRARIES      - List of libraries when using zlib.
+#  ZLIB_FOUND          - True if zlib found.
+#
+#  ZLIB_VERSION_STRING - The version of zlib found (x.y.z)
+#  ZLIB_VERSION_MAJOR  - The major version of zlib
+#  ZLIB_VERSION_MINOR  - The minor version of zlib
+#  ZLIB_VERSION_PATCH  - The patch version of zlib
+#  ZLIB_VERSION_TWEAK  - The tweak version of zlib
+#
+# The following variable are provided for backward compatibility
+#
+#  ZLIB_MAJOR_VERSION  - The major version of zlib
+#  ZLIB_MINOR_VERSION  - The minor version of zlib
+#  ZLIB_PATCH_VERSION  - The patch version of zlib
+
+#=============================================================================
+# Copyright 2001-2009 Kitware, Inc.
+#
+# Distributed under the OSI-approved BSD License (the "License");
+# see accompanying file Copyright.txt for details.
+#
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the License for more information.
+#=============================================================================
+# (To distribute this file outside of CMake, substitute the full
+#  License text for the above reference.)
+
+find_path(ZLIB_INCLUDE_DIR zlib.h
+  "[HKEY_LOCAL_MACHINE\\SOFTWARE\\GnuWin32\\Zlib;InstallPath]/include"
+)
+
+set(ZLIB_NAMES z zlib zdll zlib1 zlibd zlibd1)
+find_library(ZLIB_LIBRARY
+  NAMES
+  ${ZLIB_NAMES}
+  PATHS
+  "[HKEY_LOCAL_MACHINE\\SOFTWARE\\GnuWin32\\Zlib;InstallPath]/lib"
+  )
+mark_as_advanced(ZLIB_LIBRARY ZLIB_INCLUDE_DIR)
+
+if(ZLIB_INCLUDE_DIR AND EXISTS "${ZLIB_INCLUDE_DIR}/zlib.h")
+  file(STRINGS "${ZLIB_INCLUDE_DIR}/zlib.h" ZLIB_H REGEX "^#define ZLIB_VERSION \"[^\"]*\"$")
+
+  string(REGEX REPLACE "^.*ZLIB_VERSION \"([0-9]+).*$" "\\1" ZLIB_VERSION_MAJOR "${ZLIB_H}")
+  string(REGEX REPLACE "^.*ZLIB_VERSION \"[0-9]+\\.([0-9]+).*$" "\\1" ZLIB_VERSION_MINOR  "${ZLIB_H}")
+  string(REGEX REPLACE "^.*ZLIB_VERSION \"[0-9]+\\.[0-9]+\\.([0-9]+).*$" "\\1" ZLIB_VERSION_PATCH "${ZLIB_H}")
+  set(ZLIB_VERSION_STRING "${ZLIB_VERSION_MAJOR}.${ZLIB_VERSION_MINOR}.${ZLIB_VERSION_PATCH}")
+
+  # only append a TWEAK version if it exists:
+  set(ZLIB_VERSION_TWEAK "")
+  if("${ZLIB_H}" MATCHES "^.*ZLIB_VERSION \"[0-9]+\\.[0-9]+\\.[0-9]+\\.([0-9]+).*$")
+    set(ZLIB_VERSION_TWEAK "${CMAKE_MATCH_1}")
+    set(ZLIB_VERSION_STRING "${ZLIB_VERSION_STRING}.${ZLIB_VERSION_TWEAK}")
+  endif()
+
+  set(ZLIB_MAJOR_VERSION "${ZLIB_VERSION_MAJOR}")
+  set(ZLIB_MINOR_VERSION "${ZLIB_VERSION_MINOR}")
+  set(ZLIB_PATCH_VERSION "${ZLIB_VERSION_PATCH}")
+endif()
+
+# handle the QUIETLY and REQUIRED arguments and set ZLIB_FOUND to TRUE if
+# all listed variables are TRUE
+#INCLUDE(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
+include(${CMAKE_HOME_DIRECTORY}/cmake/FindPackageHandleStandardArgs.cmake)
+find_package_handle_standard_args(ZLIB REQUIRED_VARS ZLIB_LIBRARY ZLIB_INCLUDE_DIR
+  VERSION_VAR ZLIB_VERSION_STRING)
+
+if(ZLIB_FOUND)
+  set(ZLIB_INCLUDE_DIRS ${ZLIB_INCLUDE_DIR})
+  set(ZLIB_LIBRARIES ${ZLIB_LIBRARY})
+endif()
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2010 Sebastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2015 Sébastien Helleu <flashcode@flashtux.org>
 #
 # This file is part of WeeChat, the extensible chat client.
 #
@@ -17,24 +17,24 @@
 # along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 #

-IF(NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt")
-  MESSAGE(FATAL_ERROR "Cannot find install manifest: \"@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt\"")
-ENDIF(NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt")
-
-FILE(READ "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt" files)
-STRING(REGEX REPLACE "\n" ";" files "${files}")
-FOREACH(file ${files})
-  MESSAGE(STATUS "Uninstalling \"${file}\"")
-  IF(NOT EXISTS "${file}")
-    MESSAGE(FATAL_ERROR "File \"${file}\" does not exists.")
-  ENDIF(NOT EXISTS "${file}")
-  EXEC_PROGRAM("@CMAKE_COMMAND@" ARGS "-E remove \"${file}\""
-    OUTPUT_VARIABLE rm_out
-    RETURN_VARIABLE rm_retval)
-  IF("${rm_retval}" GREATER 0)
-    MESSAGE(FATAL_ERROR "Problem when removing \"${file}\"")
-  ENDIF("${rm_retval}" GREATER 0)
-ENDFOREACH(file)
-
-
+if(NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt")
+  message(FATAL_ERROR "Cannot find install manifest: \"@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt\"")
+endif()

+file(READ "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt" files)
+string(REGEX REPLACE "\n" ";" files "${files}")
+string(REGEX REPLACE ";$" "" files "${files}")
+list(REVERSE files)
+foreach(file ${files})
+  message(STATUS "Uninstalling \"$ENV{DESTDIR}${file}\"")
+  if(EXISTS "$ENV{DESTDIR}${file}")
+    exec_program("@CMAKE_COMMAND@" ARGS "-E remove \"$ENV{DESTDIR}${file}\""
+      OUTPUT_VARIABLE rm_out
+      RETURN_VARIABLE rm_retval)
+    if("${rm_retval}" GREATER 0)
+      message(FATAL_ERROR "Problem when removing \"$ENV{DESTDIR}${file}\"")
+    endif()
+  else()
+    message(STATUS "File \"$ENV{DESTDIR}${file}\" does not exist.")
+  endif()
+endforeach(file)
@@ -1,52 +0,0 @@
-#!/bin/sh
-#
-# Copyright (C) 2003-2010 Sebastien 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/>.
-#
-
-VERSION=@VERSION@
-SRCROOT=@CMAKE_SOURCE_DIR@
-BUILDDIR=@CMAKE_BINARY_DIR@
-PROJECT=@PROJECT_NAME@
-TAG=release-$(echo $VERSION | sed -e 's/\./-/g')
-
-EXCLUDE="@DIST_EXCLUDE@"
-EXPORT_DIR="${PROJECT}-${VERSION}"
-
-if [ -z  $CVSROOT ]; then
-    echo "The CVSROOT variable must be set"
-    exit 1
-fi
-
-echo "Exporting source tree"
-if [ $(echo $VERSION | grep cvs) ]; then
-    cvs export -r HEAD -d $PROJECT-$VERSION $PROJECT
-else
-    cvs export -r $TAG -d $PROJECT-$VERSION $PROJECT
-fi
-
-echo "Removing not needed stuff"
-for i in $EXCLUDE ; do
-    echo "  $i"
-    rm -rf $EXPORT_DIR/$i
-done
-
-echo "Generating archive"
-tar cjf ${BUILDDIR}/${PROJECT}-${VERSION}.tar.bz2 ${EXPORT_DIR}
-
-echo "Cleaning up"
-rm -rf ${EXPORT_DIR}
@@ -1,26 +1,14 @@
-#cmakedefine HAVE_ARPA_INET_H
 #cmakedefine HAVE_LIBINTL_H
-#cmakedefine HAVE_LIMITS_H
-#cmakedefine HAVE_LOCALE_H
-#cmakedefine HAVE_NETDB_H
-#cmakedefine HAVE_NETINET_IN_H
-#cmakedefine HAVE_STDLIB_H
-#cmakedefine HAVE_STRING_H
-#cmakedefine HAVE_SYS_SOCKET_H
-#cmakedefine HAVE_SYS_TIME_H
-#cmakedefine HAVE_SYS_TYPES_H
-#cmakedefine HAVE_UNISTD_H
-#cmakedefine HAVE_PWD_H
-#cmakedefine HAVE_ERRNO_H
-#cmakedefine HAVE_REGEX_H
-#cmakedefine HAVE_WCHAR_H
-#cmakedefine HAVE_SYS_FILE_H
+#cmakedefine HAVE_SYS_RESOURCE_H
 #cmakedefine HAVE_FLOCK
 #cmakedefine HAVE_LANGINFO_CODESET
-#cmakedefine HAVE_STRNDUP
 #cmakedefine HAVE_BACKTRACE
 #cmakedefine ICONV_2ARG_IS_CONST 1
-#cmakedefine HAVE_TCL_CREATE_NS
+#cmakedefine HAVE_MALLINFO
+#cmakedefine HAVE_EAT_NEWLINE_GLITCH
+#cmakedefine HAVE_ASPELL_VERSION_STRING
+#cmakedefine HAVE_ENCHANT_GET_VERSION
+#cmakedefine HAVE_GUILE_GMP_MEMORY_FUNCTIONS
 #define PACKAGE_VERSION "@VERSION@"
 #define PACKAGE "@PROJECT_NAME@"
 #define PACKAGE_NAME "@PROJECT_NAME@"
@@ -28,4 +16,6 @@
 #define WEECHAT_LIBDIR "@LIBDIR@"
 #define WEECHAT_SHAREDIR "@SHAREDIR@"
 #define LOCALEDIR "@LOCALEDIR@"
+#define WEECHAT_HOME "@WEECHAT_HOME@"
+#define CA_FILE "@CA_FILE@"
 #define _GNU_SOURCE 1
@@ -1,9 +1,28 @@
+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
+  are stronger checks while connecting with SSL. By default, if a connection
+  is not fully trusted it will fail.
+  You can find more information on how to handle this new behaviour here:
+    http://dev.weechat.org/post/2009/12/01/SSL-certificates
+
+ -- Emmanuel Bouthenot <kolter@debian.org>  Mon, 25 Jan 2010 12:35:11 +0100
+
 weechat (0.3.0-1) unstable; urgency=low

  This release introduces major changes. Large part of code was
  rewritten without keeping compatibility with older versions.

  Please refer to the file /usr/share/doc/weechat-core/UPGRADE_0.3
-  for more informations on upgrade from a version 0.2.x to 0.3.x.
+  for more information on upgrade from a version 0.2.x to 0.3.x.

 -- Emmanuel Bouthenot <kolter@openics.org>  Tue, 15 Sep 2009 20:59:42 +0000
@@ -1,3 +1,305 @@
+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
+
+ -- Emmanuel Bouthenot <kolter@debian.org>  Sun, 28 Sep 2014 17:41:10 +0200
+
+weechat (1.0-1) unstable; urgency=medium
+
+  * New upstream release (Closes: #758230, #751108)
+    - Remove the patch to fix FTBFS while building against ruby 2.1
+    - Fix the way to install upstream changelog
+    - Add new plugins (exec, trigger)
+    - Fix the way to install docs (upstream changes to asciidoc)
+  * Re-enable the build of guile plugin
+  * Fix various typos in packaging
+  * Update copyright years in debian/copyright
+  * Add new doc-base files (Relay Protocol in Japanese)
+  * Add git-buildpackage configuration
+
+ -- Emmanuel Bouthenot <kolter@debian.org>  Sun, 24 Aug 2014 17:40:36 +0200
+
+weechat (0.4.3-4) unstable; urgency=medium
+
+  * Fix FTBFS by adding a missing Build Depends on docbook-xml
+    (Closes:#753166)
+  * Update libgnutls and libgcrypt Build Depends to libgnutls28-dev and
+    libgcrypt20-dev (Closes: #753167)
+
+ -- Emmanuel Bouthenot <kolter@debian.org>  Wed, 02 Jul 2014 23:42:41 +0200
+
+weechat (0.4.3-3) unstable; urgency=medium
+
+  * Add patch (backported from upstream) to fix a FTBFS while building
+    against ruby 2.1 (Closes: #747708)
+
+ -- Emmanuel Bouthenot <kolter@debian.org>  Mon, 12 May 2014 12:49:14 +0200
+
+weechat (0.4.3-2) unstable; urgency=medium
+
+  * Add missing symlink for Polish manpage
+  * Change ruby-* Build-Depends to gem2deb so that ruby plugin will be
+    built against the newest Ruby interpreter available (Closes: #738685)
+
+ -- Emmanuel Bouthenot <kolter@debian.org>  Thu, 13 Feb 2014 12:11:54 +0000
+
+weechat (0.4.3-1) unstable; urgency=medium
+
+  * New upstream release
+  * Bump Standards-Version to 3.9.5
+  * Update debian/watch to check upstream tarballs signatures
+  * Add new doc-base files:
+    - Devel guide in French and Japanese
+    - Plugins guide in Japanese
+    - Relay protocol guide in French
+    - User guide in Polish
+
+ -- Emmanuel Bouthenot <kolter@debian.org>  Mon, 10 Feb 2014 17:15:21 +0000
+
+weechat (0.4.2-3) unstable; urgency=low
+
+  * Fix FTBS while building without Internet access (add a missing build
+    dependency on docbook-xsl) (Closes: #727206)
+
+ -- Emmanuel Bouthenot <kolter@debian.org>  Wed, 23 Oct 2013 20:54:08 +0000
+
+weechat (0.4.2-2) unstable; urgency=low
+
+  * Move dependencies from Build-Depends-Indep to Build-Depends (weechat-curses
+    as arch:any needs them to build manpages)
+
+ -- Emmanuel Bouthenot <kolter@debian.org>  Tue, 08 Oct 2013 07:16:59 +0000
+
+weechat (0.4.2-1) unstable; urgency=low
+
+  * New upstream release
+    - Add build dependency on xsltproc
+    - Enable build of documentation and manpages (now disabled by default)
+    - Install new localized manpages
+    - weechat-curses renamed to weechat
+      o update packaging accordingly
+      o add symlinks for backward compatibility
+  * Refresh XPM menu icon following upstream changes
+  * Switch to debhelper >= 9
+
+ -- Emmanuel Bouthenot <kolter@debian.org>  Mon, 07 Oct 2013 21:40:15 +0000
+
+weechat (0.4.1-2) unstable; urgency=low
+
+  * Disable build of guile plugin (as guile-2.0-dev FTBFS on multiple
+    architectures)
+
+ -- Emmanuel Bouthenot <kolter@debian.org>  Sat, 29 Jun 2013 14:48:33 +0000
+
+weechat (0.4.1-1) unstable; urgency=low
+
+  * New upstream release
+  * Move guile build dependency to guile-2.0-dev (previous versions are
+    no longer supported).
+  * Add supported protocols in long description. Thanks to Jonas Smedegaard
+    for the suggestion (Closes: #705216)
+
+ -- Emmanuel Bouthenot <kolter@debian.org>  Tue, 21 May 2013 19:44:31 +0000
+
+weechat (0.4.0-1) unstable; urgency=low
+
+  * New upstream release.
+  * Bump Standards-Version to 3.9.4
+  * Remove UPGRADE_0.3 from doc (no more included in upstream sources).
+
+ -- Emmanuel Bouthenot <kolter@debian.org>  Wed, 23 Jan 2013 18:44:36 +0000
+
+weechat (0.3.9.2-1) unstable; urgency=low
+
+  * New upstream release
+    - do not call shell to execute command in hook_process (fix security
+    problem when a plugin/script gives untrusted command)
+
+ -- Emmanuel Bouthenot <kolter@debian.org>  Sun, 18 Nov 2012 13:35:21 +0000
+
+weechat (0.3.9.1-1) unstable; urgency=low
+
+  * New upstream release
+    - fix crash when decoding IRC colors in strings
+
+ -- Emmanuel Bouthenot <kolter@debian.org>  Fri, 09 Nov 2012 23:11:09 +0000
+
+weechat (0.3.9-1) unstable; urgency=low
+
+  * New upstream release
+  * Add the new 'script' plugin and update the long descriptions accordingly
+  * Add new doc-base files:
+    - Testers guide in Japanese
+    - Users guide in Japanese
+    - Scripting guide in Japanese
+  * Fix wrong Vcs-Browser URL (Closes: #689203)
+  * Update lintian override on weechat-curses
+
+ -- Emmanuel Bouthenot <kolter@debian.org>  Sun, 30 Sep 2012 21:14:22 +0000
+
+weechat (0.3.8-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Emmanuel Bouthenot <kolter@debian.org>  Sun, 03 Jun 2012 07:54:52 +0000
+
+weechat (0.3.7-1) unstable; urgency=low
+
+  * New upstream release
+  * Bump Standards-Version to 3.9.3
+  * Update debian/copyright: new year
+  * Add new doc-base files:
+    - Developer's Guide in English
+    - Relay Protocol in English
+    - Quickstart in Spanish
+  * Update Vcs-Git and Vcs-Browser fields
+
+ -- Emmanuel Bouthenot <kolter@debian.org>  Sun, 26 Feb 2012 10:32:35 +0000
+
+weechat (0.3.6-2) unstable; urgency=low
+
+  * Update debian/rules to use build flags from dpkg-buildflags when it's
+  possible (ie: with dpkg >= 1.16.1).
+
+ -- Emmanuel Bouthenot <kolter@debian.org>  Sat, 29 Oct 2011 07:31:14 +0000
+
+weechat (0.3.6-1) unstable; urgency=low
+
+  * New upstream release
+    - Fix a FTBFS due to wrong detection of ncursesw headers
+      (Closes: #646299)
+  * Add new doc-base files (Polish translations).
+  * Install html documentation in /usr/share/doc/weechat/html instead
+    of /usr/share/doc/weechat
+  * Add a symlink from /usr/share/doc/weechat/html to
+  /usr/share/doc/weechat-doc/html so that it will be easier to find
+  documentation when weechat-doc is installed (Closes: #632621)
+  * Add a Suggest on weechat-doc for weechat and weechat-curses. Thanks to
+  Jonathan Nieder for the proposal.
+  * Fix the cmake invokation from debian/rules (cflags and ldflags)
+
+ -- Emmanuel Bouthenot <kolter@debian.org>  Wed, 26 Oct 2011 20:10:09 +0000
+
+weechat (0.3.5-1) unstable; urgency=low
+
+  * New upstream release
+    - Fix usage of deprecated _set_priority GnuTLS functions (Closes: #624055)
+  * Remove patch added to fix crash when completing /part command
+  * Bump Standards-Version to 3.9.2
+  * Update debian/copyright, switch to DEP5 format
+
+ -- Emmanuel Bouthenot <kolter@debian.org>  Mon, 16 May 2011 11:40:09 +0000
+
+weechat (0.3.4-2) unstable; urgency=low
+
+  * Add a patch which fix a crash when completing /part command on a
+  non-irc buffer.
+
+ -- Emmanuel Bouthenot <kolter@debian.org>  Sun, 13 Feb 2011 21:13:35 +0000
+
+weechat (0.3.4-1) unstable; urgency=low
+
+  * New upstream release (add relay and rmodifier plugins).
+  * Update Build depends (tcl-dev, ruby-dev, asciidoc).
+  * Remove the patch to make weechat aware of python 2.7 (merged upstream).
+  * Remove the backported patch which fix the bug with hostmasks in IRC
+    command /ignore.
+  * Update lintian override on weechat-curses.
+  * Update long descriptions regarding the new features.
+  * Add source/local-options file.
+
+ -- Emmanuel Bouthenot <kolter@debian.org>  Sun, 16 Jan 2011 11:54:55 +0000
+
+weechat (0.3.3-3) unstable; urgency=low
+
+  * Upload to unstable.
+  * Downgrade tcl-dev dependency to 8.4 until tcl 8.5 hit unstable.
+  * Add a patch to make cmake aware of python 2.7 (Closes: #606989).
+    Thanks to Matthias Klose.
+
+ -- Emmanuel Bouthenot <kolter@debian.org>  Mon, 27 Dec 2010 23:29:46 +0000
+
+weechat (0.3.3-2) experimental; urgency=low
+
+  * Switch to dpkg-source 3.0 (quilt) format
+  * Add a patch to fix bug with hostmasks in IRC command /ignore
+
+ -- Emmanuel Bouthenot <kolter@debian.org>  Fri, 20 Aug 2010 20:39:06 +0000
+
+weechat (0.3.3-1) experimental; urgency=low
+
+  * New upstream release
+  * Add new doc-base files (German translations).
+  * Update Standards-Version to 3.9.1
+
+ -- Emmanuel Bouthenot <kolter@debian.org>  Tue, 10 Aug 2010 11:23:14 +0000
+
+weechat (0.3.2-2) experimental; urgency=low
+
+  * Fix Vcs-Browser url (Closes: #580859).
+  * Rebuild against tcl-dev (>= 8.5) (Closes: #582588).
+
+ -- Emmanuel Bouthenot <kolter@debian.org>  Sun, 23 May 2010 08:32:37 +0000
+
+weechat (0.3.2-1) unstable; urgency=low
+
+  * New upstream release
+    - Add SASL authentication support (Closes: #574053)
+    - Add Build-Depend on libgcrypt11-dev (needed by SASL auth.)
+  * Fix build dependency against asciidoc (>=8.4 is needed). Thanks
+    to Michal Suchanek who spotted this bug (Closes: #574050).
+  * Update Standards-Version to 3.8.4
+  * Add debian/source/format to make lintian happy.
+  * Update lintian-override for weechat-curses manpage.
+  * Add new doc-base files (italian translations).
+
+ -- Emmanuel Bouthenot <kolter@debian.org>  Sat, 20 Mar 2010 18:09:38 +0100
+
+weechat (0.3.1.1-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Emmanuel Bouthenot <kolter@debian.org>  Sun, 31 Jan 2010 19:18:42 +0000
+
+weechat (0.3.1-1) unstable; urgency=low
+
+  * New upstream release:
+   - Add ssl client certificate support (Closes: #453348)
+   - Fix a color bug in status line (Closes: #512957)
+  * Remove patch 'fix_ftbfs_kfreebsd' (fixed upstream)
+  * Maintainer became Debian Developer: adjust email, VCS and DM fields.
+  * Update doc-base files:
+   - Remove not needed asciidoc templates
+   - Add new translations
+  * Update debian/NEWS about new SSL behaviour.
+
+ -- Emmanuel Bouthenot <kolter@debian.org>  Sat, 16 Jan 2010 12:16:26 +0100
+
+weechat (0.3.0-2) unstable; urgency=low
+
+  * Add a patch to fix a FTBFS on GNU/kFreeBSD.
+
+ -- Emmanuel Bouthenot <kolter@openics.org>  Sat, 03 Oct 2009 13:22:10 +0000
+
 weechat (0.3.0-1) unstable; urgency=low

  * New (final) upstream release.
@@ -41,7 +343,7 @@ weechat (0.2.6.2-1) unstable; urgency=low
  * New upstream release
  * Add a patch which fix typos in aspell plugin.
  * Refresh patch multiple_ip_servers according to the new upstream release.
-  
+
 -- Emmanuel Bouthenot <kolter@openics.org>  Sun, 19 Apr 2009 10:23:26 +0000

 weechat (0.2.6.1-1) unstable; urgency=low
@@ -51,9 +353,9 @@ weechat (0.2.6.1-1) unstable; urgency=low
    (Closes: #519940).
  * Refresh patch multiple_ip_servers according to the new upstream release.
  * Update Standards-Version to 3.8.1.
-  
+
 -- Emmanuel Bouthenot <kolter@openics.org>  Mon, 16 Mar 2009 13:18:29 +0000
- 
+
 weechat (0.2.6-3) unstable; urgency=low

  * Add a patch to make weechat try to connect other server IPs
@@ -88,7 +390,7 @@ weechat (0.2.6-1) unstable; urgency=low
  * New Upstream Version
  * Switch to GPLv3 (update copyright)
  * Update menu entry
-  
+
 -- Emmanuel Bouthenot <kolter@openics.org>  Thu, 06 Sep 2007 20:10:26 +0200

 weechat (0.2.5-1) unstable; urgency=low
@@ -185,11 +487,11 @@ weechat (0.1.8-1) unstable; urgency=low
 -- Julien Louis <ptitlouis@sysif.net>  Sat, 18 Mar 2006 11:32:52 +0100

 weechat (0.1.7-2) unstable; urgency=low
- 
+
   * force linking against libpthread on GNU/Hurd (Closes: #350487)
- 
+
 -- Julien Louis <ptitlouis@sysif.net>  Sun,  5 Feb 2006 18:23:24 +0100
-  
+
 weechat (0.1.7-1) unstable; urgency=low

  * New upstream release
@@ -261,8 +563,8 @@ weechat (0.1.2-2) unstable; urgency=low
 weechat (0.1.2-1) unstable; urgency=low

  * WeeChat version 0.1.2, see ChangeLog for detail.
-  
- -- Sebastien Helleu <flashcode@flashtux.org>  Sat, 21 May 2005 08:00:00 +0200
+
+ -- Sébastien Helleu <flashcode@flashtux.org>  Sat, 21 May 2005 08:00:00 +0200

 weechat (0.1.1-2) unstable; urgency=low

@@ -275,65 +577,65 @@ weechat (0.1.1-2) unstable; urgency=low
 weechat (0.1.1-1) unstable; urgency=low

  * WeeChat version 0.1.1, see ChangeLog for detail (closes: #306492)
-  
- -- Sebastien Helleu <flashcode@flashtux.org>  Sat, 20 Mar 2005 08:00:00 +0200
+
+ -- Sébastien Helleu <flashcode@flashtux.org>  Sat, 20 Mar 2005 08:00:00 +0200

 weechat (0.1.0-1) unstable; urgency=low

  * WeeChat version 0.1.0, see ChangeLog for detail.
-  
- -- Sebastien Helleu <flashcode@flashtux.org>  Sat, 12 Feb 2005 12:00:00 +0200
+
+ -- Sébastien Helleu <flashcode@flashtux.org>  Sat, 12 Feb 2005 12:00:00 +0200

 weechat (0.0.9-1) unstable; urgency=low

  * WeeChat version 0.0.9, see ChangeLog for detail.
-  
- -- Sebastien Helleu <flashcode@flashtux.org>  Sat, 01 Jan 2005 13:00:00 +0200
+
+ -- FlashCode <flashcode@flashtux.org>  Sat, 01 Jan 2005 13:00:00 +0200

 weechat (0.0.8-1) unstable; urgency=low

  * WeeChat version 0.0.8, see ChangeLog for detail.
-  
- -- Sebastien Helleu <flashcode@flashtux.org>  Sat, 30 Oct 2004 11:40:00 +0200
+
+ -- FlashCode <flashcode@flashtux.org>  Sat, 30 Oct 2004 11:40:00 +0200

 weechat (0.0.7-1) unstable; urgency=low

  * WeeChat version 0.0.7, see ChangeLog for detail.
-  
- -- Sebastien Helleu <flashcode@flashtux.org>  Sat, 08 Aug 2004 21:00:00 +0200
+
+ -- FlashCode <flashcode@flashtux.org>  Sat, 08 Aug 2004 21:00:00 +0200

 weechat (0.0.6-1) unstable; urgency=low

  * WeeChat version 0.0.6, see ChangeLog for detail.
-  
- -- Sebastien Helleu <flashcode@flashtux.org>  Sat, 05 Jun 2004 11:30:00 +0200
+
+ -- FlashCode <flashcode@flashtux.org>  Sat, 05 Jun 2004 11:30:00 +0200

 weechat (0.0.5-1) unstable; urgency=low

  * WeeChat version 0.0.5, see ChangeLog for detail.
-  
- -- Sebastien Helleu <flashcode@flashtux.org>  Sat, 07 Feb 2004 20:30:00 +0200
+
+ -- FlashCode <flashcode@flashtux.org>  Sat, 07 Feb 2004 20:30:00 +0200

 weechat (0.0.4-1) unstable; urgency=low

  * WeeChat version 0.0.4, see ChangeLog for detail.
-  
- -- Sebastien Helleu <flashcode@flashtux.org>  Thu, 01 Jan 2004 13:00:00 +0200
+
+ -- FlashCode <flashcode@flashtux.org>  Thu, 01 Jan 2004 13:00:00 +0200

 weechat (0.0.3-1) unstable; urgency=low

  * WeeChat version 0.0.3, see ChangeLog for detail.
-  
- -- Sebastien Helleu <flashcode@flashtux.org>  Mon, 03 Nov 2003 23:15:00 +0200
+
+ -- FlashCode <flashcode@flashtux.org>  Mon, 03 Nov 2003 23:15:00 +0200

 weechat (0.0.2-1) unstable; urgency=low

  * WeeChat version 0.0.2, see ChangeLog for detail.
-  
- -- Sebastien Helleu <flashcode@flashtux.org>  Sun, 05 Oct 2003 12:00:00 +0200
+
+ -- FlashCode <flashcode@flashtux.org>  Sun, 05 Oct 2003 12:00:00 +0200

 weechat (0.0.1-1) unstable; urgency=low

  * First version.
-  
- -- Sebastien Helleu <flashcode@flashtux.org>  Sat, 27 Sep 2003 12:00:00 +0200
+
+ -- FlashCode <flashcode@flashtux.org>  Sat, 27 Sep 2003 12:00:00 +0200
@@ -1 +1 @@
-7
+9
@@ -1,30 +1,55 @@
 Source: weechat
 Section: net
 Priority: optional
-Maintainer: Emmanuel Bouthenot <kolter@openics.org>
-Build-Depends-Indep: asciidoc (>= 8.2), source-highlight
-Build-Depends: debhelper (>= 7.0.50), cmake, libncursesw5-dev,
- ruby, ruby1.8-dev, libperl-dev, python-dev, libaspell-dev, liblua5.1-0-dev,
- tcl-dev, libgnutls-dev, dpkg-dev (>= 1.13.19), pkg-config
-Standards-Version: 3.8.3
-Homepage: http://weechat.org/
-Vcs-Git: git://git.debian.org/users/kolter-guest/weechat.git
-Vcs-Browser: http://git.debian.org/git/users/kolter-guest/weechat.git
-DM-Upload-Allowed: yes
+Maintainer: Emmanuel Bouthenot <kolter@debian.org>
+Build-Depends:
+    asciidoc (>= 8.5),
+    source-highlight,
+    xsltproc,
+    docbook-xsl,
+    docbook-xml,
+    debhelper (>= 9),
+    cmake, pkg-config,
+    libncursesw5-dev,
+    gem2deb,
+    libperl-dev,
+    python-dev,
+    libaspell-dev,
+    liblua5.1-0-dev,
+    tcl8.5-dev,
+    guile-2.0-dev,
+    libv8-dev,
+    libcurl4-gnutls-dev,
+    libgcrypt20-dev,
+    libgnutls28-dev,
+    zlib1g-dev
+Standards-Version: 3.9.6
+Homepage: https://weechat.org/
+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
 Depends: ${misc:Depends}, weechat-curses (>= ${source:Version})
+Suggests: weechat-doc (= ${source:Version})
 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
-  - infobar with highlight notification
  - 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-curses
@@ -33,16 +58,25 @@ Depends: ${misc:Depends}, ${shlibs:Depends}, weechat-core (= ${binary:Version})
 Conflicts: weechat-common
 Breaks: weechat-scripts (<= 20090221-1)
 Recommends: weechat-plugins (= ${binary:Version})
+Suggests: weechat-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
-  - infobar with highlight notification
  - 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).
@@ -70,9 +104,12 @@ Description: Fast, light and extensible chat client - plugins
 .
 This package provides some plugins to enhance WeeChat. It currently
 ships the following plugins:
-  - Perl, Python, Ruby, Lua, and Tcl scripting
+  - Perl, Python, Ruby, Lua, Tcl, Scheme and Javascript scripting
+  - scripts manager
  - Spell checking (thanks to aspell)
-  - And many others (Fifo, ...)
+  - FIFO pipe for remote control
+  - IRC proxy
+  - Trigger

 Package: weechat-doc
 Section: doc
@@ -88,7 +125,7 @@ Package: weechat-dev
 Section: devel
 Architecture: all
 Depends: ${misc:Depends}
-Description: Fast, light and extensible chat client - developement headers
+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.
 .
@@ -1,22 +1,32 @@
-This package was debianized by Sebastien Helleu <flashcode@flashtux.org> on
-Sat, 21 May 2005 08:00:00 +0200.
+Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=174
+Upstream-Name: weechat
+Upstream-Contact: Sébastien Helleu <flashcode@flashtux.org>
+Source: https://weechat.org/

-It was downloaded from http://weechat.org/files/src/
+Files: *
+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+

-Copyright:
-    Copyright (C) (2003-2010) Sebastien Helleu <flashcode@flashtux.org>
-    Copyright (C) (2005-2010) Emmanuel Bouthenot <kolter@openics.org>
-    Copyright (C) (2008-2010) Dmitry Kobylin <fnfal@academ.tsc.ru> (tcl plugin)
+Files: debian/*
+Copyright: 2005-2008, Julien Louis <ptitlouis@sysif.net>
+           2008-2014, Emmanuel Bouthenot <kolter@openics.org>
+License: GPL-3+

-This program 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.
-
-On Debian systems, the complete text of the GNU General Public
-License, Version 3 can be found in the file
-/usr/share/common-licenses/GPL-3
-
-Debian packaging (licensed under the GPLv3):
-  Copyright(C) 2005-2008, Julien Louis <ptitlouis@sysif.net>
-  Copyright(C) 2008-2010, Emmanuel Bouthenot <kolter@openics.org>
+License: GPL-3+
+ 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 this program.  If not, see <http://www.gnu.org/licenses/>.
+ .
+ On Debian systems, the complete text of the GNU General Public License,
+ Version 3 can be found in the file /usr/share/common-licenses/GPL-3
@@ -0,0 +1,2 @@
+[DEFAULT]
+debian-branch = unstable
@@ -1,37 +1,33 @@
 #!/usr/bin/make -f

-builddir/Makefile:
-	mkdir -p builddir
-	cd builddir && \
+BUILDDIR = builddir
+
+$(BUILDDIR)/Makefile:
+	mkdir -p $(BUILDDIR)
+	cd $(BUILDDIR) && \
 	cmake .. \
 		-DCMAKE_INSTALL_PREFIX:FILEPATH=/usr \
-		-DCMAKE_C_FLAGS:STRING="$(CFLAGS)" \
-		-DCMAKE_LD_FLAGS:STRING="-Wl,-z,defs" \
-		-DCMAKE_CXX_FLAGS:STRING="$(CXXFLAGS)" \
+		-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

-build: build-stamp
-build-stamp: builddir/Makefile
-	dh_testdir
-	$(MAKE) -C builddir
-	touch $@
+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_install:
-	$(MAKE) -C builddir DESTDIR=$(CURDIR)/debian/tmp install
-	dh_install
+override_dh_installchangelogs:
+	dh_installchangelogs ChangeLog.asciidoc

 override_dh_strip:
 	dh_strip --dbg-package=weechat-dbg

-clean:
-	rm -rf builddir
-	dh $@
-
 %:
-	dh $@
+	dh $@ --parallel --builddirectory=$(BUILDDIR)
@@ -0,0 +1 @@
+debian/upstream-signing-key.pgp
@@ -0,0 +1,2 @@
+unapply-patches
+abort-on-upstream-changes
@@ -1,2 +1,2 @@
-version=2
-http://weechat.org/files/src/weechat-(\d.*)\.tar\.bz2
+version=3
+opts=pgpsigurlmangle=s/$/.asc/  https://weechat.org/files/src/weechat-(\d.*)\.tar\.bz2
@@ -1,4 +1,4 @@
-AUTHORS
-NEWS
-README
-UPGRADE_0.3
+AUTHORS.asciidoc
+Contributing.asciidoc
+README.asciidoc
+ReleaseNotes.asciidoc
@@ -1,2 +1,4 @@
-usr/bin/weechat-curses
+usr/bin/weechat
 debian/weechat.xpm usr/share/pixmaps
+usr/share/man/man1/weechat.1
+usr/share/man/*/man1/weechat.1
@@ -0,0 +1,8 @@
+usr/bin/weechat usr/bin/weechat-curses
+usr/share/man/man1/weechat.1.gz usr/share/man/man1/weechat-curses.1.gz
+usr/share/man/de/man1/weechat.1.gz usr/share/man/de/man1/weechat-curses.1.gz
+usr/share/man/fr/man1/weechat.1.gz usr/share/man/fr/man1/weechat-curses.1.gz
+usr/share/man/it/man1/weechat.1.gz usr/share/man/it/man1/weechat-curses.1.gz
+usr/share/man/ja/man1/weechat.1.gz usr/share/man/ja/man1/weechat-curses.1.gz
+usr/share/man/pl/man1/weechat.1.gz usr/share/man/pl/man1/weechat-curses.1.gz
+usr/share/man/ru/man1/weechat.1.gz usr/share/man/ru/man1/weechat-curses.1.gz
@@ -1 +0,0 @@
-weechat-curses: manpage-has-errors-from-man usr/share/man/man1/weechat-curses.1.gz 54: warning [p 1, 8.2i]: cannot adjust line
@@ -1 +0,0 @@
-doc/weechat-curses.1
@@ -1,4 +1,4 @@
 ?package(weechat-curses):needs="text" section="Applications/Network/Communication" \
-		title="weechat-curses" \
+		title="weechat" \
 		icon="/usr/share/pixmaps/weechat.xpm" \
-		command="/usr/bin/weechat-curses"
+		command="/usr/bin/weechat"
@@ -0,0 +1,10 @@
+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-doc/html/weechat_dev.en.html
+Files: /usr/share/doc/weechat-doc/html/weechat_dev.en.html
@@ -0,0 +1,10 @@
+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-doc/html/weechat_dev.fr.html
+Files: /usr/share/doc/weechat-doc/html/weechat_dev.fr.html
@@ -0,0 +1,10 @@
+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-doc/html/weechat_dev.ja.html
+Files: /usr/share/doc/weechat-doc/html/weechat_dev.ja.html
@@ -0,0 +1,10 @@
+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-doc/html/weechat_faq.de.html
+Files: /usr/share/doc/weechat-doc/html/weechat_faq.de.html
@@ -1,13 +1,10 @@
 Document: weechat-faq-en
 Title: WeeChat FAQ (English)
-Author: Sebastien Helleu
+Author: Sébastien Helleu
 Abstract: This document answers frequently asked questions
 about the WeeChat IRC client (English version).
 Section: Network/Communication

-Format: text
-Files: /usr/share/doc/weechat-doc/weechat_faq.en.txt.gz
-
 Format: HTML
-Index: /usr/share/doc/weechat-doc/weechat_faq.en.html
-Files: /usr/share/doc/weechat-doc/weechat_faq.en.html
+Index: /usr/share/doc/weechat-doc/html/weechat_faq.en.html
+Files: /usr/share/doc/weechat-doc/html/weechat_faq.en.html
@@ -1,13 +1,10 @@
 Document: weechat-faq-fr
 Title: WeeChat FAQ (French)
-Author: Sebastien Helleu
+Author: Sébastien Helleu
 Abstract: This document answers frequently asked questions
 about the WeeChat IRC client (French version).
 Section: Network/Communication

-Format: text
-Files: /usr/share/doc/weechat-doc/weechat_faq.fr.txt.gz
-
 Format: HTML
-Index: /usr/share/doc/weechat-doc/weechat_faq.fr.html
-Files: /usr/share/doc/weechat-doc/weechat_faq.fr.html
+Index: /usr/share/doc/weechat-doc/html/weechat_faq.fr.html
+Files: /usr/share/doc/weechat-doc/html/weechat_faq.fr.html
@@ -0,0 +1,10 @@
+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-doc/html/weechat_faq.it.html
+Files: /usr/share/doc/weechat-doc/html/weechat_faq.it.html
@@ -0,0 +1,10 @@
+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-doc/html/weechat_faq.ja.html
+Files: /usr/share/doc/weechat-doc/html/weechat_faq.ja.html
@@ -1,10 +1,10 @@
 Document: weechat-faq-pl
 Title: WeeChat FAQ (Polish)
-Author: Sebastien Helleu
+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-doc/weechat_faq.pl.html
-Files: /usr/share/doc/weechat-doc/weechat_faq.pl.html
+Index: /usr/share/doc/weechat-doc/html/weechat_faq.pl.html
+Files: /usr/share/doc/weechat-doc/html/weechat_faq.pl.html
@@ -1,10 +1,10 @@
 Document: weechat-plugin-en
-Title: WeeChat plugins API (English)
-Author: Sebastien Helleu
+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-doc/weechat_plugin_api.en.html
-Files: /usr/share/doc/weechat-doc/weechat_plugin_api.en.html
+Index: /usr/share/doc/weechat-doc/html/weechat_plugin_api.en.html
+Files: /usr/share/doc/weechat-doc/html/weechat_plugin_api.en.html
@@ -1,10 +1,10 @@
 Document: weechat-plugin-fr
-Title: WeeChat plugins API (French)
-Author: Sebastien Helleu
+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-doc/weechat_plugin_api.fr.html
-Files: /usr/share/doc/weechat-doc/weechat_plugin_api.fr.html
+Index: /usr/share/doc/weechat-doc/html/weechat_plugin_api.fr.html
+Files: /usr/share/doc/weechat-doc/html/weechat_plugin_api.fr.html
@@ -0,0 +1,10 @@
+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-doc/html/weechat_plugin_api.it.html
+Files: /usr/share/doc/weechat-doc/html/weechat_plugin_api.it.html
@@ -0,0 +1,10 @@
+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-doc/html/weechat_plugin_api.ja.html
+Files: /usr/share/doc/weechat-doc/html/weechat_plugin_api.ja.html
@@ -1,9 +1,9 @@
 Document: weechat-quickstart-de
-Title: WeeChat Quickstart (German)
-Author: Sebastien Helleu
+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-doc/weechat_quickstart.de.html
-Files: /usr/share/doc/weechat-doc/weechat_quickstart.de.html
+Index: /usr/share/doc/weechat-doc/html/weechat_quickstart.de.html
+Files: /usr/share/doc/weechat-doc/html/weechat_quickstart.de.html
@@ -1,12 +1,9 @@
 Document: weechat-quickstart-en
-Title: WeeChat Quickstart (English)
-Author: Sebastien Helleu
+Title: WeeChat quick start guide (English)
+Author: Sébastien Helleu
 Abstract: A short HowTo for new WeeChat users (English version).
 Section: Network/Communication

-Format: text
-Files: /usr/share/doc/weechat-doc/weechat_quickstart.en.txt.gz
-
 Format: HTML
-Index: /usr/share/doc/weechat-doc/weechat_quickstart.en.html
-Files: /usr/share/doc/weechat-doc/weechat_quickstart.en.html
+Index: /usr/share/doc/weechat-doc/html/weechat_quickstart.en.html
+Files: /usr/share/doc/weechat-doc/html/weechat_quickstart.en.html
@@ -0,0 +1,9 @@
+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-doc/html/weechat_quickstart.es.html
+Files: /usr/share/doc/weechat-doc/html/weechat_quickstart.es.html
@@ -1,12 +1,9 @@
 Document: weechat-quickstart-fr
-Title: WeeChat Quickstart (French)
-Author: Sebastien Helleu
+Title: WeeChat quick start guide (French)
+Author: Sébastien Helleu
 Abstract: A short HowTo for new WeeChat users (French version).
 Section: Network/Communication

-Format: text
-Files: /usr/share/doc/weechat-doc/weechat_quickstart.fr.txt.gz
-
 Format: HTML
-Index: /usr/share/doc/weechat-doc/weechat_quickstart.fr.html
-Files: /usr/share/doc/weechat-doc/weechat_quickstart.fr.html
+Index: /usr/share/doc/weechat-doc/html/weechat_quickstart.fr.html
+Files: /usr/share/doc/weechat-doc/html/weechat_quickstart.fr.html
@@ -0,0 +1,9 @@
+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-doc/html/weechat_quickstart.it.html
+Files: /usr/share/doc/weechat-doc/html/weechat_quickstart.it.html
@@ -0,0 +1,9 @@
+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-doc/html/weechat_quickstart.ja.html
+Files: /usr/share/doc/weechat-doc/html/weechat_quickstart.ja.html
@@ -1,9 +1,9 @@
 Document: weechat-quickstart-pl
-Title: WeeChat Quickstart (Polish)
-Author: Sebastien Helleu
+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-doc/weechat_quickstart.pl.html
-Files: /usr/share/doc/weechat-doc/weechat_quickstart.pl.html
+Index: /usr/share/doc/weechat-doc/html/weechat_quickstart.pl.html
+Files: /usr/share/doc/weechat-doc/html/weechat_quickstart.pl.html
@@ -1,9 +1,9 @@
 Document: weechat-quickstart-ru
-Title: WeeChat Quickstart (Russian)
-Author: Sebastien Helleu
+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-doc/weechat_quickstart.ru.html
-Files: /usr/share/doc/weechat-doc/weechat_quickstart.ru.html
+Index: /usr/share/doc/weechat-doc/html/weechat_quickstart.ru.html
+Files: /usr/share/doc/weechat-doc/html/weechat_quickstart.ru.html
@@ -0,0 +1,10 @@
+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-doc/html/weechat_relay_protocol.en.html
+Files: /usr/share/doc/weechat-doc/html/weechat_relay_protocol.en.html
@@ -0,0 +1,10 @@
+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-doc/html/weechat_relay_protocol.fr.html
+Files: /usr/share/doc/weechat-doc/html/weechat_relay_protocol.fr.html
@@ -0,0 +1,10 @@
+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-doc/html/weechat_relay_protocol.ja.html
+Files: /usr/share/doc/weechat-doc/html/weechat_relay_protocol.ja.html
@@ -0,0 +1,10 @@
+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-doc/html/weechat_scripting.de.html
+Files: /usr/share/doc/weechat-doc/html/weechat_scripting.de.html
@@ -1,10 +1,10 @@
 Document: weechat-scripting-en
-Title: WeeChat Scripting Guide (English)
-Author: Sebastien Helleu
+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-doc/weechat_scripting.en.html
-Files: /usr/share/doc/weechat-doc/weechat_scripting.en.html
+Index: /usr/share/doc/weechat-doc/html/weechat_scripting.en.html
+Files: /usr/share/doc/weechat-doc/html/weechat_scripting.en.html
@@ -1,10 +1,10 @@
 Document: weechat-scripting-fr
-Title: WeeChat Scripting Guide (French)
-Author: Sebastien Helleu
+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-doc/weechat_scripting.fr.html
-Files: /usr/share/doc/weechat-doc/weechat_scripting.fr.html
+Index: /usr/share/doc/weechat-doc/html/weechat_scripting.fr.html
+Files: /usr/share/doc/weechat-doc/html/weechat_scripting.fr.html
@@ -0,0 +1,10 @@
+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-doc/html/weechat_scripting.it.html
+Files: /usr/share/doc/weechat-doc/html/weechat_scripting.it.html
@@ -0,0 +1,10 @@
+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-doc/html/weechat_scripting.ja.html
+Files: /usr/share/doc/weechat-doc/html/weechat_scripting.ja.html
@@ -0,0 +1,10 @@
+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-doc/html/weechat_scripting.pl.html
+Files: /usr/share/doc/weechat-doc/html/weechat_scripting.pl.html
@@ -0,0 +1,10 @@
+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-doc/html/weechat_tester.de.html
+Files: /usr/share/doc/weechat-doc/html/weechat_tester.de.html
@@ -1,13 +1,10 @@
 Document: weechat-tester-en
-Title: WeeChat Tester's Guide (English)
-Author: Sebastien Helleu
+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: text
-Files: /usr/share/doc/weechat-doc/weechat_tester.en.txt.gz
-
 Format: HTML
-Index: /usr/share/doc/weechat-doc/weechat_tester.en.html
-Files: /usr/share/doc/weechat-doc/weechat_tester.en.html
+Index: /usr/share/doc/weechat-doc/html/weechat_tester.en.html
+Files: /usr/share/doc/weechat-doc/html/weechat_tester.en.html
@@ -1,13 +1,10 @@
 Document: weechat-tester-fr
-Title: WeeChat Tester's Guide (French)
-Author: Sebastien Helleu
+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: text
-Files: /usr/share/doc/weechat-doc/weechat_tester.fr.txt.gz
-
 Format: HTML
-Index: /usr/share/doc/weechat-doc/weechat_tester.fr.html
-Files: /usr/share/doc/weechat-doc/weechat_tester.fr.html
+Index: /usr/share/doc/weechat-doc/html/weechat_tester.fr.html
+Files: /usr/share/doc/weechat-doc/html/weechat_tester.fr.html
@@ -0,0 +1,10 @@
+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-doc/html/weechat_tester.it.html
+Files: /usr/share/doc/weechat-doc/html/weechat_tester.it.html
@@ -0,0 +1,10 @@
+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-doc/html/weechat_tester.ja.html
+Files: /usr/share/doc/weechat-doc/html/weechat_tester.ja.html
@@ -1,10 +1,10 @@
 Document: weechat-tester-pl
-Title: WeeChat Tester's Guide (Polish)
-Author: Sebastien Helleu
+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-doc/weechat_tester.pl.html
-Files: /usr/share/doc/weechat-doc/weechat_tester.pl.html
+Index: /usr/share/doc/weechat-doc/html/weechat_tester.pl.html
+Files: /usr/share/doc/weechat-doc/html/weechat_tester.pl.html
@@ -0,0 +1,10 @@
+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-doc/html/weechat_user.de.html
+Files: /usr/share/doc/weechat-doc/html/weechat_user.de.html
@@ -1,10 +1,10 @@
 Document: weechat-user-en
-Title: WeeChat User's Guide (English)
-Author: Sebastien Helleu
+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-doc/weechat_user.en.html
-Files: /usr/share/doc/weechat-doc/weechat_user.en.html
+Index: /usr/share/doc/weechat-doc/html/weechat_user.en.html
+Files: /usr/share/doc/weechat-doc/html/weechat_user.en.html
@@ -1,10 +1,10 @@
 Document: weechat-user-fr
-Title: WeeChat User's Guide (French)
-Author: Sebastien Helleu
+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-doc/weechat_user.fr.html
-Files: /usr/share/doc/weechat-doc/weechat_user.fr.html
+Index: /usr/share/doc/weechat-doc/html/weechat_user.fr.html
+Files: /usr/share/doc/weechat-doc/html/weechat_user.fr.html
@@ -0,0 +1,10 @@
+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-doc/html/weechat_user.it.html
+Files: /usr/share/doc/weechat-doc/html/weechat_user.it.html
@@ -0,0 +1,10 @@
+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-doc/html/weechat_user.ja.html
+Files: /usr/share/doc/weechat-doc/html/weechat_user.ja.html
--- a/Show More
+++ b/Show More
				`@@ -1 +0,0 @@`
				`weechat-curses: manpage-has-errors-from-man usr/share/man/man1/weechat-curses.1.gz 54: warning [p 1, 8.2i]: cannot adjust line`