X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=policy.sgml;h=b27aecf52b9fa482cbaac628d4d835594c68517c;hb=0371de0c0aee5687e571260faf6298c2b5c7104f;hp=50c0289fa7f2d682cbc40d7e5bb50c85a937323a;hpb=5da78a06d531b211ab83cc50f7e988a4f559be5b;p=debian%2Fdebian-policy.git

diff --git a/policy.sgml b/policy.sgml
index 50c0289..b27aecf 100644
--- a/policy.sgml
+++ b/policy.sgml
@@ -1330,9 +1330,9 @@ zope.
 	  The package installation scripts should avoid producing
 	  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
-	  <prgn>install-info</prgn>.
+	  the part of a user installing many packages. This means,
+	  amongst other things, not passing the <tt>--verbose</tt>
+	  option to <prgn>update-alternatives</prgn>.
 	</p>
 
 	<p>
@@ -1916,7 +1916,8 @@ zope.
 	<p>
 	  The following targets are required and must be implemented
 	  by <file>debian/rules</file>: <tt>clean</tt>, <tt>binary</tt>,
-	  <tt>binary-arch</tt>, <tt>binary-indep</tt>, and <tt>build</tt>.
+	  <tt>binary-arch</tt>, <tt>binary-indep</tt>, <tt>build</tt>,
+	  <tt>build-arch</tt> and <tt>build-indep</tt>.
 	  These are the targets called by <prgn>dpkg-buildpackage</prgn>.
 	</p>
 
@@ -3969,8 +3970,7 @@ Checksums-Sha256:
 	  Programs called from maintainer scripts should not normally
 	  have a path prepended to them. Before installation is
 	  started, the package management system checks to see if the
-	  programs <prgn>ldconfig</prgn>,
-	  <prgn>start-stop-daemon</prgn>, <prgn>install-info</prgn>,
+	  programs <prgn>ldconfig</prgn>, <prgn>start-stop-daemon</prgn>,
 	  and <prgn>update-rc.d</prgn> can be found via the
 	  <tt>PATH</tt> environment variable. Those programs, and any
 	  other program that one would expect to be in the
@@ -4370,7 +4370,7 @@ fi
 		  <item>
 		      Otherwise, if the package had some configuration
 		      files from a previous version installed (i.e., it
-		      is in the "configuration files only" state):
+		      is in the "Config-Files" state):
 		      <example compact="compact">
 <var>new-preinst</var> install <var>old-version</var>
 		      </example>
@@ -4395,7 +4395,7 @@ fi
                       If the error-unwind fails, the package is in a
                       "Half-Installed" phase, and requires a
                       reinstall. If the error unwind works, the
-                      package is in a not installed state.
+                      package is in the "Not-Installed" state.
 		  </item>
                 </enumlist>
 	    </item>
@@ -4533,7 +4533,7 @@ fi
 		  </item>
 		  <item>
 		      It is noted in the status database as being in a
-		      sane state, namely not installed (any conffiles
+		      sane state, namely "Not-Installed" (any conffiles
 		      it may have are ignored, rather than being
 		      removed by <prgn>dpkg</prgn>).  Note that
 		      disappearing packages do not have their prerm
@@ -4596,7 +4596,7 @@ fi
 	<p>
 	  No attempt is made to unwind after errors during
 	  configuration. If the configuration fails, the package is in
-	  a "Failed Config" state, and an error message is generated.
+	  a "Half-Configured" state, and an error message is generated.
 	</p>
 
 	<p>
@@ -5407,7 +5407,7 @@ Depends: foo-data (&gt;= 1.2-3)
 	    <prgn>dpkg</prgn> does not know of any files it still
 	    contains, it is considered to have "disappeared".  It will
 	    be marked as not wanted on the system (selected for
-	    removal) and not installed.  Any <tt>conffile</tt>s
+	    removal) and "Not-Installed".  Any <tt>conffile</tt>s
 	    details noted for the package will be ignored, as they
 	    will have been taken over by the overwriting package.  The
 	    package's <prgn>postrm</prgn> script will be run with a
@@ -10497,18 +10497,23 @@ name ["<var>syshostname</var>"]:
 
 	<p>
 	  The <prgn>install-info</prgn> program maintains a directory of
-	  installed info documents in <file>/usr/share/info/dir</file> for
-	  the use of info readers.<footnote>
-	    It was previously necessary for packages installing info
-	    documents to run <prgn>install-info</prgn> from maintainer
-	    scripts.  This is no longer necessary.  The installation
-	    system now uses dpkg triggers.
-	  </footnote>
-	  This file must not be included in packages.  Packages containing
-	  info documents should depend on <tt>dpkg (>= 1.15.4) |
-	  install-info</tt> to ensure that the directory file is properly
-	  rebuilt during partial upgrades from Debian 5.0 (lenny) and
-	  earlier.
+	  installed info documents in <file>/usr/share/info/dir</file> for the
+	  use of info readers.  This file must not be included in packages
+	  other than <package>install-info</package>.
+	</p>
+
+	<p>
+	  <prgn>install-info</prgn> is automatically invoked when
+	  appropriate using dpkg triggers.  Packages other than
+	  <package>install-info</package> <em>should not</em> invoke
+	  <prgn>install-info</prgn> directly and <em>should not</em>
+	  depend on, recommend, or suggest <package>install-info</package>
+	  for this purpose.
+	</p>
+
+	<p>
+	  Info readers requiring the <file>/usr/share/info/dir</file> file
+	  should depend on <package>install-info</package>.
 	</p>
 
 	<p>
@@ -12043,6 +12048,11 @@ END-INFO-DIR-ENTRY
 	there is a time, after it has been diverted but before
 	<prgn>dpkg</prgn> has installed the new version, when the file
 	does not exist.</p>
+
+      <p>
+	Do not attempt to divert a conffile, as <prgn>dpkg</prgn> does not
+	handle it well.
+      </p>
     </appendix>
 
   </book>