From f631926724417bc0b1ccb79a9344195950c3723d Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Thu, 8 Feb 2018 13:51:04 -0500 Subject: [PATCH] debianpkg: Update build dependencies to say we don't co-exist with quagga The control files for all build platforms are not consistent. Signed-off-by: Donald Sharp --- debianpkg/backports/ubuntu12.04/debian/control | 2 +- debianpkg/backports/ubuntu14.04/debian/control | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debianpkg/backports/ubuntu12.04/debian/control b/debianpkg/backports/ubuntu12.04/debian/control index 17ceeb0381..9bae348840 100644 --- a/debianpkg/backports/ubuntu12.04/debian/control +++ b/debianpkg/backports/ubuntu12.04/debian/control @@ -13,7 +13,7 @@ Package: frr Architecture: any Depends: ${shlibs:Depends}, logrotate (>= 3.2-11), ${misc:Depends} Pre-Depends: adduser -Conflicts: zebra, zebra-pj +Conflicts: zebra, zebra-pj, quagga Replaces: zebra, zebra-pj Suggests: snmpd Description: BGP/OSPF/RIP/RIPng/ISIS/PIM/LDP routing daemon forked from Quagga diff --git a/debianpkg/backports/ubuntu14.04/debian/control b/debianpkg/backports/ubuntu14.04/debian/control index c22bd3bd58..3f31f18462 100644 --- a/debianpkg/backports/ubuntu14.04/debian/control +++ b/debianpkg/backports/ubuntu14.04/debian/control @@ -13,7 +13,7 @@ Package: frr Architecture: any Depends: ${shlibs:Depends}, logrotate (>= 3.2-11), ${misc:Depends} Pre-Depends: adduser -Conflicts: zebra, zebra-pj +Conflicts: zebra, zebra-pj, quagga Replaces: zebra, zebra-pj Suggests: snmpd Description: BGP/OSPF/RIP/RIPng/ISIS/PIM/LDP routing daemon forked from Quagga -- 2.39.5