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

[Ben Hutchings]

Author: benh
Date: Sun Jan 20 16:33:48 2013
New Revision: 19758

Log:
ivtv, linux-nonfree: Replace Hauppauge's version of v4l-cx25840.fw

The Conexant CX25840 is found in other devices that have nothing to do
with Hauppauge or the ivtv or pvrusb2 drivers.  Put a version licenced
directly by Conexant in firmware-linux-nonfree without Hauppauge
click-wrap.

Added:
   dists/trunk/firmware-nonfree/linux-nonfree/v4l-cx25840.fw   (contents, props changed)
Deleted:
   dists/trunk/firmware-nonfree/ivtv/v4l-cx25840.fw
Modified:
   dists/trunk/firmware-nonfree/debian/changelog
   dists/trunk/firmware-nonfree/debian/templates/control.binary.in
   dists/trunk/firmware-nonfree/ivtv/defines
   dists/trunk/firmware-nonfree/linux-nonfree/defines

Modified: dists/trunk/firmware-nonfree/debian/changelog
==============================================================================
--- dists/trunk/firmware-nonfree/debian/changelog	Sun Jan 20 15:33:15 2013	(r19757)
+++ dists/trunk/firmware-nonfree/debian/changelog	Sun Jan 20 16:33:48 2013	(r19758)
@@ -2,6 +2,8 @@
 
   * linux-nonfree: Add licence information for ENE UB6250 firmware
     (Closes: #697535)
+  * ivtv, linux-nonfree: Replace Hauppauge's version of v4l-cx25840.fw with
+    a version licenced directly by Conexant, in firmware-linux-nonfree
 
  -- Ben Hutchings <ben at decadent.org.uk>  Sun, 06 Jan 2013 18:19:39 +0000
 

Modified: dists/trunk/firmware-nonfree/debian/templates/control.binary.in
==============================================================================
--- dists/trunk/firmware-nonfree/debian/templates/control.binary.in	Sun Jan 20 15:33:15 2013	(r19757)
+++ dists/trunk/firmware-nonfree/debian/templates/control.binary.in	Sun Jan 20 16:33:48 2013	(r19758)
@@ -3,6 +3,7 @@
 Replaces: @?replaces@
 Conflicts: @?conflicts@
 Provides: @?provides@
+Recommends: @?recommends@
 Suggests: initramfs-tools, linux-image
 Description: Binary firmware for @desc@
  This package contains the binary firmware for @longdesc at .

Modified: dists/trunk/firmware-nonfree/ivtv/defines
==============================================================================
--- dists/trunk/firmware-nonfree/ivtv/defines	Sun Jan 20 15:33:15 2013	(r19757)
+++ dists/trunk/firmware-nonfree/ivtv/defines	Sun Jan 20 16:33:48 2013	(r19758)
@@ -4,7 +4,6 @@
  v4l-cx2341x-dec.fw
  v4l-cx2341x-enc.fw
  v4l-cx2341x-init.mpg
- v4l-cx25840.fw
  v4l-pvrusb2-24xxx-01.fw
  v4l-pvrusb2-29xxx-01.fw
 license-accept: required
@@ -12,6 +11,8 @@
 longdesc: TV cards with Conexant iTVC15-family MPEG codecs,
  supported by the ivtv and pvrusb2 drivers
 uri: http://dl.ivtvdriver.org/ivtv/firmware/
+# For v4l-cx25840.fw
+recommends: firmware-linux-nonfree (>= 0.38~)
 
 [v4l-cx2341x-dec.fw_base]
 desc: Conexant CX23415/CX23416 MPEG codec (decoder)
@@ -22,9 +23,6 @@
 [v4l-cx2341x-init.mpg_base]
 desc: Conexant CX23415/CX23416 MPEG codec (initialization)
 
-[v4l-cx25840.fw_base]
-desc: Conexant CX25840 MPEG codec
-
 [v4l-pvrusb2-24xxx-01.fw_base]
 desc: Hauppauge PVR USB2 24xxx models
 

Modified: dists/trunk/firmware-nonfree/linux-nonfree/defines
==============================================================================
--- dists/trunk/firmware-nonfree/linux-nonfree/defines	Sun Jan 20 15:33:15 2013	(r19757)
+++ dists/trunk/firmware-nonfree/linux-nonfree/defines	Sun Jan 20 16:33:48 2013	(r19758)
@@ -3,8 +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)
+replaces: firmware-linux (<< 0.19), firmware-ivtv (<< 0.38~)
+conflicts: firmware-linux (<< 0.19), firmware-ivtv (<< 0.38~)
 files:
  3com/typhoon.bin
  advansys/3550.bin
@@ -130,6 +130,7 @@
  tigon/tg3_tso.bin
  tigon/tg3.bin
  tigon/tg3_tso5.bin
+ v4l-cx25840.fw
  vntwusb.fw
 support: initramfs-tools
 uri: http://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git
@@ -502,5 +503,8 @@
 [tigon/tg3_tso5.bin_base]
 desc: Broadcom BCM5705 TSO firmware
 
+[v4l-cx25840.fw_base]
+desc: Conexant CX25840 MPEG codec
+
 [vntwusb.fw_base]
 desc: VIA VT6656 firmware

Added: dists/trunk/firmware-nonfree/linux-nonfree/v4l-cx25840.fw
==============================================================================
Binary file. No diff available.