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

Policy manual (3.6.1.1)



かねこです。

ポリシーマニュアルの 3.6.1.1 の追従です。とりあえず一通り見た
状態。3.6.1.0 からの変更は大きくありません。一応原文側の diff 
をつけておきます。

------>8------------>8------------>8------------>8------------>8
--- debian-policy-3.6.1.0/policy.sgml	Tue Aug 19 21:32:23 2003
+++ debian-policy-3.6.1.1/policy.sgml	Sat Jun 26 06:11:36 2004
@@ -157,17 +157,14 @@
 
 	<p>
 	  This manual is distributed via the Debian package
-	  <package>debian-policy</package>.
+	  <package><url name="debian-policy" id="http://packages.debian.org/debian-policy";></package>.
 	</p>
 
 	<p>
 	  The current version of this document is also available from
 	  the Debian web mirrors at
 	  <tt><url name="/doc/debian-policy/"
-		id="http://www.debian.org/doc/debian-policy/";></tt>
-	  and from the Debian archive mirrors at
-	  <tt><url name="/doc/package-developer/policy.txt.gz"
-		id="http://ftp.debian.org/debian/doc/package-developer/policy.txt.gz";></tt>.
+		id="http://www.debian.org/doc/debian-policy/";></tt>.
 	  Also available from the same directory are several other
 	  formats: <file>policy.html.tar.gz</file>, <file>policy.pdf.gz</file>
 	  and <file>policy.ps.gz</file>.
@@ -691,12 +688,12 @@
 	  <em>admin</em>, <em>base</em>, <em>comm</em>,
 	  <em>contrib</em>, <em>devel</em>, <em>doc</em>,
 	  <em>editors</em>, <em>electronics</em>, <em>embedded</em>,
-	  <em>games</em>, <em>gnome</em> <em>graphics</em>,
+	  <em>games</em>, <em>gnome</em>, <em>graphics</em>,
 	  <em>hamradio</em>, <em>interpreters</em>, <em>kde</em>,
 	  <em>libs</em>, <em>libdevel</em>, <em>mail</em>,
 	  <em>math</em>, <em>misc</em>, <em>net</em>, <em>news</em>,
 	  <em>non-US</em>, <em>non-free</em>, <em>oldlibs</em>,
-	  <em>otherosfs</em>, <em>perl</em>, <em>python</em>
+	  <em>otherosfs</em>, <em>perl</em>, <em>python</em>,
 	  <em>science</em>, <em>shells</em>,
 	  <em>sound</em>, <em>tex</em>, <em>text</em>,
 	  <em>utils</em>, <em>web</em>, <em>x11</em>.
@@ -859,11 +856,11 @@
 
 	  <p>
 	    To prevent having to use epochs for every new upstream
-	    version, the version number should be changed to the
-	    following format in such cases: "19960501", "19961224". It
-	    is up to the maintainer whether he/she wants to bother the
-	    upstream maintainer to change the version numbers upstream,
-	    too.
+	    version, the date based portion of the version number
+	    should be changed to the following format in such cases:
+	    "19960501", "19961224". It is up to the maintainer whether
+	    he/she wants to bother the upstream maintainer to change
+	    the version numbers upstream, too.
 	  </p>
 
 	  <p>
@@ -1082,10 +1079,7 @@
 	  package names can be found in the <tt>debian-policy</tt> package.
 	  It is also available from the Debian web mirrors at
 	  <tt><url name="/doc/packaging-manuals/virtual-package-names-list.txt"
-		id="http://www.debian.org/doc/packaging-manuals/virtual-package-names-list.txt";></tt>
-	  and from the Debian archive mirrors at
-	  <tt><url name="/doc/package-developer/virtual-package-names-list.txt"
-		id="http://ftp.debian.org/debian/doc/package-developer/virtual-package-names-list.txt";></tt>.
+		id="http://www.debian.org/doc/packaging-manuals/virtual-package-names-list.txt";></tt>.
 	</p>
 
 	<p>
