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 <sharpd@cumulusnetworks.com>

diff --git a/debianpkg/backports/ubuntu12.04/debian/control b/debianpkg/backports/ubuntu12.04/debian/control
index 17ceeb038148bc070886a902426cd7287a0d4dfc..9bae348840e3ff16762550fe07f03225885811a8 100644 (file)
--- 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 c22bd3bd58469d3fb4f68b3c2a23dbd2ea313cc1..3f31f18462fdbabf916e58e473e0bd3ce9553d5a 100644 (file)
--- 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