On Mon, Jul 22, 2002 at 12:02:56PM +0200, Santiago Vila wrote:
> diff -r -u debian-policy-3.5.6.1.orig/policy.sgml 
> debian-policy-3.5.6.1/policy.sgml
> --- debian-policy-3.5.6.1.orig/policy.sgml    Thu Mar 14 19:17:48 2002
> +++ debian-policy-3.5.6.1/policy.sgml Mon Jul 22 11:19:58 2002
> @@ -7383,48 +7383,6 @@
> 
>        </sect>
> 
> -      <sect id="usrdoc">
> -     <heading>Accessing the documentation</heading>
> -
> -     <p>
> -       Former Debian releases placed all additional documentation
> -       in <tt>/usr/doc/<var>package</var></tt>.  To realize a
> -       smooth migration to
> -       <tt>/usr/share/doc/<var>package</var></tt>, each package
> -       must maintain a symlink <tt>/usr/doc/<var>package</var></tt>
> -       that points to the new location of its documentation in
> -       <tt>/usr/share/doc/<var>package</var></tt><footnote>These
> -           symlinks will be removed in the future, but they have to be
> -           there for compatibility reasons until all packages have
> -           moved and the policy is changed accordingly.</footnote>.
> -       The symlink must be created when the package is installed;
> -       it cannot be contained in the package itself due to problems
> -       with <prgn>dpkg</prgn>. One reasonable way to accomplish
> -       this is to put the following in the package's
> -       <prgn>postinst</prgn><footnote>
> -         <p>
> -           The <tt>debhelper</tt> script
> -           <prgn>dh_installdocs</prgn> does this automatically.
> -         </p>
> -       </footnote>:
> -          <example compact="compact">
> -if [ "$1" = "configure" ]; then
> -  if [ -d /usr/doc -a ! -e /usr/doc/<var>package</var> \
> -       -a -d /usr/share/doc/<var>package</var> ]; then
> -    ln -sf ../share/doc/<var>package</var> /usr/doc/<var>package</var>
> -  fi
> -fi
> -          </example>
> -          and the following in the package's <prgn>prerm</prgn>:
> -          <example compact="compact">
> -if [ \( "$1" = "upgrade" -o "$1" = "remove" \) \
> -     -a -L /usr/doc/<var>package</var> ]; then
> -  rm -f /usr/doc/<var>package</var>
> -fi
> -          </example>
> -     </p>
> -      </sect>
> -
>        <sect>
>       <heading>Preferred documentation formats</heading>
> 

Seconded. I believe this is consistent with the original proposal
approved by the TC.

-- 
Colin Watson                                  [EMAIL PROTECTED]

Attachment: pgpFEElmFbhKZ.pgp
Description: PGP signature

Reply via email to