Merge lp:~chasedouglas/ubuntu/lucid/linux-firmware-nonfree/updates into lp:ubuntu/lucid/linux-firmware-nonfree

[Chase Douglas]

  * Added dvb firmware for AVerTV HD A180 tuner card and derivatives
    -LP: #508317
  * Clean up packaging, fixing lintian warnings
    - Added packaging copyright assigned to Tim Gardner
  * Updated dvb-usb-af9015.fw to newer version
    -LP: #458444
  * Add Update_firmware script and many dvb firmware files

[lp:~chasedouglas/ubuntu/lucid/linux-firmware-nonfree/updates]

12. By Chase Douglas on 2010-04-02

Add Update_firmware script and many dvb firmware files

13. By Chase Douglas on 2010-04-06

Add Broadcom Crystal HD firmware

=== modified file 'debian/changelog'
--- debian/changelog	2010-03-04 12:57:03 +0000
+++ debian/changelog	2010-04-06 15:07:28 +0000
@@ -1,3 +1,16 @@
+linux-firmware-nonfree (1.8) lucid; urgency=low
+
+  * Added dvb firmware for AVerTV HD A180 tuner card and derivatives
+    -LP: #508317
+  * Clean up packaging, fixing lintian warnings
+    - Added packaging copyright assigned to Tim Gardner
+  * Updated dvb-usb-af9015.fw to newer version
+    -LP: #458444 
+  * Add Update_firmware script and many dvb firmware files
+  * Add Broadcom Crystal HD firmware
+
+ -- Chase Douglas <[e-mail]>  Tue, 06 Apr 2010 10:59:46 -0400
+
 linux-firmware-nonfree (1.7) lucid; urgency=low
 
   * Updated dvb-fe-cx24116.fw to 1.26.90.0, fixes previous corrupt file

=== modified file 'debian/control'
--- debian/control	2009-08-16 20:26:34 +0000
+++ debian/control	2010-04-06 15:07:28 +0000
@@ -2,14 +2,15 @@
 Section: kernel
 Priority: optional
 Maintainer: Ubuntu Kernel Team <[e-mail]>
-Standards-Version: 3.8.3
-Build-Depends: debhelper (>= 5)
+Standards-Version: 3.8.4
+Build-Depends: debhelper (>= 7)
 
 Package: linux-firmware-nonfree
 Architecture: all
 Conflicts: linux-firmware (<< 1.17)
 Replaces: linux-firmware (<< 1.17)
 Priority: optional
+Depends: ${misc:Depends}
 Description: Non-free firmware for Linux kernel drivers
  This package provides non-free firmware used by Linux kernel drivers.
  .

=== modified file 'debian/copyright'
--- debian/copyright	2009-08-16 20:26:34 +0000
+++ debian/copyright	2010-04-06 15:07:28 +0000
@@ -9,6 +9,8 @@
 The firmware in this package is of dubious origin and has no
 licensing attached. Use at your own risk and disgression.
 
+The debian packaging is copyright (C) 2009-2010 Tim Gardner
+
 The firmware was downloaded from:
 
 wget http://www.wi-bw.tfh-wildau.de/~pboettch/home/files/dvb-usb-dib0700-1.20.fw

=== modified file 'debian/rules'
--- debian/rules	2009-11-24 15:17:07 +0000
+++ debian/rules	2010-04-06 15:07:28 +0000
@@ -8,7 +8,8 @@
 install-indep: build-indep
 	dh_testdir
 	dh_testroot
-	dh_clean -k -i
+	dh_prep
+	dh_clean -i
 
 	install -d $(firm_dir)
 
@@ -40,6 +41,7 @@
 clean:
 	dh_testdir
 	dh_testroot
+	dh_prep
 	dh_clean
 
 .PHONY: clean binary build binary-indep install-indep binary-arch build-arch build-indep

=== added directory 'debian/source'
=== added file 'debian/source/format'
--- debian/source/format	1970-01-01 00:00:00 +0000
+++ debian/source/format	2010-04-06 15:07:28 +0000
@@ -0,0 +1,1 @@
+3.0 (native)

=== added directory 'firmware/crystalhd'
=== added file 'firmware/crystalhd/BOM'
--- firmware/crystalhd/BOM	1970-01-01 00:00:00 +0000
+++ firmware/crystalhd/BOM	2010-04-06 15:07:28 +0000
@@ -0,0 +1,4 @@
+Downloaded from Jarod Wilson's crystal hd git tree:
+http://git.wilsonet.com/crystalhd.git/ commit a8e27b2203eb2c1f0266176f5c70d8c5b6102c76
+firmware/fwbin/70012/bcm70012fw.bin
+firmware/fwbin/70015/bcm70015fw.bin

=== added file 'firmware/crystalhd/bcm70012fw.bin'
Binary files firmware/crystalhd/bcm70012fw.bin	1970-01-01 00:00:00 +0000 and firmware/crystalhd/bcm70012fw.bin	2010-04-06 15:07:28 +0000 differ
=== added file 'firmware/crystalhd/bcm70015fw.bin'
Binary files firmware/crystalhd/bcm70015fw.bin	1970-01-01 00:00:00 +0000 and firmware/crystalhd/bcm70015fw.bin	2010-04-06 15:07:28 +0000 differ
=== modified file 'firmware/dvb/BOM'
--- firmware/dvb/BOM	2010-03-04 12:57:03 +0000
+++ firmware/dvb/BOM	2010-04-06 15:07:28 +0000
@@ -1,4 +1,10 @@
-wget -NO dvb-usb-af9015.fw http://jusst.de/manu/fw/AFA/dvb-usb-af9015.fw_a-link
+Most DVB firmware is retrieved using the latest get_dvb_firmware from the
+linux-2.6 git repository. The following lists firmware source for firmware
+retrieved elsewhere.
+
+AfaTech AF9015
+wget -N http://www.otit.fi/~crope/v4l-dvb/af9015/af9015_firmware_cutter/firmware_files/4.95.0/dvb-usb-af9015.fw
+echo "dccbc92c9168cc629a88b34ee67ede7b *dvb-usb-af9015.fw"|md5sum -c
 
 Hauppauge DVB-S2 PCI
 wget -N http://www.wintvcd.co.uk/drivers/88x_2_124_27191_1_WHQL.zip
