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

[Ben Hutchings]

Author: benh
Date: Thu Jan 19 02:26:46 2012
New Revision: 18571

Log:
Add version to firmware-libertas's conflict with libertas-firmware

The latest libertas-firmware package is a transitional package
depending on firmware-libertas.  We want firmware-libertas to coexist
with that.

Modified:
   dists/trunk/firmware-nonfree/debian/changelog
   dists/trunk/firmware-nonfree/libertas/defines

Modified: dists/trunk/firmware-nonfree/debian/changelog
==============================================================================
--- dists/trunk/firmware-nonfree/debian/changelog	Wed Jan 18 19:34:38 2012	(r18570)
+++ dists/trunk/firmware-nonfree/debian/changelog	Thu Jan 19 02:26:46 2012	(r18571)
@@ -1,3 +1,10 @@
+firmware-nonfree (0.35) UNRELEASED; urgency=low
+
+  * Add version to firmware-libertas's conflict with libertas-firmware so
+    it can coexist with the current transitional package
+
+ -- Ben Hutchings <ben at decadent.org.uk>  Tue, 17 Jan 2012 13:52:30 +0000
+
 firmware-nonfree (0.34) unstable; urgency=low
 
   [ Ben Hutchings ]

Modified: dists/trunk/firmware-nonfree/libertas/defines
==============================================================================
--- dists/trunk/firmware-nonfree/libertas/defines	Wed Jan 18 19:34:38 2012	(r18570)
+++ dists/trunk/firmware-nonfree/libertas/defines	Thu Jan 19 02:26:46 2012	(r18571)
@@ -43,7 +43,7 @@
  usb8xxx drivers
 uri: http://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git
 replaces: libertas-firmware
-conflicts: libertas-firmware
+conflicts: libertas-firmware (<< 9.70.7.p0.0-2)
 provides: libertas-firmware
 
 [lbtf_usb.bin_base]