[kernel] r9952 - in dists/trunk/linux-2.6/debian: . patches/bugfix patches/debian/dfsg patches/series

[Bastian Blank]

Author: waldi
Date: Thu Dec 13 17:06:28 2007
New Revision: 9952

Log:
Revert revisions 9950 and 9951. Readds undistributable code.


Added:
   dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-media-video-dabus.patch
Removed:
   dists/trunk/linux-2.6/debian/patches/bugfix/0001-USB-dabfirmware.h-add-missing-license.patch
Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/patches/debian/dfsg/files-1
   dists/trunk/linux-2.6/debian/patches/series/1~experimental.1

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	(original)
+++ dists/trunk/linux-2.6/debian/changelog	Thu Dec 13 17:06:28 2007
@@ -23,7 +23,6 @@
   * Set USB_EHCI_TT_NEWSCHED fills USB 2.0 bandwith better. (closes: #454797)
   * postrm: Nuke initramfs sha1sum on linux-image package removal.
   * Unifiy BSD_PROCESS_ACCT settings across configs. (closes: #455892)
-  * Reenable DABUSB as firmware is BSD licensed.
 
   [ Bastian Blank ]
   * [amd64, i386]: Set kernel architecture to x86.
@@ -35,7 +34,7 @@
   [ dann frazier ]
   * [ia64]: Enable BLK_CPQ_DA
 
- -- maximilian attems <maks at debian.org>  Thu, 13 Dec 2007 13:50:38 +0100
+ -- maximilian attems <maks at debian.org>  Wed, 12 Dec 2007 15:06:07 +0100
 
 linux-2.6 (2.6.23-1~experimental.1) UNRELEASED; urgency=low
 

Added: dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-media-video-dabus.patch
==============================================================================
--- (empty file)
+++ dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-media-video-dabus.patch	Thu Dec 13 17:06:28 2007
@@ -0,0 +1,25 @@
+diff -ruN a/drivers/media/Kconfig b/drivers/media/Kconfig
+--- a/drivers/media/Kconfig	2007-02-04 19:44:54.000000000 +0100
++++ b/drivers/media/Kconfig	2007-02-05 16:24:30.000000000 +0100
+@@ -85,16 +85,0 @@
+-if DAB
+-config USB_DABUSB
+-	tristate "DABUSB driver"
+-	depends on USB
+-	---help---
+-	  A Digital Audio Broadcasting (DAB) Receiver for USB and Linux
+-	  brought to you by the DAB-Team
+-	  <http://wwwbode.cs.tum.edu/Par/arch/dab/>.  This driver can be taken
+-	  as an example for URB-based bulk, control, and isochronous
+-	  transactions. URB's are explained in
+-	  <Documentation/usb/URB.txt>.
+-
+-	  To compile this driver as a module, choose M here: the
+-	  module will be called dabusb.
+-endif # DAB
+-
+diff -ruN a/drivers/media/video/Makefile b/drivers/media/video/Makefile
+--- a/drivers/media/video/Makefile	2007-02-04 19:44:54.000000000 +0100
++++ b/drivers/media/video/Makefile	2007-02-05 16:24:30.000000000 +0100
+@@ -94,1 +94,0 @@
+-obj-$(CONFIG_USB_DABUSB)        += dabusb.o

Modified: dists/trunk/linux-2.6/debian/patches/debian/dfsg/files-1
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/debian/dfsg/files-1	(original)
+++ dists/trunk/linux-2.6/debian/patches/debian/dfsg/files-1	Thu Dec 13 17:06:28 2007
@@ -13,6 +13,10 @@
 
 rm drivers/media/dvb/ttusb-budget/dvb-ttusb-dspbootcode.h
 
+rm drivers/media/video/dabfirmware.h
+rm drivers/media/video/dabusb.c
+rm drivers/media/video/dabusb.h
+
 rm drivers/net/acenic_firmware.h
 
 unifdef drivers/net/tg3.c -UREMOVE_DFSG

Modified: dists/trunk/linux-2.6/debian/patches/series/1~experimental.1
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/1~experimental.1	(original)
+++ dists/trunk/linux-2.6/debian/patches/series/1~experimental.1	Thu Dec 13 17:06:28 2007
@@ -36,5 +36,3 @@
 + bugfix/arm/disable-chelsio_t3.patch
 + bugfix/arm/disable-video_bt848.patch
 + bugfix/arm/disable-scsi_acard.patch
-# 2.6.24-rc6 stuff
-#+ bugfix/0001-USB-dabfirmware.h-add-missing-license.patch