[pve-devel] [PATCH pve-firmware v2] Update list of Conflicts/Replaces packages

[Chris Hofstaedtler]

Current versions of this package ship files that are also
shipped by firmware-amd-graphics et al. Update the now outdated
Conflicts/Replaces lists.

Signed-off-by: Chris Hofstaedtler <chris.hofstaedtler at deduktiva.com>
Cc: Thomas Lamprecht <t.lamprecht at proxmox.com>

[v2: fixed From: to match CLA]
---
 debian/control | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/debian/control b/debian/control
index e15aa5c..7890544 100644
--- a/debian/control
+++ b/debian/control
@@ -7,10 +7,12 @@ Homepage: http://www.proxmox.com
 Package: pve-firmware
 Architecture: all
 Suggests: linux-image,
-Conflicts: firmware-atheros,
+Conflicts: firmware-amd-graphics,
+           firmware-atheros,
            firmware-bnx2,
            firmware-bnx2x,
            firmware-brcm80211,
+           firmware-cavium,
            firmware-intelwimax,
            firmware-ipw2x00,
            firmware-ivtv,
@@ -18,15 +20,20 @@ Conflicts: firmware-atheros,
            firmware-libertas,
            firmware-linux-free,
            firmware-linux-nonfree,
+           firmware-misc-nonfree,
            firmware-myricom,
            firmware-netxen,
            firmware-qlogic,
            firmware-ralink,
            firmware-realtek,
-Replaces: firmware-atheros,
+           firmware-siano,
+           firmware-ti-connectivity,
+Replaces: firmware-amd-graphics,
+          firmware-atheros,
           firmware-bnx2,
           firmware-bnx2x,
           firmware-brcm80211,
+          firmware-cavium,
           firmware-intelwimax,
           firmware-ipw2x00,
           firmware-ivtv,
@@ -34,11 +41,14 @@ Replaces: firmware-atheros,
           firmware-libertas,
           firmware-linux-free,
           firmware-linux-nonfree,
+          firmware-misc-nonfree,
           firmware-myricom,
           firmware-netxen,
           firmware-qlogic,
           firmware-ralink,
           firmware-realtek,
+          firmware-siano,
+          firmware-ti-connectivity,
 Description: Binary firmware code for the pve-kernel
  This package contains the binary firmware for various modules used in
  the pve-kernel.
-- 
2.11.0