r1632: * Clarify dh_install's autodest behavior with wildcards. Closes: #224707

diff --git a/autoscripts/postrm-init b/autoscripts/postrm-init
index 9596dd977eb282ca5f365ab71769f56e814f3966..1c29298256bdcf9ca800b7214520cdf058a1d95d 100644 (file)
--- a/autoscripts/postrm-init
+++ b/autoscripts/postrm-init
@@ -1,3 +1,3 @@
 if [ "$1" = "purge" ] ; then
-       update-rc.d #SCRIPT# remove #INITPARMS# >/dev/null
+       update-rc.d #SCRIPT# remove >/dev/null
 fi

diff --git a/autoscripts/prerm-info b/autoscripts/prerm-info
index b3f53ccdb2b22072525565c419d06f40f92336fe..6d13234e1f7136e39ea4d464d2739ecc3c156127 100644 (file)
--- a/autoscripts/prerm-info
+++ b/autoscripts/prerm-info
@@ -1 +1,3 @@
-install-info --quiet --remove #FILE#
+if [ "$1" = remove ]; then
+       install-info --quiet --remove #FILE#
+fi

diff --git a/dh_install b/dh_install
index 779b9d6e73564033aa3b63d5c840a16654cff801..e43229a5cf20413838d71a151fe9681357238010 100755 (executable)
--- a/dh_install
+++ b/dh_install
@@ -62,7 +62,8 @@ filename. So if the filename is debian/tmp/usr/bin, then that directory
 will be copied to debian/package/usr/. If the filename is
 debian/tmp/etc/passwd, it will be copied to debian/package/etc/.
 
-Note that if you list only a filename on a line by itself in a
+Note that if you list exactly one filename or wildcard-pattern on a line by
+itself in a
 debian/package.install file, with no explicit destination, then dh_install
 will automatically guess the destination even if this flag is not set.