@@ -12,3 +18,9 @@
 chmod a+x extract.sh
 ./extract.sh
 echo "b9fa8f284483480675d29d19e704f62c *dvb-fe-tda10048-1.0.fw"|md5sum -c
+
+AVerTV HD A180
+wget -N http://www.avermedia-usa.com/support/Drivers/AVerTVHD_MCE_A180_Drv_v1.2.2.16.zip
+unzip -oj AVerTVHD_MCE_A180_Drv_v1.2.2.16.zip
+dd if=3xHybrid.sys of=dvb-fe-nxt2004.fw skip=465304 bs=1 count=9584
+echo "2a7e38d3ebc392264f840dcb89e08829 *dvb-fe-nxt2004.fw"|md5sum -c

=== added file 'firmware/dvb/Update_firmware'
--- firmware/dvb/Update_firmware	1970-01-01 00:00:00 +0000
+++ firmware/dvb/Update_firmware	2010-04-06 15:07:28 +0000
@@ -0,0 +1,46 @@
+#!/bin/sh
+
+if [ $# -gt 1 ] || [ $# -eq 1 -a "$1" != "-u" ]; then
+	echo "Usage: $0 [-u]"
+	echo "  -u: Update existing firmware files"
+	exit 1
+fi
+
+UPDATE=0
+EXCLUDE_FREE="(cx18|cx231xx|cx23885|pvrusb2)"
+
+if [ $# -eq 1 ]; then
+	UPDATE=1
+fi
+
+wget --quiet "http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=blob_plain;f=Documentation/dvb/get_dvb_firmware;hb=HEAD" -O get_dvb_firmware
+chmod a+x get_dvb_firmware
+
+# Export FWS=<firmware> to test retrieving specific firmware
+if [ "x${FWS}" = "x" ]; then
+	FWS=`./get_dvb_firmware 2>&1 | grep "^	" | egrep -v "${EXCLUDE_FREE}"`
+fi
+
+for FW in ${FWS}; do
+	mkdir tmp-${FW}
+	cd tmp-${FW}
+
+	echo -n "Retrieving firmware for ${FW}..."
+	if ../get_dvb_firmware ${FW} >/dev/null 2>&1; then
+		if [ $UPDATE -eq 1 ]; then
+			cp *.fw ../
+		else
+			cp -n *.fw ../
+		fi
+
+		echo "success"
+	else
+		echo "failure"
+	fi
+
+	cd ..
+	rm -rf tmp-${FW}
+
+done
+
+rm get_dvb_firmware

=== added file 'firmware/dvb/dvb-cx18-mpc718-mt352.fw'
Binary files firmware/dvb/dvb-cx18-mpc718-mt352.fw	1970-01-01 00:00:00 +0000 and firmware/dvb/dvb-cx18-mpc718-mt352.fw	2010-04-06 15:07:28 +0000 differ
=== added file 'firmware/dvb/dvb-dibusb-5.0.0.11.fw'
Binary files firmware/dvb/dvb-dibusb-5.0.0.11.fw	1970-01-01 00:00:00 +0000 and firmware/dvb/dvb-dibusb-5.0.0.11.fw	2010-04-06 15:07:28 +0000 differ
=== added file 'firmware/dvb/dvb-fe-nxt2004.fw'
Binary files firmware/dvb/dvb-fe-nxt2004.fw	1970-01-01 00:00:00 +0000 and firmware/dvb/dvb-fe-nxt2004.fw	2010-04-06 15:07:28 +0000 differ
=== added file 'firmware/dvb/dvb-ttusb-dec-2000t.fw'
Binary files firmware/dvb/dvb-ttusb-dec-2000t.fw	1970-01-01 00:00:00 +0000 and firmware/dvb/dvb-ttusb-dec-2000t.fw	2010-04-06 15:07:28 +0000 differ
=== added file 'firmware/dvb/dvb-ttusb-dec-2540t.fw'
Binary files firmware/dvb/dvb-ttusb-dec-2540t.fw	1970-01-01 00:00:00 +0000 and firmware/dvb/dvb-ttusb-dec-2540t.fw	2010-04-06 15:07:28 +0000 differ
=== added file 'firmware/dvb/dvb-ttusb-dec-3000s.fw'
Binary files firmware/dvb/dvb-ttusb-dec-3000s.fw	1970-01-01 00:00:00 +0000 and firmware/dvb/dvb-ttusb-dec-3000s.fw	2010-04-06 15:07:28 +0000 differ
=== modified file 'firmware/dvb/dvb-usb-af9015.fw'
Binary files firmware/dvb/dvb-usb-af9015.fw	2009-08-16 20:26:34 +0000 and firmware/dvb/dvb-usb-af9015.fw	2010-04-06 15:07:28 +0000 differ
=== added file 'firmware/dvb/ngene_15.fw'
Binary files firmware/dvb/ngene_15.fw	1970-01-01 00:00:00 +0000 and firmware/dvb/ngene_15.fw	2010-04-06 15:07:28 +0000 differ
=== added file 'firmware/dvb/ngene_17.fw'
Binary files firmware/dvb/ngene_17.fw	1970-01-01 00:00:00 +0000 and firmware/dvb/ngene_17.fw	2010-04-06 15:07:28 +0000 differ