Emmanuel Bouthenot wrote:
> You're right, I will add the missing Suggests field in weechat-curses
> and a symlink from /usr/share/doc/weechat/html to
> /usr/share/doc/weechat-doc/html
>
> I will also move /usr/share/doc/weechat-doc/*.html files into
> /usr/share/doc/weechat-doc/html
How about this? Patches attached since the BTS seems to cope best
that way.
Notes from building:
src/core/wee-network.c: In function ‘network_init’:
src/core/wee-network.c:106:5: warning:
‘gnutls_certificate_client_set_retrieve_function’
is deprecated (declared at /usr/include/gnutls/compat.h:158)
[-Wdeprecated-declarations]
dh_pysupport: This program is deprecated, you should use dh_python2 instead.
Migration guide: http://wiki.debian.org/Python/TransitionToDHPython2
dpkg-shlibdeps: warning: dependency on libcrypt.so.1 could be avoided if
"debian/weechat-plugins/usr/lib/weechat/plugins/perl.so" were not uselessly
linked
against it (they use none of its symbols).
Jonathan Nieder (2):
Move docs from /usr/share/doc/weechat-doc/*.html to
.../doc/weechat/html/
Make weechat-doc more discoverable
debian/changelog | 10 ++++++++++
debian/control | 2 ++
debian/weechat-doc.doc-base.faq-de | 4 ++--
debian/weechat-doc.doc-base.faq-en | 4 ++--
debian/weechat-doc.doc-base.faq-fr | 4 ++--
debian/weechat-doc.doc-base.faq-it | 4 ++--
debian/weechat-doc.doc-base.faq-pl | 4 ++--
debian/weechat-doc.doc-base.plugin-en | 4 ++--
debian/weechat-doc.doc-base.plugin-fr | 4 ++--
debian/weechat-doc.doc-base.plugin-it | 4 ++--
debian/weechat-doc.doc-base.quickstart-de | 4 ++--
debian/weechat-doc.doc-base.quickstart-en | 4 ++--
debian/weechat-doc.doc-base.quickstart-fr | 4 ++--
debian/weechat-doc.doc-base.quickstart-it | 4 ++--
debian/weechat-doc.doc-base.quickstart-ja | 4 ++--
debian/weechat-doc.doc-base.quickstart-pl | 4 ++--
debian/weechat-doc.doc-base.quickstart-ru | 4 ++--
debian/weechat-doc.doc-base.scripting-de | 4 ++--
debian/weechat-doc.doc-base.scripting-en | 4 ++--
debian/weechat-doc.doc-base.scripting-fr | 4 ++--
debian/weechat-doc.doc-base.scripting-it | 4 ++--
debian/weechat-doc.doc-base.tester-de | 4 ++--
debian/weechat-doc.doc-base.tester-en | 4 ++--
debian/weechat-doc.doc-base.tester-fr | 4 ++--
debian/weechat-doc.doc-base.tester-it | 4 ++--
debian/weechat-doc.doc-base.tester-pl | 4 ++--
debian/weechat-doc.doc-base.user-de | 4 ++--
debian/weechat-doc.doc-base.user-en | 4 ++--
debian/weechat-doc.doc-base.user-fr | 4 ++--
debian/weechat-doc.doc-base.user-it | 4 ++--
debian/weechat-doc.install | 2 +-
debian/weechat-doc.links | 1 +
32 files changed, 70 insertions(+), 57 deletions(-)
create mode 100644 debian/weechat-doc.links
From: Jonathan Nieder <jrnie...@gmail.com>
Date: Thu, 7 Jul 2011 14:05:56 -0500
Subject: [PATCH 1/2] Move docs from /usr/share/doc/weechat-doc/*.html to
.../doc/weechat/html/
Ian Jackson explains[*]:
| For example, there has been a recent trend for FOO's documentation
| package FOO-doc to contain /usr/share/doc/FOO-doc/html/index.html (or
| whatever). I think this is daft. It should be in
| /usr/share/doc/FOO/html/index.html. That way you can find the
| documentation for FOO in the filesystem without knowing whether the
| FOO package happens to have been split into FOO and FOO-doc, or for
| that matter libFOO8.9-dev, FOO-bin, etc. etc. etc.
Also install a symlink under /usr/share/doc/weechat-doc so readers
expecting to still find the docs there still are not completely lost.
[*] 19749.55214.255224.395...@chiark.greenend.org.uk
Helped-by: Emmanuel Bouthenot <kol...@openics.org>
Signed-off-by: Jonathan Nieder <jrnie...@gmail.com>
---
debian/changelog | 8 ++++++++
debian/weechat-doc.doc-base.faq-de | 4 ++--
debian/weechat-doc.doc-base.faq-en | 4 ++--
debian/weechat-doc.doc-base.faq-fr | 4 ++--
debian/weechat-doc.doc-base.faq-it | 4 ++--
debian/weechat-doc.doc-base.faq-pl | 4 ++--
debian/weechat-doc.doc-base.plugin-en | 4 ++--
debian/weechat-doc.doc-base.plugin-fr | 4 ++--
debian/weechat-doc.doc-base.plugin-it | 4 ++--
debian/weechat-doc.doc-base.quickstart-de | 4 ++--
debian/weechat-doc.doc-base.quickstart-en | 4 ++--
debian/weechat-doc.doc-base.quickstart-fr | 4 ++--
debian/weechat-doc.doc-base.quickstart-it | 4 ++--
debian/weechat-doc.doc-base.quickstart-ja | 4 ++--
debian/weechat-doc.doc-base.quickstart-pl | 4 ++--
debian/weechat-doc.doc-base.quickstart-ru | 4 ++--
debian/weechat-doc.doc-base.scripting-de | 4 ++--
debian/weechat-doc.doc-base.scripting-en | 4 ++--
debian/weechat-doc.doc-base.scripting-fr | 4 ++--
debian/weechat-doc.doc-base.scripting-it | 4 ++--
debian/weechat-doc.doc-base.tester-de | 4 ++--
debian/weechat-doc.doc-base.tester-en | 4 ++--
debian/weechat-doc.doc-base.tester-fr | 4 ++--
debian/weechat-doc.doc-base.tester-it | 4 ++--
debian/weechat-doc.doc-base.tester-pl | 4 ++--
debian/weechat-doc.doc-base.user-de | 4 ++--
debian/weechat-doc.doc-base.user-en | 4 ++--
debian/weechat-doc.doc-base.user-fr | 4 ++--
debian/weechat-doc.doc-base.user-it | 4 ++--
debian/weechat-doc.install | 2 +-
debian/weechat-doc.links | 1 +
31 files changed, 66 insertions(+), 57 deletions(-)
create mode 100644 debian/weechat-doc.links
diff --git a/debian/changelog b/debian/changelog
index 91374975..2c2665cc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+weechat (0.3.5-1.1) unstable; urgency=low
+
+ * Move documentation in weechat-doc from /usr/share/doc/weechat-doc/*.html
+ to /usr/share/doc/weechat/html/. (Closes: #632621)
+ * Install a symlink /usr/share/doc/weechat-doc/html -> ../weechat/html.
+
+ -- Jonathan Nieder <jrnie...@gmail.com> Thu, 07 Jul 2011 13:52:50 -0500
+
weechat (0.3.5-1) unstable; urgency=low
* New upstream release
diff --git a/debian/weechat-doc.doc-base.faq-de
b/debian/weechat-doc.doc-base.faq-de
index 921bc225..dc5f017c 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/html/weechat_faq.de.html
+Files: /usr/share/doc/weechat/html/weechat_faq.de.html
diff --git a/debian/weechat-doc.doc-base.faq-en
b/debian/weechat-doc.doc-base.faq-en
index dd01873f..dc0041f2 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/html/weechat_faq.en.html
+Files: /usr/share/doc/weechat/html/weechat_faq.en.html
diff --git a/debian/weechat-doc.doc-base.faq-fr
b/debian/weechat-doc.doc-base.faq-fr
index f5f05503..64075964 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/html/weechat_faq.fr.html
+Files: /usr/share/doc/weechat/html/weechat_faq.fr.html
diff --git a/debian/weechat-doc.doc-base.faq-it
b/debian/weechat-doc.doc-base.faq-it
index debb43ec..e91ce830 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/html/weechat_faq.it.html
+Files: /usr/share/doc/weechat/html/weechat_faq.it.html
diff --git a/debian/weechat-doc.doc-base.faq-pl
b/debian/weechat-doc.doc-base.faq-pl
index 88294c39..8cdc650b 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/html/weechat_faq.pl.html
+Files: /usr/share/doc/weechat/html/weechat_faq.pl.html
diff --git a/debian/weechat-doc.doc-base.plugin-en
b/debian/weechat-doc.doc-base.plugin-en
index a4e75c4f..1ba4b027 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/html/weechat_plugin_api.en.html
+Files: /usr/share/doc/weechat/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 da3a08bf..78d9e790 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/html/weechat_plugin_api.fr.html
+Files: /usr/share/doc/weechat/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 74d59793..4d9c1efb 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/html/weechat_plugin_api.it.html
+Files: /usr/share/doc/weechat/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 c3ec2b0e..c6fbdc00 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/html/weechat_quickstart.de.html
+Files: /usr/share/doc/weechat/html/weechat_quickstart.de.html
diff --git a/debian/weechat-doc.doc-base.quickstart-en
b/debian/weechat-doc.doc-base.quickstart-en
index c0c5379f..71d83523 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/html/weechat_quickstart.en.html
+Files: /usr/share/doc/weechat/html/weechat_quickstart.en.html
diff --git a/debian/weechat-doc.doc-base.quickstart-fr
b/debian/weechat-doc.doc-base.quickstart-fr
index ad7d555b..d80d047d 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/html/weechat_quickstart.fr.html
+Files: /usr/share/doc/weechat/html/weechat_quickstart.fr.html
diff --git a/debian/weechat-doc.doc-base.quickstart-it
b/debian/weechat-doc.doc-base.quickstart-it
index 1cbfe6d4..36ad62fd 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/html/weechat_quickstart.it.html
+Files: /usr/share/doc/weechat/html/weechat_quickstart.it.html
diff --git a/debian/weechat-doc.doc-base.quickstart-ja
b/debian/weechat-doc.doc-base.quickstart-ja
index 6cd67c9b..60094f0d 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/html/weechat_quickstart.ja.html
+Files: /usr/share/doc/weechat/html/weechat_quickstart.ja.html
diff --git a/debian/weechat-doc.doc-base.quickstart-pl
b/debian/weechat-doc.doc-base.quickstart-pl
index 3980a6d1..495bc8b1 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/html/weechat_quickstart.pl.html
+Files: /usr/share/doc/weechat/html/weechat_quickstart.pl.html
diff --git a/debian/weechat-doc.doc-base.quickstart-ru
b/debian/weechat-doc.doc-base.quickstart-ru
index d5fb427d..11b63fa5 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/html/weechat_quickstart.ru.html
+Files: /usr/share/doc/weechat/html/weechat_quickstart.ru.html
diff --git a/debian/weechat-doc.doc-base.scripting-de
b/debian/weechat-doc.doc-base.scripting-de
index 9e62cad5..7f5aa21a 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/html/weechat_scripting.de.html
+Files: /usr/share/doc/weechat/html/weechat_scripting.de.html
diff --git a/debian/weechat-doc.doc-base.scripting-en
b/debian/weechat-doc.doc-base.scripting-en
index f468e7b8..49433c4d 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/html/weechat_scripting.en.html
+Files: /usr/share/doc/weechat/html/weechat_scripting.en.html
diff --git a/debian/weechat-doc.doc-base.scripting-fr
b/debian/weechat-doc.doc-base.scripting-fr
index fa353ecf..2683dbb3 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/html/weechat_scripting.fr.html
+Files: /usr/share/doc/weechat/html/weechat_scripting.fr.html
diff --git a/debian/weechat-doc.doc-base.scripting-it
b/debian/weechat-doc.doc-base.scripting-it
index e8712df5..f4c595ec 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/html/weechat_scripting.it.html
+Files: /usr/share/doc/weechat/html/weechat_scripting.it.html
diff --git a/debian/weechat-doc.doc-base.tester-de
b/debian/weechat-doc.doc-base.tester-de
index 7d25e290..0a20dc98 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/html/weechat_tester.de.html
+Files: /usr/share/doc/weechat/html/weechat_tester.de.html
diff --git a/debian/weechat-doc.doc-base.tester-en
b/debian/weechat-doc.doc-base.tester-en
index 1f275e34..e28c4778 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/html/weechat_tester.en.html
+Files: /usr/share/doc/weechat/html/weechat_tester.en.html
diff --git a/debian/weechat-doc.doc-base.tester-fr
b/debian/weechat-doc.doc-base.tester-fr
index f26b0305..c1baeb18 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/html/weechat_tester.fr.html
+Files: /usr/share/doc/weechat/html/weechat_tester.fr.html
diff --git a/debian/weechat-doc.doc-base.tester-it
b/debian/weechat-doc.doc-base.tester-it
index 2ad952ca..83a78255 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/html/weechat_tester.it.html
+Files: /usr/share/doc/weechat/html/weechat_tester.it.html
diff --git a/debian/weechat-doc.doc-base.tester-pl
b/debian/weechat-doc.doc-base.tester-pl
index 529acd56..8d4968f4 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/html/weechat_tester.pl.html
+Files: /usr/share/doc/weechat/html/weechat_tester.pl.html
diff --git a/debian/weechat-doc.doc-base.user-de
b/debian/weechat-doc.doc-base.user-de
index 657e7a75..e7656eb3 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/html/weechat_user.de.html
+Files: /usr/share/doc/weechat/html/weechat_user.de.html
diff --git a/debian/weechat-doc.doc-base.user-en
b/debian/weechat-doc.doc-base.user-en
index 5ec8ad6e..582aec3e 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/html/weechat_user.en.html
+Files: /usr/share/doc/weechat/html/weechat_user.en.html
diff --git a/debian/weechat-doc.doc-base.user-fr
b/debian/weechat-doc.doc-base.user-fr
index a3f1fc62..cd1a5cdc 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/html/weechat_user.fr.html
+Files: /usr/share/doc/weechat/html/weechat_user.fr.html
diff --git a/debian/weechat-doc.doc-base.user-it
b/debian/weechat-doc.doc-base.user-it
index 5ad9c446..562d48bf 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/html/weechat_user.it.html
+Files: /usr/share/doc/weechat/html/weechat_user.it.html
diff --git a/debian/weechat-doc.install b/debian/weechat-doc.install
index 7a9114d6..06c6c38d 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/* usr/share/doc/weechat/html
diff --git a/debian/weechat-doc.links b/debian/weechat-doc.links
new file mode 100644
index 00000000..d58fdce3
--- /dev/null
+++ b/debian/weechat-doc.links
@@ -0,0 +1 @@
+usr/share/doc/weechat/html usr/share/doc/weechat-doc/html
--
1.7.6
From: Jonathan Nieder <jrnie...@gmail.com>
Date: Thu, 7 Jul 2011 14:07:01 -0500
Subject: [PATCH 2/2] Make weechat-doc more discoverable
weechat-core suggests weechat-doc since the latter explains how to
configure the plugins shipped by the former. Unfortunately most
Debian package managers do not prominently list packages that
automatically installed packages Suggest. To ensure people can find
weechat-doc, let the user-visible packages (weechat-curses and the
weechat metapackage) suggest it, too.
Signed-off-by: Jonathan Nieder <jrnie...@gmail.com>
---
debian/changelog | 2 ++
debian/control | 2 ++
2 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 2c2665cc..a62622bb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ weechat (0.3.5-1.1) unstable; urgency=low
* Move documentation in weechat-doc from /usr/share/doc/weechat-doc/*.html
to /usr/share/doc/weechat/html/. (Closes: #632621)
* Install a symlink /usr/share/doc/weechat-doc/html -> ../weechat/html.
+ * Let weechat and weechat-curses Suggest weechat-doc, instead of just
+ weechat-core doing so.
-- Jonathan Nieder <jrnie...@gmail.com> Thu, 07 Jul 2011 13:52:50 -0500
diff --git a/debian/control b/debian/control
index ddaa6303..f6578eea 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
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.
@@ -34,6 +35,7 @@ Description: Fast, light and extensible chat client
Package: weechat-curses
Architecture: any
Depends: ${misc:Depends}, ${shlibs:Depends}, weechat-core (= ${binary:Version})
+Suggests: weechat-doc
Conflicts: weechat-common
Breaks: weechat-scripts (<= 20090221-1)
Recommends: weechat-plugins (= ${binary:Version})
--
1.7.6