@@ -1191,7 +1185,7 @@
 
 	<p>
 	  The package installation scripts should avoid producing
-	  output which it is unnecessary for the user to see and
+	  output which is unnecessary for the user to see and
 	  should rely on <prgn>dpkg</prgn> to stave off boredom on
 	  the part of a user installing many packages.  This means,
 	  amongst other things, using the <tt>--quiet</tt> option on
@@ -1253,10 +1247,7 @@
 	    <package>debian-policy</package> package.
 	    It is also available from the Debian web mirrors at
             <tt><url name="/doc/packaging-manuals/debconf_specification.html"
-		id="http://www.debian.org/doc/packaging-manuals/debconf_specification.html";></tt>
-	    and from the Debian archive mirrors at
-            <tt><url name="/doc/package-developer/debconf_specification.txt.gz"
-		id="http://ftp.debian.org/debian/doc/package-developer/debconf_specification.txt.gz";></tt>.
+		id="http://www.debian.org/doc/packaging-manuals/debconf_specification.html";></tt>.
 	  </p>
 
 	  <p>
@@ -1486,14 +1477,15 @@
 	</p>
 
 	<p>
-	  If you need to edit a <prgn>Makefile</prgn> where
-	  GNU-style <prgn>configure</prgn> scripts are used, you
-	  should edit the <file>.in</file> files rather than editing the
+	  If you need to edit a <prgn>Makefile</prgn> where GNU-style
+	  <prgn>configure</prgn> scripts are used, you should edit the
+	  <file>.in</file> files rather than editing the
 	  <prgn>Makefile</prgn> directly.  This allows the user to
 	  reconfigure the package if necessary.  You should
 	  <em>not</em> configure the package and edit the generated
-	  <prgn>Makefile</prgn>!  This makes it impossible for
-	  someone else to later reconfigure the package.
+	  <prgn>Makefile</prgn>!  This makes it impossible for someone
+	  else to later reconfigure the package without losing the
+	  changes you made.
 	</p>
 
       </sect>
@@ -1661,7 +1653,7 @@
 	      contact the <package>dpkg</package> maintainer to have the
 	      parser script for it included in the <prgn>dpkg</prgn>
 	      package.  (You will need to agree that the parser and its
-	      manpage may be distributed under the GNU GPL, just as the rest
+	      man page may be distributed under the GNU GPL, just as the rest
 	      of <prgn>dpkg</prgn> is.)
 	    </footnote>
 	  </p>
@@ -1989,7 +1981,7 @@
 	<p>
 	  The architectures we build on and build for are determined
 	  by <prgn>make</prgn> variables using the utility
