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

X Strike Force XFree86 SVN commit: r1049 - trunk/debian



Author: branden
Date: 2004-02-17 13:00:43 -0500 (Tue, 17 Feb 2004)
New Revision: 1049

Modified:
   trunk/debian/changelog
   trunk/debian/xutils.preinst.in
Log:
Don't try to move a nonexistent /etc/X11/rstart/rstartd.real out of the way
on installs or upgrades.


Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2004-02-17 05:59:40 UTC (rev 1048)
+++ trunk/debian/changelog	2004-02-17 18:00:43 UTC (rev 1049)
@@ -229,7 +229,7 @@
     overlap with Xv header files, static library, and manpages.
     - debian/control
 
- -- Branden Robinson <branden@debian.org>  Tue, 17 Feb 2004 00:58:01 -0500
+ -- Branden Robinson <branden@debian.org>  Tue, 17 Feb 2004 12:58:28 -0500
 
 xfree86 (4.3.0-0pre1v5) experimental; urgency=low
 

Modified: trunk/debian/xutils.preinst.in
===================================================================
--- trunk/debian/xutils.preinst.in	2004-02-17 05:59:40 UTC (rev 1048)
+++ trunk/debian/xutils.preinst.in	2004-02-17 18:00:43 UTC (rev 1049)
@@ -33,9 +33,11 @@
   # priests are correct, no one will have taken this file's claims of
   # configurability seriously.
   if dpkg --compare-versions "$2" lt "4.3.0-1"; then
-    observe "preparing to remove obsolete conffile" \
-            "/etc/X11/rstart/rstartd.real"
-    mv /etc/X11/rstart/rstartd.real /etc/X11/rstart/rstartd.real.dpkg-tmp
+    if [ -e /etc/X11/rstart/rstartd.real ] ; then
+      observe "preparing to remove obsolete conffile" \
+              "/etc/X11/rstart/rstartd.real"
+      mv /etc/X11/rstart/rstartd.real /etc/X11/rstart/rstartd.real.dpkg-tmp
+    fi
   fi
 
   check_symlinks_and_warn /usr/X11R6/lib/X11/rstart /usr/bin/rstartd



Reply to: