From ae4344243782e717b8a03fc0ffb6f831edef9614 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Thu, 6 Feb 2014 00:42:17 +0000 Subject: [PATCH] Update DFSG file removal list This wasn't updated for the great drivers/media renaming in Linux 3.7, so the two removals there weren't effective. rtl8188eu now uses the firmware loader and has no embedded firmware to remove. svn path=/dists/trunk/linux/; revision=21032 --- debian/changelog | 2 ++ debian/patches/debian/dfsg/files-1 | 6 ++---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 4749e4a26..eb20e9b50 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,8 @@ linux (3.13.1-1~exp1) UNRELEASED; urgency=low * [x86] Enable R8188EU as module, 88EU_AP_MODE and 88EU_P2P (Closes: #736905) * [x86] Enable I2C_DESIGNWARE_PLATFORM as module (Closes: #737163) * [x86] snd-pcsp: Disable autoload (Closes: #697709) + * DFSG: Remove the af9005 initialisation script and vs6624 driver again + (they were renamed in 3.7) -- Ben Hutchings Thu, 23 Jan 2014 15:05:08 +0000 diff --git a/debian/patches/debian/dfsg/files-1 b/debian/patches/debian/dfsg/files-1 index 8e5f662e3..2950d5571 100644 --- a/debian/patches/debian/dfsg/files-1 +++ b/debian/patches/debian/dfsg/files-1 @@ -6,9 +6,9 @@ rm firmware rm arch/powerpc/sysdev/micropatch.c -rm drivers/media/dvb/dvb-usb/af9005-script.h +rm drivers/media/usb/dvb-usb/af9005-script.h -rm drivers/media/video/vs6624.c +rm drivers/media/i2c/vs6624.c rm drivers/net/appletalk/cops.c rm drivers/net/appletalk/cops.h @@ -20,8 +20,6 @@ rm drivers/staging/ft1000/ft1000-*/*.img rm drivers/staging/keucr/init.h -rm drivers/staging/rtl8188eu/hal/Hal8188EFWImg_CE.c - unifdef drivers/staging/rtl8192e/rtl8192e/r8192E_hwimg.c -UREMOVE_DFSG rm drivers/staging/wlags49_h2/ap_*.c