debianpkg: update packaging for new docs

Incidentally this was all broken before anyway.

* Correctly ship all documents in frr-doc
* Ship manpages for all daemons in frr
* Update rules to build docs via Sphinx
* Use packaging install files correctly

diff --git a/debianpkg/backports/ubuntu12.04/debian/rules b/debianpkg/backports/ubuntu12.04/debian/rules
index 2e9e84faa6006270c1d4d03bdb57450eea8d68ff..6449743b9d78b3ecfbdfd64b9d209c6dc03e97f9 100755 (executable)
--- a/debianpkg/backports/ubuntu12.04/debian/rules
+++ b/debianpkg/backports/ubuntu12.04/debian/rules
@@ -135,18 +135,11 @@ override_dh_auto_configure:
        fi
 
 override_dh_auto_build:
-       #dh_auto_build
-       $(MAKE)
-       dh_auto_build -- -C doc draft-zebra-00.txt
-
-
-       # doc/ is a bit crazy
 ifeq ($(GENERATE_PDF), 1)
-       dh_auto_build -- -C doc frr.pdf || true # pdfetex fails with exit code 1 but still produces a good looking .pdf
+       dh_auto_build -- -C doc user.pdf
 endif
-       rm -vf doc/frr.info
+       rm -vf doc/user/_build/texinfo/FRR.info
        dh_auto_build -- -C doc frr.info
-       rm -vf doc/frr.info.html*
 
 override_dh_auto_test:
 

diff --git a/debianpkg/backports/ubuntu14.04/debian/frr.install b/debianpkg/backports/ubuntu14.04/debian/frr.install
index adce915e1f075d7083f7c51a8669184efd25c7f1..170932084cb66c8ecf0e729df67681500bc3aaa9 100644 (file)
--- a/debianpkg/backports/ubuntu14.04/debian/frr.install
+++ b/debianpkg/backports/ubuntu14.04/debian/frr.install
@@ -4,17 +4,6 @@ usr/include/frr/
 usr/lib/
 tools/frr etc/init.d/
 usr/share/doc/frr/
-usr/share/man/man1/vtysh.1
-usr/share/man/man1/frr.1
-usr/share/man/man8
-usr/share/man/man8/bgpd.8
-usr/share/man/man8/ospf6d.8
-usr/share/man/man8/ospfd.8
-usr/share/man/man8/ripd.8
-usr/share/man/man8/ripngd.8
-usr/share/man/man8/zebra.8
-usr/share/man/man8/isisd.8
-usr/share/man/man8/watchfrr.8
 usr/share/snmp/mibs/
 tools/etc/* etc/
 tools/*.service    lib/systemd/system

diff --git a/debianpkg/backports/ubuntu14.04/debian/rules b/debianpkg/backports/ubuntu14.04/debian/rules
index 4f82d772c900810c28eae44226748edbe80cb56a..ce7f793ae297e18a4157db35b3e852b1bb747c85 100755 (executable)
--- a/debianpkg/backports/ubuntu14.04/debian/rules
+++ b/debianpkg/backports/ubuntu14.04/debian/rules
@@ -137,16 +137,13 @@ override_dh_auto_configure:
 override_dh_auto_build:
        #dh_auto_build
        $(MAKE)
-       dh_auto_build -- -C doc draft-zebra-00.txt
-
 
        # doc/ is a bit crazy
 ifeq ($(GENERATE_PDF), 1)
-       dh_auto_build -- -C doc frr.pdf || true # pdfetex fails with exit code 1 but still produces a good looking .pdf
+       dh_auto_build -- -C doc user.pdf
 endif
-       rm -vf doc/frr.info
-       dh_auto_build -- -C doc frr.info
-       rm -vf doc/frr.info.html*
+       rm -vf doc/_build/texinfo/FRR.info
+       dh_auto_build -- -C doc user.info
 
 override_dh_auto_test:
 

diff --git a/debianpkg/control b/debianpkg/control
index 471c7af3c800b8d65ab555615421471c6361639a..bbd4c43b421d9d154661169263165c075560daaf 100644 (file)
--- a/debianpkg/control
+++ b/debianpkg/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Nobody <nobody@frrouting.org>
 Uploaders: Nobody <nobody@frrouting.org>
 XSBC-Original-Maintainer: <maintainers@frrouting.org>
-Build-Depends: debhelper (>= 7.0.50~), libncurses5-dev, libreadline-dev, texlive-latex-base, texlive-generic-recommended, libpam0g-dev | libpam-dev, libcap-dev, texinfo (>= 4.7), imagemagick, ghostscript, groff, autotools-dev, libpcre3-dev, gawk, chrpath, libsnmp-dev, git, dh-autoreconf, libjson-c-dev, libjson-c2 | libjson-c3, dh-systemd, libsystemd-dev, bison, flex, libc-ares-dev, pkg-config, python (>= 2.7), python-ipaddr, python-sphinx
+Build-Depends: debhelper (>= 7.0.50~), libncurses5-dev, libreadline-dev, texlive-latex-base, texlive-generic-recommended, libpam0g-dev | libpam-dev, libcap-dev, texinfo (>= 4.7), autotools-dev, libpcre3-dev, gawk, chrpath, libsnmp-dev, git, dh-autoreconf, libjson-c-dev, libjson-c2 | libjson-c3, dh-systemd, libsystemd-dev, bison, flex, libc-ares-dev, pkg-config, python (>= 2.7), python-ipaddr, python-sphinx
 Standards-Version: 3.9.6
 Homepage: http://www.frrouting.org/
 

diff --git a/debianpkg/frr-doc.docs b/debianpkg/frr-doc.docs
index a0776fd68a3f2abfa95dce4602dd022318451918..4720a3b92034143e83913a2ee9e525a14051f8df 100644 (file)
--- a/debianpkg/frr-doc.docs
+++ b/debianpkg/frr-doc.docs
@@ -2,7 +2,5 @@ AUTHORS
 NEWS
 README
 REPORTING-BUGS
-doc/BGP-TypeCode
-doc/draft-zebra-00.txt
-doc/mpls/
-bgpd/BGP4-MIB.txt
+doc/user/*.rst
+doc/figures/*.png

diff --git a/debianpkg/frr-doc.info b/debianpkg/frr-doc.info
index c4f181cdb046ed5fda89808f287ae7e33a5622c5..5fadb0024d36653754d6ed955b30a8d9a0cdf96f 100644 (file)
--- a/debianpkg/frr-doc.info
+++ b/debianpkg/frr-doc.info
@@ -1 +1 @@
-doc/frr.info*
+doc/user/_build/texinfo/FRR.info

diff --git a/debianpkg/frr-doc.install b/debianpkg/frr-doc.install
index e5910fec8f2771e4a3c03b982e5c5080e6ddeed1..8854b2c547e187fc34d7b842d4ec446e11e7ecd9 100644 (file)
--- a/debianpkg/frr-doc.install
+++ b/debianpkg/frr-doc.install
@@ -1,2 +1 @@
-usr/share/info
-doc/*.png usr/share/info
+doc/user/_build/texinfo/*.png usr/share/info

diff --git a/debianpkg/frr.install b/debianpkg/frr.install
index 2d86009dba8a1b47354a1c91ed8c51ee2ea2db23..35dfe4377630bc15953dd39e72428965f950f9e9 100644 (file)
--- a/debianpkg/frr.install
+++ b/debianpkg/frr.install
@@ -4,19 +4,7 @@ usr/include/frr/
 usr/lib/
 tools/frr usr/lib/frr
 usr/share/doc/frr/
-usr/share/man/man1/vtysh.1
-usr/share/man/man1/frr.1
-usr/share/man/man8
-usr/share/man/man8/bgpd.8
-usr/share/man/man8/ospf6d.8
-usr/share/man/man8/ospfd.8
-usr/share/man/man8/ripd.8
-usr/share/man/man8/ripngd.8
-usr/share/man/man8/zebra.8
-usr/share/man/man8/isisd.8
-usr/share/man/man8/watchfrr.8
-usr/share/man/man8/frr-args.8
 usr/share/snmp/mibs/
 tools/etc/* etc/
-tools/*.service    lib/systemd/system
+tools/*.service  lib/systemd/system
 debian/frr.conf  usr/lib/tmpfiles.d

diff --git a/debianpkg/frr.manpages b/debianpkg/frr.manpages
index 17a128b7e31d3d5c97b413f26421727b77773619..51f82d08891c7c2046013cb8fe2aefbc95b9678e 100644 (file)
--- a/debianpkg/frr.manpages
+++ b/debianpkg/frr.manpages
@@ -1,9 +1,14 @@
-doc/bgpd.8
-doc/ospf6d.8
-doc/ospfd.8
-doc/ripd.8
-doc/ripngd.8
-doc/vtysh.1
-doc/zebra.8
-doc/isisd.8
-doc/watchfrr.8
+doc/manpages/_build/man/frr.1
+doc/manpages/_build/man/bgpd.8
+doc/manpages/_build/man/pimd.8
+doc/manpages/_build/man/eigrpd.8
+doc/manpages/_build/man/ldpd.8
+doc/manpages/_build/man/nhrpd.8
+doc/manpages/_build/man/ospf6d.8
+doc/manpages/_build/man/ospfd.8
+doc/manpages/_build/man/ripd.8
+doc/manpages/_build/man/ripngd.8
+doc/manpages/_build/man/vtysh.1
+doc/manpages/_build/man/zebra.8
+doc/manpages/_build/man/isisd.8
+doc/manpages/_build/man/watchfrr.8

diff --git a/debianpkg/rules b/debianpkg/rules
index 574f448dffe997e434c8f5e097a59bb64a86dc45..1d98e2099b149b110814b355f14a01abc11f7892 100755 (executable)
--- a/debianpkg/rules
+++ b/debianpkg/rules
@@ -136,18 +136,12 @@ override_dh_auto_configure:
        fi
 
 override_dh_auto_build:
-       #dh_auto_build
-       $(MAKE)
-       dh_auto_build -- -C doc draft-zebra-00.txt
-
-
        # doc/ is a bit crazy
 ifeq ($(GENERATE_PDF), 1)
-       dh_auto_build -- -C doc frr.pdf || true # pdfetex fails with exit code 1 but still produces a good looking .pdf
+       dh_auto_build -- -C doc user.pdf
 endif
-       rm -vf doc/frr.info
-       dh_auto_build -- -C doc frr.info
-       rm -vf doc/frr.info.html*
+       rm -vf doc/user/_build/texinfo/FRR.info
+       dh_auto_build -- -C doc FRR.info
 
 override_dh_auto_test:
 

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 8c73cb30cea181a6139d3a20589a4a6b2373cab1..bad20f04a2464337c4f26cc177b785293065366a 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -68,15 +68,18 @@ endif
 # handled by subdir target
 man: ;
 
-FRR.pdf:
+FRR.info:
+       $(MAKE) -C user info
+
+user.pdf:
        $(MAKE) -C user latexpdf
 
+user.html:
+       $(MAKE) -C user html
+
 developer.pdf:
        $(MAKE) -C developer latexpdf
 
-FRR.html:
-       $(MAKE) -C user html
-
 developer.html:
        $(MAKE) -C developer html