From 563fbfb307cf5a3aef617dd897e481ee31714d99 Mon Sep 17 00:00:00 2001 From: David Lamparter Date: Mon, 15 Oct 2018 07:02:47 +0200 Subject: [PATCH] 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 --- debianpkg/control | 2 +- debianpkg/rules | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debianpkg/control b/debianpkg/control index 71c412a96..67b701e75 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), 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 f4d28bb30..2a26ac0e8 100755 --- 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 # -- 2.39.5