From d266b58f74db565e4298f6e5d39ed3da43d9a0f9 Mon Sep 17 00:00:00 2001 From: Bastian Blank Date: Mon, 10 Sep 2007 10:40:50 +0000 Subject: [PATCH] * 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. svn path=/dists/trunk/linux-2.6/; revision=9485 --- debian/bin/abicheck.py | 2 +- debian/bin/abiupdate.py | 2 +- debian/bin/gencontrol.py | 3 ++- debian/bin/kconfig.py | 2 +- debian/modules/gencontrol.py | 3 ++- debian/rules.real | 20 ++++++++++---------- debian/templates/control.main.in | 2 +- debian/templates/control.source.in | 5 +++-- debian/templates/control.support.in | 3 ++- debian/templates/patch.apply.in | 2 +- 10 files changed, 24 insertions(+), 20 deletions(-) diff --git a/debian/bin/abicheck.py b/debian/bin/abicheck.py index 5bbe017e2..3ea8f2af6 100755 --- a/debian/bin/abicheck.py +++ b/debian/bin/abicheck.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2.4 +#!/usr/bin/env python import sys from debian_linux.abi import * diff --git a/debian/bin/abiupdate.py b/debian/bin/abiupdate.py index e1aac4a7a..7e8a0e06e 100755 --- a/debian/bin/abiupdate.py +++ b/debian/bin/abiupdate.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2.4 +#!/usr/bin/env python import sys sys.path.append(sys.path[0] + "/../lib/python") diff --git a/debian/bin/gencontrol.py b/debian/bin/gencontrol.py index 3d3d844d6..9bb07f345 100755 --- a/debian/bin/gencontrol.py +++ b/debian/bin/gencontrol.py @@ -1,4 +1,5 @@ -#!/usr/bin/env python2.4 +#!/usr/bin/env python + import os, sys sys.path.append("debian/lib/python") diff --git a/debian/bin/kconfig.py b/debian/bin/kconfig.py index 0e189d7e0..a8fee4946 100755 --- a/debian/bin/kconfig.py +++ b/debian/bin/kconfig.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2.4 +#!/usr/bin/env python import optparse, os.path, sys from debian_linux.kconfig import * diff --git a/debian/modules/gencontrol.py b/debian/modules/gencontrol.py index df8b9d5e7..38cf90b09 100755 --- a/debian/modules/gencontrol.py +++ b/debian/modules/gencontrol.py @@ -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 diff --git a/debian/rules.real b/debian/rules.real index 48b68fcbf..518be41f3 100644 --- a/debian/rules.real +++ b/debian/rules.real @@ -57,12 +57,12 @@ ifeq ($(MODULES),True) 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-arch: $(STAMPS_DIR)/source 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 @@ $(BUILD_DIR)/linux-source-$(UPSTREAMVERSION).tar.bz2: $(STAMPS_DIR)/source 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)_$(TYPE): $(STAMPS_DIR)/setu $(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 @@ install-support: 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 diff --git a/debian/templates/control.main.in b/debian/templates/control.main.in index 2aeab84e1..663a4c86c 100644 --- a/debian/templates/control.main.in +++ b/debian/templates/control.main.in @@ -54,7 +54,7 @@ Package: linux-patch-debian-@version@ Architecture: all Section: devel Priority: optional -Depends: bzip2, python2.4-minimal +Depends: bzip2, python Suggests: linux-source-@version@ Description: Debian patches to version @version@ of the Linux kernel This package includes the patches used to produce the prepackaged diff --git a/debian/templates/control.source.in b/debian/templates/control.source.in index ca8917732..13272aa6d 100644 --- a/debian/templates/control.source.in +++ b/debian/templates/control.source.in @@ -4,5 +4,6 @@ Priority: optional Maintainer: Debian Kernel Team Uploaders: Bastian Blank , Frederik Schüler , maximilian attems 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 diff --git a/debian/templates/control.support.in b/debian/templates/control.support.in index b9463712b..188ffe2fc 100644 --- a/debian/templates/control.support.in +++ b/debian/templates/control.support.in @@ -2,7 +2,8 @@ Package: linux-support-@upstreamversion@@abiname@ 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} diff --git a/debian/templates/patch.apply.in b/debian/templates/patch.apply.in index 81453c8eb..affd94a19 100644 --- a/debian/templates/patch.apply.in +++ b/debian/templates/patch.apply.in @@ -1,4 +1,4 @@ -#!/usr/bin/env python2.4 +#!/usr/bin/env python import os, os.path, re, sys from warnings import warn