Version 1.1-rc1

irc: add option "reorder" in command /server (closes #229 )
core: replace irc.freenode.net by chat.freenode.net
2026-06-12 14:14:48 +02:00 · 2014-12-21 13:05:19 +01:00 · 2014-12-21 11:12:32 +01:00 · 2014-12-21 09:20:26 +01:00 · 2014-12-20 08:07:13 +01:00 · 2014-12-15 20:39:47 +01:00
889 changed files with 259226 additions and 111929 deletions
@@ -0,0 +1,6 @@
+# files/directories excluded from tarballs
+
+.git*               export-ignore
+debian              export-ignore
+weechat.spec        export-ignore
+.mailmap            export-ignore
@@ -13,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
@@ -40,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 libcurl4-gnutls-dev libgcrypt11-dev libgnutls-dev zlib1g-dev curl
+    - curl -OL https://weechat.org/files/tests/ubuntu/precise/amd64/libcpputest-dev_3.4-3_amd64.deb
+    - sudo dpkg -i libcpputest-dev_3.4-3_amd64.deb
+    - sudo pip install msgcheck pylint
+
+script:
+    - ./scripts/build.sh
+    - msgcheck po/*.po
+    - pylint doc/docgen.py
+
+after_success:
+    - weechat --help
+    - weechat -r "/debug libs;/quit"
+
+matrix:
+    fast_finish: true
@@ -1,53 +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
-* Elián Hanisch, IRC: 'm4v'
-* Marco Paolone
-* Dmitry Kobylin
-* Dominik Honnef
-* JD Horelick, IRC: 'jdhore'
-* Stefano Pigozzi
-* Ivan Sichmann Freitas
-* Gu1ll4um3r0m41n
-
-
-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,94 @@
+= 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)
+* Asakura
+* Arvydas Sidorenko
+* Bazerka
+* Benoit Papillault (benoit)
+* Christian Heinz
+* Christopher O'Neill (deltafire)
+* David Flatz
+* Dmitry Kobylin
+* Dominik Honnef
+* Elián Hanisch (m4v)
+* Elizabeth Myers (Elizacat)
+* 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)
+* Krzysztof Koroscik (soltys)
+* Kyle Fuller (kylef)
+* Lázaro A.
+* Leonid Evdokimov
+* Maarten de Vries
+* Marco Paolone
+* Matt Robinson
+* Mantas Mikulėnas (grawity)
+* Mateusz Poszwa
+* Max Anton Teufel
+* Murilo Opsfelder Araujo
+* Nicolas Cavigneaux
+* Nils Görs (nils_2)
+* nyuszika7h
+* Odin
+* 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
+* Simon Arlott
+* Simon Kuhnle
+* Stefano Pigozzi
+* Stfn
+* 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-2012 Sebastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2014 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,142 +19,266 @@
 # 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 "7")
-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")
+if(PREFIX)
+  set(CMAKE_INSTALL_PREFIX ${PREFIX} CACHE PATH "Install path prefix" FORCE)
+endif()

-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 "1-rc1")
+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)
+# package string
+set(PKG_STRING "${PROJECT_NAME} ${VERSION}")
+string(REPLACE "\";\"" "\ " PKG_STRING ${PKG_STRING})

-IF(DEFINED INCLUDEDIR)
-  SET(INCLUDEDIR ${INCLUDEDIR}/${PROJECT_NAME})
-ELSE(DEFINED INCLUDEDIR)
-  SET(INCLUDEDIR ${CMAKE_INSTALL_PREFIX}/include/${PROJECT_NAME})
-ENDIF(DEFINED INCLUDEDIR)
+if(DEFINED LIBDIR)
+  set(LIBDIR ${LIBDIR}/${PROJECT_NAME})
+else()
+  set(LIBDIR ${CMAKE_INSTALL_PREFIX}/lib/${PROJECT_NAME})
+endif()

-OPTION(ENABLE_NCURSES   "Enable Ncurses interface"                 ON)
-OPTION(ENABLE_GTK       "Enable GTK interface"                     OFF)
-OPTION(ENABLE_NLS       "Enable Native Language Support"           ON)
-OPTION(ENABLE_GCRYPT    "Enable libgcrypt support"                 ON)
-OPTION(ENABLE_GNUTLS    "Enable SSLv3/TLS support"                 ON)
-OPTION(ENABLE_LARGEFILE "Enable Large File Support"                ON)
-OPTION(ENABLE_ZLIB      "Enable Zlib support"                      ON)
-OPTION(ENABLE_ALIAS     "Enable Alias plugin"                      ON)
-OPTION(ENABLE_ASPELL    "Enable Aspell plugin"                     ON)
-OPTION(ENABLE_CHARSET   "Enable Charset plugin"                    ON)
-OPTION(ENABLE_DEMO      "Enable Demo plugin"                       OFF)
-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_RMODIFIER "Enable Rmodifier plugin"                  ON)
-OPTION(ENABLE_SCRIPTS   "Enable script plugins"                    ON)
-OPTION(ENABLE_PERL      "Enable Perl scripting language"           ON)
-OPTION(ENABLE_PYTHON    "Enable Python scripting language"         ON)
-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_XFER      "Enable Xfer plugin"                       ON)
-OPTION(ENABLE_DOC       "Enable Documentation"                     ON)
+if(NOT DEFINED SHAREDIR)
+  set(SHAREDIR ${CMAKE_INSTALL_PREFIX}/share)
+endif()

-IF(NOT DEFINED WEECHAT_HOME OR "${WEECHAT_HOME}" STREQUAL "")
-  SET(WEECHAT_HOME "~/.weechat")
-ENDIF(NOT DEFINED WEECHAT_HOME OR "${WEECHAT_HOME}" STREQUAL "")
+if(NOT DEFINED MANDIR)
+  set(MANDIR ${SHAREDIR}/man)
+endif()

-SET(WEECHAT_HOME "${WEECHAT_HOME}" CACHE
+if(NOT DEFINED LOCALEDIR)
+  set(LOCALEDIR ${SHAREDIR}/locale)
+endif()
+
+if(DEFINED INCLUDEDIR)
+  set(INCLUDEDIR ${INCLUDEDIR}/${PROJECT_NAME})
+else()
+  set(INCLUDEDIR ${CMAKE_INSTALL_PREFIX}/include/${PROJECT_NAME})
+endif()
+
+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_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)
+mark_as_advanced(CLEAR WEECHAT_HOME)

-IF(ENABLE_NLS)
-  ADD_SUBDIRECTORY( po )
-ENDIF(ENABLE_NLS)
+# 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)

-ADD_SUBDIRECTORY( src )
-ADD_SUBDIRECTORY( doc )
+if(COMMAND cmake_policy)
+  if(POLICY CMP0003)
+    cmake_policy(SET CMP0003 NEW)
+  endif()
+  if(POLICY CMP0017)
+    cmake_policy(SET CMP0017 NEW)
+  endif()
+endif()

-CONFIGURE_FILE(config.h.cmake config.h @ONLY)
+add_definitions(-DHAVE_CONFIG_H)

-CONFIGURE_FILE(
-  "${CMAKE_CURRENT_SOURCE_DIR}/cmake/makedist.sh.in"
-  "${CMAKE_CURRENT_BINARY_DIR}/makedist.sh" IMMEDIATE
-  @ONLY)
+include(CheckIncludeFiles)
+include(CheckFunctionExists)
+include(CheckSymbolExists)

-CONFIGURE_FILE(
+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)
+
+if(ENABLE_TESTS)
+  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-2012 Sebastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2014 Sébastien Helleu <flashcode@flashtux.org>
 # Copyright (C) 2005 Julien Louis <ptitlouis@sysif.net>
 # Copyright (C) 2006-2009 Emmanuel Bouthenot <kolter@openics.org>
 #
@@ -19,40 +19,63 @@
 # 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/FindGuile.cmake \
-             cmake/makedist.sh.in \
+             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,340 +0,0 @@
-WeeChat News
-============
-Sébastien Helleu <flashcode@flashtux.org>
-v0.3.7, 2012-02-26
-
-
-Version 0.3.7 (2012-02-26)
--------------------------
-
-* option `scroll_unread` has been moved from command `/input` to `/window`,
-  therefore default command of key alt-u has been updated. To bind key with new
-  default value:
-** `/key bind meta-u /window scroll_unread`
-* extended regex is used in filters and irc ignore, so some chars that
-  needed escape in past do not need any more (for example `[0-9]\+` becomes
-  `[0-9]+`), filters and ignore have to be manually fixed
-* option 'weechat.look.highlight_regex' becomes case insensitive by default,
-  to make it case sensitive, use "(?-i)" at beginning of string, for example:
-  "(?-i)FlashCode|flashy"
-* option 'weechat.history.max_lines' has been renamed to
-  'weechat.history.max_buffer_lines_number'
-* option 'weechat.plugin.extension' now supports list of extensions, and new
-  default value is ".so,.dll" (with this value, weechat.conf is compatible with
-  Cygwin)
-
-Version 0.3.6 (2011-10-22)
--------------------------
-
-Important release notes:
-
-* bold is not used any more for basic colors (used only if terminal has less
-  than 16 colors), a new option has been added to force bold if needed:
-  'weechat.look.color_basic_force_bold'
-* option 'weechat.look.hline_char' has been renamed to
-  'weechat.look.separator_horizontal'
-
-Version 0.3.5 (2011-05-15)
--------------------------
-
-Important release notes:
-
-* if you have some colors defined in section "palette" with version 0.3.4, you
-  should remove all colors defined, and add new aliases (it's not needed any
-  more to add colors before using them)
-* colors for nick prefixes (char for op, voice, ..) are defined in a single
-  option 'irc.color.nick_prefixes', therefore following options will be lost:
-  'irc.color.nick_prefix_op', 'irc.color.nick_prefix_halfop',
-  'irc.color.nick_prefix_voice', 'irc.color.nick_prefix_user'
-* count of messages have been added to hotlist by default, if you want to come
-  back to old behaviour, do that:
-** `/set weechat.look.hotlist_count_max 0`
-** `/set weechat.look.hotlist_buffer_separator ","`
-* when you are away, all buffers are now added to hotlist by default (even if
-  they are displayed in a window), if you want to come back to old behaviour, do
-  that:
-** `/set weechat.look.hotlist_add_buffer_if_away off`
-* new keys were added, use command `/key missing` to add them or `/key listdiff`
-  to see differences between your current keys and WeeChat default keys
-
-Version 0.3.4 (2011-01-16)
--------------------------
-
-Important release notes:
-
-* if you are using `/upgrade` from a previous release:
-** some nick prefixes can be wrong, so it is recommended to do `/allchan names`
-** nick colors are defined with a new option 'weechat.color.chat_nick_colors',
-   therefore old options 'weechat.color.chat_nick_color1..10' will be lost when
-   upgrading
-** nick colors in messages displayed will be wrong if you changed some nick colors
-   (old default colors will be used)
-* some IRC options have been renamed, before upgrading to this version, note
-  value for old options, and set them again with new name:
-** options moved from 'network' section to servers (with global value, and server
-   value, like other server options):
-*** 'irc.network.connection_timeout' moved to 'irc.server_default.connection_timeout'
-*** 'irc.network.anti_flood_prio_high' moved to 'irc.server_default.anti_flood_prio_high'
-*** 'irc.network.anti_flood_prio_low' moved to 'irc.server_default.anti_flood_prio_low'
-*** 'irc.network.away_check' moved to 'irc.server_default.away_check'
-*** 'irc.network.away_check_max_nicks' moved to 'irc.server_default.away_check_max_nicks'
-*** 'irc.network.default_msg_part' moved to 'irc.server_default.default_msg_part'
-*** 'irc.network.default_msg_quit' moved to 'irc.server_default.default_msg_quit'
-** other IRC options renamed:
-*** 'irc.look.open_channel_near_server' moved to 'irc.look.new_channel_position'
-    (old option was boolean, new is integer with value as string)
-*** 'irc.look.open_pv_near_server' moved to 'irc.look.new_pv_position'
-    (old option was boolean, new is integer with value as string)
-
-Version 0.3.3 (2010-08-07)
--------------------------
-
-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,40 +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
-* small, fast and very light
-* customizable and extensible with plugins (C, Perl, Python, Ruby, Lua, Tcl, Guile)
-* compliant with IRC RFCs 1459, 2810, 2811, 2812 and 2813
-* developed from scratch
-* multi-platform (GNU/Linux, *BSD, Mac OS X, QNX, Windows & other)
-* free software, released under GPLv3
-
-
-Copyright
---------
-
-Copyright (C) 2003-2012 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,91 @@
+= WeeChat
+:author: Sébastien Helleu
+:email: flashcode@flashtux.org
+:lang: en
+
+
+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.
+
+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).
+* Fully documented and translated into several languages.
+* Developed from scratch.
+* Free software, released under GPLv3.
+
+image::http://static.weechat.org/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
+* 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 .. -DPREFIX=/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-2014 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-2012 Sebastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2014 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
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2012 Sebastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2014 Sébastien Helleu <flashcode@flashtux.org>
 #
 # This file is part of WeeChat, the extensible chat client.
 #
@@ -20,27 +20,32 @@
 # - 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.*")
+  if(${ASCIIDOC_VERSION} MATCHES "asciidoc 8.*")
+    set(ASCIIDOC_FOUND TRUE)
+  endif()

-  MARK_AS_ADVANCED(
+  mark_as_advanced(
    ASCIIDOC_EXECUTABLE
    )
-ENDIF(ASCIIDOC_EXECUTABLE)
+endif()
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2012 Sebastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2014 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,5 +1,5 @@
 #
-# Copyright (C) 2010-2012 Sebastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2014 Sébastien Helleu <flashcode@flashtux.org>
 #
 # This file is part of WeeChat, the extensible chat client.
 #
@@ -17,15 +17,21 @@
 # along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 #

-ADD_LIBRARY(rmodifier MODULE
-rmodifier.c rmodifier.h
-rmodifier-command.c rmodifier-command.h
-rmodifier-completion.c rmodifier-completion.h
-rmodifier-config.c rmodifier-config.h
-rmodifier-debug.c rmodifier-debug.h
-rmodifier-info.c rmodifier-info.h)
-SET_TARGET_PROPERTIES(rmodifier PROPERTIES PREFIX "")
+# - Find CppUTest
+# This module finds if Guile is installed and determines where the include files
+# and libraries are. It also determines what the name of the library is. This
+# code sets the following variables:
+#
+# CPPUTEST_FOUND        = CppUTest is installed
+# CPPUTEST_INCLUDE_DIRS = CppUTest include directory
+# CPPUTEST_LIBRARIES    = Link options to compile with CppUTest

-TARGET_LINK_LIBRARIES(rmodifier)
+if(CPPUTEST_FOUND)
+   # Already in cache, be silent
+   set(CPPUTEST_FIND_QUIETLY TRUE)
+endif()

-INSTALL(TARGETS rmodifier LIBRARY DESTINATION ${LIBDIR}/plugins)
+find_package(PkgConfig)
+if(PKG_CONFIG_FOUND)
+  pkg_search_module(CPPUTEST REQUIRED 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-2012 Sebastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2014 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)
+   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_CFLAGS} MATCHES "\n")
+      set(GCRYPT_CFLAGS " ")
+   endif()

-   IF(GCRYPT_LDFLAGS AND GCRYPT_CFLAGS)
-      SET(GCRYPT_FOUND TRUE)
-   ENDIF(GCRYPT_LDFLAGS AND GCRYPT_CFLAGS)
+endif()

-ENDIF(LIBGCRYPT_CONFIG_EXECUTABLE)
+# 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)

-MARK_AS_ADVANCED(GCRYPT_CFLAGS GCRYPT_LDFLAGS)
+if(GCRYPT_FOUND)
+  mark_as_advanced(GCRYPT_CFLAGS GCRYPT_LDFLAGS)
+endif()
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2012 Sebastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2014 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_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(LIBINTL_HAS_DGETTEXT)
-    ENDIF(LIBINTL_LIBRARY)
-  ENDIF(LIBC_HAS_DGETTEXT)
-ENDIF(HAVE_LIBINTL_H)
+      if(LIBINTL_HAS_DGETTEXT)
+        set(GETTEXT_FOUND TRUE)
+      endif()
+    endif()
+  endif()
+endif()
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2012 Sebastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2014 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
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2011-2012 Sebastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2011-2014 Sébastien Helleu <flashcode@flashtux.org>
 #
 # This file is part of WeeChat, the extensible chat client.
 #
@@ -26,26 +26,20 @@
 # GUILE_INCLUDE_DIRS = Guile include directory
 # GUILE_LIBRARIES    = Link options to compile Guile

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

-FIND_PATH(GUILE_INCLUDE_DIR libguile.h /usr/include /usr/local/include /usr/include/libguile /usr/local/include/libguile)
-
-FIND_LIBRARY(GUILE_LIBRARY NAMES guile PATH /usr/lib /usr/local/lib)
-
-IF(GUILE_INCLUDE_DIR AND GUILE_LIBRARY)
-  SET(GUILE_FOUND TRUE)
-  SET(GUILE_INCLUDE_DIRS ${GUILE_INCLUDE_DIR})
-  SET(GUILE_LIBRARIES ${GUILE_LIBRARY})
-ELSE(GUILE_INCLUDE_DIR AND GUILE_LIBRARY)
-  SET(GUILE_FOUND FALSE)
-  SET(GUILE_INCLUDE_DIRS)
-  SET(GUILE_LIBRARIES)
-ENDIF(GUILE_INCLUDE_DIR AND GUILE_LIBRARY)
-
-MARK_AS_ADVANCED(
-  GUILE_INCLUDE_DIR
-  GUILE_LIBRARY
-  )
+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-2012 Sebastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2014 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-2012 Sebastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2014 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.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-2012 Sebastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2014 Sébastien Helleu <flashcode@flashtux.org>
 #
 # This file is part of WeeChat, the extensible chat client.
 #
@@ -17,41 +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/ncursesw /usr/include/ncurses /usr/include
-  /usr/local/include/ncursesw /usr/local/include/ncuses /usr/local/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
 )
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2012 Sebastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2014 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}")
+  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
+  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)
+  if(PERL_LIBRARY AND PERL_INCLUDE_PATH)
+    set(PERL_FOUND TRUE)
+  endif()

-  MARK_AS_ADVANCED(
+  mark_as_advanced(
    PERL_EXECUTABLE
    PERL_INCLUDE_PATH
    PERL_LIBRARY
    PERL_CFLAGS
    PERL_LFLAGS
    )
-ENDIF(PERL_EXECUTABLE)
-
+endif()
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2012 Sebastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2014 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.7 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
+  find_path(PYTHON_INCLUDE_PATH
    NAMES Python.h
-    PATHS ${PYTHON_INC_DIR}
+    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()

-  FIND_LIBRARY(PYTHON_LIBRARY
-    NAMES python python2.7 python2.6 python2.5 python2.4 python2.3 python2.2
-    PATHS ${PYTHON_POSSIBLE_LIB_PATH}
-    )
+  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()

-  IF(PYTHON_LIBRARY AND PYTHON_INCLUDE_PATH)
-    SET(PYTHON_FOUND TRUE)
-  ENDIF(PYTHON_LIBRARY AND PYTHON_INCLUDE_PATH)
-
-  MARK_AS_ADVANCED(
+  mark_as_advanced(
    PYTHON_EXECUTABLE
    PYTHON_INCLUDE_PATH
    PYTHON_LIBRARY
    PYTHON_LFLAGS
    )

-ENDIF(PYTHON_EXECUTABLE)
+endif()
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2012 Sebastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2014 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 ruby1.9.2 ruby192 ruby1.9.1 ruby191 ruby1.9 ruby19 ruby1.8 ruby18 ruby1.6 ruby16 ruby
-  PATHS /usr/bin /usr/local/bin /usr/pkg/bin
-  )
+find_package(PkgConfig)
+if(PKG_CONFIG_FOUND)
+  pkg_search_module(RUBY 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 RbConfig::CONFIG['rubyhdrdir'] || RbConfig::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 RbConfig::CONFIG['arch']"
-    OUTPUT_VARIABLE RUBY_ARCH
-    )
-
-  EXECUTE_PROCESS(
-    COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG['libdir']"
-    OUTPUT_VARIABLE RUBY_POSSIBLE_LIB_PATH
-    )
-
-  EXECUTE_PROCESS(
-    COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG['rubylibdir']"
-    OUTPUT_VARIABLE RUBY_RUBY_LIB_PATH
-    )
-
-  EXECUTE_PROCESS(
-    COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::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-1.9.2 ruby1.9.2 ruby192 ruby-1.9.1 ruby1.9.1 ruby191 ruby1.9 ruby19 ruby1.8 ruby18 ruby1.6 ruby16 ruby
-    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-2012 Sebastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2014 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-2012 Sebastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2008-2014 Sébastien Helleu <flashcode@flashtux.org>
 #
 # This file is part of WeeChat, the extensible chat client.
 #
@@ -51,26 +51,26 @@
 #      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}"
@@ -82,12 +82,12 @@ SET(TCL_POSSIBLE_LIB_PATHS
  /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"
@@ -95,9 +95,9 @@ IF(WIN32)
    "C:/Program Files/Tcl/lib"
    "C:/Tcl/lib"
    )
-ENDIF(WIN32)
+endif()

-FIND_LIBRARY(TCL_LIBRARY
+find_library(TCL_LIBRARY
  NAMES
  tcl86 tcl8.6
  tcl85 tcl8.5
@@ -106,18 +106,18 @@ FIND_LIBRARY(TCL_LIBRARY
  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}
@@ -132,9 +132,8 @@ SET(TCL_POSSIBLE_INCLUDE_PATHS
  /usr/local/include/tcl8.5
  )

-
-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"
@@ -142,21 +141,21 @@ IF(WIN32)
    "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
@@ -31,48 +31,47 @@
 # (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"
+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)
+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 \"[^\"]*\"$")
+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}")
+  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( "${ZLIB_H}" MATCHES "^.*ZLIB_VERSION \"[0-9]+\\.[0-9]+\\.[0-9]+\\.([0-9]+).*$")
+  # 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()
+  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()
+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-2012 Sebastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2014 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-2012 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,28 +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@"
@@ -31,4 +17,5 @@
 #define WEECHAT_SHAREDIR "@SHAREDIR@"
 #define LOCALEDIR "@LOCALEDIR@"
 #define WEECHAT_HOME "@WEECHAT_HOME@"
+#define CA_FILE "@CA_FILE@"
 #define _GNU_SOURCE 1
@@ -1,3 +1,155 @@
+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
@@ -387,7 +539,7 @@ 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

@@ -401,13 +553,13 @@ 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

@@ -1 +1 @@
-7
+9
@@ -2,15 +2,30 @@ Source: weechat
 Section: net
 Priority: optional
 Maintainer: Emmanuel Bouthenot <kolter@debian.org>
-Build-Depends-Indep: asciidoc (>= 8.5), source-highlight
-Build-Depends: debhelper (>= 7.0.50), cmake, libncursesw5-dev,
- ruby1.9.1, ruby1.9.1-dev, libperl-dev, python-dev, libaspell-dev, liblua5.1-0-dev,
- tcl8.5-dev, guile-1.8-dev, libgcrypt11-dev, libgnutls-dev, zlib1g-dev,
- libcurl4-gnutls-dev, dpkg-dev (>= 1.13.19), pkg-config
-Standards-Version: 3.9.2
-Homepage: http://weechat.org/
-Vcs-Git: git://git.debian.org/users/kolter/weechat.git
-Vcs-Browser: http://git.debian.org/?p=users/kolter/weechat.git
+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,
+    libcurl4-gnutls-dev,
+    libgcrypt20-dev,
+    libgnutls28-dev,
+    zlib1g-dev
+Standards-Version: 3.9.5
+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
@@ -20,6 +35,8 @@ Description: Fast, light and extensible chat client
 WeeChat (Wee Enhanced Environment for Chat) is a fast and light chat client
 for many operating systems. Everything can be done with a keyboard.
 It is customizable and extensible with plugins/scripts, and includes:
+  - support of IRC protocol (native)
+  - support of XMPP/Jabber protocol (with additional script)
  - nicklist
  - smart hotlist
  - horizontal and vertical split
@@ -28,7 +45,8 @@ Description: Fast, light and extensible chat client
  - 256 colors support
  - incremental text search
  - dynamic filtering of buffer content
-  - Perl, Python, Ruby, Lua, Tcl and Guile scripting
+  - Perl, Python, Ruby, Lua, Tcl and Scheme scripting
+  - scripts manager
  - spell checking
  - highly customizable and extensible
  - and much more!
@@ -44,6 +62,8 @@ Description: Fast, light and extensible chat client - console client
 WeeChat (Wee Enhanced Environment for Chat) is a fast and light chat client
 for many operating systems. Everything can be done with a keyboard.
 It is customizable and extensible with plugins/scripts, and includes:
+  - support of IRC protocol (native)
+  - support of XMPP/Jabber protocol (with additional script)
  - nicklist
  - smart hotlist
  - horizontal and vertical split
@@ -52,7 +72,8 @@ Description: Fast, light and extensible chat client - console client
  - 256 colors support
  - incremental text search
  - dynamic filtering of buffer content
-  - Perl, Python, Ruby, Lua, Tcl, and Guile scripting
+  - Perl, Python, Ruby, Lua, Tcl and Scheme scripting
+  - scripts manager
  - spell checking
  - highly customizable and extensible
  - and much more!
@@ -82,11 +103,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, Tcl, and Guile scripting
+  - Perl, Python, Ruby, Lua, Tcl and Scheme scripting
+  - scripts manager
  - Spell checking (thanks to aspell)
  - FIFO pipe for remote control
  - IRC proxy
-  - Realtime input/output changes through regular expressions
+  - Trigger

 Package: weechat-doc
 Section: doc
@@ -102,7 +124,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,17 +1,17 @@
 Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=174
 Upstream-Name: weechat
-Upstream-Contact: Sebastien Helleu <flashcode@flashtux.org>
-Source: http://weechat.org/
+Upstream-Contact: Sébastien Helleu <flashcode@flashtux.org>
+Source: https://weechat.org/

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

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

 License: GPL-3+
@@ -0,0 +1,5 @@
+[DEFAULT]
+upstream-branch = upstream
+debian-branch = unstable
+upstream-tag = v%(version)s
+compression = xz
@@ -1,32 +1,21 @@
 #!/usr/bin/make -f

-# Default build flags
-CFLAGS = -g -O2
-LDFLAGS = -Wl,-Bsymbolic-functions
+BUILDDIR = builddir

-# dpkg >= 1.16.1 provides enhanced build flags (hardening features, etc.)
-DPKG_EXPORT_BUILDFLAGS = 1
-include /usr/share/dpkg/buildflags.mk
-
-builddir/Makefile:
-	mkdir -p builddir
-	cd builddir && \
+$(BUILDDIR)/Makefile:
+	mkdir -p $(BUILDDIR)
+	cd $(BUILDDIR) && \
 	cmake .. \
 		-DCMAKE_INSTALL_PREFIX:FILEPATH=/usr \
+		-DENABLE_DOC:BOOL=ON \
+		-DENABLE_MAN:BOOL=ON \
 		-DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo \
-		-DCMAKE_C_FLAGS_RELWITHDEBINFO:STRING="$(CFLAGS)" \
+		-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 VERBOSE=1
-#	touch $@
-
-override_dh_auto_build: builddir/Makefile
-	$(MAKE) -C builddir
+override_dh_auto_build: $(BUILDDIR)/Makefile
 	dh_auto_build

 override_dh_auto_configure:
@@ -34,16 +23,11 @@ override_dh_auto_configure:
 	# 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,7 @@
+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/fr/man1/weechat.1.gz usr/share/man/fr/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/it/man1/weechat.1.gz usr/share/man/it/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/pl/man1/weechat.1.gz usr/share/man/pl/man1/weechat-curses.1.gz
@@ -1 +0,0 @@
-weechat-curses: manpage-has-errors-from-man usr/share/man/man1/weechat-curses.1.gz 61: warning [p 1, 9.0i]: 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"
@@ -1,8 +1,8 @@
 Document: weechat-dev-en
-Title: WeeChat Developer's Guide (English)
-Author: Sebastien Helleu
+Title: WeeChat developer's guide (English)
+Author: Sébastien Helleu
 Abstract: This manual describes WeeChat internals and
-how to contribute to WeeChat (English version).
+ how to contribute to WeeChat (English version).
 Section: Network/Communication

 Format: 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
@@ -1,6 +1,6 @@
 Document: weechat-faq-de
 Title: WeeChat FAQ (German)
-Author: Sebastien Helleu
+Author: Sébastien Helleu
 Abstract: This document answers frequently asked questions
 about the WeeChat IRC client (German version).
 Section: Network/Communication
@@ -1,6 +1,6 @@
 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
@@ -1,6 +1,6 @@
 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
@@ -1,6 +1,6 @@
 Document: weechat-faq-it
 Title: WeeChat FAQ (Italian)
-Author: Sebastien Helleu
+Author: Sébastien Helleu
 Abstract: This document answers frequently asked questions
 about the WeeChat IRC client (Italian version).
 Section: Network/Communication
@@ -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,6 +1,6 @@
 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
@@ -1,6 +1,6 @@
 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
@@ -1,6 +1,6 @@
 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
@@ -1,6 +1,6 @@
 Document: weechat-plugin-it
-Title: WeeChat plugins API (Italian)
-Author: Sebastien Helleu
+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
@@ -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,6 +1,6 @@
 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

@@ -1,6 +1,6 @@
 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

@@ -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,6 +1,6 @@
 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

@@ -1,6 +1,6 @@
 Document: weechat-quickstart-it
-Title: WeeChat Quickstart (Italian)
-Author: Sebastien Helleu
+Title: WeeChat quick start guide (Italian)
+Author: Sébastien Helleu
 Abstract: A short HowTo for new WeeChat users (Italian version).
 Section: Network/Communication

@@ -1,6 +1,6 @@
 Document: weechat-quickstart-ja
-Title: WeeChat Quickstart (Japanese)
-Author: Sebastien Helleu
+Title: WeeChat quick start guide (Japanese)
+Author: Sébastien Helleu
 Abstract: A short HowTo for new WeeChat users (Japanese version).
 Section: Network/Communication

@@ -1,6 +1,6 @@
 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

@@ -1,6 +1,6 @@
 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

@@ -1,8 +1,8 @@
 Document: weechat-relay-protocol-en
-Title: WeeChat Relay Protocol (English)
-Author: Sebastien Helleu
+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).
+ remote GUI to communicate with Relay plugin (English version).
 Section: Network/Communication

 Format: 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
@@ -1,6 +1,6 @@
 Document: weechat-scripting-de
-Title: WeeChat Scripting Guide (German)
-Author: Sebastien Helleu
+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
@@ -1,6 +1,6 @@
 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
@@ -1,6 +1,6 @@
 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
@@ -1,6 +1,6 @@
 Document: weechat-scripting-it
-Title: WeeChat Scripting Guide (Italian)
-Author: Sebastien Helleu
+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
@@ -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
@@ -1,6 +1,6 @@
 Document: weechat-scripting-pl
-Title: WeeChat Scripting Guide (Polish)
-Author: Sebastien Helleu
+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
@@ -1,6 +1,6 @@
 Document: weechat-tester-de
-Title: WeeChat Tester's Guide (German)
-Author: Sebastien Helleu
+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
@@ -1,6 +1,6 @@
 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
@@ -1,6 +1,6 @@
 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
@@ -1,6 +1,6 @@
 Document: weechat-tester-it
-Title: WeeChat Tester's Guide (Italian)
-Author: Sebastien Helleu
+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
@@ -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,6 +1,6 @@
 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
@@ -1,6 +1,6 @@
 Document: weechat-user-de
-Title: WeeChat User's Guide (German)
-Author: Sebastien Helleu
+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
@@ -1,6 +1,6 @@
 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
@@ -1,6 +1,6 @@
 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
@@ -1,6 +1,6 @@
 Document: weechat-user-it
-Title: WeeChat User's Guide (Italian)
-Author: Sebastien Helleu
+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
@@ -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
@@ -0,0 +1,10 @@
+Document: weechat-user-pl
+Title: WeeChat user's guide (Polish)
+Author: Sébastien Helleu
+Abstract: This manual describes how to use the WeeChat
+ IRC client (Polish version).
+Section: Network/Communication
+
+Format: HTML
+Index: /usr/share/doc/weechat-doc/html/weechat_user.pl.html
+Files: /usr/share/doc/weechat-doc/html/weechat_user.pl.html
@@ -1,10 +1,12 @@
 usr/lib/weechat/plugins/aspell.so
+usr/lib/weechat/plugins/exec.so
 usr/lib/weechat/plugins/fifo.so
+usr/lib/weechat/plugins/guile.so
 usr/lib/weechat/plugins/perl.so
 usr/lib/weechat/plugins/python.so
 usr/lib/weechat/plugins/ruby.so
 usr/lib/weechat/plugins/lua.so
 usr/lib/weechat/plugins/tcl.so
-usr/lib/weechat/plugins/guile.so
+usr/lib/weechat/plugins/script.so
 usr/lib/weechat/plugins/relay.so
-usr/lib/weechat/plugins/rmodifier.so
+usr/lib/weechat/plugins/trigger.so
@@ -1,295 +1,397 @@
-/* XPM */
-static char *weechat[] = {
-/* columns rows colors chars-per-pixel */
-"32 32 257 2",
-"   c #000000",
-".  c #0A0904",
-"X  c #080813",
-"o  c #080716",
-"O  c #110D08",
-"+  c #150A15",
-"@  c #1A0D1A",
-"#  c #19150C",
-"$  c #151517",
-"%  c #1F1F32",
-"&  c #13132C",
-"*  c #260A26",
-"=  c #351935",
-"-  c #271927",
-";  c #262608",
-":  c #322C0C",
-">  c #36380B",
-",  c #353316",
-"<  c #232516",
-"1  c #242224",
-"2  c #292935",
-"3  c #2D302D",
-"4  c #2D3330",
-"5  c #3B333B",
-"6  c #1D1C4A",
-"7  c #110F7B",
-"8  c #0E0D65",
-"9  c #221F60",
-"0  c #282948",
-"q  c #292855",
-"w  c #333447",
-"e  c #383855",
-"r  c #2A2978",
-"t  c #302F70",
-"y  c #353465",
-"u  c #363574",
-"i  c #2A286E",
-"p  c #2E4110",
-"a  c #39410C",
-"s  c #3E4C11",
-"d  c #3F5220",
-"f  c #394041",
-"g  c #3E4753",
-"h  c #493F11",
-"j  c #4F1050",
-"k  c #4A0F4B",
-"l  c #572657",
-"z  c #4D374D",
-"x  c #403F6F",
-"c  c #640964",
-"v  c #641E64",
-"b  c #701770",
-"n  c #790A79",
-"m  c #683C68",
-"M  c #623662",
-"N  c #6B2B6B",
-"B  c #454A08",
-"V  c #484C15",
-"C  c #554B16",
-"Z  c #58560A",
-"A  c #595B0B",
-"S  c #545715",
-"D  c #4C5712",
-"F  c #4D5034",
-"G  c #504F24",
-"H  c #4E710E",
-"J  c #4D7C1C",
-"K  c #5B6713",
-"L  c #506B11",
-"P  c #546927",
-"I  c #506D2E",
-"U  c #665B14",
-"Y  c #696C0C",
-"T  c #68730D",
-"R  c #6F7010",
-"E  c #707128",
-"W  c #4D504D",
-"Q  c #46456A",
-"!  c #4C4C7B",
-"~  c #434577",
-"^  c #554C69",
-"/  c #5B5A7D",
-"(  c #54547A",
-")  c #535964",
-"_  c #567745",
-"`  c #4D6B57",
-"'  c #5D6C78",
-"]  c #587069",
-"[  c #6A487C",
-"{  c #6D576D",
-"}  c #645475",
-"|  c #76557A",
-" . c #786678",
-".. c #70707D",
-"X. c #676768",
-"o. c #3F3E82",
-"O. c #2D2BAA",
-"+. c #3D3BA4",
-"@. c #3B39B9",
-"#. c #484888",
-"$. c #4A4C96",
-"%. c #585885",
-"&. c #595890",
-"*. c #555494",
-"=. c #4745A6",
-"-. c #4947B5",
-";. c #514FBB",
-":. c #5A58BB",
-">. c #5C5BAF",
-",. c #755581",
-"<. c #605FB6",
-"1. c #6B6883",
-"2. c #68679B",
-"3. c #7A7497",
-"4. c #76698F",
-"5. c #6968A6",
-"6. c #706FB5",
-"7. c #7675BB",
-"8. c #6E6DB6",
-"9. c #4947C3",
-"0. c #5351C2",
-"q. c #5D5BC0",
-"w. c #6B6ACC",
-"e. c #6361C7",
-"r. c #7170C6",
-"t. c #7877D2",
-"y. c #56840C",
-"u. c #6A8814",
-"i. c #63980B",
-"p. c #748614",
-"a. c #7F9C0D",
-"s. c #749218",
-"d. c #698F13",
-"f. c #6C852A",
-"g. c #798C35",
-"h. c #76912B",
-"j. c #76B505",
-"k. c #70A50F",
-"l. c #7EA525",
-"z. c #678946",
-"x. c #A57A5A",
-"c. c #9A1E9A",
-"v. c #861B86",
-"b. c #912B92",
-"n. c #8A298A",
-"m. c #A030A0",
-"M. c #864886",
-"N. c #8F469E",
-"B. c #975897",
-"V. c #8A788A",
-"C. c #936A93",
-"Z. c #987599",
-"A. c #866892",
-"S. c #9470AB",
-"D. c #A25FA2",
-"F. c #B16FB1",
-"G. c #B07FB1",
-"H. c #B776B7",
-"J. c #807FD0",
-"K. c #A37AC2",
-"L. c #87880B",
-"P. c #888513",
-"I. c #869A0A",
-"U. c #8B9B14",
-"Y. c #94970D",
-"T. c #9B9C13",
-"R. c #98961A",
-"E. c #968D16",
-"W. c #929D2F",
-"Q. c #82A90B",
-"!. c #8CAA06",
-"~. c #82B30A",
-"^. c #84B706",
-"/. c #97A913",
-"(. c #96B90A",
-"). c #99B914",
-"_. c #91AB10",
-"`. c #A39A1C",
-"'. c #A09A3D",
-"]. c #A9AE05",
-"[. c #A7AA16",
-"{. c #A7B90B",
-"}. c #ACB712",
-"|. c #BDBA18",
-" X c #B7B711",
-".X c #B0B726",
-"XX c #9A8B4B",
-"oX c #9EC008",
-"OX c #BCC40D",
-"+X c #BCC90E",
-"@X c #B1C707",
-"#X c #AEC90C",
-"$X c #C4AE2A",
-"%X c #C4CB11",
-"&X c #C8D809",
-"*X c #CBD011",
-"=X c #D1CF1A",
-"-X c #D1D50E",
-";X c #D7E803",
-":X c #918197",
-">X c #858494",
-",X c #8987BA",
-"<X c #928BBB",
-"1X c #9B9BA8",
-"2X c #9B98B8",
-"3X c #8784A3",
-"4X c #A787A8",
-"5X c #AE9CAE",
-"6X c #AC99B1",
-"7X c #B988B9",
-"8X c #BB92BC",
-"9X c #B598B8",
-"0X c #A0A0A7",
-"qX c #A6A6B7",
-"wX c #8382C6",
-"eX c #8382D4",
-"rX c #8D8CD4",
-"tX c #9C8CC7",
-"yX c #908FD9",
-"uX c #9493C6",
-"iX c #9A99DB",
-"pX c #9493D3",
-"aX c #A693C8",
-"sX c #A09AD5",
-"dX c #A8A5C9",
-"fX c #A9A6D6",
-"gX c #B7A8C7",
-"hX c #B7B6DA",
-"jX c #B5B1CE",
-"kX c #B7B4E2",
-"lX c #A9A8E2",
-"zX c #C88EC8",
-"xX c #C38BC3",
-"cX c #C695C6",
-"vX c #C2ADC2",
-"bX c #C7A6C7",
-"nX c #C4B5C4",
-"mX c #C6B9D3",
-"MX c #DDB9DD",
-"NX c #D9B4D9",
-"BX c #D3A4D4",
-"VX c #C9C5CA",
-"CX c #CAC9D7",
-"ZX c #D4CBD4",
-"AX c #D9C1D9",
-"SX c #DACEDA",
-"DX c #C4C3E4",
-"FX c #CBC9E6",
-"GX c #D8D7E6",
-"HX c #E7CCE7",
-"JX c #E9CFE9",
-"KX c #EADBEA",
-"LX c #E4DAE4",
-"PX c #EDE2ED",
-"IX c #EAEAF4",
-"UX c #F0E1F0",
-"YX c None",
-/* pixels */
-"YXYXYXYXYXYXYXYXYXSXLXIXUXCX    YXYXYXYXVXLXPXPXZX.   YXYXYXYXYX",
-"YXYXYXYXYXYXYXnXKXUXUXKXJXSXnX    YXnXKXPXPXPXKXSXnX    YXYXYXYX",
-"YXYXYXYXYXYX9XHXJXMX0XvX:X9XSX     .HXJXAX5XvX>XvXAX.   YXYXYXYX",
-"YXYXYXYXYXYXMXMXkXx.. | 4XNXvX    NXMXMXV.  { 4XNXbX      YXYXYX",
-"YXYXYXYXYXBXBX8XZ.    4X8X8XZ.  { BX8X4X    G.7XcXZ.      YXYXYX",
-"YXYXYXYXLXcXcXC.z     zXxX7X) X.G.G.C.z     zXcX7X5 5 VX    YXYX",
-"YXYX1XIXGXBXCXC.+   H.H.F.6XIXIX8X| B.-   F.H.8X5X0XCXCX      YX",
-"YXYX3 GXmX8XmXZ.M M.D.m | VXCXGX4X| B.M.B.D.m gXqX1XCXW       YX",
-"YXYX  CXgXS.jXA.= + =   2XFXqXFXZ.| n.l @ =   jX>X..GX$       YX",
-"YXYX  hXaXA.jX,.= +     kXFXDXFX3.{ m l *   w hXV.2XdX        YX",
-"YXYX  hXdX,.fX[ v n.j b.kX2XDXhX1.4.v b.m.j S.tX3XkX1.        YX",
-"YXYX  fXdX4.aX^ j v.c.N.fX) kXuX} <X= b c.c.G.tX1.kX%       YXYX",
-"YXYX  <XfXuX<X[ k c c S.uX( fX,X' iXk c n b tX/ 3.uX        YXYX",
-"YXYX  2.iXrX2./ $     pX2.6.rX,XQ iX2     2 iXQ pX/         YXYX",
-"YXYX  e rXrX( %.e   ( rX( 5.7.wXQ J.y     5.yX( yX&       YXYXYX",
-"YXYXYX  t.eXQ 5.~   7.7.2.% 2.eX&.2.&.    J.6.8.5.        YXYXYX",
-"YXYXYX  r.t.y 8.#.o 8.~ *.  x t.r.~ 8.  0 t.! r.0   o $ F YXYXYX",
-"YXYXYX  <.w.~ >.#.d ] #.0   q w.w.y w.o #.e.$.<..   d I I     YX",
-"YXYXYX  =.e.=.#.g z.I t X   q ;.e.u :.y :.o.q.u   < J y.d     YX",
-"YXYXYX  y 0.0.r ] _ I 6     o -.0.-.=.0.;.t 0.o   , I y.p     YX",
-"YXYXYXYX  9.9.i ' _ g X     + +.9.9.@.;.i +.r     y.k.i.y.H     ",
-"YXYXXXW.Q.] =.@.z.J 4 . V s.E o.@.@.-.' d.z.L ; s j.j.j.i.D     ",
-"YXXXW.Q.Q.f.) O.l.f.# D Q.u.u.o O.$.g.g.h.^.^.> s.oX~.~.u.s     ",
-"YX}.oXD a P w 9 ~.f.S T p.p.K   ~ ).g q g j.(.. # k.a.K         ",
-".X#X{.  . ; 7 0 _.!.V O I.U.C . oXg.6 8 4 Y.(.  a /.).T         ",
-"+X#X(.      1 # T.{.,   #X{.C B +XI.    I./.{.  T #XoXA       YX",
-"&X+X}.Y P.%X[.P.+X@X.   &X@XY Z ;X/.A T.OX}.+X; Y.}.[.B     YXYX",
-".X*XOX;X;X XZ T.*XL.    =X%XP.; ;X%X*XT.> `.|., ].`. X:     YXYX",
-". Y.].T.A .   C C ;     $X-Xh   P.].R O   R :    XE.P.O     YXYX",
-"                        E U                     C .         YXYX",
-"YX                    YX. #                               YXYXYX",
-"YXYXYXYXYXYXYXYXYXYXYXYXYX      YXYXYXYXYXYXYXYXYX    YXYXYXYXYX"
-};
+/* XPM */
+static char * C:\temp\weechat_xpm[] = {
+"32 32 362 2",
+"  	c None",
+". 	c #117529",
+"+ 	c #0E7527",
+"@ 	c #0A7424",
+"# 	c #057323",
+"$ 	c #016F20",
+"% 	c #5DAA58",
+"& 	c #5DB059",
+"* 	c #5AB158",
+"= 	c #57B157",
+"- 	c #54AF55",
+"; 	c #4FAE53",
+"> 	c #4BAE52",
+", 	c #48AD50",
+"' 	c #44AC4E",
+") 	c #3FAB4C",
+"! 	c #3BA849",
+"~ 	c #36A646",
+"{ 	c #30A343",
+"] 	c #2CA040",
+"^ 	c #279D3D",
+"/ 	c #229A3A",
+"( 	c #1D9837",
+"_ 	c #189534",
+": 	c #129232",
+"< 	c #0D8F2E",
+"[ 	c #088D2C",
+"} 	c #03691F",
+"| 	c #64AB5B",
+"1 	c #6FC468",
+"2 	c #6AC265",
+"3 	c #66BF62",
+"4 	c #62BC5F",
+"5 	c #5DBA5D",
+"6 	c #58B85A",
+"7 	c #54B557",
+"8 	c #4FB254",
+"9 	c #4AB052",
+"0 	c #45AD4F",
+"a 	c #40AB4C",
+"b 	c #3CA849",
+"c 	c #37A647",
+"d 	c #32A344",
+"e 	c #2DA041",
+"f 	c #289D3D",
+"g 	c #239A3B",
+"h 	c #1E9838",
+"i 	c #199535",
+"j 	c #139232",
+"k 	c #0F8F2F",
+"l 	c #098B2B",
+"m 	c #035018",
+"n 	c #68AE5E",
+"o 	c #76C96B",
+"p 	c #70C568",
+"q 	c #6CC365",
+"r 	c #67C062",
+"s 	c #62BD60",
+"t 	c #5FBC5E",
+"u 	c #5ABA5B",
+"v 	c #55B859",
+"w 	c #51B656",
+"x 	c #4CB354",
+"y 	c #47B051",
+"z 	c #42AD4E",
+"A 	c #3EAA4B",
+"B 	c #38A647",
+"C 	c #32A243",
+"D 	c #2E9D40",
+"E 	c #28993C",
+"F 	c #239439",
+"G 	c #1E9036",
+"H 	c #188C32",
+"I 	c #13882F",
+"J 	c #0F842C",
+"K 	c #0A7C27",
+"L 	c #629F57",
+"M 	c #7BCC6F",
+"N 	c #76C86B",
+"O 	c #71C569",
+"P 	c #6DC366",
+"Q 	c #69C163",
+"R 	c #65C162",
+"S 	c #57AC56",
+"T 	c #3E803F",
+"U 	c #377539",
+"V 	c #316E34",
+"W 	c #2C6830",
+"X 	c #28602C",
+"Y 	c #225928",
+"Z 	c #1D5124",
+"` 	c #1A4E22",
+" .	c #184C20",
+"..	c #81CF72",
+"+.	c #7CCB6E",
+"@.	c #77C86C",
+"#.	c #72C76A",
+"$.	c #6EC467",
+"%.	c #69C164",
+"&.	c #549F51",
+"*.	c #71B062",
+"=.	c #84D274",
+"-.	c #7FCF71",
+";.	c #7ACD6F",
+">.	c #76CB6C",
+",.	c #72C869",
+"'.	c #6CC465",
+").	c #1F391D",
+"!.	c #558DC1",
+"~.	c #568EC3",
+"{.	c #568FC5",
+"].	c #5790C7",
+"^.	c #5892C8",
+"/.	c #538ABE",
+"(.	c #5B98D0",
+"_.	c #5C99D2",
+":.	c #5E9CD5",
+"<.	c #609FDB",
+"[.	c #61A1DC",
+"}.	c #497440",
+"|.	c #3F6638",
+"1.	c #355930",
+"2.	c #2C4A28",
+"3.	c #213B1F",
+"4.	c #609ED9",
+"5.	c #63A4E2",
+"6.	c #63A4E1",
+"7.	c #5B96CE",
+"8.	c #64A6E4",
+"9.	c #4878A4",
+"0.	c #426E96",
+"a.	c #4F83B3",
+"b.	c #4E82B2",
+"c.	c #62A3DF",
+"d.	c #64A6E3",
+"e.	c #274159",
+"f.	c #44729C",
+"g.	c #5B97CF",
+"h.	c #5B97D0",
+"i.	c #5C98D0",
+"j.	c #5C98D1",
+"k.	c #5B97CE",
+"l.	c #64A5E2",
+"m.	c #36597B",
+"n.	c #64A4E2",
+"o.	c #5A95CD",
+"p.	c #5993CB",
+"q.	c #64A5E3",
+"r.	c #45729C",
+"s.	c #63A4E3",
+"t.	c #62A2E1",
+"u.	c #62A1E1",
+"v.	c #61A1E1",
+"w.	c #609FE0",
+"x.	c #5993D4",
+"y.	c #5D9BDF",
+"z.	c #5D99DF",
+"A.	c #5C99DF",
+"B.	c #5B98DE",
+"C.	c #4878B1",
+"D.	c #63A3E5",
+"E.	c #609EE0",
+"F.	c #5F9DE0",
+"G.	c #5F9DDF",
+"H.	c #5E9BDF",
+"I.	c #5C99DC",
+"J.	c #2B4666",
+"K.	c #4D7FBD",
+"L.	c #5A96DF",
+"M.	c #5A94DE",
+"N.	c #5993DD",
+"O.	c #5992DD",
+"P.	c #5993E1",
+"Q.	c #4069A0",
+"R.	c #365A8E",
+"S.	c #568EDF",
+"T.	c #548ADB",
+"U.	c #5489DB",
+"V.	c #5389DB",
+"W.	c #5287DA",
+"X.	c #2E4D7C",
+"Y.	c #4C7DC1",
+"Z.	c #5891DE",
+"`.	c #568FDC",
+" +	c #568EDC",
+".+	c #568DDC",
+"++	c #558CDC",
+"@+	c #4F82CD",
+"#+	c #4D7ECD",
+"$+	c #5185DA",
+"%+	c #5085DA",
+"&+	c #5084DA",
+"*+	c #4F82D9",
+"=+	c #5185DF",
+"-+	c #121E31",
+";+	c #4370C2",
+">+	c #4C7CD9",
+",+	c #4A7BD7",
+"'+	c #4A7AD7",
+")+	c #4978D7",
+"!+	c #4877D6",
+"~+	c #4E82D9",
+"{+	c #4E81D9",
+"]+	c #4E80D9",
+"^+	c #4E7FD9",
+"/+	c #4D7ED8",
+"(+	c #4C7DDA",
+"_+	c #395FA4",
+":+	c #4775D2",
+"<+	c #4876D6",
+"[+	c #4775D6",
+"}+	c #4773D6",
+"|+	c #4674D7",
+"1+	c #3B62B7",
+"2+	c #436ED6",
+"3+	c #416CD4",
+"4+	c #416AD3",
+"5+	c #4069D3",
+"6+	c #406AD6",
+"7+	c #304FA2",
+"8+	c #375BA8",
+"9+	c #4673D5",
+"0+	c #4572D5",
+"a+	c #4571D5",
+"b+	c #4470D5",
+"c+	c #436FD4",
+"d+	c #4470D9",
+"e+	c #14213E",
+"f+	c #3150A3",
+"g+	c #4069D4",
+"h+	c #3E67D3",
+"i+	c #3E66D2",
+"j+	c #3D64D2",
+"k+	c #3D64D3",
+"l+	c #243C7F",
+"m+	c #2F4DAC",
+"n+	c #395ED1",
+"o+	c #385CD0",
+"p+	c #375AD0",
+"q+	c #365ACF",
+"r+	c #375AD5",
+"s+	c #111C41",
+"t+	c #3558B8",
+"u+	c #3C63D2",
+"v+	c #3C62D2",
+"w+	c #3B61D1",
+"x+	c #3A60D2",
+"y+	c #3658C2",
+"z+	c #3455C4",
+"A+	c #3659CF",
+"B+	c #3557CF",
+"C+	c #3556CF",
+"D+	c #3354CF",
+"E+	c #3151C5",
+"F+	c #101A3E",
+"G+	c #2C49C0",
+"H+	c #2F4DCC",
+"I+	c #2E4CCC",
+"J+	c #2D4ACB",
+"K+	c #2D49CB",
+"L+	c #2741B7",
+"M+	c #3353C6",
+"N+	c #3455CF",
+"O+	c #3454CE",
+"P+	c #3353CE",
+"Q+	c #3252CD",
+"R+	c #3151CE",
+"S+	c #304FCC",
+"T+	c #162467",
+"U+	c #1F318C",
+"V+	c #2E4BCF",
+"W+	c #2C47CB",
+"X+	c #2B47CA",
+"Y+	c #2A45CA",
+"Z+	c #2943C8",
+"`+	c #2841C5",
+" @	c #2942CB",
+".@	c #2841CB",
+"+@	c #273EC9",
+"@@	c #263DC9",
+"#@	c #253BC8",
+"$@	c #243AC7",
+"%@	c #2339C9",
+"&@	c #172583",
+"*@	c #1D2F86",
+"=@	c #2D49CE",
+"-@	c #2B46CB",
+";@	c #2B46CA",
+">@	c #2A44CA",
+",@	c #2943CA",
+"'@	c #2841C9",
+")@	c #2740C9",
+"!@	c #2840CC",
+"~@	c #273FCA",
+"{@	c #263DCA",
+"]@	c #243AC8",
+"^@	c #2339C7",
+"/@	c #2338C7",
+"(@	c #2237C7",
+"_@	c #2135C6",
+":@	c #2034C6",
+"<@	c #2033C6",
+"[@	c #1E31C5",
+"}@	c #1E30C5",
+"|@	c #1D2EC4",
+"1@	c #1C2DC4",
+"2@	c #1B2CC4",
+"3@	c #1A2AC3",
+"4@	c #1928C0",
+"5@	c #0C1258",
+"6@	c #1B2C97",
+"7@	c #233AC9",
+"8@	c #2238C7",
+"9@	c #2136C7",
+"0@	c #1F32C6",
+"a@	c #1D2FC5",
+"b@	c #1C2EC5",
+"c@	c #1B2BC4",
+"d@	c #1A2AC4",
+"e@	c #1929C3",
+"f@	c #1827C3",
+"g@	c #1826C3",
+"h@	c #1724C2",
+"i@	c #1623C2",
+"j@	c #1522C1",
+"k@	c #1420C2",
+"l@	c #141FC2",
+"m@	c #121EC1",
+"n@	c #111CC2",
+"o@	c #111AC1",
+"p@	c #0E17B2",
+"q@	c #1A2AC1",
+"r@	c #1929C4",
+"s@	c #1927C4",
+"t@	c #1724C3",
+"u@	c #1623C3",
+"v@	c #1522C4",
+"w@	c #1520C3",
+"x@	c #131FC3",
+"y@	c #131DC3",
+"z@	c #111CC0",
+"A@	c #111ABB",
+"B@	c #0F19B6",
+"C@	c #0F17B1",
+"D@	c #0D15AD",
+"E@	c #0D14A9",
+"F@	c #0C13A7",
+"G@	c #0B11A4",
+"H@	c #0A1099",
+"I@	c #080D8B",
+"J@	c #070B7A",
+"K@	c #060968",
+"L@	c #0F179E",
+"M@	c #0E16AA",
+"N@	c #0E15AF",
+"O@	c #0C13A9",
+"P@	c #0C129C",
+"Q@	c #0A108F",
+"R@	c #090E80",
+"S@	c #080C72",
+"T@	c #070B63",
+"U@	c #060957",
+"                                                                ",
+"                                                                ",
+"                                                                ",
+"                                                                ",
+"                                                                ",
+"                                                    . + @ # $   ",
+"                  % & * = - ; > , ' ) ! ~ { ] ^ / ( _ : < [ }   ",
+"              | 1 2 3 4 5 6 7 8 9 0 a b c d e f g h i j k l m   ",
+"            n o p q r s t u v w x y z A B C D E F G H I J K     ",
+"          L M N O P Q R S T U V W X Y Z `  .                    ",
+"          ..+.@.#.$.%.&.                                        ",
+"        *.=.-.;.>.,.'.).      !.~.{.].^.      /.(._.:.<.[.      ",
+"          }.|.1.2.3.        4.5.6.6.6.7.      [.6.6.6.8.9.      ",
+"                          0.8.6.6.6.6.a.    b.c.6.6.6.d.e.      ",
+"      f.g.h.i.j._.{.      k.l.6.6.6.l.m.    !.n.6.6.6.o.        ",
+"      p.l.6.6.6.q.r.      s.t.t.u.v.w.      x.y.z.A.B.C.        ",
+"      D.E.F.G.H.I.J.    K.L.M.N.O.P.Q.    R.S.T.U.V.W.X.        ",
+"    Y.Z.`. +.+++@+      #+$+%+&+*+=+-+    ;+>+,+'+)+!+          ",
+"    ~+{+]+^+/+(+_+      :+<+[+}+|+1+      2+3+4+5+6+7+          ",
+"  8+9+0+a+b+c+d+e+    f+g+h+i+j+k+l+    m+n+o+p+q+r+s+          ",
+"  t+j+u+v+w+x+y+      z+A+B+C+D+E+F+    G+H+I+J+K+L+            ",
+"  M+N+O+P+Q+R+S+T+  U+V+K+W+X+Y+Z+`+ @.@+@@@#@$@%@&@            ",
+"*@=@-@;@>@,@'@)@!@~@{@]@^@/@(@_@:@<@[@}@|@1@2@3@4@5@            ",
+"6@7@8@9@_@:@0@[@a@b@1@c@d@e@f@g@h@i@j@k@l@m@n@o@p@              ",
+"  q@r@s@g@t@u@v@w@x@y@z@A@B@C@D@E@F@G@H@I@J@K@                  ",
+"    L@M@N@O@P@Q@R@S@T@U@                                        ",
+"                                                                ",
+"                                                                ",
+"                                                                ",
+"                                                                ",
+"                                                                ",
+"                                                                "};
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2012 Sebastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2014 Sébastien Helleu <flashcode@flashtux.org>
 # Copyright (C) 2009 Emmanuel Bouthenot <kolter@openics.org>
 #
 # This file is part of WeeChat, the extensible chat client.
@@ -18,21 +18,17 @@
 # along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 #

-IF(ENABLE_DOC)
-
-  FIND_PACKAGE(Sourcehighlight)
-  FIND_PACKAGE(Asciidoc)
-  IF(ASCIIDOC_FOUND AND SOURCEHIGHLIGHT_FOUND)
-    ADD_SUBDIRECTORY( en )
-    ADD_SUBDIRECTORY( fr )
-    ADD_SUBDIRECTORY( it )
-    ADD_SUBDIRECTORY( de )
-    ADD_SUBDIRECTORY( pl )
-    ADD_SUBDIRECTORY( es )
-    ADD_SUBDIRECTORY( ru )
-    ADD_SUBDIRECTORY( ja )
-  ENDIF(ASCIIDOC_FOUND AND SOURCEHIGHLIGHT_FOUND)
-
-ENDIF(ENABLE_DOC)
-
-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/weechat-curses.1 DESTINATION ${SHAREDIR}/man/man1)
+if(ENABLE_MAN OR ENABLE_DOC)
+  find_package(Sourcehighlight)
+  find_package(Asciidoc)
+  if(ASCIIDOC_FOUND)
+    add_subdirectory(en)
+    add_subdirectory(fr)
+    add_subdirectory(it)
+    add_subdirectory(de)
+    add_subdirectory(pl)
+    add_subdirectory(es)
+    add_subdirectory(ru)
+    add_subdirectory(ja)
+  endif()
+endif()
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2012 Sebastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2014 Sébastien Helleu <flashcode@flashtux.org>
 # Copyright (C) 2006 Julien Louis <ptitlouis@sysif.net>
 #
 # This file is part of WeeChat, the extensible chat client.
@@ -20,9 +20,7 @@

 SUBDIRS = . en fr it de pl es ru ja

-man_MANS = weechat-curses.1
-
-EXTRA_DIST = $(man_MANS) docgen.py CMakeLists.txt asciidoc.conf asciidoc.css
+EXTRA_DIST = docgen.py CMakeLists.txt asciidoc.conf asciidoc.css

 uninstall-hook:
 	-rmdir $(DESTDIR)$(datadir)/doc/$(PACKAGE)
--- a/Show More
+++ b/Show More
				`@@ -1 +0,0 @@`
				`weechat-curses: manpage-has-errors-from-man usr/share/man/man1/weechat-curses.1.gz 61: warning [p 1, 9.0i]: cannot adjust line`