Merge branch 'master' of ssh://git.debian.org/git/debhelper/debhelper

[debhelper.git] / debhelper.pod

diff --git a/debhelper.pod b/debhelper.pod
index f81234d08a5b6401ef200bde1d124fb10d1efd41..dad286ee0f5e5b5f2587696c3a5717bc9c0a6760 100644 (file)
--- a/debhelper.pod
+++ b/debhelper.pod
@@ -118,6 +118,14 @@ are not architecture independent.
 Do not act on the specified package even if an -a, -i, or -p option lists
 the package as one that should be acted on.
 
+=item B<--remaining-packages>
+
+Do not act on the packages which have already been acted on by this debhelper
+command earlier (i.e. if the command is present in the package debhelper log).
+For example, if you need to call the command with special options only for a
+couple of binary packages, pass this option to the last call of the command to
+process the rest of packages with default settings. 
+
 =item B<--ignore=>I<file>
 
 Ignore the specified file. This can be used if debian/ contains a debhelper
@@ -333,6 +341,8 @@ dh_link will correct existing links to conform with policy.
 
 =back
 
+This mode is deprecated.
+
 =item V5
 
 Changes from V4 are:
@@ -366,8 +376,8 @@ Changes from V5 are:
 
 =item -
 
-Commands that generate maintainer script fragements will order the
-fragements in reverse order for the prerm and postrm scripts.
+Commands that generate maintainer script fragments will order the
+fragments in reverse order for the prerm and postrm scripts.
 
 =item -
 
@@ -384,7 +394,7 @@ DH_ALWAYS_EXCLUDE, if it was set to a list of things to exclude, such as
 =item -
 
 dh_installman allows overwriting existing man pages in the package build
-directory. In previous compatability levels it silently refuses to do this.
+directory. In previous compatibility levels it silently refuses to do this.
 
 =back
 
@@ -398,10 +408,10 @@ Changes from V6 are:
 
 =item -
 
-dh_install, if --sourcedir is not specified, will first look for files in
-debian/tmp, and then will look in the current directory. This allows
-dh_install to interoperate with dh_auto_install without needing any special
-parameters.
+dh_install, will fall back to looking for files in debian/tmp if it doesn't
+find them in the current directory (or wherever you tell it look using
+--sourcedir). This allows dh_install to interoperate with dh_auto_install,
+which installs to debian/tmp, without needing any special parameters.
 
 =item -
 
@@ -411,6 +421,11 @@ dh_clean will read debian/clean and delete files listed there.
 
 dh_clean will delete toplevel *-stamp files.
 
+=item -
+
+dh_installchangelogs will guess at what file is the upstream changelog if
+none is specified.
+
 =back
 
 =back
@@ -472,10 +487,13 @@ Set to 1 to enable no-act mode.
 =item DH_OPTIONS
 
 Anything in this variable will be prepended to the command line arguments
-of all debhelper commands. This is useful in some situations, for example,
-if you need to pass -p to all debhelper commands that will be run. One good
-way to set DH_OPTIONS is by using "Target-specific Variable Values" in your
-debian/rules file. See the make documentation for details on doing this.
+of all debhelper commands. Command-specific options will be ignored by 
+commands that do not support them. 
+
+This is useful in some situations, for example, if you need to pass -p to
+all debhelper commands that will be run. One good way to set DH_OPTIONS is
+by using "Target-specific Variable Values" in your debian/rules file. See
+the make documentation for details on doing this.
 
 =item DH_ALWAYS_EXCLUDE