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

[Andres Salomon]

Author: dilinger-guest
Date: 2005-03-21 08:57:15 +0100 (Mon, 21 Mar 2005)
New Revision: 2754

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
Log:
Switch up naming to ensure consistency w/ standard module names.  This means
that the source package is called 'kernel-source-nonfree-*', while the
generated source package and modules are called
'kernel-nonfree-{source,modules}-*'.  


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-21 07:48:10 UTC (rev 2753)
+++ trunk/kernel/source/kernel-source-nonfree-2.6.11-2.6.11/debian/control	2005-03-21 07:57:15 UTC (rev 2754)
@@ -6,9 +6,9 @@
 Standards-Version: 3.6.1
 Build-Depends-Indep: bzip2, cdbs, debhelper (>> 4.1.0), fakeroot, module-assistant, kernel-build-2.6.11-1
 
-Package: kernel-source-nonfree-2.6.11
+Package: kernel-nonfree-source-2.6.11
 Architecture: all
-Provides: kernel-source-nonfree, kernel-source-nonfree-2.6
+Provides: kernel-nonfree, kernel-nonfree-source-2.6
 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

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-21 07:48:10 UTC (rev 2753)
+++ trunk/kernel/source/kernel-source-nonfree-2.6.11-2.6.11/debian/control.modules.in	2005-03-21 07:57:15 UTC (rev 2754)
@@ -1,4 +1,4 @@
-Source: kernel-source-nonfree-2.6.11
+Source: kernel-nonfree-source-2.6.11
 Section: devel
 Priority: optional
 Maintainer: Debian kernel team <debian-kernel@lists.debian.org>
@@ -15,5 +15,5 @@
  within this package include tg3, keyspan, and the various
  qla2xxx modules.
  .
- This package contains the compiled kernel modules for _KVERS_
+ This package contains the compiled kernel modules for _KVERS_.
 

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-21 07:48:10 UTC (rev 2753)
+++ trunk/kernel/source/kernel-source-nonfree-2.6.11-2.6.11/debian/rules	2005-03-21 07:57:15 UTC (rev 2754)
@@ -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-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
+	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
 
 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-modules-nonfree-%,kernel-headers-%,$@) \
-		--text-mode build kernel-source-nonfree-$(upstream)
+		/usr/src/$(patsubst build/kernel-nonfree-modules-%,kernel-headers-%,$@) \
+		--text-mode build kernel-nonfree-source-$(upstream)
 
-install/kernel-source-nonfree-$(upstream)::
-	mkdir -p debian/kernel-source-nonfree-$(upstream)/usr/src
-	tar jcf debian/kernel-source-nonfree-$(upstream)/usr/src/kernel-source-nonfree-$(upstream).tar.bz2 modules
+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