diff options
34 files changed, 90 insertions, 60 deletions
diff --git a/debian/changelog b/debian/changelog index 22b44da35..65d0d7019 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,20 @@ +weechat (0.3.6-1) unstable; urgency=low + + * New upstream release + - Fix a FTBFS due to wrong detection of ncursesw headers + (Closes: #646299) + * Add new doc-base files (Polish translations). + * Install html documentation in /usr/share/doc/weechat/html instead + of /usr/share/doc/weechat + * Add a symlink from /usr/share/doc/weechat/html to + /usr/share/doc/weechat-doc/html so that it will be easier to find + documentation when weechat-doc is installed (Closes: #632621) + * Add a Suggest on weechat-doc for weechat and weechat-curses. Thanks to + Jonathan Nieder for the proposal. + * Fix the cmake invokation from debian/rules (cflags and ldflags) + + -- Emmanuel Bouthenot <kolter@debian.org> Wed, 26 Oct 2011 20:10:09 +0000 + weechat (0.3.5-1) unstable; urgency=low * New upstream release diff --git a/debian/control b/debian/control index ddaa6303b..73371fdfb 100644 --- a/debian/control +++ b/debian/control @@ -14,6 +14,7 @@ Vcs-Browser: http://git.debian.org/?p=users/kolter/weechat.git Package: weechat Architecture: all Depends: ${misc:Depends}, weechat-curses (>= ${source:Version}) +Suggests: weechat-doc (= ${source:Version}) Description: Fast, light and extensible chat client WeeChat (Wee Enhanced Environment for Chat) is a fast and light chat client for many operating systems. Everything can be done with a keyboard. @@ -37,6 +38,7 @@ Depends: ${misc:Depends}, ${shlibs:Depends}, weechat-core (= ${binary:Version}) Conflicts: weechat-common Breaks: weechat-scripts (<= 20090221-1) Recommends: weechat-plugins (= ${binary:Version}) +Suggests: weechat-doc (= ${source:Version}) Description: Fast, light and extensible chat client - console client WeeChat (Wee Enhanced Environment for Chat) is a fast and light chat client for many operating systems. Everything can be done with a keyboard. diff --git a/debian/rules b/debian/rules index c40e8b5bc..17e24cc89 100755 --- a/debian/rules +++ b/debian/rules @@ -5,9 +5,9 @@ builddir/Makefile: cd builddir && \ cmake .. \ -DCMAKE_INSTALL_PREFIX:FILEPATH=/usr \ - -DCMAKE_C_FLAGS:STRING="$(CFLAGS)" \ - -DCMAKE_LD_FLAGS:STRING="-Wl,-z,defs" \ - -DCMAKE_CXX_FLAGS:STRING="$(CXXFLAGS)" \ + -DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo \ + -DCMAKE_C_FLAGS_RELWITHDEBINFO:STRING="-O2 -g $(CFLAGS)" \ + -DCMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO:STRING="-Wl,-z,defs" \ -DCMAKE_SKIP_RPATH:BOOL=ON \ -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON diff --git a/debian/weechat-doc.doc-base.faq-de b/debian/weechat-doc.doc-base.faq-de index 921bc225e..517218c72 100644 --- a/debian/weechat-doc.doc-base.faq-de +++ b/debian/weechat-doc.doc-base.faq-de @@ -6,5 +6,5 @@ Abstract: This document answers frequently asked questions Section: Network/Communication Format: HTML -Index: /usr/share/doc/weechat-doc/weechat_faq.de.html -Files: /usr/share/doc/weechat-doc/weechat_faq.de.html +Index: /usr/share/doc/weechat-doc/html/weechat_faq.de.html +Files: /usr/share/doc/weechat-doc/html/weechat_faq.de.html diff --git a/debian/weechat-doc.doc-base.faq-en b/debian/weechat-doc.doc-base.faq-en index dd01873f6..331b7e8b8 100644 --- a/debian/weechat-doc.doc-base.faq-en +++ b/debian/weechat-doc.doc-base.faq-en @@ -6,5 +6,5 @@ Abstract: This document answers frequently asked questions Section: Network/Communication Format: HTML -Index: /usr/share/doc/weechat-doc/weechat_faq.en.html -Files: /usr/share/doc/weechat-doc/weechat_faq.en.html +Index: /usr/share/doc/weechat-doc/html/weechat_faq.en.html +Files: /usr/share/doc/weechat-doc/html/weechat_faq.en.html diff --git a/debian/weechat-doc.doc-base.faq-fr b/debian/weechat-doc.doc-base.faq-fr index f5f055032..acd2efc78 100644 --- a/debian/weechat-doc.doc-base.faq-fr +++ b/debian/weechat-doc.doc-base.faq-fr @@ -6,5 +6,5 @@ Abstract: This document answers frequently asked questions Section: Network/Communication Format: HTML -Index: /usr/share/doc/weechat-doc/weechat_faq.fr.html -Files: /usr/share/doc/weechat-doc/weechat_faq.fr.html +Index: /usr/share/doc/weechat-doc/html/weechat_faq.fr.html +Files: /usr/share/doc/weechat-doc/html/weechat_faq.fr.html diff --git a/debian/weechat-doc.doc-base.faq-it b/debian/weechat-doc.doc-base.faq-it index debb43ec2..37476d3d1 100644 --- a/debian/weechat-doc.doc-base.faq-it +++ b/debian/weechat-doc.doc-base.faq-it @@ -6,5 +6,5 @@ Abstract: This document answers frequently asked questions Section: Network/Communication Format: HTML -Index: /usr/share/doc/weechat-doc/weechat_faq.it.html -Files: /usr/share/doc/weechat-doc/weechat_faq.it.html +Index: /usr/share/doc/weechat-doc/html/weechat_faq.it.html +Files: /usr/share/doc/weechat-doc/html/weechat_faq.it.html diff --git a/debian/weechat-doc.doc-base.faq-pl b/debian/weechat-doc.doc-base.faq-pl index 88294c398..9d90ddf46 100644 --- a/debian/weechat-doc.doc-base.faq-pl +++ b/debian/weechat-doc.doc-base.faq-pl @@ -6,5 +6,5 @@ Abstract: This document answers frequently asked questions Section: Network/Communication Format: HTML -Index: /usr/share/doc/weechat-doc/weechat_faq.pl.html -Files: /usr/share/doc/weechat-doc/weechat_faq.pl.html +Index: /usr/share/doc/weechat-doc/html/weechat_faq.pl.html +Files: /usr/share/doc/weechat-doc/html/weechat_faq.pl.html diff --git a/debian/weechat-doc.doc-base.plugin-en b/debian/weechat-doc.doc-base.plugin-en index a4e75c4f8..9812267da 100644 --- a/debian/weechat-doc.doc-base.plugin-en +++ b/debian/weechat-doc.doc-base.plugin-en @@ -6,5 +6,5 @@ Abstract: This document describes the API to create plugins Section: Network/Communication Format: HTML -Index: /usr/share/doc/weechat-doc/weechat_plugin_api.en.html -Files: /usr/share/doc/weechat-doc/weechat_plugin_api.en.html +Index: /usr/share/doc/weechat-doc/html/weechat_plugin_api.en.html +Files: /usr/share/doc/weechat-doc/html/weechat_plugin_api.en.html diff --git a/debian/weechat-doc.doc-base.plugin-fr b/debian/weechat-doc.doc-base.plugin-fr index da3a08bff..bff1ac95a 100644 --- a/debian/weechat-doc.doc-base.plugin-fr +++ b/debian/weechat-doc.doc-base.plugin-fr @@ -6,5 +6,5 @@ Abstract: This document describes the API to create plugins Section: Network/Communication Format: HTML -Index: /usr/share/doc/weechat-doc/weechat_plugin_api.fr.html -Files: /usr/share/doc/weechat-doc/weechat_plugin_api.fr.html +Index: /usr/share/doc/weechat-doc/html/weechat_plugin_api.fr.html +Files: /usr/share/doc/weechat-doc/html/weechat_plugin_api.fr.html diff --git a/debian/weechat-doc.doc-base.plugin-it b/debian/weechat-doc.doc-base.plugin-it index 74d597937..d82f47158 100644 --- a/debian/weechat-doc.doc-base.plugin-it +++ b/debian/weechat-doc.doc-base.plugin-it @@ -6,5 +6,5 @@ Abstract: This document describes the API to create plugins Section: Network/Communication Format: HTML -Index: /usr/share/doc/weechat-doc/weechat_plugin_api.it.html -Files: /usr/share/doc/weechat-doc/weechat_plugin_api.it.html +Index: /usr/share/doc/weechat-doc/html/weechat_plugin_api.it.html +Files: /usr/share/doc/weechat-doc/html/weechat_plugin_api.it.html diff --git a/debian/weechat-doc.doc-base.quickstart-de b/debian/weechat-doc.doc-base.quickstart-de index c3ec2b0ef..22b4e82ef 100644 --- a/debian/weechat-doc.doc-base.quickstart-de +++ b/debian/weechat-doc.doc-base.quickstart-de @@ -5,5 +5,5 @@ Abstract: A short HowTo for new WeeChat users (German version). Section: Network/Communication Format: HTML -Index: /usr/share/doc/weechat-doc/weechat_quickstart.de.html -Files: /usr/share/doc/weechat-doc/weechat_quickstart.de.html +Index: /usr/share/doc/weechat-doc/html/weechat_quickstart.de.html +Files: /usr/share/doc/weechat-doc/html/weechat_quickstart.de.html diff --git a/debian/weechat-doc.doc-base.quickstart-en b/debian/weechat-doc.doc-base.quickstart-en index c0c5379ff..8359911fc 100644 --- a/debian/weechat-doc.doc-base.quickstart-en +++ b/debian/weechat-doc.doc-base.quickstart-en @@ -5,5 +5,5 @@ Abstract: A short HowTo for new WeeChat users (English version). Section: Network/Communication Format: HTML -Index: /usr/share/doc/weechat-doc/weechat_quickstart.en.html -Files: /usr/share/doc/weechat-doc/weechat_quickstart.en.html +Index: /usr/share/doc/weechat-doc/html/weechat_quickstart.en.html +Files: /usr/share/doc/weechat-doc/html/weechat_quickstart.en.html diff --git a/debian/weechat-doc.doc-base.quickstart-fr b/debian/weechat-doc.doc-base.quickstart-fr index ad7d555bd..fc9cffc69 100644 --- a/debian/weechat-doc.doc-base.quickstart-fr +++ b/debian/weechat-doc.doc-base.quickstart-fr @@ -5,5 +5,5 @@ Abstract: A short HowTo for new WeeChat users (French version). Section: Network/Communication Format: HTML -Index: /usr/share/doc/weechat-doc/weechat_quickstart.fr.html -Files: /usr/share/doc/weechat-doc/weechat_quickstart.fr.html +Index: /usr/share/doc/weechat-doc/html/weechat_quickstart.fr.html +Files: /usr/share/doc/weechat-doc/html/weechat_quickstart.fr.html diff --git a/debian/weechat-doc.doc-base.quickstart-it b/debian/weechat-doc.doc-base.quickstart-it index 1cbfe6d4b..8e2e8240e 100644 --- a/debian/weechat-doc.doc-base.quickstart-it +++ b/debian/weechat-doc.doc-base.quickstart-it @@ -5,5 +5,5 @@ Abstract: A short HowTo for new WeeChat users (Italian version). Section: Network/Communication Format: HTML -Index: /usr/share/doc/weechat-doc/weechat_quickstart.it.html -Files: /usr/share/doc/weechat-doc/weechat_quickstart.it.html +Index: /usr/share/doc/weechat-doc/html/weechat_quickstart.it.html +Files: /usr/share/doc/weechat-doc/html/weechat_quickstart.it.html diff --git a/debian/weechat-doc.doc-base.quickstart-ja b/debian/weechat-doc.doc-base.quickstart-ja index 6cd67c9b2..f2a76c78e 100644 --- a/debian/weechat-doc.doc-base.quickstart-ja +++ b/debian/weechat-doc.doc-base.quickstart-ja @@ -5,5 +5,5 @@ Abstract: A short HowTo for new WeeChat users (Japanese version). Section: Network/Communication Format: HTML -Index: /usr/share/doc/weechat-doc/weechat_quickstart.ja.html -Files: /usr/share/doc/weechat-doc/weechat_quickstart.ja.html +Index: /usr/share/doc/weechat-doc/html/weechat_quickstart.ja.html +Files: /usr/share/doc/weechat-doc/html/weechat_quickstart.ja.html diff --git a/debian/weechat-doc.doc-base.quickstart-pl b/debian/weechat-doc.doc-base.quickstart-pl index 3980a6d1f..f02dd58f9 100644 --- a/debian/weechat-doc.doc-base.quickstart-pl +++ b/debian/weechat-doc.doc-base.quickstart-pl @@ -5,5 +5,5 @@ Abstract: A short HowTo for new WeeChat users (Polish version). Section: Network/Communication Format: HTML -Index: /usr/share/doc/weechat-doc/weechat_quickstart.pl.html -Files: /usr/share/doc/weechat-doc/weechat_quickstart.pl.html +Index: /usr/share/doc/weechat-doc/html/weechat_quickstart.pl.html +Files: /usr/share/doc/weechat-doc/html/weechat_quickstart.pl.html diff --git a/debian/weechat-doc.doc-base.quickstart-ru b/debian/weechat-doc.doc-base.quickstart-ru index d5fb427d5..a1ccced78 100644 --- a/debian/weechat-doc.doc-base.quickstart-ru +++ b/debian/weechat-doc.doc-base.quickstart-ru @@ -5,5 +5,5 @@ Abstract: A short HowTo for new WeeChat users (Russian version). Section: Network/Communication Format: HTML -Index: /usr/share/doc/weechat-doc/weechat_quickstart.ru.html -Files: /usr/share/doc/weechat-doc/weechat_quickstart.ru.html +Index: /usr/share/doc/weechat-doc/html/weechat_quickstart.ru.html +Files: /usr/share/doc/weechat-doc/html/weechat_quickstart.ru.html diff --git a/debian/weechat-doc.doc-base.scripting-de b/debian/weechat-doc.doc-base.scripting-de index 9e62cad50..1c4d4a458 100644 --- a/debian/weechat-doc.doc-base.scripting-de +++ b/debian/weechat-doc.doc-base.scripting-de @@ -6,5 +6,5 @@ Abstract: This document describes the API to create scripts Section: Network/Communication Format: HTML -Index: /usr/share/doc/weechat-doc/weechat_scripting.de.html -Files: /usr/share/doc/weechat-doc/weechat_scripting.de.html +Index: /usr/share/doc/weechat-doc/html/weechat_scripting.de.html +Files: /usr/share/doc/weechat-doc/html/weechat_scripting.de.html diff --git a/debian/weechat-doc.doc-base.scripting-en b/debian/weechat-doc.doc-base.scripting-en index f468e7b82..eafd60b9e 100644 --- a/debian/weechat-doc.doc-base.scripting-en +++ b/debian/weechat-doc.doc-base.scripting-en @@ -6,5 +6,5 @@ Abstract: This document describes the API to create scripts Section: Network/Communication Format: HTML -Index: /usr/share/doc/weechat-doc/weechat_scripting.en.html -Files: /usr/share/doc/weechat-doc/weechat_scripting.en.html +Index: /usr/share/doc/weechat-doc/html/weechat_scripting.en.html +Files: /usr/share/doc/weechat-doc/html/weechat_scripting.en.html diff --git a/debian/weechat-doc.doc-base.scripting-fr b/debian/weechat-doc.doc-base.scripting-fr index fa353ecf0..5a1a9e7a3 100644 --- a/debian/weechat-doc.doc-base.scripting-fr +++ b/debian/weechat-doc.doc-base.scripting-fr @@ -6,5 +6,5 @@ Abstract: This document describes the API to create scripts Section: Network/Communication Format: HTML -Index: /usr/share/doc/weechat-doc/weechat_scripting.fr.html -Files: /usr/share/doc/weechat-doc/weechat_scripting.fr.html +Index: /usr/share/doc/weechat-doc/html/weechat_scripting.fr.html +Files: /usr/share/doc/weechat-doc/html/weechat_scripting.fr.html diff --git a/debian/weechat-doc.doc-base.scripting-it b/debian/weechat-doc.doc-base.scripting-it index e8712df55..184c57331 100644 --- a/debian/weechat-doc.doc-base.scripting-it +++ b/debian/weechat-doc.doc-base.scripting-it @@ -6,5 +6,5 @@ Abstract: This document describes the API to create scripts Section: Network/Communication Format: HTML -Index: /usr/share/doc/weechat-doc/weechat_scripting.it.html -Files: /usr/share/doc/weechat-doc/weechat_scripting.it.html +Index: /usr/share/doc/weechat-doc/html/weechat_scripting.it.html +Files: /usr/share/doc/weechat-doc/html/weechat_scripting.it.html diff --git a/debian/weechat-doc.doc-base.scripting-pl b/debian/weechat-doc.doc-base.scripting-pl new file mode 100644 index 000000000..07657d798 --- /dev/null +++ b/debian/weechat-doc.doc-base.scripting-pl @@ -0,0 +1,10 @@ +Document: weechat-scripting-pl +Title: WeeChat Scripting Guide (Polish) +Author: Sebastien Helleu +Abstract: This document describes the API to create scripts + for WeeChat (Polish version). +Section: Network/Communication + +Format: HTML +Index: /usr/share/doc/weechat-doc/html/weechat_scripting.pl.html +Files: /usr/share/doc/weechat-doc/html/weechat_scripting.pl.html diff --git a/debian/weechat-doc.doc-base.tester-de b/debian/weechat-doc.doc-base.tester-de index 7d25e2909..13204e924 100644 --- a/debian/weechat-doc.doc-base.tester-de +++ b/debian/weechat-doc.doc-base.tester-de @@ -6,5 +6,5 @@ Abstract: This document describes how to test and report Section: Network/Communication Format: HTML -Index: /usr/share/doc/weechat-doc/weechat_tester.de.html -Files: /usr/share/doc/weechat-doc/weechat_tester.de.html +Index: /usr/share/doc/weechat-doc/html/weechat_tester.de.html +Files: /usr/share/doc/weechat-doc/html/weechat_tester.de.html diff --git a/debian/weechat-doc.doc-base.tester-en b/debian/weechat-doc.doc-base.tester-en index 1f275e340..cf9833702 100644 --- a/debian/weechat-doc.doc-base.tester-en +++ b/debian/weechat-doc.doc-base.tester-en @@ -6,5 +6,5 @@ Abstract: This document describes how to test and report Section: Network/Communication Format: HTML -Index: /usr/share/doc/weechat-doc/weechat_tester.en.html -Files: /usr/share/doc/weechat-doc/weechat_tester.en.html +Index: /usr/share/doc/weechat-doc/html/weechat_tester.en.html +Files: /usr/share/doc/weechat-doc/html/weechat_tester.en.html diff --git a/debian/weechat-doc.doc-base.tester-fr b/debian/weechat-doc.doc-base.tester-fr index f26b03059..048025582 100644 --- a/debian/weechat-doc.doc-base.tester-fr +++ b/debian/weechat-doc.doc-base.tester-fr @@ -6,5 +6,5 @@ Abstract: This document describes how to test and report Section: Network/Communication Format: HTML -Index: /usr/share/doc/weechat-doc/weechat_tester.fr.html -Files: /usr/share/doc/weechat-doc/weechat_tester.fr.html +Index: /usr/share/doc/weechat-doc/html/weechat_tester.fr.html +Files: /usr/share/doc/weechat-doc/html/weechat_tester.fr.html diff --git a/debian/weechat-doc.doc-base.tester-it b/debian/weechat-doc.doc-base.tester-it index 2ad952ca1..7a5d90c44 100644 --- a/debian/weechat-doc.doc-base.tester-it +++ b/debian/weechat-doc.doc-base.tester-it @@ -6,5 +6,5 @@ Abstract: This document describes how to test and report Section: Network/Communication Format: HTML -Index: /usr/share/doc/weechat-doc/weechat_tester.it.html -Files: /usr/share/doc/weechat-doc/weechat_tester.it.html +Index: /usr/share/doc/weechat-doc/html/weechat_tester.it.html +Files: /usr/share/doc/weechat-doc/html/weechat_tester.it.html diff --git a/debian/weechat-doc.doc-base.tester-pl b/debian/weechat-doc.doc-base.tester-pl index 529acd560..589307c58 100644 --- a/debian/weechat-doc.doc-base.tester-pl +++ b/debian/weechat-doc.doc-base.tester-pl @@ -6,5 +6,5 @@ Abstract: This document describes how to test and report Section: Network/Communication Format: HTML -Index: /usr/share/doc/weechat-doc/weechat_tester.pl.html -Files: /usr/share/doc/weechat-doc/weechat_tester.pl.html +Index: /usr/share/doc/weechat-doc/html/weechat_tester.pl.html +Files: /usr/share/doc/weechat-doc/html/weechat_tester.pl.html diff --git a/debian/weechat-doc.doc-base.user-de b/debian/weechat-doc.doc-base.user-de index 657e7a75a..65a6fbd34 100644 --- a/debian/weechat-doc.doc-base.user-de +++ b/debian/weechat-doc.doc-base.user-de @@ -6,5 +6,5 @@ Abstract: This manual describes how to use the WeeChat Section: Network/Communication Format: HTML -Index: /usr/share/doc/weechat-doc/weechat_user.de.html -Files: /usr/share/doc/weechat-doc/weechat_user.de.html +Index: /usr/share/doc/weechat-doc/html/weechat_user.de.html +Files: /usr/share/doc/weechat-doc/html/weechat_user.de.html diff --git a/debian/weechat-doc.doc-base.user-en b/debian/weechat-doc.doc-base.user-en index 5ec8ad6e1..bf0739ab6 100644 --- a/debian/weechat-doc.doc-base.user-en +++ b/debian/weechat-doc.doc-base.user-en @@ -6,5 +6,5 @@ Abstract: This manual describes how to use the WeeChat Section: Network/Communication Format: HTML -Index: /usr/share/doc/weechat-doc/weechat_user.en.html -Files: /usr/share/doc/weechat-doc/weechat_user.en.html +Index: /usr/share/doc/weechat-doc/html/weechat_user.en.html +Files: /usr/share/doc/weechat-doc/html/weechat_user.en.html diff --git a/debian/weechat-doc.doc-base.user-fr b/debian/weechat-doc.doc-base.user-fr index a3f1fc62a..d869d841b 100644 --- a/debian/weechat-doc.doc-base.user-fr +++ b/debian/weechat-doc.doc-base.user-fr @@ -6,5 +6,5 @@ Abstract: This manual describes how to use the WeeChat Section: Network/Communication Format: HTML -Index: /usr/share/doc/weechat-doc/weechat_user.fr.html -Files: /usr/share/doc/weechat-doc/weechat_user.fr.html +Index: /usr/share/doc/weechat-doc/html/weechat_user.fr.html +Files: /usr/share/doc/weechat-doc/html/weechat_user.fr.html diff --git a/debian/weechat-doc.doc-base.user-it b/debian/weechat-doc.doc-base.user-it index 5ad9c446f..cacf01ee9 100644 --- a/debian/weechat-doc.doc-base.user-it +++ b/debian/weechat-doc.doc-base.user-it @@ -6,5 +6,5 @@ Abstract: This manual describes how to use the WeeChat Section: Network/Communication Format: HTML -Index: /usr/share/doc/weechat-doc/weechat_user.it.html -Files: /usr/share/doc/weechat-doc/weechat_user.it.html +Index: /usr/share/doc/weechat-doc/html/weechat_user.it.html +Files: /usr/share/doc/weechat-doc/html/weechat_user.it.html diff --git a/debian/weechat-doc.install b/debian/weechat-doc.install index 7a9114d6b..fe353bdb0 100644 --- a/debian/weechat-doc.install +++ b/debian/weechat-doc.install @@ -1 +1 @@ -usr/share/doc/weechat/* usr/share/doc/weechat-doc +usr/share/doc/weechat/*.html usr/share/doc/weechat-doc/html diff --git a/debian/weechat-doc.links b/debian/weechat-doc.links new file mode 100644 index 000000000..b38e7f14b --- /dev/null +++ b/debian/weechat-doc.links @@ -0,0 +1 @@ +usr/share/doc/weechat-doc/html usr/share/doc/weechat/html |