[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Re: /usr/doc link



On Mon, Aug 19, 2002 at 02:39:00PM -0400, Joey Hess wrote:
> Henrique de Moraes Holschuh wrote:
> > On Mon, 19 Aug 2002, Oliver Elphick wrote:
> > > Are we still supposed to maintain the /usr/share/doc/x -> /usr/doc/x
> > > link for uploads to sarge?
> > 
> > No.
> 
> Of course policy still says we must. I don't know when we want to change
> that; now or when a lot of packages have stopped including it, or what.

Why wait? It's not like we'll be adding a requirement for every
package to drop it (at least, not right away).

--- policy.sgml.old	2002-08-19 22:47:16.000000000 +0100
+++ policy.sgml	2002-08-19 22:51:21.000000000 +0100
@@ -7391,37 +7391,10 @@
 	  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>
+          added a symlink <tt>/usr/doc/<var>package</var></tt>
+	  that pointed to the new location of its documentation in
+	  <tt>/usr/share/doc/<var>package</var></tt>. This is no
+          longer necessary, and packages may now remove the symlinks.
 	</p>
       </sect>



-- 
  .''`.  ** Debian GNU/Linux ** | Andrew Suffield
 : :' :  http://www.debian.org/ | Dept. of Computing,
 `. `'                          | Imperial College,
   `-             -><-          | London, UK

Attachment: pgpQ2YbWOnfBq.pgp
Description: PGP signature


Reply to: