X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=dh;h=f77e5944c641c09f42a32fcd6675b1e4b256a72d;hb=047394511b43087914a8f4e1e056da29e451ce83;hp=aba8c270efb29d8bc9c4ebbcec67e14775d63b58;hpb=f24df6415586bd07fb5903fba3252495c4e5c065;p=debhelper.git

diff --git a/dh b/dh
index aba8c27..f77e594 100755
--- a/dh
+++ b/dh
@@ -162,12 +162,13 @@ after a particular debhelper command is run.
 		dh_fixperms
 		chmod 4755 debian/foo/usr/bin/foo
 
-If your package is a Python package, B<dh> will use B<dh_pysupport> by
-default. This is how to use B<dh_pycentral> instead.
+Python tools are not run by dh by default, due to the continual change
+in that area. (Before compatability level v9, dh does run B<dh_pysupport>.)
+Here is how to use B<dh_python2>.
 
 	#!/usr/bin/make -f
 	%:
-		dh $@ --with python-central
+		dh $@ --with python2
 
 If your package uses autotools and you want to freshen F<config.sub> and
 F<config.guess> with newer versions from the B<autotools-dev> package
@@ -258,8 +259,8 @@ B<build-indep>.
 Note that in the example above, dh will arrange for "debian/rules build"
 to call your build-indep and build-arch targets. You do not need to
 explicitly define the dependencies in the rules file when using dh with
-compatability level v9. This example would be more complicated with
-earlier compatability levels.
+compatibility level v9. This example would be more complicated with
+earlier compatibility levels.
 
 =head1 INTERNALS
 
@@ -291,9 +292,11 @@ might suggest, is subject to change at any time.
 # Stash this away before init modifies it.
 my @ARGV_orig=@ARGV;
 
-# python-support is enabled by default, at least for now
-# (and comes first so python-central loads later and can disable it).
-unshift @ARGV, "--with=python-support";
+if (compat(8)) {
+	# python-support was enabled by default before v9.
+	# (and comes first so python-central loads later and can disable it).
+	unshift @ARGV, "--with=python-support";
+}
 		
 init(options => {
 		"until=s" => \$dh{UNTIL},
@@ -332,7 +335,7 @@ my $sequence;
 if (! compat(7)) {
 	# From v8, the sequence is the very first parameter.
 	$sequence=shift @ARGV_orig;
-	if ($sequence=~/^-/) {
+	if (defined $sequence && $sequence=~/^-/) {
 		error "Unknown sequence $sequence (options should not come before the sequence)";
 	}
 }