From: Quentin Young Date: Fri, 16 Feb 2018 16:21:14 +0000 (-0500) Subject: debianpkg: update packaging for new docs X-Git-Tag: frr-5.0-dev~165^2~26 X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=72a475e87c669c54ef8cd831f509229486f2a018;p=mirror%2Ffrr.git 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 2e9e84faa6..6449743b9d 100755 --- 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 adce915e1f..170932084c 100644 --- 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 4f82d772c9..ce7f793ae2 100755 --- 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 471c7af3c8..bbd4c43b42 100644 --- a/debianpkg/control +++ b/debianpkg/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Nobody Uploaders: Nobody XSBC-Original-Maintainer: -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 a0776fd68a..4720a3b920 100644 --- 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 c4f181cdb0..5fadb0024d 100644 --- 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 e5910fec8f..8854b2c547 100644 --- 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 2d86009dba..35dfe43776 100644 --- 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 17a128b7e3..51f82d0889 100644 --- 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 574f448dff..1d98e2099b 100755 --- 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 8c73cb30ce..bad20f04a2 100644 --- 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