[debhelper-devel] [debhelper] 02/02: dh_installdeb: Clarify what goes in maintscript config file

[Niels Thykier]

This is an automated email from the git hooks/post-receive script.

nthykier pushed a commit to branch master
in repository debhelper.

commit 333738c6b8ca1fcf8436184eca7533ae09b4ef20
Author: Niels Thykier <niels at thykier.net>
Date:   Sat Feb 27 09:45:03 2016 +0000

    dh_installdeb: Clarify what goes in maintscript config file
    
    Signed-off-by: Niels Thykier <niels at thykier.net>
---
 debian/changelog |  3 +++
 dh_installdeb    | 12 ++++++++++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2a91861..e4b587f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -26,6 +26,9 @@ debhelper (9.20160116) UNRELEASED; urgency=medium
     reporting the bug.  (Closes: #615854)
   * cmake.pm: Apply patch from Helmut Grohne to correct the
     name of the default cross compilers.  (Closes: #812136)
+  * dh_installdeb: Clarify what goes in the "maintscript" config
+    files.  Thanks to Julian Andres Klode for the report.
+    (Closes: #814761)
 
   [ Joachim Breitner ]
   * addsubstvar: Pass -a to grep to handle substvars with unicode content
diff --git a/dh_installdeb b/dh_installdeb
index 6f8eae2..c881707 100755
--- a/dh_installdeb
+++ b/dh_installdeb
@@ -56,8 +56,16 @@ there is no need to list them manually here.
 
 =item I<package>.maintscript
 
-Lines in this file correspond to L<dpkg-maintscript-helper(1)> commands and
-parameters.
+Lines in this file correspond to L<dpkg-maintscript-helper(1)>
+commands and parameters.  However, the "maint-script-parameters"
+should I<not> be included as debhelper will add those automatically.
+
+Example:
+
+    # Correct
+    rm_conffile /etc/obsolete.conf 0.2~ foo
+    # INCORRECT
+    rm_conffile /etc/obsolete.conf 0.2~ foo -- "$@"
 
 In compat 10 or later, any shell metacharacters will be escaped, so
 arbitrary shell code cannot be inserted here.  For example, a line

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debhelper/debhelper.git