[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

X Strike Force SVN commit: rev 493 - trunk/debian



Author: branden
Date: 2003-09-10 04:24:39 -0500 (Wed, 10 Sep 2003)
New Revision: 493

Modified:
   trunk/debian/changelog
   trunk/debian/xdm.preinst.in
Log:
debian/xdm.prerm.in: clean up the old logic for deregistering the old
  xdm-greeter alternative to only do so if upgrading from versions of the
  package prior to 4.0.3 and that alternative is actually registered (see
  bug #164021 for a similar issue with another package)


Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2003-09-10 09:05:11 UTC (rev 492)
+++ trunk/debian/changelog	2003-09-10 09:24:39 UTC (rev 493)
@@ -39,8 +39,13 @@
                     of service or execute arbitrary code via heap-based and
                     stack-based buffer overflow attacks)
 
- -- Branden Robinson <branden@debian.org>  Wed, 10 Sep 2003 04:01:45 -0500
+  * debian/xdm.prerm.in: clean up the old logic for deregistering the old
+    xdm-greeter alternative to only do so if upgrading from versions of the
+    package prior to 4.0.3 and that alternative is actually registered (see
+    bug #164021 for a similar issue with another package)
 
+ -- Branden Robinson <branden@debian.org>  Wed, 10 Sep 2003 04:23:00 -0500
+
 xfree86 (4.2.1-11) unstable; urgency=medium
 
   * urgency set to medium because bug #206790 bites a lot of people (but,

Modified: trunk/debian/xdm.preinst.in
===================================================================
--- trunk/debian/xdm.preinst.in	2003-09-10 09:05:11 UTC (rev 492)
+++ trunk/debian/xdm.preinst.in	2003-09-10 09:24:39 UTC (rev 493)
@@ -18,9 +18,15 @@
     message "Note: 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 libXdmGreeter in 4.0.3
-  update-alternatives --remove xdm-greeter /usr/X11R6/lib/libXdmGreet.so.1
-  rm -f /usr/X11R6/lib/libXdmGreet.so
+  if [ "$1" = "upgrade" ] && dpkg --compare-versions "$2" lt "4.0.3"; then
+    if update-alternatives --display xdm-greeter | \
+      fgrep -q /usr/X11R6/lib/libXdmGreet.so.1; then
+      update-alternatives --remove xdm-greeter /usr/X11R6/lib/libXdmGreet.so.1
+    fi
+  fi
+
   check_symlinks_and_warn /usr/X11R6/lib/X11/xdm
 fi
 



Reply to: