debian/x11-common.postrm.in | 3 +++ debian/x11-common.preinst.in | 3 +++ 2 files changed, 6 insertions(+)
New commits: commit 5c5f16f9cfad48691c923e75bd36a9b0155428aa Author: Bryce Harrington <br...@bryceharrington.org> Date: Wed Mar 18 13:41:05 2009 -0700 Fix up my cargo-culting... and now it finally actually works. diff --git a/debian/x11-common.preinst.in b/debian/x11-common.preinst.in index d4cc6cb..ea5099c 100644 --- a/debian/x11-common.preinst.in +++ b/debian/x11-common.preinst.in @@ -31,7 +31,7 @@ if [ "$1" = "install" ] || [ "$1" = "upgrade" ]; then remove_conffile_lookup xinit "/etc/X11/Xsession.d/99xorg-common_start" fi if dpkg --compare-versions "$2" lt-nl "1:7.4~5ubuntu16"; then - remove_conffile_lookup xinit "/etc/X11/Xsession.d/60x11-localhost" + remove_conffile_lookup x11-common "/etc/X11/Xsession.d/60x11-localhost" fi # We need to remove /usr/X11R6/bin so we can replace it with a symlink commit 37936879f6a7ee1a11917f50e668c43f4f218743 Author: Bryce Harrington <br...@bryceharrington.org> Date: Wed Mar 18 13:15:35 2009 -0700 Also add handling for 60x11-localhost cleanup to preinst and postrm diff --git a/debian/x11-common.postrm.in b/debian/x11-common.postrm.in index 44f7595..98f9c4b 100644 --- a/debian/x11-common.postrm.in +++ b/debian/x11-common.postrm.in @@ -27,6 +27,9 @@ abort-install|abort-upgrade) remove_conffile_rollback "/etc/X11/Xsession.d/90xorg-common_ssh-agent" remove_conffile_rollback "/etc/X11/Xsession.d/99xorg-common_start" fi + if dpkg --compare-versions "$2" lt-nl "1:7.4~5ubuntu16"; then + remove_conffile_rollback "/etc/X11/Xsession.d/60x11-localhost" + fi esac # clean up non-conffile configuration files and related materials on purge diff --git a/debian/x11-common.preinst.in b/debian/x11-common.preinst.in index e398ab8..d4cc6cb 100644 --- a/debian/x11-common.preinst.in +++ b/debian/x11-common.preinst.in @@ -30,6 +30,9 @@ if [ "$1" = "install" ] || [ "$1" = "upgrade" ]; then remove_conffile_lookup xinit "/etc/X11/Xsession.d/90xorg-common_ssh-agent" remove_conffile_lookup xinit "/etc/X11/Xsession.d/99xorg-common_start" fi + if dpkg --compare-versions "$2" lt-nl "1:7.4~5ubuntu16"; then + remove_conffile_lookup xinit "/etc/X11/Xsession.d/60x11-localhost" + fi # We need to remove /usr/X11R6/bin so we can replace it with a symlink if [ -d "/usr/X11R6/bin" ] && [ ! -L /usr/X11R6/bin ]; then -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org