From: joey <joey>
Date: Mon, 20 Sep 1999 19:46:13 +0000 (+0000)
Subject: r281:    * dh_installdocs: create the compatability symlink before calling
X-Git-Tag: version_2.0.101~317
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=7e9ba39074d0d4b1100dbce3e79320797ef3f6ee;p=debhelper.git

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 f98c959..242c71a 100644
--- 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 d6c11c8..a94a514 100755
--- 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 0c363ac..9e6cdf4 100755
--- 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