[kernel] r9485 - in dists/trunk/linux-2.6/debian: . bin modules templates

Bastian Blank waldi at alioth.debian.org
Mon Sep 10 10:40:50 UTC 2007 

Author: waldi
Date: Mon Sep 10 10:40:50 2007
New Revision: 9485

Log:
* debian/bin/abicheck.py, debian/bin/abiupdate.py, debian/bin/gencontrol.py
  debian/bin/kconfig.py, debian/modules/gencontrol.py,
  debian/templates/patch.apply.in: Use default python.
* debian/rules.real: Use python-central.
* debian/templates/control.main.in: Depend against python.
* debian/templates/control.source.in
  - Build depend against python and python-central.
  - Setup new python support.
* debian/templates/control.support.in: Setup python support.


Modified:
   dists/trunk/linux-2.6/debian/bin/abicheck.py
   dists/trunk/linux-2.6/debian/bin/abiupdate.py
   dists/trunk/linux-2.6/debian/bin/gencontrol.py
   dists/trunk/linux-2.6/debian/bin/kconfig.py
   dists/trunk/linux-2.6/debian/modules/gencontrol.py
   dists/trunk/linux-2.6/debian/rules.real
   dists/trunk/linux-2.6/debian/templates/control.main.in
   dists/trunk/linux-2.6/debian/templates/control.source.in
   dists/trunk/linux-2.6/debian/templates/control.support.in
   dists/trunk/linux-2.6/debian/templates/patch.apply.in

Modified: dists/trunk/linux-2.6/debian/bin/abicheck.py
==============================================================================
--- dists/trunk/linux-2.6/debian/bin/abicheck.py	(original)
+++ dists/trunk/linux-2.6/debian/bin/abicheck.py	Mon Sep 10 10:40:50 2007
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.4
+#!/usr/bin/env python
 
 import sys
 from debian_linux.abi import *

Modified: dists/trunk/linux-2.6/debian/bin/abiupdate.py
==============================================================================
--- dists/trunk/linux-2.6/debian/bin/abiupdate.py	(original)
+++ dists/trunk/linux-2.6/debian/bin/abiupdate.py	Mon Sep 10 10:40:50 2007
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.4
+#!/usr/bin/env python
 
 import sys
 sys.path.append(sys.path[0] + "/../lib/python")

Modified: dists/trunk/linux-2.6/debian/bin/gencontrol.py
==============================================================================
--- dists/trunk/linux-2.6/debian/bin/gencontrol.py	(original)
+++ dists/trunk/linux-2.6/debian/bin/gencontrol.py	Mon Sep 10 10:40:50 2007
@@ -1,4 +1,5 @@
-#!/usr/bin/env python2.4
+#!/usr/bin/env python
+
 import os, sys
 sys.path.append("debian/lib/python")
 

Modified: dists/trunk/linux-2.6/debian/bin/kconfig.py
==============================================================================
--- dists/trunk/linux-2.6/debian/bin/kconfig.py	(original)
+++ dists/trunk/linux-2.6/debian/bin/kconfig.py	Mon Sep 10 10:40:50 2007
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.4
+#!/usr/bin/env python
 
 import optparse, os.path, sys
 from debian_linux.kconfig import *

Modified: dists/trunk/linux-2.6/debian/modules/gencontrol.py
==============================================================================
--- dists/trunk/linux-2.6/debian/modules/gencontrol.py	(original)
+++ dists/trunk/linux-2.6/debian/modules/gencontrol.py	Mon Sep 10 10:40:50 2007
@@ -1,4 +1,5 @@
-#!/usr/bin/env python2.4
+#!/usr/bin/env python
+
 import sys
 sys.path.append(sys.path[0] + "/../lib/python")
 import debian_linux.gencontrol

Modified: dists/trunk/linux-2.6/debian/rules.real
==============================================================================
--- dists/trunk/linux-2.6/debian/rules.real	(original)
+++ dists/trunk/linux-2.6/debian/rules.real	Mon Sep 10 10:40:50 2007
@@ -57,12 +57,12 @@
   binary-arch-flavour: install-headers_$(ARCH)_$(FEATURESET)_$(FLAVOUR)
 endif
 
-binary-indep: install-doc
-binary-indep: install-manual
-binary-indep: install-patch
-binary-indep: install-source
+#binary-indep: install-doc
+#binary-indep: install-manual
+#binary-indep: install-patch
+#binary-indep: install-source
 binary-indep: install-support
-binary-indep: install-tree
+#binary-indep: install-tree
 
 build: $(STAMPS_DIR)/build_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_$(TYPE)
 
@@ -72,7 +72,7 @@
 source-featureset: $(STAMPS_DIR)/source_$(ARCH)_$(FEATURESET)
 
 $(BUILD_DIR)/config.$(ARCH)_$(FEATURESET)_$(FLAVOUR): $(KCONFIG)
-	python2.4 debian/bin/kconfig.py '$@' $(KCONFIG)
+	python debian/bin/kconfig.py '$@' $(KCONFIG)
 
 $(BUILD_DIR)/linux-source-$(UPSTREAMVERSION).tar.bz2: SOURCE_DIR=$(BUILD_DIR)/source
 $(BUILD_DIR)/linux-source-$(UPSTREAMVERSION).tar.bz2: DIR = $(BUILD_DIR)/linux-source-$(UPSTREAMVERSION)
