diff options
| author | David Lamparter <equinox@diac24.net> | 2019-02-04 20:16:34 +0100 |
|---|---|---|
| committer | David Lamparter <equinox@diac24.net> | 2019-02-04 21:57:43 +0100 |
| commit | 7ad413ce0ff5295fbbab840be533b3eb112c0dc8 (patch) | |
| tree | 68cb62875b727ff02d08c4c7420a71cae86f3ee1 | |
| parent | dc73cce87e16dc599e307910c0efe0532b51cddc (diff) | |
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>
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rw-r--r-- | debian/control | 15 |
2 files changed, 15 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 3c024ecec7..13fb521fca 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ frr (6.0.2-2) UNRELEASED; urgency=medium * remove bogus libjson0 build-dep (closes: #921349) * fix broken systemd dependency spec + * add proper Conflicts: for quagga and pimd (closes: #921376) -- David Lamparter <equinox-debian@diac24.net> Mon, 04 Feb 2019 04:51:00 +0100 diff --git a/debian/control b/debian/control index cf5aa0492e..9b7e3f518f 100644 --- a/debian/control +++ b/debian/control @@ -45,7 +45,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 @@ -96,6 +108,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 |