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

[Maximilian Attems]

Author: maks
Date: Thu Dec 13 22:26:38 2007
New Revision: 9953

Log:
Revert "Revert revisions 9950 and 9951. Readds undistributable code."
no valuable reason given for the revert, over and out.

This reverts commit 64be4bc9527aefb650463684193b22d4b9d58a21.


Added:
   dists/trunk/linux-2.6/debian/patches/bugfix/0001-USB-dabfirmware.h-add-missing-license.patch
Removed:
   dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-media-video-dabus.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 22:26:38 2007
@@ -23,6 +23,7 @@
   * 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.
@@ -34,7 +35,7 @@
   [ dann frazier ]
   * [ia64]: Enable BLK_CPQ_DA
 
- -- maximilian attems <maks at debian.org>  Wed, 12 Dec 2007 15:06:07 +0100
+ -- maximilian attems <maks at debian.org>  Thu, 13 Dec 2007 13:50:38 +0100
 
 linux-2.6 (2.6.23-1~experimental.1) UNRELEASED; urgency=low
 

Added: dists/trunk/linux-2.6/debian/patches/bugfix/0001-USB-dabfirmware.h-add-missing-license.patch
==============================================================================
--- (empty file)
+++ dists/trunk/linux-2.6/debian/patches/bugfix/0001-USB-dabfirmware.h-add-missing-license.patch	Thu Dec 13 22:26:38 2007
@@ -0,0 +1,34 @@
+From 468bf6a10da185bc6d79c1670f7a418f1c5a3cd5 Mon Sep 17 00:00:00 2001
+From: maximilian attems <max at stro.at>
+Date: Thu, 13 Dec 2007 13:36:21 +0100
+Subject: [PATCH] [USB] dabfirmware.h add missing license
+
+Received written ack from the dabusb author
+that the firmware is BSD licensed.
+
+Signed-off-by: maximilian attems <max at stro.at>
+Acked-by: Deti Fliegl <deti at fliegl.de>
+---
+ drivers/media/video/dabfirmware.h |    7 +++++++
+ 1 files changed, 7 insertions(+), 0 deletions(-)
+
+diff --git a/drivers/media/video/dabfirmware.h b/drivers/media/video/dabfirmware.h
+index d14d803..cbd9263 100644
+--- a/drivers/media/video/dabfirmware.h
++++ b/drivers/media/video/dabfirmware.h
+@@ -1,5 +1,12 @@
+ /*
+  * dabdata.h - dab usb firmware and bitstream data
++ *
++ * Copyright (C) 1999 BayCom GmbH
++ *
++ * Redistribution and use in source and binary forms, with or without
++ * modification, are permitted provided that redistributions of source
++ * code retain the above copyright notice and this comment without
++ * modification.
+  */
+ 
+ static INTEL_HEX_RECORD firmware[] = {
+-- 
+debian.1.5.3.7.1-dirty
+

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 22:26:38 2007
@@ -13,10 +13,6 @@
 
 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 22:26:38 2007
@@ -36,3 +36,5 @@
 + 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