[kernel] r4734 - in people/waldi/linux-nonfree-2.6: . debian debian/bin debian/templates

Bastian Blank waldi at costa.debian.org
Sun Nov 6 16:21:09 UTC 2005 

Author: waldi
Date: 2005-11-06 16:21:07 +0000 (Sun, 06 Nov 2005)
New Revision: 4734

Added:
   people/waldi/linux-nonfree-2.6/debian/compat
   people/waldi/linux-nonfree-2.6/debian/templates/control.main.in
Modified:
   people/waldi/linux-nonfree-2.6/
   people/waldi/linux-nonfree-2.6/debian/bin/gencontrol.py
   people/waldi/linux-nonfree-2.6/debian/changelog
   people/waldi/linux-nonfree-2.6/debian/rules.real
   people/waldi/linux-nonfree-2.6/debian/templates/control.modules.in
   people/waldi/linux-nonfree-2.6/debian/templates/control.source.in
Log:
Merge /dists/trunk/linux-nonfree-2.6.



Property changes on: people/waldi/linux-nonfree-2.6
___________________________________________________________________
Name: svk:merge
   + 510b9475-24dd-0310-9b6c-e0eefe99d49f:/dists/trunk/linux-nonfree-2.6:4621

Modified: people/waldi/linux-nonfree-2.6/debian/bin/gencontrol.py
===================================================================
--- people/waldi/linux-nonfree-2.6/debian/bin/gencontrol.py	2005-11-06 16:19:16 UTC (rev 4733)
+++ people/waldi/linux-nonfree-2.6/debian/bin/gencontrol.py	2005-11-06 16:21:07 UTC (rev 4734)
@@ -252,6 +252,9 @@
     source = read_template("source")
     packages['source'] = process_package(source[0], vars)
 
