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

Andres Salomon dilinger@costa.debian.org
Sun, 03 Apr 2005 13:03:21 +0000 

Author: dilinger
Date: 2005-04-03 13:03:21 +0000 (Sun, 03 Apr 2005)
New Revision: 2897

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.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:
instead of kernel-nonfree-source-2.6.11, use kernel-nonfree-2.6.11-source


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-04-03 12:47:16 UTC (rev 2896)
+++ trunk/kernel/source/kernel-source-nonfree-2.6.11-2.6.11/debian/control	2005-04-03 13:03:21 UTC (rev 2897)
@@ -6,9 +6,9 @@
 Standards-Version: 3.6.1
 Build-Depends: bzip2, cdbs, debhelper (>> 4.1.0), fakeroot, module-assistant, kernel-headers-2.6.11-1-i386 [i386], kernel-headers-2.6.11-9-amd64 [amd64]
 
-Package: kernel-nonfree-source-2.6.11
+Package: kernel-nonfree-2.6.11-source
 Architecture: all
-Provides: kernel-nonfree, kernel-nonfree-source-2.6
+Provides: kernel-nonfree-source, kernel-nonfree-2.6-source
 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
@@ -16,7 +16,7 @@
  the modules contained within this package include acenic, tg3, keyspan, and
  the various qla2xxx modules.
 
-Package: kernel-nonfree-modules-2.6.11-1-386
+Package: kernel-nonfree-2.6.11-modules-2.6.11-1-386
 Architecture: i386
 Description: Linux kernel driver non-free modules from 2.6.11
  This package provides Linux kernel modules from 2.6.11 that are
@@ -26,7 +26,7 @@
  .
  This package contains the compiled kernel modules for 2.6.11-1-386.
 
-Package: kernel-nonfree-modules-2.6.11-1-686
+Package: kernel-nonfree-2.6.11-modules-2.6.11-1-686
 Architecture: i386
 Description: Linux kernel driver non-free modules from 2.6.11
  This package provides Linux kernel modules from 2.6.11 that are
@@ -36,7 +36,7 @@
  .
  This package contains the compiled kernel modules for 2.6.11-1-686.
 
-Package: kernel-nonfree-modules-2.6.11-1-686-smp
+Package: kernel-nonfree-2.6.11-modules-2.6.11-1-686-smp
 Architecture: i386
 Description: Linux kernel driver non-free modules from 2.6.11
  This package provides Linux kernel modules from 2.6.11 that are
@@ -46,7 +46,7 @@
  .
  This package contains the compiled kernel modules for 2.6.11-1-686-smp.
 
-Package: kernel-nonfree-modules-2.6.11-1-k7
+Package: kernel-nonfree-2.6.11-modules-2.6.11-1-k7
 Architecture: i386
 Description: Linux kernel driver non-free modules from 2.6.11
  This package provides Linux kernel modules from 2.6.11 that are
@@ -56,7 +56,7 @@
  .
  This package contains the compiled kernel modules for 2.6.11-1-k7.
 
-Package: kernel-nonfree-modules-2.6.11-1-k7-smp
+Package: kernel-nonfree-2.6.11-modules-2.6.11-1-k7-smp
 Architecture: i386
 Description: Linux kernel driver non-free modules from 2.6.11
  This package provides Linux kernel modules from 2.6.11 that are
@@ -66,7 +66,7 @@
  .
  This package contains the compiled kernel modules for 2.6.11-1-k7-smp.
 
-Package: kernel-nonfree-modules-2.6.11-1-amd64-generic
+Package: kernel-nonfree-2.6.11-modules-2.6.11-1-amd64-generic
 Architecture: amd64 i386
 Description: Linux kernel driver non-free modules from 2.6.11
  This package provides Linux kernel modules from 2.6.11 that are
@@ -76,7 +76,7 @@
  .
  This package contains the compiled kernel modules for 2.6.11-1-amd64-generic.
 
-Package: kernel-nonfree-modules-2.6.11-1-amd64-k8
+Package: kernel-nonfree-2.6.11-modules-2.6.11-1-amd64-k8
 Architecture: amd64 i386
 Description: Linux kernel driver non-free modules from 2.6.11
  This package provides Linux kernel modules from 2.6.11 that are
@@ -86,7 +86,7 @@
  .
  This package contains the compiled kernel modules for 2.6.11-1-amd64-k8.
 
-Package: kernel-nonfree-modules-2.6.11-1-amd64-k8-smp
+Package: kernel-nonfree-2.6.11-modules-2.6.11-1-amd64-k8-smp
 Architecture: amd64 i386
 Description: Linux kernel driver non-free modules from 2.6.11
  This package provides Linux kernel modules from 2.6.11 that are
@@ -96,7 +96,7 @@
  .
  This package contains the compiled kernel modules for 2.6.11-1-amd64-k8-smp.
 
