[firmware-nonfree] 01/03: amd-graphics, misc-nonfree: Add {Breaks, Replaces}: firmware-linux-nonfree

[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 3b8f53ef49d24f61bd7e40ac47bae5536d3b88af
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Mon Oct 19 18:21:59 2015 +0100

    amd-graphics, misc-nonfree: Add {Breaks,Replaces}: firmware-linux-nonfree
    
    Needed to support upgrades (Closes: #802336, #802337)
---
 debian/changelog                   | 7 +++++++
 debian/config/amd-graphics/defines | 2 ++
 debian/config/misc-nonfree/defines | 4 ++--
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c17641c..d9efeb7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+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)
+
+ -- Ben Hutchings <ben at decadent.org.uk>  Mon, 19 Oct 2015 18:16:48 +0100
+
 firmware-nonfree (20151018-1) unstable; urgency=medium
 
   [ Ben Hutchings ]
diff --git a/debian/config/amd-graphics/defines b/debian/config/amd-graphics/defines
index 9e712e7..4c1811d 100644
--- a/debian/config/amd-graphics/defines
+++ b/debian/config/amd-graphics/defines
@@ -1,6 +1,8 @@
 [base]
 desc: AMD/ATI graphics chips
 longdesc: AMD/ATI graphics chips supported by the radeon, amdgpu and r128 drivers
+replaces: firmware-linux-nonfree (<< 20151018-1~)
+breaks: firmware-linux-nonfree (<< 20151018-1~)
 files:
  amdgpu/carrizo_ce.bin
  amdgpu/carrizo_me.bin
diff --git a/debian/config/misc-nonfree/defines b/debian/config/misc-nonfree/defines
index b471cc7..1b8c1dc 100644
--- a/debian/config/misc-nonfree/defines
+++ b/debian/config/misc-nonfree/defines
@@ -3,9 +3,9 @@ desc: various drivers in the Linux kernel
 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-adi, firmware-ralink
+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~)
+breaks: firmware-linux (<< 0.19), firmware-ivtv (<< 0.38~), firmware-linux-nonfree (<< 20151018-1~)
 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