-	  <qref id="pkg-dpkgarch"><prgn>dpkg-architecture</prgn></qref>.
+	  <qref id="pkg-dpkg-architecture"><prgn>dpkg-architecture</prgn></qref>.
 	  You can determine the
 	  Debian architecture and the GNU style architecture
 	  specification string for the build machine (the machine type
@@ -2289,6 +2281,7 @@
 	  syntax is described above, in <ref id="pkg-controlfields">.
 
 	<list compact="compact">
+	  <item><qref id="f-Format"><tt>Format</tt></qref></item>
 	  <item><qref id="f-Source"><tt>Source</tt></qref> (mandatory)</item>
 	  <item><qref id="f-Version"><tt>Version</tt></qref> (mandatory)</item>
 	  <item><qref id="f-Maintainer"><tt>Maintainer</tt></qref> (mandatory)</item>
@@ -2472,31 +2465,54 @@
 	  <heading><tt>Architecture</tt></heading>
 
 	  <p>
-	    This is the architecture string; it is a single word for
-	    the Debian architecture. The special value <tt>all</tt>
-	    indicates that the package is architecture-independent.
+	    Depending on context and the control file used, the
+	    <tt>Architecture</tt> field can include the following sets of
+	    values:
+	    <list>
+		<item>A unique single word identifying a Debian machine
+		      architecture, see <ref id="arch-spec">.
+		<item><tt>all</tt>, which indicates an
+		      architecture-independent package.
+		<item><tt>any</tt>, which indicates a package available
+		      for building on any architecture.
+		<item><tt>source</tt>, which indicates a source package.
+	    </list>
 	  </p>
 
 	  <p>
 	    In the main <file>debian/control</file> file in the source
 	    package, or in the source package control file
-	    <file>.dsc</file>, a list of architectures (separated by
-	    spaces) is also allowed, as is the special value
-	    <tt>any</tt>.  A list indicates that the source will build
-	    an architecture-dependent package, and will only work
-	    correctly on the listed architectures.  <tt>any</tt>
-	    indicates that though the source package isn't dependent
-	    on any particular architecture and should compile fine on
-	    any one, the binary package(s) produced are not
-	    architecture-independent but will instead be specific to
-	    whatever the current build architecture is.
+	    <file>.dsc</file>, one may specify a list of architectures
+	    separated by spaces, or the special values <tt>any</tt> or
+	    <tt>all</tt>.
+	  </p>
+
+	  <p>
+	    Specifying <tt>any</tt> indicates that the source package
+	    isn't dependent on any particular architecture and should
+	    compile fine on any one. The produced binary package(s)
+	    will be specific to whatever the current build architecture
+	    is.<footnote>
+		This is the most often used setting, and is recommended
+		for new packages that aren't <tt>Architecture: all</tt>.
+	    </footnote>
+	  </p>
+
+	  <p>
+	    Specifying a list of architectures indicates that the source
+	    will build an architecture-dependent package, and will only
+	    work correctly on the listed architectures.<footnote>
+		This is a setting used for a minority of cases where the
+		program is not portable. Generally, it should not be used
+		for new packages.
+	    </footnote>
 	  </p>
 
 	  <p>
-	    In a <file>.changes</file> file the <tt>Architecture</tt>
+	    In a <file>.changes</file> file, the <tt>Architecture</tt>
 	    field lists the architecture(s) of the package(s)
 	    currently being uploaded.  This will be a list; if the
-	    source for the package is being uploaded too the special
+	    source for the package is also being uploaded, the special
 	    entry <tt>source</tt> is also present.
 	  </p>
 
@@ -2527,7 +2543,7 @@
 	  <heading>Package interrelationship fields:
 	    <tt>Depends</tt>, <tt>Pre-Depends</tt>,
 	    <tt>Recommends</tt>, <tt>Suggests</tt>, <tt>Conflicts</tt>,
-	    <tt>Provides</tt>, <tt>Replaces</tt>
+	    <tt>Provides</tt>, <tt>Replaces</tt>, <tt>Enhances</tt>
 	  </heading>
 
 	  <p>
@@ -3648,10 +3664,18 @@
 
 	<p>
 	  If there is no most recently configured version
-	  <prgn>dpkg</prgn> will pass a null argument; older versions
-	  of dpkg may pass <tt>&lt;unknown&gt;</tt> (including the
-	  angle brackets) in this case.  Even older ones do not pass a
-	  second argument at all, under any circumstances.
+	  <prgn>dpkg</prgn> will pass a null argument.
+	  <footnote>
+	    <p>
+	      Historical note: Truly ancient (pre-1997) versions of
+	      <prgn>dpkg</prgn> passed <tt>&lt;unknown&gt;</tt>
+	      (including the angle brackets) in this case.  Even older
+	      ones did not pass a second argument at all, under any
+	      circumstance.  Note that upgrades using such an old dpkg
+	      version are unlikely to work for other reasons, even if
+	      this old argument behavior is handled by your postinst script.
+	    </p>
+	  </footnote>	  
 	</p>
       </sect>
 
@@ -4579,9 +4603,9 @@
 	  libraries, it must provide a <file>shlibs</file> file for other
 	  packages to use, and when a package is built which contains
 	  any shared libraries or compiled binaries, it must run
-	  <prgn>dpkg-shlibdeps</prgn> on these to determine the
-	  libraries used and hence the dependencies needed by this
-	  package.<footnote>
+	  <qref id="pkg-dpkg-shlibdeps"><prgn>dpkg-shlibdeps</prgn></qref>
+	  on these to determine the libraries used and hence the
+	  dependencies needed by this package.<footnote>
 	    <p>
 	      In the past, the shared libraries linked to were
 	      determined by calling <prgn>ldd</prgn>, but now
@@ -4635,9 +4659,9 @@
 	<p>
 	  In the following sections, we will first describe where the
 	  various <tt>shlibs</tt> files are to be found, then how to
-	  use <prgn>dpkg-shlibdeps</prgn>, and finally the
-	  <tt>shlibs</tt> file format and how to create them if your
-	  package contains a shared library.
+	  use <prgn>dpkg-shlibdeps</prgn>, and finally the <tt>shlibs</tt>
+	  file format and how to create them if your package contains a
+	  shared library.
 	</p>
 
       <sect1>
@@ -4646,8 +4670,9 @@
 	<p>
 	  There are several places where <tt>shlibs</tt> files are
 	  found.  The following list gives them in the order in which
-	  they are read by <prgn>dpkg-shlibdeps</prgn>.  (The first
-	  one which gives the required information is used.)
+	  they are read by
+	  <qref id="pkg-dpkg-shlibdeps"><prgn>dpkg-shlibdeps</prgn></qref>.
+	  (The first one which gives the required information is used.)
 	</p>
 
 	<p>
@@ -4741,10 +4766,11 @@
 	    <file>shlibs</file> files</heading>
 
 	<p>
-	  Put a call to <prgn>dpkg-shlibdeps</prgn> into your
-	  <file>debian/rules</file> file.  If your package contains only
-	  compiled binaries and libraries (but no scripts), you can
-	  use a command such as:
+	  Put a call to
+	  <qref id="pkg-dpkg-shlibdeps"><prgn>dpkg-shlibdeps</prgn></qref>
+	  into your <file>debian/rules</file> file.  If your package
+	  contains only compiled binaries and libraries (but no scripts),
+	  you can use a command such as:
 	  <example compact="compact">
 dpkg-shlibdeps debian/tmp/usr/bin/* debian/tmp/usr/sbin/* \
   debian/tmp/usr/lib/*
@@ -4779,8 +4805,12 @@
 	  compiled libraries or binaries.  In such a case, you will
 	  need to use the <tt>-T</tt> option to the <tt>dpkg</tt>
 	  utilities to specify a different <file>substvars</file> file.
-	  For more details on this and other options, see <manref
-	  name="dpkg-shlibdeps" section="1">.
+	</p>
+
+	<p>
+	  For more details on dpkg-shlibdeps, please see
+	  <ref id="pkg-dpkg-shlibdeps"> and
+	  <manref name="dpkg-shlibdeps" section="1">.
 	</p>
       </sect1>
 
@@ -5468,7 +5498,7 @@
 	    Directly managing the /etc/rc?.d links and directly
 	    invoking the <file>/etc/init.d/</file> initscripts should
 	    be done only by packages providing the initscript
-	    subsystem (such as <prgn>sysv-rct</prgn> and
+	    subsystem (such as <prgn>sysv-rc</prgn> and
 	    <prgn>file-rc</prgn>).
 	  </p>
 
@@ -5537,7 +5567,7 @@
 
 	    <p>
 	      For more information about using <tt>update-rc.d</tt>,
-	      please consult its manpage <manref name="update-rc.d"
+	      please consult its man page <manref name="update-rc.d"
 		section="8">.
 	    </p>
 	  </sect2>
@@ -5578,11 +5608,11 @@
 	      &lt;action&gt;</example> in their <prgn>postinst</prgn>
 	      and <prgn>prerm</prgn> scripts to:
 	      <example compact="compact">
-          if [ -x /usr/sbin/invoke-rc.d ] ; then
+	if command -v invoke-rc.d >/dev/null 2>&1; then
 		invoke-rc.d <var>package</var> &lt;action&gt;
-          else
-             /etc/init.d/<var>package</var> &lt;action&gt;
-          fi
+	else
+		/etc/init.d/<var>package</var> &lt;action&gt;
+	fi
 	      </example>
 	    </p>
 
@@ -5595,7 +5625,7 @@
 
 	    <p>
 	      For more information about using
-	      <prgn>invoke-rc.d</prgn>, please consult its manpage
+	      <prgn>invoke-rc.d</prgn>, please consult its man page
 	      <manref name="invoke-rc.d" section="8">.
 	    </p>
 	  </sect2>
@@ -6006,10 +6036,7 @@
 	  files in the <tt>debian-policy</tt> package.
 	  It is also available from the Debian web mirrors at
           <tt><url name="/doc/packaging-manuals/menu-policy/"
-		id="http://www.debian.org/doc/packaging-manuals/menu-policy/";></tt>
-	  and from the Debian archive mirrors at
-          <tt><url name="/doc/package-developer/menu-policy.txt.gz"
-		id="http://ftp.debian.org/debian/doc/package-developer/menu-policy.txt.gz";></tt>.
+		id="http://www.debian.org/doc/packaging-manuals/menu-policy/";></tt>.
 	</p>
 
 	<p>
@@ -6048,10 +6075,7 @@
 	  files in the <tt>debian-policy</tt> package.
 	  It is also available from the Debian web mirrors at
           <tt><url name="/doc/packaging-manuals/mime-policy/"
-		id="http://www.debian.org/doc/packaging-manuals/mime-policy/";></tt>
-	  and from the Debian archive mirrors at
-          <tt><url name="/doc/package-developer/mime-policy.txt.gz"
-		id="http://ftp.debian.org/debian/doc/package-developer/mime-policy.txt.gz";></tt>.
+		id="http://www.debian.org/doc/packaging-manuals/mime-policy/";></tt>.
 	</p>
 
       </sect>
@@ -6568,7 +6592,7 @@
 	  <prgn>csh</prgn> and <prgn>tcsh</prgn> should be avoided as
 	  scripting languages.  See <em>Csh Programming Considered
 	  Harmful</em>, one of the <tt>comp.unix.*</tt> FAQs, which
-	  can be found at <url id="http://language.perl.com/versus/csh.whynot";>.
+	  can be found at <url id="http://www.faqs.org/faqs/unix-faq/shell/csh-whynot/";>.
 	  If an upstream package comes with <prgn>csh</prgn> scripts
 	  then you must make sure that they start with
 	  <tt>#!/bin/csh</tt> and make your package depend on the
@@ -7207,7 +7231,7 @@
 	    string</em> in some place, the following format should be
 	    used: <var>arch</var>-<var>os</var><footnote>
 	      The following architectures and operating systems are
-	      currently recognised by <prgn>dpkg-archictecture</prgn>.
+	      currently recognised by <prgn>dpkg-architecture</prgn>.
 	      The architecture, <tt><var>arch</var></tt>, is one of
 	      the following: <tt>alpha</tt>, <tt>arm</tt>,
 	      <tt>hppa</tt>, <tt>i386</tt>, <tt>ia64</tt>,
@@ -7683,7 +7707,7 @@
 
               <item>
                   If the window manager complies with <url
-		    id="http://www.freedesktop.org/standards/wm-spec.html";
+		    id="http://www.freedesktop.org/Standards/wm-spec";
 		    name="The Window Manager Specification Project">,
                   written by the <url id="http://www.freedesktop.org/";
 		    name="Free Desktop Group">, add 40 points.
@@ -8040,10 +8064,7 @@
 	  files in the <tt>debian-policy</tt> package.
 	  It is also available from the Debian web mirrors at
           <tt><url name="/doc/packaging-manuals/perl-policy/"
-		id="http://www.debian.org/doc/packaging-manuals/perl-policy/";></tt>
-	  and from the Debian archive mirrors at
-          <tt><url name="/doc/package-developer/perl-policy.txt.gz"
-		id="http://ftp.debian.org/debian/doc/package-developer/perl-policy.txt.gz";></tt>.
+		id="http://www.debian.org/doc/packaging-manuals/perl-policy/";></tt>.
 	</p>
       </sect>
 
@@ -8140,7 +8161,7 @@
           and should be reported to the Debian Bug Tracking System (the
           maintainer of the package is allowed to write this bug report
           themselves, if they so desire).  Do not close the bug report
-          until a proper manpage is available.<footnote>
+          until a proper man page is available.<footnote>
               It is not very hard to write a man page. See the
 	      <url id="http://www.schweikhardt.net/man_page_howto.html";
 		name="Man-Page-HOWTO">,
@@ -8152,10 +8173,10 @@
 	</p>
 
 	<p>
-	  You may forward a complaint about a missing manpage to the
+	  You may forward a complaint about a missing man page to the
 	  upstream authors, and mark the bug as forwarded in the
 	  Debian bug tracking system.  Even though the GNU Project do
-	  not in general consider the lack of a manpage to be a bug,
+	  not in general consider the lack of a man page to be a bug,
 	  we do; if they tell you that they don't consider it a bug
 	  you should leave the bug in our bug tracking system open
 	  anyway.
@@ -8166,21 +8187,21 @@
         </p>
 
 	<p>
-	  If one manpage needs to be accessible via several names it
+	  If one man page needs to be accessible via several names it
 	  is better to use a symbolic link than the <file>.so</file>
 	  feature, but there is no need to fiddle with the relevant
 	  parts of the upstream source to change from <file>.so</file> to
 	  symlinks: don't do it unless it's easy.  You should not
 	  create hard links in the manual page directories, nor put
 	  absolute filenames in <file>.so</file> directives.  The filename
-	  in a <file>.so</file> in a manpage should be relative to the
-	  base of the manpage tree (usually
+	  in a <file>.so</file> in a man page should be relative to the
+	  base of the man page tree (usually
 	  <file>/usr/share/man</file>). If you do not create any links
 	  (whether symlinks, hard links, or <tt>.so</tt> directives)
-	  in the filesystem to the alternate names of the manpage,
+	  in the filesystem to the alternate names of the man page,
 	  then you should not rely on <prgn>man</prgn> finding your
-	  manpage under those names based solely on the information in
-	  the manpage's header.<footnote>
+	  man page under those names based solely on the information in
+	  the man page's header.<footnote>
 	      Supporting this in <prgn>man</prgn> often requires
 	      unreasonable processing time to find a manual page or to
 	      report that none exists, and moves knowledge into man's
@@ -8512,7 +8533,7 @@
 	This manual does not go into detail about the options and
 	usage of the package building and installation tools.  It
 	should therefore be read in conjuction with those programs'
-	manpages.
+	man pages.
       </p>
 
       <p>
@@ -8520,7 +8541,7 @@
 	for managing various system configuration and similar issues,
 	such as <prgn>update-rc.d</prgn> and
 	<prgn>install-info</prgn>, are not described in detail here -
-	please see their manpages.
+	please see their man pages.
       </p>
 
       <p>
@@ -8558,7 +8579,7 @@
 	In the future binary packages may also contain other
 	components, such as checksums and digital signatures. The
 	format for the archive is described in full in the
-	<file>deb(5)</file> manpage.
+	<file>deb(5)</file> man page.
       </p>
 
 
@@ -8629,7 +8650,7 @@
 	</p>
 
 	<p>
-	  See the manpage <manref name="dpkg-deb" section="8"> for details of how
+	  See the man page <manref name="dpkg-deb" section="8"> for details of how
 	  to examine the contents of this newly-created file.  You may find the
 	  output of following commands enlightening:
 	  <example>
@@ -8639,7 +8660,7 @@
 	  </example>
 	  To view the copyright file for a package you could use this command:
 	  <example>
-  dpkg --fsys-tarfile <var>filename</var>.deb | tar xof usr/share/doc/<var>\*</var>copyright | less
+  dpkg --fsys-tarfile <var>filename</var>.deb | tar xO ./usr/share/doc/\*/copyright | pager
 	  </example>
 	</p>
       </sect>
@@ -8807,7 +8828,7 @@
 	  package.
 	</p>
 
-	<sect1>
+	<sect1 id="pkg-dpkg-source">
 	  <heading>
 	    <prgn>dpkg-source</prgn> - packs and unpacks Debian source
 	    packages
@@ -8856,7 +8877,7 @@
 	</sect1>
 
 
-	<sect1>
+	<sect1 id="pkg-dpkg-buildpackage">
 	  <heading>
 	    <prgn>dpkg-buildpackage</prgn> - overall package-building
 	    control script
@@ -8867,8 +8888,8 @@
 	    <prgn>dpkg-source</prgn>, the <file>debian/rules</file>
 	    targets <tt>clean</tt>, <tt>build</tt> and
 	    <tt>binary</tt>, <prgn>dpkg-genchanges</prgn> and
-	    <prgn>pgp</prgn> to build a signed source and binary
-	    package upload.
+	    <prgn>gpg</prgn> (or <prgn>pgp</prgn>) to build a signed
+	    source and binary package upload.
 	  </p>
 
 	  <p>
@@ -8879,16 +8900,16 @@
 	      <tag><tt>-uc</tt>, <tt>-us</tt></tag>
 	      <item>
 		<p>
-		  Do not PGP-sign the <tt>.changes</tt> file or the
+		  Do not sign the <tt>.changes</tt> file or the
 		  source package <tt>.dsc</tt> file, respectively.</p>
 	      </item>
-	      <tag><tt>-p<var>pgp-command</var></tt></tag>
+	      <tag><tt>-p<var>sign-command</var></tt></tag>
 	      <item>
 		<p>
-		  Invoke <var>pgp-command</var> instead of finding
-		  <tt>pgp</tt> on the <prgn>PATH</prgn>.
-		  <var>pgp-command</var> must behave just like
-		  <prgn>pgp</prgn>.</p>
+		  Invoke <var>sign-command</var> instead of finding
+		  <tt>gpg</tt> or <tt>pgp</tt> on the <prgn>PATH</prgn>.
+		  <var>sign-command</var> must behave just like
+		  <prgn>gpg</prgn> or <tt>pgp</tt>.</p>
 	      </item>
 	      <tag><tt>-r<var>root-command</var></tt></tag>
 	      <item>
@@ -8915,7 +8936,7 @@
 	  </p>
 	</sect1>
 
-	<sect1>
+	<sect1 id="pkg-dpkg-gencontrol">
 	  <heading>
 	    <prgn>dpkg-gencontrol</prgn> - generates binary package
 	    control files
@@ -8978,7 +8999,7 @@
 	    <prgn>dpkg-genchanges</prgn>.</p>
 	</sect1>
 
-	<sect1>
+	<sect1 id="pkg-dpkg-shlibdeps">
 	  <heading>
 	    <prgn>dpkg-shlibdeps</prgn> - calculates shared library
 	    dependencies
@@ -9028,19 +9049,24 @@
 	  </p>
 
 	  <p>
-	    For example, the <prgn>procps</prgn> package generates two
-	    kinds of binaries, simple C binaries like <prgn>ps</prgn>
-	    which require a predependency and full-screen ncurses
-	    binaries like <prgn>top</prgn> which require only a
-	    recommendation.  It can say in its <file>debian/rules</file>:
+	    For example, a package that generates an essential part
+	    which requires dependencies, and optional parts that 
+	    which only require a recommendation, would separate those
+	    two sets of dependencies into two different fields.<footnote>
+		At the time of writing, an example for this was the
+		<package/xmms/ package, with Depends used for the xmms
+		executable, Recommends for the plug-ins and Suggests for
+		even more optional features provided by unzip.
+	    </footnote>
+            It can say in its <file>debian/rules</file>:
 	    <example>
-  dpkg-shlibdeps -dPre-Depends ps -dRecommends top
+  dpkg-shlibdeps -dDepends <var>program anotherprogram ...</var> \
+                 -dRecommends <var>optionalpart anotheroptionalpart</var>
 	    </example>
 	    and then in its main control file <file>debian/control</file>:
 	    <example>
   <var>...</var>
-  Package: procps
-  Pre-Depends: ${shlibs:Pre-Depends}
+  Depends: ${shlibs:Pre-Depends}
   Recommends: ${shlibs:Recommends}
   <var>...</var>
 	    </example>
@@ -9061,7 +9087,7 @@
 	</sect1>
 
 
-	<sect1>
+	<sect1 id="pkg-dpkg-distaddfile">
 	  <heading>
 	    <prgn>dpkg-distaddfile</prgn> - adds a file to
 	    <file>debian/files</file>
@@ -9100,8 +9126,10 @@
 	</sect1>
 
 
-	<sect1><heading><prgn>dpkg-genchanges</prgn> - generates a <file>.changes</file> upload
-	    control file
+	<sect1 id="pkg-dpkg-genchanges">
+	  <heading>
+	    <prgn>dpkg-genchanges</prgn> - generates a <file>.changes</file>
+	    upload control file
 	  </heading>
 
 	  <p>
@@ -9122,8 +9150,10 @@
 	</sect1>
 
 
-	<sect1><heading><prgn>dpkg-parsechangelog</prgn> - produces parsed representation of
-	    a changelog
+	<sect1 id="pkg-dpkg-parsechangelog">
+          <heading>
+            <prgn>dpkg-parsechangelog</prgn> - produces parsed
+	    representation of a changelog
 	  </heading>
 
 	  <p>
@@ -9136,8 +9166,10 @@
 	  </p>
 	</sect1>
 
-        <sect1 id="pkg-dpkgarch"><heading><prgn>dpkg-architecture</prgn> -
-	    information about the build and host system
+        <sect1 id="pkg-dpkg-architecture">
+	  <heading>
+	    <prgn>dpkg-architecture</prgn> - information about the build and
+	    host system
           </heading>
 
           <p>
@@ -9403,15 +9435,11 @@
 	    </tag>
 
 	    <item>
-
 	      <p>
 		This is a compressed (with <tt>gzip -9</tt>)
 		<prgn>tar</prgn> file containing the source code from
-		the upstream authors of the program.  The tarfile
-		unpacks into a directory
-		<file><var>package</var>-<var>upstream-version</var>.orig</file>,
-		and does not contain files anywhere other than in
-		there or in its subdirectories.</p>
+		the upstream authors of the program.
+	      </p>
 	    </item>
 
 	    <tag>
@@ -9445,7 +9473,7 @@
 		automatically make the <file>debian/rules</file> file
 		executable (see below).</p></item>
 	  </taglist>
-
+	</p>
 
 	<p>
 	  If there is no original source code - for example, if the
@@ -9453,8 +9481,8 @@
 	  maintainer is the same as the upstream maintainer - the
 	  format is slightly different: then there is no diff, and the
 	  tarfile is named
-	  <file><var>package</var>_<var>version</var>.tar.gz</file> and
-	  contains a directory
+	  <file><var>package</var>_<var>version</var>.tar.gz</file>,
+	  and preferably contains a directory named
 	  <file><var>package</var>-<var>version</var></file>.
 	</p>
       </sect>
@@ -9897,7 +9925,7 @@
       </p>
 
       <p>
-	See the manpage <manref name="update-alternatives"
+	See the man page <manref name="update-alternatives"
 	section="8"> for details.
       </p>
 
------>8------------>8------------>8------------>8------------>8

Attachment: %policy.sgml.gz
Description: application/applefile

Attachment: policy.sgml.gz
Description: Binary data

-- 
Seiji Kaneko                         skaneko@xxxxxxxxxxxx
---------------------------------------------------------