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

Andres Salomon dilinger-guest@costa.debian.org
Sun, 20 Mar 2005 12:34:19 +0100 

Author: dilinger-guest
Date: 2005-03-20 12:34:09 +0100 (Sun, 20 Mar 2005)
New Revision: 2749

Added:
   trunk/kernel/source/kernel-source-nonfree-2.6.11-2.6.11/debian/kernel-source-nonfree-2.6.11.dirs
Modified:
   trunk/kernel/source/kernel-source-nonfree-2.6.11-2.6.11/debian/changelog
   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.modules.in
   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.modules
Log:
commit misc fixes and stuff


Modified: trunk/kernel/source/kernel-source-nonfree-2.6.11-2.6.11/debian/changelog
===================================================================
--- trunk/kernel/source/kernel-source-nonfree-2.6.11-2.6.11/debian/changelog	2005-03-20 07:05:10 UTC (rev 2748)
+++ trunk/kernel/source/kernel-source-nonfree-2.6.11-2.6.11/debian/changelog	2005-03-20 11:34:09 UTC (rev 2749)
@@ -2,5 +2,5 @@
 
   * Initial release; nonfree drivers split out from kernel-source-2.6.11.
 
- -- Andres Salomon <dilinger@voxel.net>  Sat, 19 Mar 2005 19:20:58 -0500
+ -- Andres Salomon <dilinger@debian.org>  Sat, 19 Mar 2005 19:20:58 -0500
 

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 07:05:10 UTC (rev 2748)
+++ trunk/kernel/source/kernel-source-nonfree-2.6.11-2.6.11/debian/control	2005-03-20 11:34:09 UTC (rev 2749)
@@ -1,33 +1,20 @@
 Source: kernel-source-nonfree-2.6.11
-Section: devel
+Section: non-free/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, kernel-build-2.6.11
+Build-Depends-Indep: bzip2, cdbs, debhelper (>> 4.1.0)
 
 Package: kernel-source-nonfree-2.6.11
 Architecture: all
-Section: devel
-Priority: optional
 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
-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.
- .
- You may configure the kernel to your setup by typing "make config"
- and following instructions, but you could get ncursesX.X-dev and try
- "make menuconfig" for a jazzier, and easier to use interface. There 
- are options to use QT or GNOME based configuration interfaces, but they
- need additional packages to be installed. Also, please read the detailed 
- documentation in the file
- /usr/share/doc/kernel-source-2.6.11/README.headers.gz.
- .
- If you wish to use this package to create a custom Linux kernel, then
- it is suggested that you investigate the package kernel-package,
- which has been designed to ease the task of creating kernel image
- packages. 
+Depends: module-assistant, bzip2, coreutils | fileutils (>= 4.0), debhelper (>> 4.1.0)
+Description: Linux kernel module source for non-free 2.6.11 drivers
+ This package provides the source code for the Linux kernel modules
+ contained in 2.6.11 that are considered non-free by Debian.  Some of
+ the modules contained within this package include tg3, keyspan, and
+ the various qla2xxx modules.
 
 Package: kernel-modules-nonfree-2.6.11-1-386
 Architecture: i386

Modified: 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 07:05:10 UTC (rev 2748)
+++ trunk/kernel/source/kernel-source-nonfree-2.6.11-2.6.11/debian/control.modules.in	2005-03-20 11:34:09 UTC (rev 2749)
@@ -4,10 +4,16 @@
 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
+Build-Depends-Indep: bzip2, cdbs, debhelper (>> 4.1.0)
 
-Package: kernel-modules-nonfree-2.6.11-_KVERS_
+Package: kernel-nonfree-modules-_KVERS_
 Architecture: any
-Provides: kernel-modules-nonfree, kernel-modules-nonfree-2.6
-Description: Linux kernel modules from 2.6.11, containing non-free bits
+Provides: kernel-nonfree-modules
+Description: Linux kernel driver non-free modules from 2.6.11
+ This package provides Linux kernel modules from 2.6.11 that are
+ considered non-free by Debian.  Some of the modules contained
+ within this package include tg3, keyspan, and the various
+ qla2xxx modules.
+ .
+ This package contains the compiled kernel modules for _KVERS_
 

Added: trunk/kernel/source/kernel-source-nonfree-2.6.11-2.6.11/debian/kernel-source-nonfree-2.6.11.dirs
===================================================================
--- trunk/kernel/source/kernel-source-nonfree-2.6.11-2.6.11/debian/kernel-source-nonfree-2.6.11.dirs	2005-03-20 07:05:10 UTC (rev 2748)
+++ trunk/kernel/source/kernel-source-nonfree-2.6.11-2.6.11/debian/kernel-source-nonfree-2.6.11.dirs	2005-03-20 11:34:09 UTC (rev 2749)
@@ -0,0 +1 @@
+/usr/src

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 07:05:10 UTC (rev 2748)
+++ trunk/kernel/source/kernel-source-nonfree-2.6.11-2.6.11/debian/rules	2005-03-20 11:34:09 UTC (rev 2749)
@@ -10,9 +10,7 @@
 
 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
+	cp -ra [^m][^o]* modules/kernel-source-nonfree-$(upstream)
 	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

Modified: 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 07:05:10 UTC (rev 2748)
+++ trunk/kernel/source/kernel-source-nonfree-2.6.11-2.6.11/debian/rules.modules	2005-03-20 11:34:09 UTC (rev 2749)
@@ -1,20 +1,18 @@
 #!/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)
+PACKAGE = kernel-nonfree-modules
 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)
+	$(MAKE) clean DIR=$(KSRC)
 
 kdist_config: prep-deb-files
 
-TARGET = $(CURDIR)/debian/kernel-modules-nonfree-$(upstream)-$(KVERS)
+TARGET = $(CURDIR)/debian/kernel-nonfree-modules-$(KVERS)
 
 binary-modules: kdist_config
 	dh_testdir
@@ -23,8 +21,8 @@
 	dh_installdirs lib/modules/$(KVERS)
 
 	# build and install the module
-	$(MAKE) KERNEL_PATH=$(KSRC) DESTDIR=$(TARGET)
-	$(MAKE) KERNEL_PATH=$(KSRC) DESTDIR=$(TARGET) install
+	$(MAKE) DIR=$(KSRC) DESTDIR=$(TARGET)
+	$(MAKE) DIR=$(KSRC) DESTDIR=$(TARGET) install
 
 	dh_installdocs
 	dh_installchangelogs