diff options
author | joey <joey> | 1999-09-20 19:46:13 +0000 |
---|---|---|
committer | joey <joey> | 1999-09-20 19:46:13 +0000 |
commit | 7e9ba39074d0d4b1100dbce3e79320797ef3f6ee (patch) | |
tree | d9c39826da72d97fe58a4c8cb35fe855ad66b909 | |
parent | 496b6f60c8155eefe5494da494e0468b82e0226f (diff) |
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.
-rw-r--r-- | debian/changelog | 8 | ||||
-rwxr-xr-x | dh_installdocs | 23 | ||||
-rwxr-xr-x | examples/rules.multi2 | 8 |
3 files changed, 24 insertions, 15 deletions
diff --git a/debian/changelog b/debian/changelog index f98c959d..242c71a6 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 d6c11c89..a94a5142 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 0c363acf..9e6cdf42 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 |