r2746 - trunk/kernel/source/kernel-source-nonfree-2.6.11-2.6.11/debian

Andres Salomon dilinger-guest@costa.debian.org
Sun, 20 Mar 2005 02:22:30 +0100


Author: dilinger-guest
Date: 2005-03-20 02:22:27 +0100 (Sun, 20 Mar 2005)
New Revision: 2746

Added:
   trunk/kernel/source/kernel-source-nonfree-2.6.11-2.6.11/debian/control.modules.in
   trunk/kernel/source/kernel-source-nonfree-2.6.11-2.6.11/debian/postinst.modules.in
   trunk/kernel/source/kernel-source-nonfree-2.6.11-2.6.11/debian/rules.modules
Removed:
   trunk/kernel/source/kernel-source-nonfree-2.6.11-2.6.11/debian/apply
   trunk/kernel/source/kernel-source-nonfree-2.6.11-2.6.11/debian/compat
   trunk/kernel/source/kernel-source-nonfree-2.6.11-2.6.11/debian/make-substvars
   trunk/kernel/source/kernel-source-nonfree-2.6.11-2.6.11/debian/prune-non-free
   trunk/kernel/source/kernel-source-nonfree-2.6.11-2.6.11/debian/unpatch
Modified:
   trunk/kernel/source/kernel-source-nonfree-2.6.11-2.6.11/debian/README.Debian
   trunk/kernel/source/kernel-source-nonfree-2.6.11-2.6.11/debian/control
   trunk/kernel/source/kernel-source-nonfree-2.6.11-2.6.11/debian/rules
Log:
make kernel-source-nonfree like a standard modules package; add stuff to generate
a kernel-source-nonfree-2.6.11.tar.bz2 and build modules using module-assistant;
next up, adding stuff to build modules within the package.


Modified: trunk/kernel/source/kernel-source-nonfree-2.6.11-2.6.11/debian/README.Debian
===================================================================
--- trunk/kernel/source/kernel-source-nonfree-2.6.11-2.6.11/debian/README.Debian	2005-03-20 00:28:32 UTC (rev 2745)
+++ trunk/kernel/source/kernel-source-nonfree-2.6.11-2.6.11/debian/README.Debian	2005-03-20 01:22:27 UTC (rev 2746)
@@ -1,4 +1,4 @@
-kernel-source for DEBIAN
+kernel-source-nonfree for DEBIAN
 ------------------------
 
 Patches
@@ -8,67 +8,23 @@
 contains a description and mentions the author.  The patches can be found
 at http://svn.debian.org/wsvn/kernel/tags/kernel/source/.
 
-Rebuilding Adaptec AIC7xxx/79xx firmware
-----------------------------------------
-You can rebuild the firmware for the Adaptec AIC7xxx/79xx SCSI Adapters. To
-do so you need to set AIC7XXX_BUILD_FIRMWARE/AIC79XX_BUILD_FIRMWARE config
-options.  Note that this requires to have the development packages for
-berkelydb (libdb4.2-dev) installed.
-
-PS/2 Mice
----------
-If your PS/2 mouse does not work, make sure that the modules psmouse and
-mousedev are loaded.
-
-AMD 768 erratum 10
-------------------
-If you have a motherboard with the AMD 768 chipset, and you are experiencing
-IDE errors or lock ups, then you should either connect a PS/2 mouse to the
-system or disable APIC.  Refer to the following link for details:
-
-http://lists.insecure.org/lists/linux-kernel/2002/Sep/5966.html
-
-mem= on 2.4.19 and later
-------------------------
-mem=xxxM can no longer be used to enlarge the RAM that the kernel uses.
-You must specify the exact memory map.  For example, Compaq Proliant users
-can specify mem=48M@16M if they have 64M of memory.
-
-80386 compatibility
--------------------
-DRM modules will not work on true 80386 processors.  These drivers all assume
-that cmpxchg is available.
-
-IDE bswap option
-----------------
-The bswap option is obsolete and may disappear in future.  For the moment
-it does work provided that you disable dma with the nodma option.
-
-Additional Drivers
-------------------
-* SCSI Media Changer
-  http://bytesex.org/patches/
-* Amiga Smart Filesystem driver
-  http://march.home.staszic.waw.pl/asfs/
-
-Non-free bits removed
+Drivers stripped from kernel-source
 ---------------------