@@ -84,7 +84,7 @@
 	rm -rf '$(DIR)'
 
 define patch_cmd
-cd '$(DIR)'; python2.4 '$(CURDIR)/debian/bin/patch.apply' --overwrite-home='$(CURDIR)/debian/patches'
+cd '$(DIR)'; python '$(CURDIR)/debian/bin/patch.apply' --overwrite-home='$(CURDIR)/debian/patches'
 endef
 
 $(STAMPS_DIR)/source: SOURCE_FILES = $(filter-out debian, $(wildcard * .[^.]*))
@@ -151,14 +151,14 @@
 
 $(STAMPS_DIR)/build_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_kernel-package:
 	cd '$(DIR)'; $(setup_env) $(setup_env_kpkg_jobs) $(kpkg_image) build
-	python2.4 debian/bin/abicheck.py $(DIR) $(ARCH) $(FEATURESET) $(FLAVOUR)
+	python debian/bin/abicheck.py $(DIR) $(ARCH) $(FEATURESET) $(FLAVOUR)
 	touch '$@'
 
 $(STAMPS_DIR)/build_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_plain \
 $(STAMPS_DIR)/build_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_plain-s390-tape \
 $(STAMPS_DIR)/build_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_plain-xen:
 	$(MAKE_CLEAN) -C '$(DIR)' $(JOBS_ARG)
-	python2.4 debian/bin/abicheck.py $(DIR) $(ARCH) $(FEATURESET) $(FLAVOUR)
+	python debian/bin/abicheck.py $(DIR) $(ARCH) $(FEATURESET) $(FLAVOUR)
 	touch '$@'
 
 $(STAMPS_DIR)/build-doc: SOURCE_DIR=$(BUILD_DIR)/source
@@ -365,7 +365,7 @@
 	dh_clean -k -d
 	chmod a+x debian/modules/gencontrol.py
 	dh_install debian/config debian/lib debian/modules /usr/src/$(PACKAGE_NAME)
-	dh_python -V 2.4 /usr/src/$(PACKAGE_NAME)/lib/python
+	dh_pycentral /usr/src/$(PACKAGE_NAME)/lib/python
 	echo -e "[version]\nsource: $(SOURCEVERSION)\nabiname: $(ABINAME)" > $(PACKAGE_DIR)/usr/src/$(PACKAGE_NAME)/version
 	$(MAKE_SELF) install-base
 

Modified: dists/trunk/linux-2.6/debian/templates/control.main.in
==============================================================================
--- dists/trunk/linux-2.6/debian/templates/control.main.in	(original)
+++ dists/trunk/linux-2.6/debian/templates/control.main.in	Mon Sep 10 10:40:50 2007
@@ -54,7 +54,7 @@
 Architecture: all
 Section: devel
 Priority: optional
-Depends: bzip2, python2.4-minimal
+Depends: bzip2, python
 Suggests: linux-source- at version@
 Description: Debian patches to version @version@ of the Linux kernel
  This package includes the patches used to produce the prepackaged

Modified: dists/trunk/linux-2.6/debian/templates/control.source.in
==============================================================================
--- dists/trunk/linux-2.6/debian/templates/control.source.in	(original)
+++ dists/trunk/linux-2.6/debian/templates/control.source.in	Mon Sep 10 10:40:50 2007
@@ -4,5 +4,6 @@
 Maintainer: Debian Kernel Team <debian-kernel at lists.debian.org>
 Uploaders: Bastian Blank <waldi at debian.org>, Frederik Schüler <fs at debian.org>, maximilian attems <maks at debian.org>
 Standards-Version: 3.7.2.2
-Build-Depends: debhelper (>= 4.1.0), module-init-tools, dpkg-dev (>= 1.10.23), debianutils (>= 1.6), bzip2, sparc-utils [sparc], kernel-package (>= 10.063), python, python2.4-minimal
-Build-Depends-Indep: docbook-utils, findutils (>= 4.2.12), gs, transfig, xmlto
+Build-Depends: debhelper (>= 4.1.0), module-init-tools, dpkg-dev (>= 1.10.23), debianutils (>= 1.6), bzip2, sparc-utils [sparc], kernel-package (>= 10.063), python
+Build-Depends-Indep: docbook-utils, findutils (>= 4.2.12), gs, transfig, xmlto, python-central
+XS-Python-Version: current

Modified: dists/trunk/linux-2.6/debian/templates/control.support.in
==============================================================================
--- dists/trunk/linux-2.6/debian/templates/control.support.in	(original)
+++ dists/trunk/linux-2.6/debian/templates/control.support.in	Mon Sep 10 10:40:50 2007
@@ -2,7 +2,8 @@
 Architecture: all
 Section: devel
 Priority: optional
-Depends: python2.4-minimal
+Depends: ${python:Depends}
 Description: Support files for Linux @upstreamversion@
  This package provides support files for the Linux kernel build.
+XB-Python-Version: ${python:Versions}
 

Modified: dists/trunk/linux-2.6/debian/templates/patch.apply.in
==============================================================================
--- dists/trunk/linux-2.6/debian/templates/patch.apply.in	(original)
+++ dists/trunk/linux-2.6/debian/templates/patch.apply.in	Mon Sep 10 10:40:50 2007
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.4
+#!/usr/bin/env python
 
 import os, os.path, re, sys
 from warnings import warn

More information about the Kernel-svn-changes mailing list