r353: * Modified all postinst script fragments to only run when called with

     "configure". I looked at the other possibilities, and I don't think any
     of the supported stuff should be called if the postist is called for
     error unwinds. Closes: #66673
   * Implemented dh_clean -X, to allow specification of files to not delete,
     Closes: #66670

13 files changed, 45 insertions, 23 deletions

diff --git a/autoscripts/postinst-emacsen b/autoscripts/postinst-emacsen
index 48bf26e7..97004eb7 100644
--- a/autoscripts/postinst-emacsen
+++ b/autoscripts/postinst-emacsen
@@ -1,3 +1,4 @@
-if [ -x /usr/lib/emacsen-common/emacs-package-install ]; then
+if [ "$1" = "configure" -a -x /usr/lib/emacsen-common/emacs-package-install ]
+then
 	/usr/lib/emacsen-common/emacs-package-install #PACKAGE#
 fi
diff --git a/autoscripts/postinst-info b/autoscripts/postinst-info
index 59881a19..71ffa19b 100644
--- a/autoscripts/postinst-info
+++ b/autoscripts/postinst-info
@@ -1 +1,3 @@
-install-info --quiet --section "#SECTION#" "#SECTION#" #FILE#
+if [ "$1" = "configure" ]; then
+	install-info --quiet --section "#SECTION#" "#SECTION#" #FILE#
+fi
diff --git a/autoscripts/postinst-info-nosection b/autoscripts/postinst-info-nosection
index cba27d27..ffef8636 100644
--- a/autoscripts/postinst-info-nosection
+++ b/autoscripts/postinst-info-nosection
@@ -1 +1,3 @@
-install-info --quiet #FILE#
+if [ "$1" = "configure" ]; then
+	install-info --quiet #FILE#
+fi
diff --git a/autoscripts/postinst-menu b/autoscripts/postinst-menu
index a73a1692..8a46311f 100644
--- a/autoscripts/postinst-menu
+++ b/autoscripts/postinst-menu
@@ -1 +1 @@
-if [ -x /usr/bin/update-menus ] ; then update-menus ; fi
+if [ "$1" = "configure" -a -x /usr/bin/update-menus ]; then update-menus ; fi
diff --git a/autoscripts/postinst-mime b/autoscripts/postinst-mime
index e993233b..a28e5bd7 100644
--- a/autoscripts/postinst-mime
+++ b/autoscripts/postinst-mime
@@ -1 +1 @@
-if [ -x /usr/sbin/update-mime ]; then update-mime; fi
+if [ "$1" = "configure" -a -x /usr/sbin/update-mime ]; then update-mime; fi
diff --git a/autoscripts/postinst-modules b/autoscripts/postinst-modules
index a8f4ce70..64b8eb0c 100644
--- a/autoscripts/postinst-modules
+++ b/autoscripts/postinst-modules
@@ -1,2 +1,4 @@
-update-modules
-depmod -a
+if [ "$1" = "configure" ]; then
+	update-modules
+	depmod -a
+fi
diff --git a/autoscripts/postinst-suid b/autoscripts/postinst-suid
index 1294d313..820d69a4 100644
--- a/autoscripts/postinst-suid
+++ b/autoscripts/postinst-suid
@@ -1,6 +1,8 @@
-if [ -e /etc/suid.conf -a -x /usr/sbin/suidregister ]; then
-        suidregister -s #PACKAGE# /#FILE# #OWNER# #GROUP# #PERMS#
-else
-        chown #OWNER#.#GROUP# /#FILE#
-        chmod #PERMS# /#FILE#
+if [ "$1" = "configure" ]; then
+	if command -v suidregister >/dev/null 2>&1 && [ -e /etc/suid.conf ]; then
+	        suidregister -s #PACKAGE# /#FILE# #OWNER# #GROUP# #PERMS#
+	elif [ -e /#FILE# ]; then
+	        chown #OWNER#.#GROUP# /#FILE#
+	        chmod #PERMS# /#FILE#
+	fi
 fi
diff --git a/autoscripts/postinst-wm b/autoscripts/postinst-wm
index 794ad700..aef412a3 100644
--- a/autoscripts/postinst-wm
+++ b/autoscripts/postinst-wm
@@ -1,2 +1,4 @@
-update-alternatives --install /usr/bin/x-window-manager \
-	x-window-manager #WM# #PRIORITY#
+if [ "$1" = "configure" ]; then
+	update-alternatives --install /usr/bin/x-window-manager \
+		x-window-manager #WM# #PRIORITY#
+fi
diff --git a/autoscripts/postinst-xaw b/autoscripts/postinst-xaw
index b8d718ea..324058f8 100644
--- a/autoscripts/postinst-xaw
+++ b/autoscripts/postinst-xaw
@@ -1,3 +1,8 @@
-if test -x /usr/sbin/update-xaw-wrappers; then
-	/usr/sbin/update-xaw-wrappers
+if [ "$1" = "configure" ]; then
+	if test -x /usr/sbin/update-xaw-wrappers; then
+		/usr/sbin/update-xaw-wrappers
+	fi
+	for opts in #OPTS#; do
+		update-alternatives --quiet --install $opts 25
+	done
 fi
diff --git a/autoscripts/postinst-xfonts b/autoscripts/postinst-xfonts
index a0b58c9d..ae999633 100644
--- a/autoscripts/postinst-xfonts
+++ b/autoscripts/postinst-xfonts
@@ -1,8 +1,10 @@
-fontdirs="#FONTDIRS#"
-updatecmds="#UPDATECMDS#"
-
-for dir in $fontdirs; do
-	for currentcmd in $updatecmds; do
-		$currentcmd /usr/lib/X11/fonts/$dir
+if [ "$1" = "configure" ]; then
+	fontdirs="#FONTDIRS#"
+	updatecmds="#UPDATECMDS#"
+	
+	for dir in $fontdirs; do
+		for currentcmd in $updatecmds; do
+			$currentcmd /usr/lib/X11/fonts/$dir
+		done
 	done
-done
+fi
diff --git a/autoscripts/postrm-menu b/autoscripts/postrm-menu
new file mode 100644
index 00000000..a34b6f18
--- /dev/null
+++ b/autoscripts/postrm-menu
@@ -0,0 +1 @@
+if [ -x /usr/bin/update-menus ]; then update-menus ; fi
diff --git a/autoscripts/postrm-mime b/autoscripts/postrm-mime
new file mode 100644
index 00000000..e993233b
--- /dev/null
+++ b/autoscripts/postrm-mime
@@ -0,0 +1 @@
+if [ -x /usr/sbin/update-mime ]; then update-mime; fi
diff --git a/autoscripts/postrm-modules b/autoscripts/postrm-modules
new file mode 100644
index 00000000..a8f4ce70
--- /dev/null
+++ b/autoscripts/postrm-modules
@@ -0,0 +1,2 @@
+update-modules
+depmod -a