debianpkg: include docs and register with doc-base

Signed-off-by: David Lamparter <equinox@diac24.net>

diff --git a/debianpkg/frr-doc.doc-base b/debianpkg/frr-doc.doc-base
new file mode 100644 (file)
index 0000000..ec7870d
--- /dev/null
+++ b/debianpkg/frr-doc.doc-base
@@ -0,0 +1,23 @@
+Document: frr
+Title: FRRouting user manual
+Abstract: General user/operator description for the FRRouting suite of
+ routing protocol daemons.
+Section: Network/Communication
+
+Format: HTML
+Index: /usr/share/doc/frr/html/index.html
+Files: /usr/share/doc/frr/html/*
+
+Format: info
+Index: /usr/share/info/frr.info.gz
+Files:
+ /usr/share/info/frr.info.gz
+ /usr/share/info/fig-normal-processing.png
+ /usr/share/info/fig-rs-processing.png
+ /usr/share/info/fig-vnc-commercial-route-reflector.png
+ /usr/share/info/fig-vnc-frr-route-reflector.png
+ /usr/share/info/fig-vnc-gw.png
+ /usr/share/info/fig-vnc-mesh.png
+ /usr/share/info/fig-vnc-redundant-route-reflectors.png
+ /usr/share/info/fig_topologies_full.png
+ /usr/share/info/fig_topologies_rs.png

diff --git a/debianpkg/frr-doc.docs b/debianpkg/frr-doc.docs
deleted file mode 100644 (file)
index 6053532..0000000
--- a/debianpkg/frr-doc.docs
+++ /dev/null
@@ -1,3 +0,0 @@
-README.md
-doc/user/*.rst
-doc/figures/*.png

diff --git a/debianpkg/frr-doc.install b/debianpkg/frr-doc.install
index 79dbf5fb784121246e2632524c15e749f0c8bfaf..c48dc5a8db68cc357554db3bbee7adfcc57adbfa 100644 (file)
--- a/debianpkg/frr-doc.install
+++ b/debianpkg/frr-doc.install
@@ -1,2 +1,10 @@
+# html docs include RST sources
+usr/share/doc/frr/html
+
+# info + images referenced by it
 usr/share/info/
 doc/user/_build/texinfo/*.png usr/share/info
+
+# other
+README.md         usr/share/doc/frr
+doc/figures/*.png usr/share/doc/frr

diff --git a/debianpkg/frr.install b/debianpkg/frr.install
index 79d4e015ecb7ef3c7cbbd60a9283d1b788b29f99..2b672f07f741e6da797681a80de740cc6d56859f 100644 (file)
--- a/debianpkg/frr.install
+++ b/debianpkg/frr.install
@@ -8,7 +8,7 @@ usr/lib/frr/*d
 usr/lib/frr/watchfrr
 usr/lib/frr/zebra
 usr/lib/*/frr/modules/zebra_irdp.so
-usr/share/doc/frr/
+usr/share/doc/frr/examples
 usr/share/man/
 usr/share/yang/
 tools/etc/* etc/

diff --git a/debianpkg/subdir.am b/debianpkg/subdir.am
index 85ece9a9909534f0a6265e646692b675c80e202d..dacb615af57915492338b110ddd75d40d9ce7cd0 100644 (file)
--- a/debianpkg/subdir.am
+++ b/debianpkg/subdir.am
@@ -18,7 +18,7 @@ EXTRA_DIST += \
        debianpkg/watch \
        \
        debianpkg/frr-dbg.lintian-overrides \
-       debianpkg/frr-doc.docs \
+       debianpkg/frr-doc.doc-base \
        debianpkg/frr-doc.info \
        debianpkg/frr-doc.install \
        debianpkg/frr-pythontools.install \