xdm: Changes to 'debian-unstable'
debian/changelog | 2 ++
debian/xdm.postinst.in | 11 -----------
debian/xdm.postrm.in | 18 ------------------
debian/xdm.preinst.in | 44 --------------------------------------------
4 files changed, 2 insertions(+), 73 deletions(-)
New commits:
commit ae1cc768e8c52c94f7a1f560cec72fa39049357d
Author: Julien Cristau <jcristau@debian.org>
Date: Mon May 24 11:49:13 2010 +0200
Remove code dealing with upgrades from pre-etch from maintainer scripts
Drop obsolete upgrade code from pre-etch versions in preinst, postinst
and postrm scripts.
diff --git a/debian/changelog b/debian/changelog
index bab295b..f20f0eb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ xdm (1:1.1.10-2) UNRELEASED; urgency=low
* debian.diff: replace references to the XFree86 X server with Xorg.
* Set default system and user PATHs when running configure instead of
patching xdm-config.
+ * Drop obsolete upgrade code from pre-etch versions in preinst, postinst and
+ postrm scripts.
-- Julien Cristau <jcristau@debian.org> Tue, 20 Apr 2010 02:08:13 +0200
diff --git a/debian/xdm.postinst.in b/debian/xdm.postinst.in
index 24822d3..d871e02 100644
--- a/debian/xdm.postinst.in
+++ b/debian/xdm.postinst.in
@@ -15,20 +15,9 @@ THIS_SCRIPT=postinst
#INCLUDE_SHELL_LIB#
-OBSOLETE_CONFFILES="pixmaps/XFree86.xpm pixmaps/XFree86bw.xpm pixmaps/debian.xpm pixmaps/debianbw.xpm pixmaps/xorg.xpm pixmaps/xorgbw.xpm"
DAEMON=/usr/bin/xdm
OLD_DAEMON=/usr/bin/X11/xdm
-# now safe to remove old xserver dir
-if [ -e /usr/X11R6/lib/X11/xdm.moved-by-preinst ]; then
- rm -r /usr/X11R6/lib/X11/xdm.moved-by-preinst
-fi
-
-# now safe to remove obsolete conffiles
-for F in $OBSOLETE_CONFFILES; do
- remove_conffile_commit "/etc/X11/xdm/$F"
-done
-
# debconf is not a registry, so we only fiddle with the default file if it
# does not exist
DEFAULT_DISPLAY_MANAGER_FILE=/etc/X11/default-display-manager
diff --git a/debian/xdm.postrm.in b/debian/xdm.postrm.in
index dd90a63..ab440d1 100644
--- a/debian/xdm.postrm.in
+++ b/debian/xdm.postrm.in
@@ -12,27 +12,9 @@ THIS_SCRIPT=postrm
#INCLUDE_SHELL_LIB#
-OBSOLETE_CONFFILES="pixmaps/XFree86.xpm pixmaps/XFree86bw.xpm pixmaps/debian.xpm pixmaps/debianbw.xpm pixmaps/xorg.xpm pixmaps/xorg-bw.xpm"
DAEMON=/usr/bin/xdm
DEFAULT_DISPLAY_MANAGER_FILE=/etc/X11/default-display-manager
-if [ "$1" = "abort-install" ] || [ "$1" = "abort-upgrade" ]; then
- if [ -d /usr/X11R6/lib/X11/xdm.moved-by-preinst ]; then
- mv /usr/X11R6/lib/X11/xdm.moved-by-preinst /usr/X11R6/lib/X11/xdm
- fi
-
- # roll back removal of obsolete conffiles
- for F in $OBSOLETE_CONFFILES; do
- remove_conffile_rollback "/etc/X11/xdm/$F"
- done
-
- # roll back displacement of default display manager file
- if [ -e "$DEFAULT_DISPLAY_MANAGER_FILE.dpkg-tmp" ]; then
- observe "rolling back change of default X display manager"
- mv "$DEFAULT_DISPLAY_MANAGER_FILE.dpkg-tmp" "$DEFAULT_DISPLAY_MANAGER_FILE"
- fi
-fi
-
#DEBHELPER#
if [ "$1" = "purge" ]; then
diff --git a/debian/xdm.preinst.in b/debian/xdm.preinst.in
index 11b4f9f..a227235 100644
--- a/debian/xdm.preinst.in
+++ b/debian/xdm.preinst.in
@@ -12,50 +12,6 @@ THIS_SCRIPT=preinst
#INCLUDE_SHELL_LIB#
-if [ "$1" = "install" ] || [ "$1" = "upgrade" ]; then
- # deal with a bug in very old versions of xbase (prior to 3.3.2-1)
- if dpkg --compare-versions "$2" lt "3.3.2-1"; then
- for DIR in rc0.d rc1.d rc6.d; do
- if [ -L "/etc/$DIR/K1xdm" ]; then
- observe "fixing buggy symbolic link /etc/$DIR/K1xdm"
- mv "/etc/$DIR/K1xdm" "/etc/$DIR/K01xdm"
- fi
- done
- fi
-
- # as of the xfree86 4.x packages, we expect /usr/X11R6/lib/X11/xdm to be a
- # symbolic link to the /etc/X11/xdm directory; move an existing directory out
- # of the way (even if we're installing over a non-packaged XFree86
- # installation)
- if [ -e /usr/X11R6/lib/X11/xdm ] && ! [ -L /usr/X11R6/lib/X11/xdm ]; then
- observe "removing obsolete /usr/X11R6/lib/X11/xdm directory"
- mv /usr/X11R6/lib/X11/xdm /usr/X11R6/lib/X11/xdm.moved-by-preinst
- fi
-
- # got rid of the shared libXdmGreet in 4.0.3
- if dpkg --compare-versions "$2" lt "4.0.3-1"; then
- if update-alternatives --display xdm-greeter |
- fgrep -q /usr/X11R6/lib/libXdmGreet.so.1; then
- observe "removing obsolete xdm-greeter alternative and .so symlink"
- update-alternatives --remove xdm-greeter /usr/X11R6/lib/libXdmGreet.so.1
- # remove this garbage link that ldconfig creates
- rm -f /usr/X11R6/lib/libXdmGreet.so
- fi
- fi
-
- if dpkg --compare-versions "$2" lt "6.8.1-0.3"; then
- remove_conffile_prepare /etc/X11/xdm/pixmaps/XFree86.xpm 91cf8f46b31119b5d69270ae7bc5081d
- remove_conffile_prepare /etc/X11/xdm/pixmaps/XFree86bw.xpm c9ef591e6e78edd3d2352e55c0067160
- fi
-
- if dpkg --compare-versions "$2" lt "1:1.0.1-1"; then
- remove_conffile_prepare /etc/X11/xdm/pixmaps/debianbw.xpm c90b32c82b91d0c8c69ba5a69594a21f
- remove_conffile_prepare /etc/X11/xdm/pixmaps/debian.xpm 8bd89d6976e41f6598ab61fda364505e
- remove_conffile_prepare /etc/X11/xdm/pixmaps/xorg-bw.xpm 30e3a8767640924d5025b6995c74d8fd
- remove_conffile_prepare /etc/X11/xdm/pixmaps/xorg.xpm 97e00d725c718298a23395d11abd00a2
- fi
-fi
-
if [ "$1" = "install" ]; then
# Create a flag file that tells the postinst script this is an install, not
# an upgrade.
Reply to: