24 files changed, 188 insertions, 23 deletions
diff --git a/debian/changelog b/debian/changelog
index 7ad9f034..f0faff1b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+debhelper (0.58) unstable; urgency=low
+
+  * Fixed bug #17597 - DH_VERBOSE wasn'talways taking effect.
+
+ -- Joey Hess <joeyh@master.debian.org>  Wed, 28 Jan 1998 17:18:17 -0500
+
 debhelper (0.57) unstable; urgency=low
 
   * Depend on perl 5.004 or greater (for Getopt::Long).
diff --git a/dh_builddeb.1 b/dh_builddeb.1
index 9d52b3ab..ecbbfa6c 100644
--- a/dh_builddeb.1
+++ b/dh_builddeb.1
@@ -3,7 +3,7 @@
 dh_builddeb \- build debian packages
 .SH SYNOPSIS
 .B dh_builddeb
-.I "[-v] [-a] [-i] [-ppackage] [-Ptmpdir]"
+.I "[-v] [-a] [-i] [--no-act] [-ppackage] [-Ptmpdir]"
 .SH "DESCRIPTION"
 dh_builddeb simply calls
 .BR dpkg (8)
@@ -19,6 +19,10 @@ Build all architecture dependent packages.
 .B \-i, \--indep
 Build all architecture independent packages.
 .TP
+.B \--no-act
+Do not really do anything. If used with -v, the result is that this command
+will output a list of what it would have done.
+.TP
 .B -ppackage, \--package=package
 Build the package named "package".
 .TP
@@ -36,6 +40,9 @@ the control file will be built.
 .TP
 .I DH_VERBOSE
 Enables verbose mode
+.TP
+.I DH_NO_ACT
+Enables no-act mode (see above).
 .SH "SEE ALSO"
 .BR /usr/doc/debhelper/README
 .SH AUTHOR
diff --git a/dh_clean.1 b/dh_clean.1
index f4f14c5a..cb437e9c 100644
--- a/dh_clean.1
+++ b/dh_clean.1
@@ -3,7 +3,7 @@
 dh_clean \- clean up package build directories
 .SH SYNOPSIS
 .B dh_clean
-.I "[-v] [-a] [-i] [-k] [-ppackage] [-Ptmpdir] [file ...]"
+.I "[-v] [-a] [-i] [-k] [--no-act] [-ppackage] [-Ptmpdir] [file ...]"
 .SH "DESCRIPTION"
 dh_clean is a debhelper program that is responsible for cleaning up after a
 package is built. It removes the package build directories, and removes some
@@ -20,6 +20,10 @@ Clean up the package build directory for all architecture dependent packages.
 .B \-i, \--indep
 Clean up the package build directory for all architecture independent packages.
 .TP
+.B \--no-act
+Do not really do anything. If used with -v, the result is that this command
+will output a list of what it would have done.
+.TP
 .B \-ppackage, \--package=package
 Clean up the package build directory for the package named "package".
 .TP
@@ -49,6 +53,9 @@ the control file will have their package build directories cleaned up.
 .TP
 .I DH_VERBOSE
 Enables verbose mode
+.TP
+.I DH_NO_ACT
+Enables no-act mode (see above).
 .SH "SEE ALSO"
 .BR /usr/doc/debhelper/README
 .SH BUGS
diff --git a/dh_compress.1 b/dh_compress.1
index 9e23a8f0..dbb33e6d 100644
--- a/dh_compress.1
+++ b/dh_compress.1
@@ -3,7 +3,7 @@
 dh_compress \- compress files and fix symlinks in package build directories
 .SH SYNOPSIS
 .B dh_compress
-.I "[-v] [-a] [-i] [-ppackage] [-Ptmpdir]"
+.I "[-v] [-a] [-i] [--no-act] [-ppackage] [-Ptmpdir]"
 .SH "DESCRIPTION"
 dh_compress is a debhelper program that is responsible for compressing
 the files in package build directories, and makes sure that any symlinks
