mirror of
https://git.proxmox.com/git/mirror_frr
synced 2025-08-04 11:33:48 +00:00
debian: add missing Conflicts:
We were missing several Conflicts: (or Breaks:) lines. Specifically, - the .png diagrams in frr-doc conflict with quagga-doc - the quagga package was split up and we conflict on each on the daemon's man pages - pimd also conflicts on the man page. This is a "conservative" fix for the time being, putting everything into Conflicts:. Some of these might have other options to fix them (e.g. renaming the diagrams or man pages) but that needs more thought and isn't appropriate for a simple fix. There is also the "layer 9" consideration of whether to add "Replaces: quagga" lines. For the time being I'd say it's a bit early to have that discussion. Reported-by: Andreas Beckmann <anbe@debian.org> References: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=921376 Signed-off-by: David Lamparter <equinox@diac24.net>
This commit is contained in:
parent
75ec70d358
commit
01b5725bf7
15
debian/control
vendored
15
debian/control
vendored
@ -46,7 +46,19 @@ Depends:
|
||||
Pre-Depends: adduser
|
||||
Recommends: frr-pythontools
|
||||
Suggests: frr-doc
|
||||
Conflicts: zebra, zebra-pj, quagga
|
||||
Conflicts:
|
||||
zebra,
|
||||
zebra-pj,
|
||||
pimd,
|
||||
quagga,
|
||||
quagga-bgpd,
|
||||
quagga-core,
|
||||
quagga-isisd,
|
||||
quagga-ospf6d,
|
||||
quagga-ospfd,
|
||||
quagga-pimd,
|
||||
quagga-ripd,
|
||||
quagga-ripngd
|
||||
Replaces: zebra, zebra-pj
|
||||
Description: FRRouting suite of internet protocols (BGP, OSPF, IS-IS, ...)
|
||||
FRRouting implements the routing protocols commonly used in the
|
||||
@ -97,6 +109,7 @@ Depends:
|
||||
libjs-jquery,
|
||||
libjs-underscore
|
||||
Suggests: frr
|
||||
Conflicts: quagga-doc
|
||||
Description: FRRouting suite - user manual
|
||||
This provides the FRR user manual in HTML form. This is the official
|
||||
manual maintained as part of the package and is also available online
|
||||
|
Loading…
Reference in New Issue
Block a user