r194: Initial Import

diff --git a/debhelper.1 b/debhelper.1
index 7bf558551c6f229d9cc0049dfca26f656e20c4c4..1562b2bf933677c14a8f899b6a4eb8bfdac72c4c 100644 (file)
--- a/debhelper.1
+++ b/debhelper.1
@@ -12,6 +12,7 @@ document those options and to document debhelper as a whole. For additional
 options, and documentation for each individual command, see the commands' own
 man pages.
 .SH "SHARED DEBHLPER OPTIONS"
+The following command line options are supported by all debhelper programs.
 .TP
 .B \-v, \--verbose
 Verbose mode: show all commands that modify the package build directory.
@@ -44,6 +45,20 @@ the package as one that should be acted on.
 .TP
 .B \-Ptmpdir, \--tmpdir=tmpdir
 Use "tmpdir" for package build directory. 
+.SH "COMMON DEBHELPER OPTIONS"
+The following command line options are supported by some debhelper programs.
+See the man page of each program for a complete explination of what the
+option does.
+.TP
+.B \-n
+Do not modify postinst/postrm/etc scripts.
+.TP
+.B \-Xitem, \--exclude=item
+Exclude an item from processing.
+.TP
+.B \-A, \-all
+Makes files or other items that are specified on the command line take effect
+in ALL packages acted on, not just the first.
 .SH NOTES
 .TP
 .B Multiple binary package support

diff --git a/debian/changelog b/debian/changelog
index 3a50778c9d50f2c81bcb7e5a679ad90ca649d68b..846eadf90b4a75529de4e8c83ef1ad27e5fce72a 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+debhelper (1.2.55) unstable; urgency=low
+
+  * Various man page enhancements.
+  * dh_md5sums: supports -X to make it skip including files in the
+    md5sums (#35819).
+
+ -- Joey Hess <joeyh@master.debian.org>  Fri,  9 Apr 1999 18:21:58 -0700
+
 debhelper (1.2.54) unstable; urgency=low
 
   * dh_installinit.1: man page fixups (#34160).

diff --git a/dh_installdocs.1 b/dh_installdocs.1
index 50f07e1f3e8c5b59b9966606e219a06c6412f392..afc481e6ab7ef8e2e9ba23ce62b0a0fa200cb444 100644 (file)
--- a/dh_installdocs.1
+++ b/dh_installdocs.1
@@ -56,7 +56,7 @@ Install all files specified by command line parameters in ALL packages
 acted on.
 .TP
 .B \-n, \--noscripts
-DO not modify postinst/prerm scripts.
+Do not modify postinst/prerm scripts.
 .TP
 .B file ...
 Install these files as documentation into the first package acted on. (Or in

diff --git a/dh_md5sums.1 b/dh_md5sums.1
index 6489a6c44a9535a39e0e5c6811e5de53e5a0defd..61fb3b73509a8d104a85a6b8c684da69f0a9fc63 100644 (file)
--- a/dh_md5sums.1
+++ b/dh_md5sums.1
@@ -3,7 +3,7 @@
 dh_md5sums \- generate DEBIAN/md5sums file (deprecated)
 .SH SYNOPSIS
 .B dh_md5sums
-.I "[debhelper options] [-x]"
+.I "[debhelper options] [-x] [-Xitem]"
 .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.
@@ -20,8 +20,12 @@ See
 for a list of options common to all debhelper commands.
 .TP
 .B \-x, \--include-conffiles
-Include conffiles in the md5sums list. Note that this is redundant, and
-included elsewhere in debian packages.
+Include conffiles in the md5sums list. Note that this information is
+redundant since it is included elsewhere in debian packages.
+.TP
+.B \-Xitem, --exclude=item
+Exclude files that contain "item" anywhere in their filename from
+being listed in the md5sums file.
 .SH ENVIRONMENT
 See
 .BR debhelper (1)