The following commit has been merged in the master branch:
commit c819a400aa596e513ca8b28710ab9e2c62fcacd2
Author: Guillem Jover <guil...@debian.org>
Date:   Thu Jul 7 06:24:37 2011 +0200

    dpkg-maintscript-helper: Unify somewhat --help output with other commands

diff --git a/debian/changelog b/debian/changelog
index 49bc4e7..41607a6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -132,6 +132,7 @@ dpkg (1.16.1) UNRELEASED; urgency=low
     - Correctly format text with bold and italics.
   * Refer to Sources and Packages files as part of a repository instead of
     as being of exclusive use or owned by APT, which has never been the case.
+  * Unify somewhat dpkg-maintscript-helper --help output with other commands.
 
   [ Bill Allombert]
   * Add support for Build-Features: build-arch. Closes: #229357
diff --git a/scripts/dpkg-maintscript-helper.sh 
b/scripts/dpkg-maintscript-helper.sh
index 631a5a1..92088ae 100755
--- a/scripts/dpkg-maintscript-helper.sh
+++ b/scripts/dpkg-maintscript-helper.sh
@@ -234,22 +234,16 @@ warning() {
 
 usage() {
        cat <<END
-Syntax: $0 <command> <parameters> -- <maintainer script parameters>
-
-Commands and parameters:
+Usage: $PROGNAME <command> <parameter>... -- <maintainer-script-parameter>...
 
+Commands:
   supports <command>
-       Returns 0 (success) if the given command is supported, 1
-       otherwise.
-
+       Returns 0 (success) if the given command is supported, 1 otherwise.
   rm_conffile <conffile> [<last-version> [<package>]]
-       Remove obsolete conffile.
-       Must be called in preinst, postinst and postrm.
-
+       Remove obsolete conffile. Must be called in preinst, postinst and
+       postrm.
   mv_conffile <old-conf> <new-conf> [<last-version> [<package>]]
-       Rename a conffile.
-       Must be called in preinst, postinst and postrm.
-
+       Rename a conffile. Must be called in preinst, postinst and postrm.
   help
        Display this usage information.
 END

-- 
dpkg's main repository


-- 
To UNSUBSCRIBE, email to debian-dpkg-cvs-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

Reply via email to