@@ -40,6 +40,10 @@ Compress files for all architecture dependent packages.
 .B \-i, \--indep
 Compress files for all architecture independent packages.
 .TP
+.B \--no-act
+Do not really do anything. If used with -v, the result is that this command
+will output a list of what it would have done.
+.TP
 .B \-ppackage, \--package=package
 Compress files for the package named "package".
 .TP
@@ -62,6 +66,9 @@ apply to. (This works for the first binary package too.)
 .TP
 .I DH_VERBOSE
 Enables verbose mode
+.TP
+.I DH_NO_ACT
+Enables no-act mode (see above).
 .SH "SEE ALSO"
 .BR /usr/doc/debhelper/README
 .SH BUGS
diff --git a/dh_du.1 b/dh_du.1
index 41bd1c43..9c04106e 100644
--- a/dh_du.1
+++ b/dh_du.1
@@ -3,7 +3,7 @@
 dh_du \- generate DEBIAN/du file
 .SH SYNOPSIS
 .B dh_du
-.I "[-v] [-a] [-i] [-ppackage] [-Ptmpdir]"
+.I "[-v] [-a] [-i] [--no-act] [-ppackage] [-Ptmpdir]"
 .SH "DESCRIPTION"
 dh_du is a debhelper program that is responsible for generating
 a DEBIAN/du file, which lists the disk usage of directories in the package.
@@ -22,6 +22,10 @@ Generate du files for all architecture dependent packages.
 .B \-i, \--indep
 Generate du files for all architecture independent packages.
 .TP
+.B \--no-act
+Do not really do anything. If used with -v, the result is that this command
+will output a list of what it would have done.
+.TP
 .B \-ppackage, \--package=package
 Generate du file for the package named "package".
 .TP
@@ -39,6 +43,9 @@ the control file will be effected.
 .TP
 .I DH_VERBOSE
 Enables verbose mode
+.TP
+.I DH_NO_ACT
+Enables no-act mode (see above).
 .SH "SEE ALSO"
 .BR /usr/doc/debhelper/README
 .SH AUTHOR
diff --git a/dh_fixperms.1 b/dh_fixperms.1
index 316644d6..913a8c76 100644
--- a/dh_fixperms.1
+++ b/dh_fixperms.1
@@ -3,7 +3,7 @@
 dh_fixperms \- fix permissions of files in package build directories
 .SH SYNOPSIS
 .B dh_fixperms
-.I "[-v] [-a] [-i] [-ppackage] [-Ptmpdir]"
+.I "[-v] [-a] [-i] [--no-act] [-ppackage] [-Ptmpdir]"
 .SH "DESCRIPTION"
 dh_fixperms is a debhelper program that is responsible for setting the
 permissions of files in package build directories to a sane state.
@@ -24,6 +24,10 @@ Fix permissions for all architecture dependent packages.
 .B \-i, \--indep
 Fix permissions for all architecture independent packages.
 .TP
+.B \--no-act
+Do not really do anything. If used with -v, the result is that this command
+will output a list of what it would have done.
+.TP
 .B \-ppackage, \--package=package
 Fix permissions for the package named "package".
 .TP
@@ -41,6 +45,9 @@ the control file will have their permissions fixed.
 .TP
 .I DH_VERBOSE
 Enables verbose mode
+.TP
+.I DH_NO_ACT
+Enables no-act mode (see above).
 .SH "SEE ALSO"
 .BR /usr/doc/debhelper/README
 .SH "CONFORMS TO"
diff --git a/dh_gencontrol.1 b/dh_gencontrol.1
index 484add0e..70486a97 100644
--- a/dh_gencontrol.1
+++ b/dh_gencontrol.1
@@ -3,7 +3,7 @@
 dh_gencontrol \- generate and install control file
 .SH SYNOPSIS
 .B dh_gencontrol
-.I "[-v] [-a] [-i] [-ppackage] [-Ptmpdir] [-uparams]"
+.I "[-v] [-a] [-i] [--no-act] [-ppackage] [-Ptmpdir] [-uparams]"
 .SH "DESCRIPTION"
 dh_gencontrol is a debhelper program that is responsible for generating and
 installing control files, and installing them into the DEBIAN directory with
