From b5b78574f714684204233a366515d09d972bd6ba Mon Sep 17 00:00:00 2001 From: David Lamparter Date: Sun, 28 Oct 2018 16:58:24 +0100 Subject: [PATCH] debianpkg: include docs and register with doc-base Signed-off-by: David Lamparter --- debianpkg/frr-doc.doc-base | 23 +++++++++++++++++++++++ debianpkg/frr-doc.docs | 3 --- debianpkg/frr-doc.install | 8 ++++++++ debianpkg/frr.install | 2 +- debianpkg/subdir.am | 2 +- 5 files changed, 33 insertions(+), 5 deletions(-) create mode 100644 debianpkg/frr-doc.doc-base delete mode 100644 debianpkg/frr-doc.docs diff --git a/debianpkg/frr-doc.doc-base b/debianpkg/frr-doc.doc-base new file mode 100644 index 000000000..ec7870d7a --- /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 index 605353289..000000000 --- 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 79dbf5fb7..c48dc5a8d 100644 --- 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 79d4e015e..2b672f07f 100644 --- 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 85ece9a99..dacb615af 100644 --- 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 \ -- 2.39.5