dh: Avoid running install sequence a third time in v9 when the rules file has explici...

[debhelper.git] / dh

diff --git a/dh b/dh
index 8538024407dfa511d4a2faa0301c06bc53877aec..dff7f25d4ae438b02e6f9358c380114b085c4b70 100755 (executable)
--- a/dh
+++ b/dh
@@ -123,14 +123,6 @@ after a particular debhelper command is run.
                dh_fixperms
                chmod 4755 debian/foo/usr/bin/foo
 
-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 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
 at build time, you can use some commands provided in B<autotools-dev>
@@ -140,6 +132,14 @@ that automate it, like this.
        %:
                dh $@ --with autotools_dev
 
+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 python2
+
 Here is how to force use of Perl's B<Module::Build> build system,
 which can be necessary if debhelper wrongly detects that the package
 uses MakeMaker.
@@ -418,7 +418,7 @@ if (! compat(8)) {
        $sequences{build} = [@bd_minimal, rules("build-arch"), rules("build-indep")];
        $sequences{'install-indep'} = [rules("build-indep"), @i];
        $sequences{'install-arch'} = [rules("build-arch"), @i];
-       $sequences{'install'} = [rules("build"), rules("install-arch"), rules("install-indep"), @i];
+       $sequences{'install'} = [rules("build"), rules("install-arch"), rules("install-indep")];
        $sequences{'binary-indep'} = [rules("install-indep"), @b];
        $sequences{'binary-arch'} = [rules("install-arch"), @ba, @b];
        $sequences{binary} = [rules("install"), rules("binary-arch"), rules("binary-indep")];