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

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



Author: branden
Date: 2003-09-30 15:37:33 -0500 (Tue, 30 Sep 2003)
New Revision: 612

Modified:
   trunk/debian/changelog
   trunk/debian/xlibs.preinst.in
Log:
Update xlibs's pre-installation script to clean up after a mess made by
woody-era xlibs post-installation script: it used ln -sf instead of ln
-nsf to create a symbolic link to a directory, which often had the result
of creating a symlink "/etc/X11/app-defaults/app-defaults", which is bogus
and stupid.  (Closes: #210980)

- debian/xlibs.preinst.in


Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2003-09-30 19:03:07 UTC (rev 611)
+++ trunk/debian/changelog	2003-09-30 20:37:33 UTC (rev 612)
@@ -298,8 +298,15 @@
     Old World Order (prior to 4.2.1-10).
     - debian/xserver-xfree86.preinst.in
 
- -- Branden Robinson <branden@debian.org>  Tue, 30 Sep 2003 11:22:30 -0500
+  * Update xlibs's pre-installation script to clean up after a mess made by
+    woody-era xlibs post-installation script: it used ln -sf instead of ln
+    -nsf to create a symbolic link to a directory, which often had the result
+    of creating a symlink "/etc/X11/app-defaults/app-defaults", which is bogus
+    and stupid.  (Closes: #210980)
+    - debian/xlibs.preinst.in
 
+ -- Branden Robinson <branden@debian.org>  Tue, 30 Sep 2003 15:34:48 -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/xlibs.preinst.in
===================================================================
--- trunk/debian/xlibs.preinst.in	2003-09-30 19:03:07 UTC (rev 611)
+++ trunk/debian/xlibs.preinst.in	2003-09-30 20:37:33 UTC (rev 612)
@@ -21,6 +21,16 @@
     fi
   done
 
+  # ensure the sanity of the app-defaults symlink in /usr; the xlibs postinst
+  # script in woody could make it insane
+  for DIR in /usr/X11R6/lib/X11/app-defaults /etc/X11/app-defaults; do
+    LINK="$DIR/app-defaults"
+    if [ -L "$LINK" ]; then
+      debug "Removing bogus symbolic link $LINK."
+      rm -f "$LINK"
+    fi
+  done
+
   check_symlinks_and_warn /usr/X11R6/lib/X11/xkb \
                           /usr/X11R6/lib/X11/app-defaults
 



Reply to: