[kernel] r18047 - in dists/trunk/firmware-nonfree: debian/templates libertas

[Ben Hutchings]

Author: benh
Date: Mon Sep  5 02:36:27 2011
New Revision: 18047

Log:
firmware-libertas replaces, conflicts and provides libertas-firmware

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

Modified: dists/trunk/firmware-nonfree/debian/templates/control.binary.in
==============================================================================
--- dists/trunk/firmware-nonfree/debian/templates/control.binary.in	Mon Sep  5 01:13:26 2011	(r18046)
+++ dists/trunk/firmware-nonfree/debian/templates/control.binary.in	Mon Sep  5 02:36:27 2011	(r18047)
@@ -2,6 +2,7 @@
 Architecture: all
 Replaces: @?replaces@
 Conflicts: @?conflicts@
+Provides: @?provides@
 Suggests: initramfs-tools, linux-image
 Description: Binary firmware for @desc@
  This package contains the binary firmware for @longdesc at .

Modified: dists/trunk/firmware-nonfree/libertas/defines
==============================================================================
--- dists/trunk/firmware-nonfree/libertas/defines	Mon Sep  5 01:13:26 2011	(r18046)
+++ dists/trunk/firmware-nonfree/libertas/defines	Mon Sep  5 02:36:27 2011	(r18047)
@@ -39,6 +39,9 @@
 longdesc: wireless network cards with Marvell Libertas 8xxx chips supported
  by the libertas_cs, libertas_sdio, libertas_spi, mwl8k and usb8xxx drivers
 uri: http://git.kernel.org/?p=linux/kernel/git/dwmw2/linux-firmware.git
+replaces: libertas-firmware
+conflicts: libertas-firmware
+provides: libertas-firmware
 
 [libertas/cf8381.bin_base]
 desc: CF8381 main code