Merge branch 'master' into buildsystems

[debhelper.git] / debhelper.pod

diff --git a/debhelper.pod b/debhelper.pod
index de2a053a4d7df3a645c4c3ae8b24e6b98246b869..8c232d2859bac1e3caac44cfed1beefb7a63cf21 100644 (file)
--- a/debhelper.pod
+++ b/debhelper.pod
@@ -62,9 +62,10 @@ debian/control, debhelper will use debian/foo if no debian/package.foo
 file can be found.
 
 In some rare cases, you may want to have different versions of these files
 file can be found.
 
 In some rare cases, you may want to have different versions of these files

-for different architectures. If files named debian/package.foo.arch
-exist, where "arch" is the same as the output of 
-"dpkg-architecture -qDEB_HOST_ARCH",
+for different architectures or OSes. If files named debian/package.foo.ARCH
+or debian/package.foo.OS exist, where "ARCH" and "OS" are the same as the
+output of  "dpkg-architecture -qDEB_HOST_ARCH" /
+"dpkg-architecture -qDEB_HOST_ARCH_OS",

 then they will be used in preference to other, more general files.
 
 In many cases, these config files are used to specify various types of
 then they will be used in preference to other, more general files.
 
 In many cases, these config files are used to specify various types of


@@ -118,6 +119,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.
 
 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
 =item B<--ignore=>I<file>
 
 Ignore the specified file. This can be used if debian/ contains a debhelper


@@ -333,6 +342,8 @@ dh_link will correct existing links to conform with policy.
 
 =back
 
 
 =back
 

+This mode is deprecated.
+

 =item V5
 
 Changes from V4 are:
 =item V5
 
 Changes from V4 are:


@@ -480,8 +491,14 @@ Anything in this variable will be prepended to the command line arguments
 of all debhelper commands. Command-specific options will be ignored by 
 commands that do not support them. 
 
 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
+Arguments are separated by whitespaces unless a whitespace is escaped
+with a backslash character (\). Then the whitespace is treated literally.
+Likewise, the backslash character is treated literally unless it is followed
+by a single whitespace. If a backslash is followed by two or more spaces,
+it will be considered as the last symbol of the argument.
+
+DH_OPTIONS 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.
 
 by using "Target-specific Variable Values" in your debian/rules file. See
 the make documentation for details on doing this.