r2910 - trunk/kernel/source/kernel-source-nonfree-2.6.11-2.6.11/debian
Andres Salomon
dilinger@costa.debian.org
Mon, 04 Apr 2005 04:55:31 +0000
Author: dilinger
Date: 2005-04-04 04:55:30 +0000 (Mon, 04 Apr 2005)
New Revision: 2910
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:
update package names once more. s/kernel-nonfree/kernel-nonfree-source/ in
/usr/src/modules, and drop $(upstream) name from kernel-nonfree-source and
kernel-nonfree-modules package names
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-04-04 04:06:19 UTC (rev 2909)
+++ trunk/kernel/source/kernel-source-nonfree-2.6.11-2.6.11/debian/changelog 2005-04-04 04:55:30 UTC (rev 2910)
@@ -1,6 +1,6 @@
-kernel-source-nonfree-2.6.11 (2.6.11-1) unstable; urgency=low
+kernel-source-nonfree (2.6.11-1) unstable; urgency=low
* Initial release; nonfree drivers split out from kernel-source-2.6.11.
- -- Andres Salomon <dilinger@debian.org> Sun, 03 Apr 2005 08:48:46 -0400
+ -- Andres Salomon <dilinger@debian.org> Mon, 04 Apr 2005 00:50:33 -0400
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-04 04:06:19 UTC (rev 2909)
+++ trunk/kernel/source/kernel-source-nonfree-2.6.11-2.6.11/debian/control 2005-04-04 04:55:30 UTC (rev 2910)
@@ -1,4 +1,4 @@
-Source: kernel-source-nonfree-2.6.11
+Source: kernel-source-nonfree
Section: non-free/devel
Priority: optional
Maintainer: Debian Kernel Team <debian-kernel@lists.debian.org>
@@ -6,9 +6,8 @@
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-2.6.11-source
+Package: kernel-nonfree-source
Architecture: all
-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 +15,7 @@
the modules contained within this package include acenic, tg3, keyspan, and
the various qla2xxx modules.
-Package: kernel-nonfree-2.6.11-modules-2.6.11-1-386
+Package: kernel-nonfree-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 +25,7 @@
.
This package contains the compiled kernel modules for 2.6.11-1-386.
-Package: kernel-nonfree-2.6.11-modules-2.6.11-1-686
+Package: kernel-nonfree-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 +35,7 @@
.
This package contains the compiled kernel modules for 2.6.11-1-686.
-Package: kernel-nonfree-2.6.11-modules-2.6.11-1-686-smp
+Package: kernel-nonfree-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 +45,7 @@
.
This package contains the compiled kernel modules for 2.6.11-1-686-smp.
-Package: kernel-nonfree-2.6.11-modules-2.6.11-1-k7
+Package: kernel-nonfree-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 +55,7 @@
.
This package contains the compiled kernel modules for 2.6.11-1-k7.
-Package: kernel-nonfree-2.6.11-modules-2.6.11-1-k7-smp
+Package: kernel-nonfree-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 +65,7 @@
.
This package contains the compiled kernel modules for 2.6.11-1-k7-smp.
-Package: kernel-nonfree-2.6.11-modules-2.6.11-1-amd64-generic
+Package: kernel-nonfree-modules-2.6.11-1-amd64-generic
Architecture: amd64
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 +75,7 @@
.
This package contains the compiled kernel modules for 2.6.11-1-amd64-generic.
-Package: kernel-nonfree-2.6.11-modules-2.6.11-1-amd64-k8
+Package: kernel-nonfree-modules-2.6.11-1-amd64-k8
Architecture: amd64
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 +85,7 @@
.
This package contains the compiled kernel modules for 2.6.11-1-amd64-k8.
-Package: kernel-nonfree-2.6.11-modules-2.6.11-1-amd64-k8-smp
+Package: kernel-nonfree-modules-2.6.11-1-amd64-k8-smp
Architecture: amd64
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 +95,7 @@
.
This package contains the compiled kernel modules for 2.6.11-1-amd64-k8-smp.
-Package: kernel-nonfree-2.6.11-modules-2.6.11-1-em64t-p4
+Package: kernel-nonfree-modules-2.6.11-1-em64t-p4
Architecture: amd64
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 +105,7 @@
.
This package contains the compiled kernel modules for 2.6.11-1-em64t-p4.
-Package: kernel-nonfree-2.6.11-modules-2.6.11-1-em64t-p4-smp
+Package: kernel-nonfree-modules-2.6.11-1-em64t-p4-smp
Architecture: amd64
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-04 04:06:19 UTC (rev 2909)
+++ trunk/kernel/source/kernel-source-nonfree-2.6.11-2.6.11/debian/control.modules.in 2005-04-04 04:55:30 UTC (rev 2910)
@@ -1,4 +1,4 @@
-Source: kernel-nonfree-2.6.11-source
+Source: kernel-nonfree-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-2.6.11-modules-_KVERS_
+Package: kernel-nonfree-modules-_KVERS_
Architecture: any
-Provides: kernel-nonfree-2.6.11-modules
+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
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-04 04:06:19 UTC (rev 2909)
+++ trunk/kernel/source/kernel-source-nonfree-2.6.11-2.6.11/debian/rules 2005-04-04 04:55:30 UTC (rev 2910)
@@ -6,25 +6,25 @@
upstream := $(shell dpkg-parsechangelog | sed -n 's/^Version: \?\([0-9\.]\+\)-[0-9]\+$$/\1/p')
mod-src-dir:
- 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
- sed -i 's/^kernel-source-nonfree-$(upstream)/kernel-nonfree-$(upstream)-source/' \
- modules/kernel-nonfree-$(upstream)/debian/changelog
+ mkdir -p modules/kernel-nonfree-source/debian
+ cp -ra [^m][^o]* modules/kernel-nonfree-source
+ install -m755 debian/rules.modules modules/kernel-nonfree-source/debian/rules
+ sed -i 's/^kernel-source-nonfree/kernel-nonfree-source/' \
+ modules/kernel-nonfree-source/debian/changelog
clean::
rm -rf $(CURDIR)/modules
rm -f $(CURDIR)/*.deb
$(patsubst %,build/%,$(DEB_ARCH_PACKAGES)):: mod-src-dir
- cd modules/kernel-nonfree-$(upstream) && \
+ cd modules/kernel-nonfree-source && \
fakeroot debian/rules binary-modules \
- KSRC=/usr/src/$(patsubst build/kernel-nonfree-$(upstream)-modules-%,kernel-headers-%,$@) DEB_DESTDIR=$(CURDIR)
+ KSRC=/usr/src/$(patsubst build/kernel-nonfree-modules-%,kernel-headers-%,$@) DEB_DESTDIR=$(CURDIR)
$(patsubst %,binary/%,$(DEB_ARCH_PACKAGES))::
dpkg-distaddfile $(wildcard $(patsubst binary/%,%,$@)_*.deb) non-free/devel optional
mv $(wildcard $(patsubst binary/%,%,$@)_*.deb) ..
-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
+install/kernel-nonfree-source:: mod-src-dir
+ mkdir -p debian/kernel-nonfree-source/usr/src
+ tar jcf debian/kernel-nonfree-source/usr/src/kernel-nonfree-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-04 04:06:19 UTC (rev 2909)
+++ trunk/kernel/source/kernel-source-nonfree-2.6.11-2.6.11/debian/rules.modules 2005-04-04 04:55:30 UTC (rev 2910)
@@ -1,7 +1,7 @@
#!/usr/bin/make -f
# module-assistant stuff
-PACKAGE = kernel-nonfree-2.6.11-modules
+PACKAGE = kernel-nonfree-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-2.6.11-modules-$(KVERS)
+TARGET = $(CURDIR)/debian/kernel-nonfree-modules-$(KVERS)
binary-modules: kdist_config
dh_testdir