diff options
| author | David Lamparter <equinox@opensourcerouting.org> | 2023-01-02 13:39:35 +0100 |
|---|---|---|
| committer | David Lamparter <equinox@opensourcerouting.org> | 2023-01-24 18:19:42 +0100 |
| commit | 3a42c62d81bd8949e142fe3508de64b99633c85f (patch) | |
| tree | e3e2ce950404dc0f84977d95ceb92f5730d273c2 | |
| parent | debian: fix cross-build marks (libelf/libpython3) (diff) | |
| download | frr-3a42c62d81bd8949e142fe3508de64b99633c85f.tar.xz frr-3a42c62d81bd8949e142fe3508de64b99633c85f.zip | |
debian: fix sphinx docs
- use dh_sphinxdoc to get rid of embedded JS
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
(cherry picked from commit e1e2ea84eed7f1880e1ed3fa2cfa09eaa9d2cdc1)
| -rw-r--r-- | debian/control | 5 | ||||
| -rwxr-xr-x | debian/rules | 8 |
2 files changed, 3 insertions, 10 deletions
diff --git a/debian/control b/debian/control index 5f51bca53..01c940931 100644 --- a/debian/control +++ b/debian/control @@ -104,9 +104,8 @@ Package: frr-doc Section: doc Architecture: all Multi-Arch: foreign -Depends: libjs-jquery, - libjs-underscore, - ${misc:Depends} +Depends: ${misc:Depends}, + ${sphinxdoc:Depends} Suggests: frr Conflicts: quagga-doc Description: FRRouting suite - user manual diff --git a/debian/rules b/debian/rules index 083464034..bed16b86a 100755 --- a/debian/rules +++ b/debian/rules @@ -36,7 +36,7 @@ endif export PYTHON=python3 %: - dh $@ -Bbuild + dh $@ -Bbuild --with=sphinxdoc override_dh_auto_configure: $(shell dpkg-buildflags --export=sh); \ @@ -93,12 +93,6 @@ override_dh_auto_install: rm -rf debian/tmp/usr/include -rm debian/tmp/usr/lib/frr/ssd -# use installed js libraries - -rm -f debian/tmp/usr/share/doc/frr/html/_static/jquery.js - ln -s /usr/share/javascript/jquery/jquery.js debian/tmp/usr/share/doc/frr/html/_static/jquery.js - -rm -f debian/tmp/usr/share/doc/frr/html/_static/underscore.js - ln -s /usr/share/javascript/underscore/underscore.js debian/tmp/usr/share/doc/frr/html/_static/underscore.js - override_dh_auto_build: dh_auto_build -- $(MAKE_SILENT) |