-* Keyspan firmware, driver disabled
+The following drivers are in this package because they contain non-free
+firmware.  The firmware is contained in the following files:
+* Keyspan firmware
   . drivers/usb/serial/ksyspan_{mpr,usa*}_fw.h
-* Emagic EMI 2|6 usb audio interface firmware loader
+* Emagic EMI 2|6 usb audio interface
   . drivers/usb/misc/emi62_fw_*.h
-
-Firmware removed
-----------------
-* SMC Token Ring firmware, driver disabled:
+* SMC Token Ring firmware
   . drivers/net/tokenring/smctr_firmware.h
-* ACENIC firwmare, driver disabled:
+* ACENIC firwmare
   . drivers/net/acenic_firmware.h
-* DGRS firmware, driver disabled:
+* DGRS firmware
   . drivers/net/dgrs_firmware.c
-* DAB firmware, driver disabled:
+* DAB firmware
   . drivers/usb/media/dabfirmware.h
-* QLA2XXX firmware, driver disabled:
+* QLA2XXX firmware
   . drivers/scsi/qla2xxx/*_fw.c
-* TIGON3 firmware:
+* TIGON3 firmware
   . drivers/net/tg3.c

Deleted: trunk/kernel/source/kernel-source-nonfree-2.6.11-2.6.11/debian/apply
===================================================================
--- trunk/kernel/source/kernel-source-nonfree-2.6.11-2.6.11/debian/apply	2005-03-20 00:28:32 UTC (rev 2745)
+++ trunk/kernel/source/kernel-source-nonfree-2.6.11-2.6.11/debian/apply	2005-03-20 01:22:27 UTC (rev 2746)
@@ -1,251 +0,0 @@
-#!/bin/sh 
-# $Id: apply,v 1.4 2003/06/30 12:49:09 herbert Exp $
-
-set -e
-
-length=50
-
-die() {
-	echo "E: $@" >&2
-	exit 1
-}
-
-warn() {
-	echo "W: $@" >&2
-}
-
-uncompress_patch() {
-	patch=$1
-	case "$patch" in
-		*.bz2) bzcat $patch ;;
-		*.gz) zcat $patch ;;
-		*) cat $patch ;;
-	esac
-}
-
-find_patch() {
-	patch=$1
-
-	if [ -f "$patch" ]; then
-		echo "$patch"
-	elif [ -f "$patch.bz2" ]; then
-		echo "$patch.bz2"
-	elif [ -f "$patch.gz" ]; then
-		echo "$patch.gz"
-	else
-		die "$patch is in the series, but doesn't exist!"
-	fi
-}
-		
-apply_patch() {
-	patch=$(find_patch $home/$1)
-	base=$1
-	if uncompress_patch "$patch" | patch -p1 -f -s -t --no-backup-if-mismatch; then
-		printf "%-${length}s\tOK (+)\n" "$base"
-	else
-		printf "%-${length}s\tFAIL (+)\n" "$base"
-		exit 1
-	fi
-}
-
-deapply_patch() {
-	patch=$(find_patch $home/$1)
-	base=$1
-	if uncompress_patch "$patch" | patch -p1 -f -s -t -R --no-backup-if-mismatch; then
-		printf "%-${length}s\tOK (-)\n" "$base"
-	else
-		printf "%-${length}s\tFAIL (-)\n" "$base"
-		exit 1
-	fi
-}
-
-unpatch_series() {
-	series=$1
-	[ -f "$series" ] || die "I wasn't passed a series: $series"
-
-	tac $series | while read action patch; do
-		case "$action" in
-			+) deapply_patch $patch ;;
-			-) apply_patch $patch ;;
-			X)
-				bakfile="$(dirname $patch)/.$(basename $patch).bak"
-				if [ -f "$bakfile" ]; then
-					mv -f "$bakfile" "$patch"
-					printf "%-${length}s\tRESTORED (X)\n" "$patch"
-				else
-					printf "%-${length}s\tNO BACKUP (X)\n" "$patch"
-				fi
-			;;
-		esac
-	done 
-	echo "--> $(basename $series) fully unapplied."
-}
-
-patch_series() {
-	series=$1
-	[ -f "$series" ] || die "I wasn't passed a series: $series"
-
-	while read action patch; do
-		case "$action" in
-			+) apply_patch $patch ;;
-			-) deapply_patch $patch ;;
-			X)
-				bakfile="$(dirname $patch)/.$(basename $patch).bak"
-				if [ -f "$patch" ]; then
-					mv -f "$patch" "$bakfile"
-					printf "%-${length}s\tREMOVED (X)\n" "$patch"
-				else
-					printf "%-${length}s\tNO FILE (X)\n" "$patch"
-				fi
-			;;
-		esac
-	done < $series
-	echo "--> $(basename $series) fully applied."
-}
-
-bubble_sort ()
-{
-	DIR=$1
-	shift
-	SORTED=$@
-
-	SWAPED=1
-	while [ $SWAPED = 1 ]; do
-		X=0
-		A=""
-		SWAPED=0
-		NEW=""
-		for i in $SORTED; do
-			if [ -z "$A" ]; then
-				A="$i"
-				continue
-			fi
-			B="$i"
-		
-			if dpkg --compare-versions "$A" "$DIR" "$B"; then
-				SWAPED=1
-				NEW="$NEW $B"
-			else
-				NEW="$NEW $A"
-				A="$B"
-			fi
-
-			X=$(($X + 1))
-		done
-		SORTED="$NEW $A"
-	done
-
-	echo $SORTED
-}
-
-bubble_sort_fwd ()
-{
-	bubble_sort "lt" $@
-}
-
-bubble_sort_rev ()
-{
-	bubble_sort "gt" $@
-}
-
-
-if ! [ -d Documentation ] || ! [ -d kernel ]; then
-	die 'Not in kernel top level directory.  Exiting'
-	exit 1
-fi
-
-# for THIS particular version of the source package
-version=${override_version:-@version@}
-upstream=${version%-*}
-revision=${version#*-}
-
-home=${home:-/usr/src/kernel-patches/all/$upstream/debian}
-
-if [ -f version.Debian ]; then
-	current=$(cat version.Debian)
-	current_rev=${current#*-}
-	current_up=${current%-*}
-
-	if [ "$current" = "$upstream" ]; then
-		current_rev=0
-	fi
-else
-	warn "No version.Debian file, assuming pristine Linux $upstream"
-	current=$upstream
-	current_rev=0
-fi
-
-target=${1:-$version}
-
-target_rev=${target#*-}
-target_up=${target%-*}
-
-# Sanity checks
-if dpkg --compare-versions "$target_up" ne "$upstream"; then
-	die "Upstream $target_up doesn't match $upstream!"
-# We don't have that version out yet!
-elif [ ! -n "$target_rev" ] || 
-		( dpkg --compare-versions "$target_rev" ne "$target" && 
-			dpkg --compare-versions "$target_rev" gt "$revision" ); then
-	year=$(($(date +%Y) + 1))
-	die "Can't patch to nonexistent revision $target_rev (wait until $year)"
-fi
-
-# At this point, we must handle three cases.
-# 1. $target_rev is greater than $current_rev. We must patch forward for this.
-# 2. $target_rev is less than $current_rev. We must reverse the list of series,
-#    reverse each used series (tac) and unapply applied patches and vice versa.
-# 3. $target_rev is undefined, and $target is $upstream.
-
-# Revert to upstream.
-if [ "$target_rev" = "$target" ]; then
-	# already reverted
-	if [ "$current" = "$target" ]; then 
-		echo "Nothing to do, exiting."
-		exit 0
-	fi
-
-	for base in $(cd $home/series/ && bubble_sort_fwd $(ls -d *)); do
-		srev=${base#*-}
-		if [ -n "$srev" ]; then
-			if dpkg --compare-versions $srev "<=" $current_rev; then
-				unpatch_series $home/series/$base
-			fi
-		else
-			die "Series doesn't have a revision!"
-		fi
-	done
-elif dpkg --compare-versions "$current_rev" eq "$upstream" ||
-              dpkg --compare-versions "$target_rev" gt "$current_rev"; then
-	for base in $(cd $home/series/ && bubble_sort_rev $(ls -d *)); do
-		srev=${base#*-}
-		if [ -n "$srev" ]; then
-		    if dpkg --compare-versions "$srev" gt "$current_rev" && 
-			            dpkg --compare-versions "$srev" le "$target_rev"; then
-				patch_series $home/series/$base
-			fi
-		else
-			die "Series doesn't have a revision!"
-		fi
-	done
-elif dpkg --compare-versions "$target_rev" eq "$current_rev"; then
-	echo "Nothing to do, exiting."
-	exit 0
-elif dpkg --compare-versions "$target_rev" lt "$current_rev"; then
-	for base in $(cd $home/series/ && bubble_sort_fwd $(ls -d *)); do
-		srev=${base#*-}
-		if [ -n "$srev" ]; then
-			# -gt because you don't want to unapply the target series
-			if dpkg --compare-versions "$srev" le "$current_rev" && 
-			            dpkg --compare-versions "$srev" gt "$target_rev"; then
-				unpatch_series $home/series/$base
-			fi
-		else
-			die "Series doesn't have a revision!"
-		fi
-	done
-fi
-
-echo $target > version.Debian
-
-# vim:noet:ai:ts=4

Deleted: trunk/kernel/source/kernel-source-nonfree-2.6.11-2.6.11/debian/compat
===================================================================
--- trunk/kernel/source/kernel-source-nonfree-2.6.11-2.6.11/debian/compat	2005-03-20 00:28:32 UTC (rev 2745)
+++ trunk/kernel/source/kernel-source-nonfree-2.6.11-2.6.11/debian/compat	2005-03-20 01:22:27 UTC (rev 2746)
@@ -1 +0,0 @@
-4

Modified: trunk/kernel/source/kernel-source-nonfree-2.6.11-2.6.11/debian/control
===================================================================
--- trunk/kernel/source/kernel-source-nonfree-2.6.11-2.6.11/debian/control	2005-03-20 00:28:32 UTC (rev 2745)
+++ trunk/kernel/source/kernel-source-nonfree-2.6.11-2.6.11/debian/control	2005-03-20 01:22:27 UTC (rev 2746)
@@ -1,19 +1,18 @@
-Source: kernel-source-2.6.11
+Source: kernel-source-nonfree-2.6.11
 Section: devel
 Priority: optional
 Maintainer: Debian kernel team <debian-kernel@lists.debian.org>
-Uploaders: William Lee Irwin III <wli@debian.org>, Jens Schmalzing <jensen@debian.org>, Sven Luther <luther@debian.org>, Andres Salomon <dilinger@debian.org>, Joshua Kwan <joshk@triplehelix.org>, Simon Horman <horms@debian.org>
+Uploaders: Andres Salomon <dilinger@debian.org>
 Standards-Version: 3.6.1
-Build-Depends-Indep: bzip2, debhelper (>= 4), docbook-utils, gs, kernel-package (>= 7.48), transfig
+Build-Depends-Indep: bzip2, debhelper (>> 4.1.0), cdbs, kernel-build-2.6.11
 
-Package: kernel-source-2.6.11
+Package: kernel-source-nonfree-2.6.11
 Architecture: all
 Section: devel
 Priority: optional
-Provides: kernel-source, kernel-source-2.6
-Depends: binutils, bzip2, coreutils | fileutils (>= 4.0)
+Provides: kernel-source-nonfree, kernel-source-nonfree-2.6
+Depends: binutils, module-assistant, bzip2, coreutils | fileutils (>= 4.0), debhelper (>> 4.1.0)
 Recommends: libc6-dev | libc-dev, gcc, make
-Suggests: libncurses-dev | ncurses-dev, kernel-package, libqt3-mt-dev
 Description: Linux kernel source for version 2.6.11 with Debian patches
  This package provides the source code for the Linux kernel version 2.6.11.
  .
@@ -30,57 +29,23 @@
  which has been designed to ease the task of creating kernel image
  packages. 
 
-Package: kernel-doc-2.6.11
-Architecture: all
-Section: doc
-Priority: optional
-Provides: kernel-doc-2.6
-Depends: coreutils | fileutils (>= 4.0)
-Description: Linux kernel specific documentation for version 2.6.11
- This package provides the various readme's in the 2.6.11 kernel
- Documentation/ subdirectory: these typically contain kernel-specific
- installation notes for some drivers for example. See
- /usr/share/doc/kernel-doc-X.X.XX/Documentation/00-INDEX for a list of what
- is contained in each file.  Please read the Changes file, as it
- contains information about the problems, which may result by
- upgrading your kernel.
+Package: kernel-modules-nonfree-2.6.11-1-386
+Architecture: i386
+Description: Linux kernel modules from 2.6.11, containing non-free bits
 
-Package: kernel-patch-debian-2.6.11
-Architecture: all
-Section: devel
-Priority: optional
-Depends: bzip2
-Suggests: kernel-source-2.6.11
-Description: Debian patches to Linux 2.6.11
- This package includes the patches used to produce the prepackaged
- kernel-source-2.6.11 package.  Note that these patches do NOT apply
- against a pristine Linux 2.6.11 kernel but only against
- kernel-source-2.6.11_2.6.11.orig.tar.gz from the Debian archive.
+Package: kernel-modules-nonfree-2.6.11-1-686
+Architecture: i386
+Description: Linux kernel modules from 2.6.11, containing non-free bits
 
-Package: kernel-tree-2.6.11
-Architecture: all
-Section: devel
-Priority: optional
-Depends: kernel-patch-debian-2.6.11 (= ${Source-Version}), ${kt-depends}
-Provides: ${kt-provides}
-Description: Linux kernel source tree for building Debian kernel images
- This meta package is used as a build dependency of Debian
- kernel-image packages to prevent a version discrepancy between
- the kernel-image and corresponding kernel-sources packages in the
- fast-moving unstable archive. The package's dependency relations
- are structured so that a kernel-image package's build
- dependencies can always be satisfied, even if the kernel-source
- package that had been used to compile the image has been
- superseeded by a newer Debian revision since the last build.
- .
- The package provides a list of virtual packages, corresponding to
- Debian revisions of a kernel-source package. The Debian
- kernel-patch contains the information needed to roll back the
- current kernel-source to any of the revisions identified by the
- provided virtual packages. Therefore, the kernel-tree package
- ensures the availability of the kernel source tree corresponding
- to each of the virtual packages listed.
- .
- The package serves no purpose outside of the Debian build and
- archive infrastructure.
+Package: kernel-modules-nonfree-2.6.11-1-686-smp
+Architecture: i386
+Description: Linux kernel modules from 2.6.11, containing non-free bits
 
+Package: kernel-modules-nonfree-2.6.11-1-k7
+Architecture: i386
+Description: Linux kernel modules from 2.6.11, containing non-free bits
+
+Package: kernel-modules-nonfree-2.6.11-1-k7-smp
+Architecture: i386
+Description: Linux kernel modules from 2.6.11, containing non-free bits
+

Added: trunk/kernel/source/kernel-source-nonfree-2.6.11-2.6.11/debian/control.modules.in
===================================================================
--- trunk/kernel/source/kernel-source-nonfree-2.6.11-2.6.11/debian/control.modules.in	2005-03-20 00:28:32 UTC (rev 2745)
+++ trunk/kernel/source/kernel-source-nonfree-2.6.11-2.6.11/debian/control.modules.in	2005-03-20 01:22:27 UTC (rev 2746)
@@ -0,0 +1,13 @@
+Source: kernel-source-nonfree-2.6.11
+Section: devel
+Priority: optional
+Maintainer: Debian kernel team <debian-kernel@lists.debian.org>
+Uploaders: Andres Salomon <dilinger@debian.org>
+Standards-Version: 3.6.1
+Build-Depends-Indep: bzip2, debhelper (>> 4.1.0), cdbs
+
+Package: kernel-modules-nonfree-2.6.11-_KVERS_
+Architecture: any
+Provides: kernel-modules-nonfree, kernel-modules-nonfree-2.6
+Description: Linux kernel modules from 2.6.11, containing non-free bits
+

Deleted: trunk/kernel/source/kernel-source-nonfree-2.6.11-2.6.11/debian/make-substvars
===================================================================
--- trunk/kernel/source/kernel-source-nonfree-2.6.11-2.6.11/debian/make-substvars	2005-03-20 00:28:32 UTC (rev 2745)
+++ trunk/kernel/source/kernel-source-nonfree-2.6.11-2.6.11/debian/make-substvars	2005-03-20 01:22:27 UTC (rev 2746)
@@ -1,20 +0,0 @@
-#!/bin/sh
-
-upstream=$1
-
-ktdepends="kt-depends="
-ktprovides="kt-provides="
-
-for series in debian/patches/series/*; do
-	base=$(basename $series)
-	ktdepends="${ktdepends}kernel-source-$upstream (= $base) | "
-	ktprovides="${ktprovides}kernel-tree-$base, "
-done
-
-ktprovides=${ktprovides%, }
-ktdepends=${ktdepends%| }
-
-echo $ktdepends
-echo $ktprovides
-
-# vim:ts=4:noet:ai

Added: trunk/kernel/source/kernel-source-nonfree-2.6.11-2.6.11/debian/postinst.modules.in
===================================================================
--- trunk/kernel/source/kernel-source-nonfree-2.6.11-2.6.11/debian/postinst.modules.in	2005-03-20 00:28:32 UTC (rev 2745)
+++ trunk/kernel/source/kernel-source-nonfree-2.6.11-2.6.11/debian/postinst.modules.in	2005-03-20 01:22:27 UTC (rev 2746)
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+set -e
+                                          
+if [ "`uname -r`" = "_KVERS_" ]; then
+	/sbin/depmod -a
+fi
+
+#DEBHELPER#
+
+exit 0

Deleted: trunk/kernel/source/kernel-source-nonfree-2.6.11-2.6.11/debian/prune-non-free
===================================================================
--- trunk/kernel/source/kernel-source-nonfree-2.6.11-2.6.11/debian/prune-non-free	2005-03-20 00:28:32 UTC (rev 2745)
+++ trunk/kernel/source/kernel-source-nonfree-2.6.11-2.6.11/debian/prune-non-free	2005-03-20 01:22:27 UTC (rev 2746)
@@ -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
-

Modified: trunk/kernel/source/kernel-source-nonfree-2.6.11-2.6.11/debian/rules
===================================================================
--- trunk/kernel/source/kernel-source-nonfree-2.6.11-2.6.11/debian/rules	2005-03-20 00:28:32 UTC (rev 2745)
+++ trunk/kernel/source/kernel-source-nonfree-2.6.11-2.6.11/debian/rules	2005-03-20 01:22:27 UTC (rev 2746)
@@ -1,142 +1,18 @@
 #!/usr/bin/make -f
-#
-# debian/rules for kernel-source.
-#
-# GNU copyright 1997 to 1999 by Joey Hess.
-# Copyright (c) 1999-2002 Herbert Xu <herbert@debian.org>
-# Copyright (c) 2004 Jens Schmalzing <jensen@debian.org>
-#
 
-release := $(shell dpkg-parsechangelog | awk '/^Version: / { print $$2 }')
-upstream := $(shell echo "$(release)" | sed 's/:\?\([0-9\.]\+\)-[0-9].*/\1/')
-patch_home := debian/kernel-patch-debian-$(upstream)/usr/src/kernel-patches/all/$(upstream)
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/class/makefile.mk
 
