r2758 - trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian

Andres Salomon dilinger-guest@costa.debian.org
Mon, 21 Mar 2005 09:36:50 +0100


Author: dilinger-guest
Date: 2005-03-21 09:36:49 +0100 (Mon, 21 Mar 2005)
New Revision: 2758

Added:
   trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/NEWS.Debian
Removed:
   trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/prune-non-free
Modified:
   trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/changelog
Log:
Drop prune-non-free, and add NEWS.Debian that documents dropping of tg3
(and the existence of kernel-nonfree-source-2.6.11).


Added: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/NEWS.Debian
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/NEWS.Debian	2005-03-21 08:28:32 UTC (rev 2757)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/NEWS.Debian	2005-03-21 08:36:49 UTC (rev 2758)
@@ -0,0 +1,11 @@
+kernel-source-2.6.11 (2.6.11-1) unstable; urgency=low
+
+  * This release drops the tg3 driver.  Previously, it was included, but
+    with (non-free) firmware stripped out.  Instead, from now on, it will
+    be in a separate package; kernel-nonfree-source-2.6.11.  This package
+    is in non-free, and contains the full tg3 driver (with firmware), as
+    well as a number of other drivers that have been removed from Debian's
+    kernel-source packages for quite some time.
+
+ -- Andres Salomon <dilinger@debian.org>  Mon, 21 Mar 2005 03:33:28 -0500
+

Modified: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/changelog
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/changelog	2005-03-21 08:28:32 UTC (rev 2757)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/changelog	2005-03-21 08:36:49 UTC (rev 2758)
@@ -65,6 +65,10 @@
 
   * Fetch upstream tarball for prune target if not already available.
 
+  * Drop prune-non-free, add NEWS.Debian to document the dropping
+    of the tg3 driver, and the existence of kernel-nonfree-*
+    (Andres Salomon).
+
  -- Simon Horman <horms@debian.org>  Fri, 18 Mar 2005 16:30:11 +0900
 
 kernel-source-2.6.10 (2.6.10-6) unstable; urgency=low

Deleted: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/prune-non-free
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/prune-non-free	2005-03-21 08:28:32 UTC (rev 2757)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/prune-non-free	2005-03-21 08:36:49 UTC (rev 2758)
@@ -1,20 +0,0 @@
-#!/bin/sh
-
-# Scrubs known non-DFSG-compliant stuff out of the source tree so that a
-# DFSG-free .orig.tar.gz for the source package can be created.
-
-PROGNAME=${0##*/}
-
-if [ ! -d kernel ]; then
-    echo "$PROGNAME: no unpacked source tree in current working directory" >&2
-    exit 1
-fi
-
-grep -h '^X' debian/patches/series/2.6.* | while read x file; do
-    echo "Deleting $file"
-    rm -f $file
-done
-
-# Upstream deletes our debian directory.  Bastards.
-sed -i 's#^.*/debian/$##' scripts/package/Makefile
-