r281: * dh_installdocs: create the compatability symlink before calling

     install-docs. I'm told this is better in some cases. (Closes: #45608)
   * examples/rules.multi2: clarified what you have to comment/uncomment.

diff --git a/debian/changelog b/debian/changelog
index f98c959de642b66240e277e3ecae119f99f83e98..242c71a6e95bf304250d68792d7030eff5efd7b0 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+debhelper (2.0.51) unstable; urgency=low
+
+  * dh_installdocs: create the compatability symlink before calling
+    install-docs. I'm told this is better in some cases. (Closes: #45608)
+  * examples/rules.multi2: clarified what you have to comment/uncomment.
+
+ -- Joey Hess <joeyh@master.debian.org>  Mon, 20 Sep 1999 12:43:09 -0700
+
 debhelper (2.0.50) unstable; urgency=medium
 
   * Oops. Fixed dh_shlibdeps so it actually generates dependancies, broke in

diff --git a/dh_installdocs b/dh_installdocs
index d6c11c896ddcbe6d806328fc17610cbd670d27b7..a94a514253e30ec98dfecc363f0d8053e1b9b0ad 100755 (executable)
--- a/dh_installdocs
+++ b/dh_installdocs
@@ -66,7 +66,17 @@ foreach $PACKAGE (@{$dh{DOPACKAGES}}) {
                        doit("install","-m","644","-p",$copyright,
                                "$TMP/usr/share/doc/$PACKAGE/copyright");
        }
-       
+
+       # Add in the /usr/doc compatability symlinks code.
+       if (! $dh{NOSCRIPTS}) {
+               autoscript($PACKAGE,"postinst","postinst-doc",
+                       "s/#PACKAGE#/$PACKAGE/g",
+               );
+               autoscript($PACKAGE,"prerm","prerm-doc",
+                       "s/#PACKAGE#/$PACKAGE/g",
+               );
+       }
+
        # Handle doc-base files. There are two filename formats, the usual
        # plus an extended format (debian/package.*).
        my %doc_ids;
@@ -109,15 +119,4 @@ foreach $PACKAGE (@{$dh{DOPACKAGES}}) {
                        );
                }
        }
-
-
-       # Add in the /usr/doc compatability symlinks code.
-       if (! $dh{NOSCRIPTS}) {
-               autoscript($PACKAGE,"postinst","postinst-doc",
-                       "s/#PACKAGE#/$PACKAGE/g",
-               );
-               autoscript($PACKAGE,"prerm","prerm-doc",
-                       "s/#PACKAGE#/$PACKAGE/g",
-               );
-       }
 }

diff --git a/examples/rules.multi2 b/examples/rules.multi2
index 0c363acff3662565c1ec45688e76098b711596bf..9e6cdf421123cdfd5c24fd29ce4006aa66f76e69 100755 (executable)
--- a/examples/rules.multi2
+++ b/examples/rules.multi2
@@ -80,9 +80,11 @@ binary-common:
        dh_builddeb
 
 # Build architecture independant packages using the common target.
-# (Comment this out if you have none to build.)
-binary-indep: DH_OPTIONS=-i
-binary-indep: build install binary-common
+# (Uncomment the next two lines and comment out the third if you have
+# such packages)
+#binary-indep: DH_OPTIONS=-i
+#binary-indep: build install binary-common
+binary-indep:
 
 # Build architecture dependant packages using the common target.
 binary-arch: DH_OPTIONS=-a