From 1539789b469fde0d2e7c634b87ebedf5860ced4e Mon Sep 17 00:00:00 2001 From: Bastian Blank Date: Tue, 26 May 2009 09:40:55 +0000 Subject: [PATCH] * debian/changelog: Set version to 2.6.30~rc7-1~experimental.1. * debian/patches/debian/dfsg/firmware-cleanup.patch: Don't remove unpruned firmwares. svn path=/dists/trunk/linux-2.6/; revision=13670 --- debian/changelog | 2 +- debian/patches/debian/dfsg/firmware-cleanup.patch | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index d99b4c02c..ed1d964c7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -linux-2.6 (2.6.30~rc6-1~experimental.1) UNRELEASED; urgency=low +linux-2.6 (2.6.30~rc7-1~experimental.1) UNRELEASED; urgency=low * New upstream release - radeonfb: suspend/resume for ATI Mobility Radeon RV350. diff --git a/debian/patches/debian/dfsg/firmware-cleanup.patch b/debian/patches/debian/dfsg/firmware-cleanup.patch index a95688472..e46e46dae 100644 --- a/debian/patches/debian/dfsg/firmware-cleanup.patch +++ b/debian/patches/debian/dfsg/firmware-cleanup.patch @@ -2,7 +2,7 @@ diff --git a/firmware/Makefile b/firmware/Makefile index 25200d1..c3a4fa8 100644 --- a/firmware/Makefile +++ b/firmware/Makefile -@@ -20,93 +20,9 @@ fw-external-y := $(subst ",,$(CONFIG_EXTRA_FIRMWARE)) +@@ -20,93 +20,10 @@ fw-external-y := $(subst ",,$(CONFIG_EXTRA_FIRMWARE)) # accurate. In the latter case it doesn't matter -- it'll use $(fw-shipped-all). # But be aware that the config file might not be included at all. @@ -16,7 +16,7 @@ index 25200d1..c3a4fa8 100644 -fw-shipped-$(CONFIG_ACENIC) += $(acenic-objs) -fw-shipped-$(CONFIG_ADAPTEC_STARFIRE) += adaptec/starfire_rx.bin \ - adaptec/starfire_tx.bin --fw-shipped-$(CONFIG_ATARI_DSP56K) += dsp56k/bootstrap.bin + fw-shipped-$(CONFIG_ATARI_DSP56K) += dsp56k/bootstrap.bin -fw-shipped-$(CONFIG_ATM_AMBASSADOR) += atmsar11.fw -fw-shipped-$(CONFIG_BNX2) += bnx2/bnx2-mips-09-4.6.17.fw \ - bnx2/bnx2-rv2p-09-4.6.15.fw \