[kernel] r14408 - in dists/trunk/firmware-nonfree: debian debian/templates linux-nonfree

[Ben Hutchings]

Author: benh
Date: Sun Oct 18 18:34:54 2009
New Revision: 14408

Log:
firmware-linux-nonfree Replaces and Conflicts with old firmware-linux (Closes: #551146)

Modified:
   dists/trunk/firmware-nonfree/debian/changelog
   dists/trunk/firmware-nonfree/debian/templates/control.binary.in
   dists/trunk/firmware-nonfree/linux-nonfree/defines

Modified: dists/trunk/firmware-nonfree/debian/changelog
==============================================================================
--- dists/trunk/firmware-nonfree/debian/changelog	Sun Oct 18 18:33:49 2009	(r14407)
+++ dists/trunk/firmware-nonfree/debian/changelog	Sun Oct 18 18:34:54 2009	(r14408)
@@ -1,3 +1,10 @@
+firmware-nonfree (0.20) UNRELEASED; urgency=low
+
+  * firmware-linux-nonfree Replaces and Conflicts with old firmware-linux
+    (Closes: #551146)
+
+ -- Ben Hutchings <ben at decadent.org.uk>  Fri, 16 Oct 2009 04:32:10 +0100
+
 firmware-nonfree (0.19) experimental; urgency=low
 
   [ dann frazier ]

Modified: dists/trunk/firmware-nonfree/debian/templates/control.binary.in
==============================================================================
--- dists/trunk/firmware-nonfree/debian/templates/control.binary.in	Sun Oct 18 18:33:49 2009	(r14407)
+++ dists/trunk/firmware-nonfree/debian/templates/control.binary.in	Sun Oct 18 18:34:54 2009	(r14408)
@@ -1,5 +1,7 @@
 Package: firmware- at package@
 Architecture: all
+Replaces: @?replaces@
+Conflicts: @?conflicts@
 Suggests: initramfs-tools, linux-image
 Description: Binary firmware for @desc@
  This package contains the binary firmware for @longdesc at .

Modified: dists/trunk/firmware-nonfree/linux-nonfree/defines
==============================================================================
--- dists/trunk/firmware-nonfree/linux-nonfree/defines	Sun Oct 18 18:33:49 2009	(r14407)
+++ dists/trunk/firmware-nonfree/linux-nonfree/defines	Sun Oct 18 18:34:54 2009	(r14408)
@@ -3,6 +3,8 @@
 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)
+conflicts: firmware-linux (<< 0.19)
 files:
  3com/typhoon.bin
  agere_ap_fw.bin