debianpkg: clean up dependencies

- accept either python2 or python3 packages for everything
- drop texlive-latex-base, texlive-generic-recommended (only needed for
  PDF docs)
- python-ipaddr is not a build time requirement, only runtime

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

diff --git a/debianpkg/control b/debianpkg/control
index 71c412a960b5965565a2c759549a2250e39e48e2..67b701e75db6081942976cdef12d8ad85e21d578 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), 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, libpython-dev, install-info
+Build-Depends: debhelper (>= 7.0.50~), libncurses5-dev, libreadline-dev, 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) | python3, python-sphinx | python3-sphinx, libpython-dev | libpython3-dev, install-info
 Standards-Version: 3.9.6
 Homepage: http://www.frrouting.org/
 

diff --git a/debianpkg/rules b/debianpkg/rules
index f4d28bb306fc212d39d6054827660085d38ea9ee..2a26ac0e883329f42f7d376f310404b5190bab29 100755 (executable)
--- a/debianpkg/rules
+++ b/debianpkg/rules
@@ -39,6 +39,7 @@ WANT_FRR_USER ?= frr
 WANT_FRR_VTY_GROUP ?= frrvty
 
 # Don't build PDF docs by default
+# add build deps: texlive-latex-base, texlive-generic-recommended
 GENERATE_PDF ?= 0
 
 #