-# Little things that help you...
-patch:
-	override_version=$(release) home=debian/patches sh debian/apply
+DEB_MAKE_INVOKE = /bin/true
 
-unpatch:
-	override_version=$(release) home=debian/patches sh debian/apply $(upstream)
+upstream := $(shell dpkg-parsechangelog | sed -n 's/^Version: \?\([0-9\.]\+\)-[0-9]\+$$/\1/p')
 
-../orig/kernel-source-$(upstream)-$(upstream):
-	if [ -e "../kernel-source-$(upstream)_$(upstream).orig.tar.gz" ]; then \
-		mkdir -p ../orig; \
-		tar -C ../orig -xzf ../kernel-source-$(upstream)_$(upstream).orig.tar.gz; \
-	else \
-		echo "Can't find orig tarball." >&2; \
-		exit 1; \
-	fi
-
-orig: ../orig/kernel-source-$(upstream)-$(upstream)
-	rsync -av --delete --exclude .svn --exclude debian ../orig/kernel-source-$(upstream)-$(upstream)/ .
-
-diff: ../orig/kernel-source-$(upstream)-$(upstream)
-	(cd .. && diff --exclude debian --exclude .svn -ur orig/kernel-source-$(upstream)-$(upstream) kernel-source-$(upstream)-$(upstream))
-
-#####################
-# Below comes Herbert's stuff with minimal additions
-
-build:
-# Ye olde no-op.
-
-clean:
-	dh_testdir
-	dh_testroot
-
-# Hack in case we killed it in the middle of something
-ifneq (,$(wildcard version.Debian))
-ifneq ($(shell cat version.Debian),$(upstream))
-	override_version=$(release) home=debian/patches sh debian/apply $(upstream)
-endif
-endif
-
-	make-kpkg clean
-	rm -f stamp-* .config* version.Debian 
-
-	dh_clean
-
-install:
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
-
-debian/kernel-tree-$(upstream).substvars: debian/patches debian/make-substvars
-	sh debian/make-substvars $(upstream) > $@
-
-binary-kernel-patch:
-	mkdir -p $(patch_home) $(patch_home)/apply $(patch_home)/debian $(patch_home)/unpatch
-	cp debian/patches/*.dpatch $(patch_home)/debian
-	chmod -x $(patch_home)/debian/*.dpatch
-	mkdir -p $(patch_home)/debian/series
-	cp debian/patches/series/* $(patch_home)/debian/series/
-
-	sed 's/@version@/$(release)/' debian/apply > $(patch_home)/apply/debian
-	sed 's/@upstream@/$(upstream)/' debian/unpatch > $(patch_home)/unpatch/debian
-	chmod a+x $(patch_home)/apply/debian $(patch_home)/unpatch/debian
-	bzip2 -9 $(patch_home)/debian/*.dpatch
-
-	dh_fixperms -pkernel-patch-debian-$(upstream)
-	dh_installdocs -pkernel-patch-debian-$(upstream)
-	dh_installchangelogs -pkernel-patch-debian-$(upstream)
-	dh_compress -pkernel-patch-debian-$(upstream)
-	dh_installdeb -pkernel-patch-debian-$(upstream)
-	dh_gencontrol -pkernel-patch-debian-$(upstream)
-	dh_builddeb -pkernel-patch-debian-$(upstream)
-	
-# Build architecture-independent files here.
-binary-indep: install binary-kernel-patch debian/kernel-tree-$(upstream).substvars
-	dh_testdir
-	dh_testroot
-
-# Patch kernel with the Debian patch!
-	home=$(patch_home)/debian sh $(patch_home)/apply/debian
-	make-kpkg kernel-source
-
-# kernel-doc takes a LONG time, so build kernel-tree first for immediate use
-	dh_fixperms -pkernel-patch-debian-$(upstream)
-	dh_installdocs -pkernel-tree-$(upstream)
-	dh_installchangelogs -pkernel-tree-$(upstream)
-	dh_compress -pkernel-tree-$(upstream)
-	dh_installdeb -pkernel-tree-$(upstream)
-	dh_gencontrol -pkernel-tree-$(upstream)
-	dh_builddeb -pkernel-tree-$(upstream)
-	
-	make-kpkg kernel-doc
-# Clean up after yourself
-	home=$(patch_home)/debian sh $(patch_home)/apply/debian $(upstream)	
-
-# Build architecture-dependent files here.
-binary-arch:
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
-
-#####################
-# The following targets set the stage for building the Debian packages.
-# 
-# They unpack the vanilla kernel, remove the tainted bits, and package
-# everything again.  This produces both a free .orig.tar.gz in the
-# parent directory and an unpacked version plus the debian
-# subdirectory in the current directory.  In order to use these
-# targets, download the vanilla kernel as a gzipped tarball, put it
-# into the parent directory as linux-<release>.tar.bz2, and run
-# 'debian/rules prune'.
-
-# phony target for easy reference
-.PHONY:	prune
-prune:	../kernel-source-$(upstream)_$(upstream).orig.tar.gz
-
-# prune the tainted bits from the vanilla kernel and package the result
-../kernel-source-$(upstream)_$(upstream).orig.tar.gz: debian/official
-	chmod u+x debian/prune-non-free
-	debian/prune-non-free
-	test $(notdir $(CURDIR)) = kernel-source-$(upstream)-$(upstream)
-	tar czCf .. $@ --exclude .svn --exclude debian kernel-source-$(upstream)-$(upstream)
-
-# unpack the vanilla kernel from a tarball, move stuff over, and create a stamp file
-debian/official: ../linux-$(upstream).tar.bz2
-	tar xjCf .. $<
-	mv ../linux-$(upstream)/* .
-	rmdir ../linux-$(upstream)
-	echo This is the Debian version of Linux $(upstream). > $@
+install/kernel-source-nonfree-$(upstream)::
+	mkdir -p modules/kernel-source-nonfree-$(upstream)/debian
+	cp -ra * modules/kernel-source-nonfree-$(upstream)
+	cp debian/{changelog,compat,copyright} modules/kernel-source-nonfree-$(upstream)/debian
+	cp debian/*.modules.in modules/kernel-source-nonfree-$(upstream)/debian
+	install -m755 debian/rules.modules modules/kernel-source-nonfree-$(upstream)/debian/rules
+	tar jcf debian/kernel-source-nonfree-$(upstream)/usr/src/kernel-source-nonfree-$(upstream).tar.bz2 modules
+	rm -rf modules

Added: trunk/kernel/source/kernel-source-nonfree-2.6.11-2.6.11/debian/rules.modules
===================================================================
--- trunk/kernel/source/kernel-source-nonfree-2.6.11-2.6.11/debian/rules.modules	2005-03-20 00:28:32 UTC (rev 2745)
+++ trunk/kernel/source/kernel-source-nonfree-2.6.11-2.6.11/debian/rules.modules	2005-03-20 01:22:27 UTC (rev 2746)
@@ -0,0 +1,36 @@
+#!/usr/bin/make -f
+
+upstream := $(shell dpkg-parsechangelog | sed -n 's/^Version: \?\([0-9\.]\+\)-[0-9]\+$$/\1/p')
+
+# module-assistant stuff
+PACKAGE = kernel-modules-nonfree-$(upstream)
+MA_DIR ?= /usr/share/modass
+-include $(MA_DIR)/include/generic.make
+-include $(MA_DIR)/include/common-rules.make
+
+kdist_clean: prep-deb-files
+	dh_clean
+	$(MAKE) clean KERNEL_PATH=$(KSRC)
+
+kdist_config: prep-deb-files
+
+TARGET = $(CURDIR)/debian/kernel-modules-nonfree-$(upstream)-$(KVERS)
+
+binary-modules: kdist_config
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs lib/modules/$(KVERS)
+
+	# build and install the module
+	$(MAKE) KERNEL_PATH=$(KSRC) DESTDIR=$(TARGET)
+	$(MAKE) KERNEL_PATH=$(KSRC) DESTDIR=$(TARGET) install
+
+	dh_installdocs
+	dh_installchangelogs
+	dh_compress
+	dh_fixperms
+	dh_installdeb
+	dh_gencontrol -- -v$(VERSION)
+	dh_md5sums
+	dh_builddeb --destdir=$(DEB_DESTDIR)


Property changes on: trunk/kernel/source/kernel-source-nonfree-2.6.11-2.6.11/debian/rules.modules
___________________________________________________________________
Name: svn:executable
   + *

Deleted: trunk/kernel/source/kernel-source-nonfree-2.6.11-2.6.11/debian/unpatch
===================================================================
--- trunk/kernel/source/kernel-source-nonfree-2.6.11-2.6.11/debian/unpatch	2005-03-20 00:28:32 UTC (rev 2745)
+++ trunk/kernel/source/kernel-source-nonfree-2.6.11-2.6.11/debian/unpatch	2005-03-20 01:22:27 UTC (rev 2746)
@@ -1,8 +0,0 @@
-#!/bin/sh
-# $Id: unpatch,v 1.3 2003/06/30 12:49:09 herbert Exp $
-
-set -e
-
-upstream=${override_upstream:-@upstream@}
-
-/usr/src/kernel-patches/all/$upstream/apply/debian $upstream