From f4819fe26fcb7eddb167e3c808bd3b8f403ea0af Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Fri, 8 Jul 2011 01:07:49 +0000 Subject: [PATCH] linux-support, linux-tools: Use dh_python2 instead of dh_pysupport svn path=/dists/trunk/linux-2.6/; revision=17820 --- debian/changelog | 3 +++ debian/rules.real | 4 ++-- debian/templates/control.source.in | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 952245655..54e0fe4c1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,9 @@ linux-2.6 (3.0.0~rc6-1~experimental.2) UNRELEASED; urgency=low * [x86_32] enable modular XO15_EBOOK. * ALSA: hda - Enable auto-parser as default for Conexant codecs. + [ Ben Hutchings ] + * linux-support, linux-tools: Use dh_python2 instead of dh_pysupport + -- maximilian attems Tue, 05 Jul 2011 14:25:29 +0200 linux-2.6 (3.0.0~rc6-1~experimental.1) experimental; urgency=low diff --git a/debian/rules.real b/debian/rules.real index 7434fe373..110f6e38a 100644 --- a/debian/rules.real +++ b/debian/rules.real @@ -322,7 +322,7 @@ install-support: cp debian/lib/python/debian_linux/*.py $(PACKAGE_DIR)$(PACKAGE_ROOT)/lib/python/debian_linux cp debian/modules/* $(PACKAGE_DIR)$(PACKAGE_ROOT)/modules chmod a+x $(PACKAGE_DIR)$(PACKAGE_ROOT)/modules/gencontrol.py - dh_pysupport + dh_python2 dh_link $(PACKAGE_ROOT) /usr/src/$(PACKAGE_NAME) +$(MAKE_SELF) install-base @@ -505,7 +505,7 @@ install-tools_$(ARCH): $(STAMPS_DIR)/build-tools_$(ARCH) sed -i '/^\.SH "SEE ALSO"/,/^\.SH/ { s/perf-/perf_$(VERSION)-/g }' \ $(PACKAGE_DIR)/usr/share/man/*/* dh_perl /usr/share/perf_$(VERSION)-core/scripts/perl/Perf-Trace-Util/lib/ - dh_pysupport /usr/share/perf_$(VERSION)-core/scripts/python/Perf-Trace-Util/lib/ + dh_python2 /usr/share/perf_$(VERSION)-core/scripts/python/Perf-Trace-Util/lib/ +$(MAKE_SELF) install-base install-patch: PACKAGE = linux-patch-debian-$(VERSION) diff --git a/debian/templates/control.source.in b/debian/templates/control.source.in index ee2999843..60c84c944 100644 --- a/debian/templates/control.source.in +++ b/debian/templates/control.source.in @@ -3,7 +3,7 @@ Priority: optional Maintainer: Debian Kernel Team Uploaders: Bastian Blank , Frederik Schüler , maximilian attems , Ben Hutchings Standards-Version: 3.9.2 -Build-Depends: debhelper (>> 7), cpio, module-init-tools, python, lzma [armel], libelf-dev, libdw-dev, binutils-dev, asciidoc, xmlto, libperl-dev, python-dev, libnewt-dev, python-support +Build-Depends: debhelper (>> 7), cpio, module-init-tools, python (>= 2.6.6-3~), lzma [armel], libelf-dev, libdw-dev, binutils-dev, asciidoc, xmlto, libperl-dev, python-dev, libnewt-dev Build-Depends-Indep: bzip2 Vcs-Svn: svn://svn.debian.org/svn/kernel/dists/sid/linux-2.6/ Vcs-Browser: http://svn.debian.org/wsvn/kernel/dists/sid/linux-2.6/?op=log