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>

diff --git a/debian/changelog b/debian/changelog
index 3c024ecec7610b51573599eeecc9ca60340f06f5..13fb521fca3e68bdf17bcb02310ca5233c0ccf4d 100644 (file)
--- 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 cf5aa0492e7165b8b4ab5914030485940c6be12a..9b7e3f518fdef3b2045319b56c3001052fa22ae4 100644 (file)
--- 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