@@ -25,6 +25,10 @@ Install files for all architecture dependent packages.
 .B \-i, \--indep
 Install files for all architecture independent packages.
 .TP
+.B \--no-act
+Do not really do anything. If used with -v, the result is that this command
+will output a list of what it would have done.
+.TP
 .B \-ppackage, \--package=package
 Install files for the package named "package".
 .TP
@@ -46,6 +50,9 @@ the control file will be effected.
 .TP
 .I DH_VERBOSE
 Enables verbose mode
+.TP
+.I DH_NO_ACT
+Enables no-act mode (see above).
 .SH "SEE ALSO"
 .BR /usr/doc/debhelper/README
 .BR dpkg-shlibdeps (1)
diff --git a/dh_getopt.pl b/dh_getopt.pl
index a9969a1e..e877a551 100755
--- a/dh_getopt.pl
+++ b/dh_getopt.pl
@@ -107,6 +107,8 @@ GetOptions(
 
 	"A" => \$all,
 	"all" => \$all,
+
+	"no-act" => \$no_act,
 );
 
 # Check to see if -V was specified. If so, but no parameters were passed,
@@ -121,10 +123,16 @@ if ($ENV{DH_VERBOSE} ne undef) {
 	$verbose=1;
 }
 
+# Check to see if DH_NO_ACT was set, if so, make sure no act mode is on.
+if ($ENV{DH_NO_ACT} ne undef) {
+	$no_act=1;
+}
+
 # Now output everything, in a format suitable for a shell to eval it. 
 # Note the last line sets $@ in the shell to whatever arguements remain.
 print qq{
 DH_VERBOSE='$verbose'
+DH_NO_ACT='$no_act'
 DH_DOPACKAGES='@packages'
 DH_DOINDEP='$indep'
 DH_DOARCH='$arch'
diff --git a/dh_installchangelogs.1 b/dh_installchangelogs.1
index 4ec5ce91..7b9f2300 100644
--- a/dh_installchangelogs.1
+++ b/dh_installchangelogs.1
@@ -3,7 +3,7 @@
 dh_installchangelogs \- install changelogs into package build directories
 .SH SYNOPSIS
 .B dh_installchangelogs
-.I "[-v] [-a] [-i] [-ppackage] [-Ptmpdir] [upstream]"
+.I "[-v] [-a] [-i] [--no-act] [-ppackage] [-Ptmpdir] [upstream]"
 .SH "DESCRIPTION"
 dh_installchangelogs is a debhelper program that is responsible for installing
 changelogs into package build directories.
@@ -27,6 +27,10 @@ Install changelogs for all architecture dependent packages.
 .B \-i, \--indep
 Install changelogs for all architecture independent packages.
 .TP
+.B \--no-act
+Do not really do anything. If used with -v, the result is that this command
+will output a list of what it would have done.
+.TP
 .B \-ppackage, \--package=package
 Install changelogs for the package named "package".
 .TP
@@ -50,6 +54,9 @@ package.
 .TP
 .I DH_VERBOSE
 Enables verbose mode
+.TP
+.I DH_NO_ACT
+Enables no-act mode (see above).
 .SH "SEE ALSO"
 .BR /usr/doc/debhelper/README
 .SH "CONFORMS TO"
diff --git a/dh_installcron.1 b/dh_installcron.1
index f090420b..31f8d810 100644
--- a/dh_installcron.1
+++ b/dh_installcron.1
@@ -3,7 +3,7 @@
 dh_installcron \- install cron scripts into etc/cron.*
 .SH SYNOPSIS
 .B dh_installcron
-.I "[-v] [-a] [-i] [-ppackage] [-Ptmpdir]"
+.I "[-v] [-a] [-i] [--no-act] [-ppackage] [-Ptmpdir]"
 .SH "DESCRIPTION"
 dh_installcron is a debhelper program that is responsible for installing
 cron scripts into etc/cron.* in package build directories. The files 
@@ -23,6 +23,10 @@ Install cron files for all architecture dependent packages.
 .B \-i, \--indep
 Install cron files for all architecture independent packages.
 .TP
+.B \--no-act
+Do not really do anything. If used with -v, the result is that this command
+will output a list of what it would have done.
+.TP
 .B \-ppackage, \--package=package
 Install cron files for the package named "package".
 .TP
@@ -40,6 +44,9 @@ the control file will be effected.
 .TP
 .I DH_VERBOSE
 Enables verbose mode
+.TP
+.I DH_NO_ACT
+Enables no-act mode (see above).
 .SH "SEE ALSO"
 .BR /usr/doc/debhelper/README
 .SH "CONFORMS TO"
diff --git a/dh_installdeb.1 b/dh_installdeb.1
index bb658262..fc7b8dee 100644
--- a/dh_installdeb.1
+++ b/dh_installdeb.1
@@ -3,7 +3,7 @@
 dh_installdeb \- install files into the DEBIAN directory
 .SH SYNOPSIS
 .B dh_installdeb
-.I "[-v] [-a] [-i] [-ppackage] [-Ptmpdir]"
+.I "[-v] [-a] [-i] [--no-act] [-ppackage] [-Ptmpdir]"
 .SH "DESCRIPTION"
 dh_installdeb is a debhelper program that is responsible for installing
 files into the DEBIAN directory in package build directories with the
@@ -43,6 +43,10 @@ Install files for all architecture dependent packages.
 .B \-i, \--indep
 Install files for all architecture independent packages.
 .TP
+.B \--no-act
+Do not really do anything. If used with -v, the result is that this command
+will output a list of what it would have done.
+.TP
 .B \-ppackage, \--package=package
 Install files for the package named "package".
 .TP
@@ -60,6 +64,9 @@ the control file will be effected.
 .TP
 .I DH_VERBOSE
 Enables verbose mode
+.TP
+.I DH_NO_ACT
+Enables no-act mode (see above).
 .SH "SEE ALSO"
 .BR /usr/doc/debhelper/README
 .SH "CONFORMS TO"
diff --git a/dh_installdirs.1 b/dh_installdirs.1
index 0c6aaa54..8ae440c6 100644
--- a/dh_installdirs.1
+++ b/dh_installdirs.1
@@ -3,7 +3,7 @@
 dh_installdirs \- create subdirectories in package build directories
 .SH SYNOPSIS
 .B dh_installdirs
-.I "[-v] [-a] [-i] [-ppackage] [-Ptmpdir] [-A] [dir ...]"
+.I "[-v] [-a] [-i] [--no-act] [-ppackage] [-Ptmpdir] [-A] [dir ...]"
 .SH "DESCRIPTION"
 dh_installdirs is a debhelper program that is responsible for creating
 subdirectories in package build directories.
@@ -30,6 +30,10 @@ Create directories for all architecture dependent packages.
 .B \-i, \--indep
 Create directories for all architecture independent packages.
 .TP
+.B \--no-act
+Do not really do anything. If used with -v, the result is that this command
+will output a list of what it would have done.
+.TP
 .B \-ppackage, \--package=package
 Create directories for the package named "package".
 .TP
@@ -55,6 +59,9 @@ the control file will be effected.
 .TP
 .I DH_VERBOSE
 Enables verbose mode
+.TP
+.I DH_NO_ACT
+Enables no-act mode (see above).
 .SH "SEE ALSO"
 .BR /usr/doc/debhelper/README
 .SH BUGS
diff --git a/dh_installdocs.1 b/dh_installdocs.1
index 6b8b33a6..e1f2e590 100644
--- a/dh_installdocs.1
+++ b/dh_installdocs.1
@@ -3,7 +3,7 @@
 dh_installdocs \- install documentation into package build directories
 .SH SYNOPSIS
 .B dh_installdocs
-.I "[-v] [-a] [-i] [-ppackage] [-Ptmpdir] [-A] [file ...]"
+.I "[-v] [-a] [-i] [--no-act] [-ppackage] [-Ptmpdir] [-A] [file ...]"
 .SH "DESCRIPTION"
 dh_installdocs is a debhelper program that is responsible for installing
 documentation into usr/doc/package in package build directories.
@@ -36,6 +36,10 @@ Install files for all architecture dependent packages.
 .B \-i, \--indep
 Install files for all architecture independent packages.
 .TP
+.B \--no-act
+Do not really do anything. If used with -v, the result is that this command
+will output a list of what it would have done.
+.TP
 .B \-ppackage, \--package=package
 Install files for the package named "package".
 .TP
@@ -65,6 +69,9 @@ directory, it will install the complete contents of the directory.
 .TP
 .I DH_VERBOSE
 Enables verbose mode
+.TP
+.I DH_NO_ACT
+Enables no-act mode (see above).
 .SH "SEE ALSO"
 .BR /usr/doc/debhelper/README
 .SH BUGS
diff --git a/dh_installexamples.1 b/dh_installexamples.1
index c2997d95..be0b4cc3 100644
--- a/dh_installexamples.1
+++ b/dh_installexamples.1
@@ -3,7 +3,7 @@
 dh_installexamples \- install example files into package build directories
 .SH SYNOPSIS
 .B dh_installexamples
-.I "[-v] [-a] [-i] [-ppackage] [-Ptmpdir] [-A] [file ...]"
+.I "[-v] [-a] [-i] [--no-act] [-ppackage] [-Ptmpdir] [-A] [file ...]"
 .SH "DESCRIPTION"
 dh_installexamples is a debhelper program that is responsible for installing
 examples into usr/doc/package/examples in package build directories.
@@ -26,6 +26,10 @@ Install files for all architecture dependent packages.
 .B \-i, \--indep
 Install files for all architecture independent packages.
 .TP
+.B \--no-act
+Do not really do anything. If used with -v, the result is that this command
+will output a list of what it would have done.
+.TP
 .B \-ppackage, \--package=package
 Install files for the package named "package".
 .TP
@@ -55,6 +59,9 @@ directory, it will install the complete contents of the directory.
 .TP
 .I DH_VERBOSE
 Enables verbose mode
+.TP
+.I DH_NO_ACT
+Enables no-act mode (see above).
 .SH "SEE ALSO"
 .BR /usr/doc/debhelper/README
 .SH BUGS
diff --git a/dh_installmanpages.1 b/dh_installmanpages.1
index e44eaf22..5a84d76b 100644
--- a/dh_installmanpages.1
+++ b/dh_installmanpages.1
@@ -3,7 +3,7 @@
 dh_installmanpages \- install man pages into package build directories
 .SH SYNOPSIS
 .B dh_installmanpages
-.I "[-v] [-a] [-i] [-ppackage] [-Ptmpdir] [file ...]"
+.I "[-v] [-a] [-i] [--no-act] [-ppackage] [-Ptmpdir] [file ...]"
 .SH "DESCRIPTION"
 dh_installmanpages is a debhelper program that is responsible for
 automatically installing man pages into usr/man/ and usr/X11R6/man/ in
@@ -29,6 +29,10 @@ Install man pages into all architecture dependent packages.
 .B \-i, \--indep
 Install man pages into all architecture independent packages.
 .TP
+.B \--no-act
+Do not really do anything. If used with -v, the result is that this command
+will output a list of what it would have done.
+.TP
 .B \-ppackage, \--package=package
 Install man pages into the package named "package".
 .TP
@@ -55,6 +59,9 @@ pages belong in.
 .TP
 .I DH_VERBOSE
 Enables verbose mode
+.TP
+.I DH_NO_ACT
+Enables no-act mode (see above).
 .SH "SEE ALSO"
 .BR /usr/doc/debhelper/README
 .SH BUGS
diff --git a/dh_installmenu.1 b/dh_installmenu.1
index cf54949c..7147b49f 100644
--- a/dh_installmenu.1
+++ b/dh_installmenu.1
@@ -3,7 +3,7 @@
 dh_installmenu \- install debian menu files into package build directories
 .SH SYNOPSIS
 .B dh_installmenu
-.I "[-v] [-a] [-i] [-ppackage] [-Ptmpdir] [-n]"
+.I "[-v] [-a] [-i] [--no-act] [-ppackage] [-Ptmpdir] [-n]"
 .SH "DESCRIPTION"
 dh_installmenu is a debhelper program that is responsible for installing
 files used by the debian menu package into package build directories. 
@@ -34,6 +34,10 @@ Install menu files into all architecture dependent packages.
 .B \-i, \--indep
 Install menu files into all architecture independent packages.
 .TP
+.B \--no-act
+Do not really do anything. If used with -v, the result is that this command
+will output a list of what it would have done.
+.TP
 .B \-ppackage, \--package=package
 Install menu files into the package named "package".
 .TP
@@ -54,6 +58,9 @@ the control file will be effected.
 .TP
 .I DH_VERBOSE
 Enables verbose mode
+.TP
+.I DH_NO_ACT
+Enables no-act mode (see above).
 .SH "SEE ALSO"
 .BR /usr/doc/debhelper/README
 ,
diff --git a/dh_lib b/dh_lib
index 020f9e6d..7c7c2e18 100644
--- a/dh_lib
+++ b/dh_lib
@@ -9,7 +9,9 @@
 # involving redirection. Use complex_doit instead.
 doit() {
 	verbose_echo "$@"
-	eval '$@'
+	if [ ! "$DH_NO_ACT" ]; then
+		eval '$@'
+	fi
 }
 
 
@@ -17,7 +19,9 @@ doit() {
 # are evaled with double quotes. This version can handle compound commands.
 complex_doit() {
 	verbose_echo "$@"
-	eval "$@"
+	if [ ! "$DH_NO_ACT" ]; then
+		eval "$@"
+	fi
 }
 
 # Echo something if the verbose flag is on.
diff --git a/dh_makeshlibs.1 b/dh_makeshlibs.1
index cb2703f4..c39eb04c 100644
--- a/dh_makeshlibs.1
+++ b/dh_makeshlibs.1
@@ -3,7 +3,7 @@
 dh_makeshlibs \- automatically create shlibs file
 .SH SYNOPSIS
 .B dh_makeshlibs
-.I "[-v] [-a] [-i] [-mmajor] [-Ptmpdir] [-ppackage] [-mmajor] [-V[dependancies]]"
+.I "[-v] [-a] [-i] [--no-act] [-mmajor] [-Ptmpdir] [-ppackage] [-mmajor] [-V[dependancies]]"
 .SH "DESCRIPTION"
 dh_makeshlibs is a debhelper program that automatically scans for shared
 libraries, and generates a shlibs file for the libraries it finds.
@@ -21,6 +21,10 @@ Generate shlibs files for all architecture dependent packages.
 .B \-i, \--indep
 Generate shlibs files for all architecture independent packages.
 .TP
+.B \--no-act
+Do not really do anything. If used with -v, the result is that this command
+will output a list of what it would have done.
+.TP
 .B \-ppackage, \--package=package
 Generate shlibs file for the package named "package".
 .TP
@@ -67,6 +71,9 @@ the control file will be effected.
 .TP
 .I DH_VERBOSE
 Enables verbose mode
+.TP
+.I DH_NO_ACT
+Enables no-act mode (see above).
 .SH "SEE ALSO"
 .BR /usr/doc/debhelper/README
 .SH BUGS
diff --git a/dh_md5sums.1 b/dh_md5sums.1
index ab3c2bed..f432fed2 100644
--- a/dh_md5sums.1
+++ b/dh_md5sums.1
@@ -3,7 +3,7 @@
 dh_md5sums \- generate DEBIAN/md5sums file
 .SH SYNOPSIS
 .B dh_md5sums
-.I "[-x] [-v] [-a] [-i] [-Ptmpdir] [-ppackage]"
+.I "[-x] [-v] [-a] [-i] [--no-act] [-Ptmpdir] [-ppackage]"
 .SH "DESCRIPTION"
 dh_md5sums is a debhelper program that is responsible for generating
 a DEBIAN/md5sums file, which lists the md5sums of each file in the package.
@@ -23,6 +23,10 @@ Generate md5sums files for all architecture dependent packages.
 .B \-i, \--indep
 Generate md5sums files for all architecture independent packages.
 .TP
+.B \--no-act
+Do not really do anything. If used with -v, the result is that this command
+will output a list of what it would have done.
+.TP
 .B \-ppackage, \--package=package
 Generate md5sums file for the package named "package".
 .TP
@@ -44,6 +48,9 @@ the control file will be effected.
 .TP
 .I DH_VERBOSE
 Enables verbose mode
+.TP
+.I DH_NO_ACT
+Enables no-act mode (see above).
 .SH "SEE ALSO"
 .BR /usr/doc/debhelper/README
 .SH AUTHOR
diff --git a/dh_movefiles.1 b/dh_movefiles.1
index c2b0e92a..5ff47bb1 100644
--- a/dh_movefiles.1
+++ b/dh_movefiles.1
@@ -3,7 +3,7 @@
 dh_movefiles \- moves files out of debian/tmp into subpackages
 .SH SYNOPSIS
 .B dh_movefiles
-.I "[-v] [-a] [-i] [-ppackage] [-Ptmpdir]"
+.I "[-v] [-a] [-i] [--no-act] [-ppackage] [-Ptmpdir]"
 .SH "DESCRIPTION"
 dh_movefiles is a debhelper program that is responsible for moving files out
 of debian/tmp and into other package build directories. This may be useful
@@ -23,6 +23,10 @@ Move files for all architecture dependent packages.
 .B \-i, \--indep
 Move files for all architecture independent packages.
 .TP
+.B \--no-act
+Do not really do anything. If used with -v, the result is that this command
+will output a list of what it would have done.
+.TP
 .B \-ppackage, \--package=package
 Move files for the package named "package".
 .TP
@@ -40,6 +44,9 @@ the control file will be effected.
 .TP
 .I DH_VERBOSE
 Enables verbose mode
+.TP
+.I DH_NO_ACT
+Enables no-act mode (see above).
 .SH "SEE ALSO"
 .BR /usr/doc/debhelper/README
 .SH AUTHOR
diff --git a/dh_shlibdeps.1 b/dh_shlibdeps.1
index 421a2215..b976f8c9 100644
--- a/dh_shlibdeps.1
+++ b/dh_shlibdeps.1
@@ -3,7 +3,7 @@
 dh_shlibdeps \- calculate shared library dependancies
 .SH SYNOPSIS
 .B dh_shlibdeps
-.I "[-v] [-a] [-i] [-ppackage] [-Ptmpdir] [-uparams]"
+.I "[-v] [-a] [-i] [--no-act] [-ppackage] [-Ptmpdir] [-uparams]"
 .SH "DESCRIPTION"
 dh_shlibdeps is a debhelper program that is responsible for calculating
 shared library dependancies for all executables found in the package build
@@ -26,6 +26,10 @@ Install files for all architecture dependent packages.
 .B \-i, \--indep
 Install files for all architecture independent packages.
 .TP
+.B \--no-act
+Do not really do anything. If used with -v, the result is that this command
+will output a list of what it would have done.
+.TP
 .B \-ppackage, \--package=package
 Install files for the package named "package".
 .TP
@@ -47,6 +51,9 @@ the control file will be effected.
 .TP
 .I DH_VERBOSE
 Enables verbose mode
+.TP
+.I DH_NO_ACT
+Enables no-act mode (see above).
 .SH "SEE ALSO"
 .BR /usr/doc/debhelper/README
 .BR dpkg-shlibdeps (1)
diff --git a/dh_strip.1 b/dh_strip.1
index 9cdd85a0..9ae97c60 100644
--- a/dh_strip.1
+++ b/dh_strip.1
@@ -3,7 +3,7 @@
 dh_strip \- strip executables, shared libraries, and some static libraries.
 .SH SYNOPSIS
 .B dh_strip
-.I "[-v] [-a] [-i] [-Ptmpdir] [-ppackage]"
+.I "[-v] [-a] [-i] [--no-act] [-Ptmpdir] [-ppackage]"
 .SH "DESCRIPTION"
 dh_strip is a debhelper program that is responsible for stripping
 executables, shared libraries, and static libraries that are not used for
@@ -23,6 +23,10 @@ Strip files in all architecture dependent packages.
 Strip files in all architecture independent packages (likely, this is
 pointless :-).
 .TP
+.B \--no-act
+Do not really do anything. If used with -v, the result is that this command
+will output a list of what it would have done.
+.TP
 .B \-ppackage, \--package=package
 Strip files for the package named "package".
 .TP
@@ -40,6 +44,9 @@ the control file will have their files stripped.
 .TP
 .I DH_VERBOSE
 Enables verbose mode
+.TP
+.I DH_NO_ACT
+Enables no-act mode (see above).
 .SH "SEE ALSO"
 .BR /usr/doc/debhelper/README
 .SH "CONFORMS TO"
diff --git a/dh_suidregister.1 b/dh_suidregister.1
index 51e08fe5..182386b4 100644
--- a/dh_suidregister.1
+++ b/dh_suidregister.1
@@ -3,7 +3,7 @@
 dh_suidregister \- set up package to register files with suidregister
 .SH SYNOPSIS
 .B dh_suidregister
-.I "[-v] [-a] [-i] [-ppackage] [-Ptmpdir] [-A] [file ...]"
+.I "[-v] [-a] [-i] [--no-act] [-ppackage] [-Ptmpdir] [-A] [file ...]"
 .SH "DESCRIPTION"
 dh_suidregister is a debhelper program that is responsible for modifying the
 postinst and postrm scripts of a package so the package will register files
@@ -37,6 +37,10 @@ Register files for all architecture dependent packages.
 .B \-i, \--indep
 Register files for all architecture independent packages.
 .TP
+.B \--no-act
+Do not really do anything. If used with -v, the result is that this command
+will output a list of what it would have done.
+.TP
 .B \-ppackage, \--package=package
 Register files for the package named "package".
 .TP
@@ -63,6 +67,9 @@ the control file will be effected.
 .TP
 .I DH_VERBOSE
 Enables verbose mode
+.TP
+.I DH_NO_ACT
+Enables no-act mode (see above).
 .SH "SEE ALSO"
 .BR /usr/doc/debhelper/README
 ,
diff --git a/dh_undocumented.1 b/dh_undocumented.1
index 26498934..69d2150a 100644
--- a/dh_undocumented.1
+++ b/dh_undocumented.1
@@ -3,7 +3,7 @@
 dh_undocumented \- make symlinks to undocumented.7.gz man page
 .SH SYNOPSIS
 .B dh_undocumented
-.I "[-v] [-a] [-i] [-ppackage] [-Ptmpdir] [-A] [manpage ...]"
+.I "[-v] [-a] [-i] [--no-act] [-ppackage] [-Ptmpdir] [-A] [manpage ...]"
 .SH "DESCRIPTION"
 dh_undocumented is a debhelper program that is responsible for making
 symlinks to the
@@ -41,6 +41,10 @@ Install undocumented man page symlinks for all architecture dependent packages.
 .B \-i, \--indep
 Install undocumented man page symlinks for all architecture independent packages.
 .TP
+.B \--no-act
+Do not really do anything. If used with -v, the result is that this command
+will output a list of what it would have done.
+.TP
 .B \-ppackage, \--package=package
 Install undocumented man page symlinks for the package named "package".
 .TP
@@ -68,6 +72,9 @@ the control file will be effected.
 .TP
 .I DH_VERBOSE
 Enables verbose mode
+.TP
+.I DH_NO_ACT
+Enables no-act mode (see above).
 .SH "SEE ALSO"
 .BR /usr/doc/debhelper/README
 ,