r403: * dh_installwm: Moved update-alternatives --remove call to prerm,

     Closes: #80209
   * ALso guarded all update-alternatives --remove calls.

diff --git a/autoscripts/postrm-wm b/autoscripts/postrm-wm
deleted file mode 100644 (file)
index c4670b9..0000000
--- a/autoscripts/postrm-wm
+++ /dev/null
@@ -1,2 +0,0 @@
-update-alternatives --remove x-window-manager #WM#
-

diff --git a/autoscripts/prerm-wm b/autoscripts/prerm-wm
new file mode 100644 (file)
index 0000000..b97d627
--- /dev/null
+++ b/autoscripts/prerm-wm
@@ -0,0 +1,3 @@
+if [ "$1" = "remove" ]; then
+       update-alternatives --remove x-window-manager #WM#
+fi

diff --git a/autoscripts/prerm-xaw b/autoscripts/prerm-xaw
index 2507a2f5dce136c0371addba51846103bbe2627a..98837f82edb43205f7661bd271da4e420b83915f 100644 (file)
--- a/autoscripts/prerm-xaw
+++ b/autoscripts/prerm-xaw
@@ -1,4 +1,5 @@
-for opts in #OPTS#; do
-       update-alternatives --quiet --remove $opts
-done
-       
+if [ "$1" = "remove" ]; then
+       for opts in #OPTS#; do
+               update-alternatives --quiet --remove $opts
+       done
+fi

diff --git a/debian/changelog b/debian/changelog
index d6bacad18a56bebc32e66f1cc9fdfa622940fcde..bab542224e655f185e5982dc4445445a41a3f099 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+debhelper (2.2.8) unstable; urgency=medium
+
+  * dh_installwm: Moved update-alternatives --remove call to prerm, 
+    Closes: #80209
+  * ALso guarded all update-alternatives --remove calls.
+
+ -- Joey Hess <joeyh@debian.org>  Thu, 21 Dec 2000 11:33:30 -0800
+
 debhelper (2.2.7) unstable; urgency=low
 
   * Spelling patch.