dh_auto_test: New program, automates running make test or make check if the Makefile...

[debhelper.git] / debhelper.pod

diff --git a/debhelper.pod b/debhelper.pod
index 546528b0c69a67359fd3d35884c2f09332bc4810..55089338fb02a01a738e1f312a1c2a574c58d1a8 100644 (file)
--- a/debhelper.pod
+++ b/debhelper.pod
@@ -64,7 +64,8 @@ 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 --print-architecture",
+exist, where "arch" is the same as the output of 
+"dpkg-architecture -qDEB_HOST_ARCH",
 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,16 @@ 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<--ignore=>I<file>
+
+Ignore the specified file. This can be used if debian/ contains a debhelper
+config file that a debhelper command should not act on. Note that
+debian/compat, debian/control, and debian/changelog can't be ignored, but
+then, there should never be a reason to ignore those files.
+
+For example, if upstream ships a debian/init that you don't want
+dh_installinit to install, use --ignore=debian/init
+
 =item B<-P>I<tmpdir>, B<--tmpdir=>I<tmpdir>
 
 Use "tmpdir" for package build directory. The default is debian/<package>
@@ -250,10 +261,10 @@ debian/compat. For example, to turn on V5 mode:
   % echo 5 > debian/compat
 
 Unless otherwise indicated, all debhelper documentation assumes that you
-are using the most recent compatability level, and in most cases does not
-indicate if the behavior is different in an earlier compatability level, so
-if you are not using the most recent compatability level, you're advised to
-read below for notes about what is different in earlier compatability
+are using the most recent compatibility level, and in most cases does not
+indicate if the behavior is different in an earlier compatibility level, so
+if you are not using the most recent compatibility level, you're advised to
+read below for notes about what is different in earlier compatibility
 levels.
 
 These are the available compatibility levels:
@@ -328,8 +339,7 @@ dh_link will correct existing links to conform with policy.
 
 =item V5
 
-This is the recommended mode of operation. It does everything V4 does,
-plus:
+Changes from V4 are:
 
 =over 8
 
@@ -346,6 +356,41 @@ symbols in, not the packages to take the symbols from.
 
 dh_installdocs skips installing empty files.
 
+=item -
+
+dh_install errors out if wildcards expand to nothing.
+
+=back
+
+=item V6
+
+This is the recommended mode of operation. It does everything V5 does,
+plus:
+
+=over 8
+
+=item -
+
+Commands that generate maintainer script fragements will order the
+fragements in reverse order for the prerm and postrm scripts.
+
+=item -
+
+dh_installwm will install a slave manpage link for x-window-manager.1.gz,
+if it sees the man page in usr/share/man/man1 in the package build
+directory.
+
+=item -
+
+dh_builddeb did not previously delete everything matching
+DH_ALWAYS_EXCLUDE, if it was set to a list of things to exclude, such as
+"CVS:.svn:.git". Now it does.
+
+=item -
+
+dh_installman allows overwriting existing man pages in the package build
+directory. In previous compatability levels it silently refuses to do this.
+
 =back
 
 =back
@@ -382,9 +427,9 @@ Once your package uses debhelper to build, be sure to add
 debhelper to your Build-Depends line in debian/control. You should
 build-depend on a version of debhelper equal to (or greater than) the
 debhelper compatibility level your package uses. So if your package used
-compatibility level 5:
+compatibility level 6:
 
-  Build-Depends: debhelper (>= 5)
+  Build-Depends: debhelper (>= 6)
 
 =head1 ENVIRONMENT
 
@@ -438,7 +483,7 @@ DH_ALWAYS_EXCLUDE=CVS:.svn
 
 A set of example debian/rules files that use debhelper.
 
-=item L<http://kitenet.net/programs/debhelper/>
+=item L<http://kitenet.net/~joey/code/debhelper/>
 
 Debhelper web site.