[kernel] r17820 - in dists/trunk/linux-2.6/debian: . templates

[Ben Hutchings]

Author: benh
Date: Fri Jul  8 01:07:49 2011
New Revision: 17820

Log:
linux-support, linux-tools: Use dh_python2 instead of dh_pysupport

Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/rules.real
   dists/trunk/linux-2.6/debian/templates/control.source.in

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	Wed Jul  6 21:22:25 2011	(r17819)
+++ dists/trunk/linux-2.6/debian/changelog	Fri Jul  8 01:07:49 2011	(r17820)
@@ -8,6 +8,9 @@
   * [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 <maks at debian.org>  Tue, 05 Jul 2011 14:25:29 +0200
 
 linux-2.6 (3.0.0~rc6-1~experimental.1) experimental; urgency=low

Modified: dists/trunk/linux-2.6/debian/rules.real
==============================================================================
--- dists/trunk/linux-2.6/debian/rules.real	Wed Jul  6 21:22:25 2011	(r17819)
+++ dists/trunk/linux-2.6/debian/rules.real	Fri Jul  8 01:07:49 2011	(r17820)
@@ -322,7 +322,7 @@
 	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 @@
 	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)

Modified: dists/trunk/linux-2.6/debian/templates/control.source.in
==============================================================================
--- dists/trunk/linux-2.6/debian/templates/control.source.in	Wed Jul  6 21:22:25 2011	(r17819)
+++ dists/trunk/linux-2.6/debian/templates/control.source.in	Fri Jul  8 01:07:49 2011	(r17820)
@@ -3,7 +3,7 @@
 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>, Ben Hutchings <ben at decadent.org.uk>
 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