-Package: kernel-nonfree-modules-2.6.11-1-em64t-p4
+Package: kernel-nonfree-2.6.11-modules-2.6.11-1-em64t-p4
 Architecture: amd64 i386
 Description: Linux kernel driver non-free modules from 2.6.11
  This package provides Linux kernel modules from 2.6.11 that are
@@ -106,7 +106,7 @@
  .
  This package contains the compiled kernel modules for 2.6.11-1-em64t-p4.
 
-Package: kernel-nonfree-modules-2.6.11-1-em64t-p4--smp
+Package: kernel-nonfree-2.6.11-modules-2.6.11-1-em64t-p4-smp
 Architecture: amd64 i386
 Description: Linux kernel driver non-free modules from 2.6.11
  This package provides Linux kernel modules from 2.6.11 that are

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-04-03 12:47:16 UTC (rev 2896)
+++ trunk/kernel/source/kernel-source-nonfree-2.6.11-2.6.11/debian/control.modules.in	2005-04-03 13:03:21 UTC (rev 2897)
@@ -1,4 +1,4 @@
-Source: kernel-nonfree-source-2.6.11
+Source: kernel-nonfree-2.6.11-source
 Section: devel
 Priority: optional
 Maintainer: Debian kernel team <debian-kernel@lists.debian.org>
@@ -6,9 +6,9 @@
 Standards-Version: 3.6.1
 Build-Depends-Indep: bzip2, cdbs, debhelper (>> 4.1.0)
 
-Package: kernel-nonfree-modules-_KVERS_
+Package: kernel-nonfree-2.6.11-modules-_KVERS_
 Architecture: any
-Provides: kernel-nonfree-modules
+Provides: kernel-nonfree-2.6.11-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

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-04-03 12:47:16 UTC (rev 2896)
+++ trunk/kernel/source/kernel-source-nonfree-2.6.11-2.6.11/debian/rules	2005-04-03 13:03:21 UTC (rev 2897)
@@ -6,9 +6,9 @@
 upstream := $(shell dpkg-parsechangelog | sed -n 's/^Version: \?\([0-9\.]\+\)-[0-9]\+$$/\1/p')
 
 mod-src-dir:
-	mkdir -p modules/kernel-nonfree-source-$(upstream)/debian
-	cp -ra [^m][^o]* modules/kernel-nonfree-source-$(upstream)
-	install -m755 debian/rules.modules modules/kernel-nonfree-source-$(upstream)/debian/rules
+	mkdir -p modules/kernel-nonfree-$(upstream)/debian
+	cp -ra [^m][^o]* modules/kernel-nonfree-$(upstream)
+	install -m755 debian/rules.modules modules/kernel-nonfree-$(upstream)/debian/rules
 
 clean::
 	rm -rf $(CURDIR)/modules
@@ -16,9 +16,9 @@
 $(patsubst %,build/%,$(DEB_ARCH_PACKAGES)):: mod-src-dir
 	MOD_SRCDIR=$(CURDIR) KPKG_DEST_DIR=$(CURDIR)/.. \
 		fakeroot module-assistant --kernel-dir \
-		/usr/src/$(patsubst build/kernel-nonfree-modules-%,kernel-headers-%,$@) \
-		--text-mode build kernel-nonfree-source-$(upstream)
+		/usr/src/$(patsubst build/kernel-nonfree-$(upstream)-modules-%,kernel-headers-%,$@) \
+		--text-mode build kernel-nonfree-$(upstream)
 
-install/kernel-nonfree-source-$(upstream):: mod-src-dir
-	mkdir -p debian/kernel-nonfree-source-$(upstream)/usr/src
-	tar jcf debian/kernel-nonfree-source-$(upstream)/usr/src/kernel-nonfree-source-$(upstream).tar.bz2 modules
+install/kernel-nonfree-$(upstream)-source:: mod-src-dir
+	mkdir -p debian/kernel-nonfree-$(upstream)-source/usr/src
+	tar jcf debian/kernel-nonfree-$(upstream)-source/usr/src/kernel-nonfree-$(upstream)-source.tar.bz2 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-04-03 12:47:16 UTC (rev 2896)
+++ trunk/kernel/source/kernel-source-nonfree-2.6.11-2.6.11/debian/rules.modules	2005-04-03 13:03:21 UTC (rev 2897)
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
 # module-assistant stuff
-PACKAGE = kernel-nonfree-modules
+PACKAGE = kernel-nonfree-2.6.11-modules
 MA_DIR ?= /usr/share/modass
 -include $(MA_DIR)/include/generic.make
 -include $(MA_DIR)/include/common-rules.make
@@ -12,7 +12,7 @@
 
 kdist_config: prep-deb-files
 
-TARGET = $(CURDIR)/debian/kernel-nonfree-modules-$(KVERS)
+TARGET = $(CURDIR)/debian/kernel-nonfree-2.6.11-modules-$(KVERS)
 
 binary-modules: kdist_config
 	dh_testdir