Followup-For: Bug #706747
Control: tag -1 patch
Attached is a patch backporting the alternatives fixes from wheezy and
cleaning up some more old alternatives.
Andreas
diff -u xview-3.2p1.4/debian/olvwm.prerm xview-3.2p1.4/debian/olvwm.prerm
--- xview-3.2p1.4/debian/olvwm.prerm
+++ xview-3.2p1.4/debian/olvwm.prerm
@@ -8,5 +8,5 @@
upgrade) ;;
remove|failed-upgrade|deconfigure)
-update-alternatives --remove x-window-manager /usr/bin/X11/olvwm-x-window-manager
+update-alternatives --remove x-window-manager /usr/bin/olvwm-x-window-manager
;;
esac
diff -u xview-3.2p1.4/debian/changelog xview-3.2p1.4/debian/changelog
--- xview-3.2p1.4/debian/changelog
+++ xview-3.2p1.4/debian/changelog
@@ -1,3 +1,13 @@
+xview (3.2p1.4-25+squeeze1) squeeze; urgency=low
+
+ * Non-maintainer upload.
+ * ol[v]wm: Fix alternatives handling. We are no longer installed in
+/usr/bin/X11/ and /usr/X11R6/. Backported from 3.2p1.4-26 (#411131,
+#617211) and 3.2p1.4-28.1 (#656450, #668448). Cleanup more old
+alternatives. (Closes: #706747)
+
+ -- Andreas Beckmann a...@debian.org Sat, 04 May 2013 11:04:30 +0200
+
xview (3.2p1.4-25) unstable; urgency=low
* QA upload.
diff -u xview-3.2p1.4/debian/olwm.prerm xview-3.2p1.4/debian/olwm.prerm
--- xview-3.2p1.4/debian/olwm.prerm
+++ xview-3.2p1.4/debian/olwm.prerm
@@ -8,5 +8,5 @@
upgrade) ;;
remove|failed-upgrade|deconfigure)
-update-alternatives --remove x-window-manager /usr/bin/X11/olwm-x-window-manager
+update-alternatives --remove x-window-manager /usr/bin/olwm-x-window-manager
;;
esac
diff -u xview-3.2p1.4/debian/olwm.postinst xview-3.2p1.4/debian/olwm.postinst
--- xview-3.2p1.4/debian/olwm.postinst
+++ xview-3.2p1.4/debian/olwm.postinst
@@ -8,6 +8,7 @@
# Remove old alternative (if it's still there)
update-alternatives --remove x-window-manager /usr/bin/X11/olwm /dev/null 21 || true
+ update-alternatives --remove x-window-manager /usr/bin/X11/olwm-x-window-manager /dev/null 21 || true
# ...and install new one that now points to the wrapper
- update-alternatives --install /usr/bin/x-window-manager x-window-manager /usr/bin/X11/olwm-x-window-manager 44 \
+ update-alternatives --install /usr/bin/x-window-manager x-window-manager /usr/bin/olwm-x-window-manager 44 \
--slave /usr/share/man/man1/x-window-manager.1.gz x-window-manager.1.gz /usr/share/man/man1/olwm.1.gz
fi
diff -u xview-3.2p1.4/debian/olvwm.postinst xview-3.2p1.4/debian/olvwm.postinst
--- xview-3.2p1.4/debian/olvwm.postinst
+++ xview-3.2p1.4/debian/olvwm.postinst
@@ -21,5 +21,6 @@
update-alternatives --remove x-window-manager /usr/bin/X11/olvwm /dev/null 21 || true
+ update-alternatives --remove x-window-manager /usr/bin/X11/olvwm-x-window-manager /dev/null 21 || true
# ...and install new one that now points to the wrapper
- update-alternatives --install /usr/bin/x-window-manager x-window-manager /usr/bin/X11/olvwm-x-window-manager 45 \
- --slave /usr/share/man/man1/x-window-manager.1.gz x-window-manager.1.gz /usr/X11R6/man/man1/olvwm.1.gz
+ update-alternatives --install /usr/bin/x-window-manager x-window-manager /usr/bin/olvwm-x-window-manager 45 \
+ --slave /usr/share/man/man1/x-window-manager.1.gz x-window-manager.1.gz /usr/share/man/man1/olvwm.1.gz
fi