[firmware-nonfree] 02/03: misc-nonfree: Change Conflicts relation with firmware-{adi, ralink} to Breaks

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

benh pushed a commit to branch master
in repository firmware-nonfree.

commit 9246f0ac0826b57c9967ca7528bc823cb55ed1d3
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Mon Oct 19 18:22:46 2015 +0100

    misc-nonfree: Change Conflicts relation with firmware-{adi,ralink} to Breaks
    
    Breaks+Replaces is the proper way to take over files.
---
 debian/changelog                   | 2 ++
 debian/config/misc-nonfree/defines | 3 +--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d9efeb7..fc1ffc0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ firmware-nonfree (20151018-2) UNRELEASED; urgency=medium
 
   * amd-graphics, misc-nonfree: Add Breaks and Replaces relations to older
     firmware-linux-nonfree, to support upgrades (Closes: #802336, #802337)
+  * misc-nonfree: Change Conflicts relation with firmware-{adi,ralink} to
+    Breaks
 
  -- Ben Hutchings <ben at decadent.org.uk>  Mon, 19 Oct 2015 18:16:48 +0100
 
diff --git a/debian/config/misc-nonfree/defines b/debian/config/misc-nonfree/defines
index 1b8c1dc..c5e5583 100644
--- a/debian/config/misc-nonfree/defines
+++ b/debian/config/misc-nonfree/defines
@@ -4,8 +4,7 @@ longdesc:
  various drivers in the Linux kernel. This is a collection of firmware blobs
  which are not individually large enough to warrant a standalone package
 replaces: firmware-linux (<< 0.19), firmware-ivtv (<< 0.38~), firmware-linux-nonfree (<< 20151018-1~), firmware-adi, firmware-ralink
-conflicts: firmware-adi, firmware-ralink
-breaks: firmware-linux (<< 0.19), firmware-ivtv (<< 0.38~), firmware-linux-nonfree (<< 20151018-1~)
+breaks: firmware-linux (<< 0.19), firmware-ivtv (<< 0.38~), firmware-linux-nonfree (<< 20151018-1~), firmware-adi, firmware-ralink
 provides: firmware-adi, firmware-ralink
 files:
  3com/typhoon.bin

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/firmware-nonfree.git