+    main = read_template("main")
+    packages.extend(process_packages(main, vars))
+
     makeflags = {
         'VERSION': version['version'],
         'SOURCE_VERSION': version['source'],

Modified: people/waldi/linux-nonfree-2.6/debian/changelog
===================================================================
--- people/waldi/linux-nonfree-2.6/debian/changelog	2005-11-06 16:19:16 UTC (rev 4733)
+++ people/waldi/linux-nonfree-2.6/debian/changelog	2005-11-06 16:21:07 UTC (rev 4734)
@@ -1,4 +1,4 @@
-linux-nonfree-2.6 (2.6.12+2.6.13-rc6-1) UNRELEASED; urgency=low
+linux-nonfree-2.6 (2.6.13+2.6.14-rc5-1) UNRELEASED; urgency=low
 
   *
 

Added: people/waldi/linux-nonfree-2.6/debian/compat
===================================================================
--- people/waldi/linux-nonfree-2.6/debian/compat	2005-11-06 16:19:16 UTC (rev 4733)
+++ people/waldi/linux-nonfree-2.6/debian/compat	2005-11-06 16:21:07 UTC (rev 4734)
@@ -0,0 +1 @@
+4

Modified: people/waldi/linux-nonfree-2.6/debian/rules.real
===================================================================
--- people/waldi/linux-nonfree-2.6/debian/rules.real	2005-11-06 16:19:16 UTC (rev 4733)
+++ people/waldi/linux-nonfree-2.6/debian/rules.real	2005-11-06 16:21:07 UTC (rev 4734)
@@ -16,18 +16,37 @@
 #
 binary-arch-flavour: install-modules-$(ARCH)-$(SUBARCH)-$(FLAVOUR)
 
+binary-indep: install-source
+
 build: $(STAMPS_DIR)/build-$(ARCH)-$(SUBARCH)-$(FLAVOUR)
 
+$(BUILD_DIR)/linux-nonfree-source-$(UPSTREAM_VERSION).tar.bz2: SOURCE_DIR=$(BUILD_DIR)/source
+$(BUILD_DIR)/linux-nonfree-source-$(UPSTREAM_VERSION).tar.bz2: DIR = $(BUILD_DIR)/linux-nonfree-source-$(UPSTREAM_VERSION)
+$(BUILD_DIR)/linux-nonfree-source-$(UPSTREAM_VERSION).tar.bz2: $(STAMPS_DIR)/source
+	rm -rf '$@' '$(DIR)'
+	cp -al '$(SOURCE_DIR)' '$(DIR)'
+	chmod -R u+rw,go=rX '$(DIR)'
+	cd '$(BUILD_DIR)'; tar -cjf 'linux-nonfree-source-$(UPSTREAM_VERSION).tar.bz2' 'linux-nonfree-source-$(UPSTREAM_VERSION)'
+	rm -rf '$(DIR)'
+
+srcfiles := $(filter-out debian, $(wildcard *))
+$(STAMPS_DIR)/source: DIR=$(BUILD_DIR)/source
+$(STAMPS_DIR)/source:
+	rm -rf '$(DIR)'
+	mkdir -p '$(DIR)'
+	cp -a $(srcfiles) '$(DIR)'
+	touch '$@'
+
 $(STAMPS_DIR)/build-$(ARCH)-$(SUBARCH)-$(FLAVOUR): DIR=$(BUILD_DIR)/build-$(ARCH)-$(SUBARCH)-$(FLAVOUR)
 $(STAMPS_DIR)/build-$(ARCH)-$(SUBARCH)-$(FLAVOUR): $(STAMPS_DIR)/setup-$(ARCH)-$(SUBARCH)-$(FLAVOUR)
-	cd $(DIR); env -u MAKEFLAGS ARCH=$(KERNEL_ARCH) $(MAKE) DIR=$(HEADERS_DIR) V=1
+	cd $(DIR); env -u MAKEFLAGS ARCH=$(KERNEL_ARCH) $(MAKE) DIR=$(HEADERS_DIR)
 	touch $@
 
+$(STAMPS_DIR)/setup-$(ARCH)-$(SUBARCH)-$(FLAVOUR): SOURCE_DIR=$(BUILD_DIR)/source
 $(STAMPS_DIR)/setup-$(ARCH)-$(SUBARCH)-$(FLAVOUR): DIR=$(BUILD_DIR)/build-$(ARCH)-$(SUBARCH)-$(FLAVOUR)
-$(STAMPS_DIR)/setup-$(ARCH)-$(SUBARCH)-$(FLAVOUR):
+$(STAMPS_DIR)/setup-$(ARCH)-$(SUBARCH)-$(FLAVOUR): $(STAMPS_DIR)/source
 	rm -rf $(DIR)
-	mkdir -p $(DIR)
-	cp -al $(filter-out debian, $(wildcard *)) $(DIR)
+	cp -al '$(SOURCE_DIR)' '$(DIR)'
 	cd $(HEADERS_DIR); \
 	for i in $$(find -follow -name "Kconfig*"); do \
 	  mkdir -p $(CURDIR)/$(DIR)/$$(dirname $$i); \
@@ -36,7 +55,6 @@
 	cat $(HEADERS_DIR)/.config debian/arch/kconfig > $(DIR)/.config
 	echo "source 'arch/$(KERNEL_ARCH)/Kconfig'" > $(DIR)/Kconfig.include
 	echo "source 'Kconfig'" >> $(DIR)/Kconfig.include
-	rm $(DIR)/Makefile
 	echo "include $(CURDIR)/$(DIR)/.config" > $(DIR)/Makefile
 	echo "include $(CURDIR)/Makefile" >> $(DIR)/Makefile
 	cd $(DIR); $(HEADERS_DIR)/scripts/kconfig/conf -s Kconfig.include
@@ -62,4 +80,12 @@
 	dh_installchangelogs $(DH_OPTIONS)
 	$(MAKE) -f debian/rules.real install-base DH_OPTIONS=$(DH_OPTIONS)
 
+install-source: DH_OPTIONS = -plinux-nonfree-source-$(VERSION)
+install-source: $(BUILD_DIR)/linux-nonfree-source-$(UPSTREAM_VERSION).tar.bz2
+	dh_testdir
+	dh_testroot
+	dh_install $(DH_OPTIONS) '$<' /usr/src
+	dh_installdocs $(DH_OPTIONS)
+	dh_installchangelogs $(DH_OPTIONS)
+	$(MAKE) -f debian/rules.real install-base DH_OPTIONS='$(DH_OPTIONS)'
 

Added: people/waldi/linux-nonfree-2.6/debian/templates/control.main.in
===================================================================
--- people/waldi/linux-nonfree-2.6/debian/templates/control.main.in	2005-11-06 16:19:16 UTC (rev 4733)
+++ people/waldi/linux-nonfree-2.6/debian/templates/control.main.in	2005-11-06 16:21:07 UTC (rev 4734)
@@ -0,0 +1,10 @@
+Package: linux-nonfree-source- at version@
+Architecture: all
+Section: non-free/devel
+Priority: optional
+Depends: bzip2
+Recommends: gcc, make
+Description: Linux non-free source for version @version@
+ This package provides source code for the non-free parts of the Linux
+ kernel version @version at .  This source closely tracks official Linux
+ kernel releases.

Modified: people/waldi/linux-nonfree-2.6/debian/templates/control.modules.in
===================================================================
--- people/waldi/linux-nonfree-2.6/debian/templates/control.modules.in	2005-11-06 16:19:16 UTC (rev 4733)
+++ people/waldi/linux-nonfree-2.6/debian/templates/control.modules.in	2005-11-06 16:21:07 UTC (rev 4734)
@@ -1,5 +1,5 @@
 Package: linux-modules-nonfree- at subarch@@version at -@abiname at -@flavour@
-Section: nonfree/base
+Section: non-free/base
 Priority: optional
 Description: Non-free modules for the Linux kernel version @version@
  This package the nonfree modules for the Linux kernel version @version at .

Modified: people/waldi/linux-nonfree-2.6/debian/templates/control.source.in
===================================================================
--- people/waldi/linux-nonfree-2.6/debian/templates/control.source.in	2005-11-06 16:19:16 UTC (rev 4733)
+++ people/waldi/linux-nonfree-2.6/debian/templates/control.source.in	2005-11-06 16:21:07 UTC (rev 4734)
@@ -4,4 +4,4 @@
 Maintainer: Debian Kernel Team <debian-kernel at lists.debian.org>
 Uploaders: Andres Salomon <dilinger at debian.org>, Bastian Blank <waldi at debian.org>
 Standards-Version: 3.6.1.0
-Build-Depends: gcc (>= 4:4.0) [!arm !sparc !alpha !m68k], gcc-3.3 [arm sparc alpha m68k], binutils-hppa64 [hppa], gcc-4.0-hppa64 [hppa], debhelper (>= 4.1.0), module-init-tools, dpkg-dev (>= 1.10.23), debianutils (>= 1.6), bzip2, console-tools [!s390], sparc-utils [sparc], kernel-package (>= 9.005)
+Build-Depends: gcc (>= 4:4.0) [!arm !sparc !alpha !m68k], gcc-3.3 [arm sparc alpha m68k], binutils-hppa64 [hppa], gcc-4.0-hppa64 [hppa], debhelper (>= 4.1.0), module-init-tools

More information about the Kernel-svn-changes mailing list