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

X Strike Force X.Org X11 SVN commit: r1170 - trunk/debian



Author: dnusinow
Date: 2006-02-07 23:06:46 -0500 (Tue, 07 Feb 2006)
New Revision: 1170

Modified:
   trunk/debian/changelog
   trunk/debian/x11-common.preinst.in
Log:
* Remove rgb.txt stuff from x11-common.preinst. This is causing the file to
  be deleted.


Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2006-02-06 03:08:41 UTC (rev 1169)
+++ trunk/debian/changelog	2006-02-08 04:06:46 UTC (rev 1170)
@@ -18,8 +18,10 @@
     as a result of this patch I've removed general/021_evdev_manpage.diff
     which is now obsolete and rolled in to general/033_evdev_rewrite.diff.
     This also adds patch general/034_evdev_xkb.diff as well. (closes: #350389)
+  * Remove rgb.txt stuff from x11-common.preinst. This is causing the file to
+    be deleted.
 
- -- David Nusinow <dnusinow@debian.org>  Sun,  5 Feb 2006 22:05:29 -0500
+ -- David Nusinow <dnusinow@debian.org>  Tue,  7 Feb 2006 22:54:07 -0500
 
 xorg-x11 (6.9.0.dfsg.1-4) unstable; urgency=low
 

Modified: trunk/debian/x11-common.preinst.in
===================================================================
--- trunk/debian/x11-common.preinst.in	2006-02-06 03:08:41 UTC (rev 1169)
+++ trunk/debian/x11-common.preinst.in	2006-02-08 04:06:46 UTC (rev 1170)
@@ -64,13 +64,8 @@
        84ffa95821ba703d6bc203afbfd4bcac
     remove_conffile_prepare /etc/X11/Xsession.options \
        e675efbb486930e08bc779cbeb53a44e
-    remove_conffile_prepare /etc/X11/rgb.txt \
-       4896b3e3380a6a2af1920709bc31b140
     remove_conffile_prepare /etc/init.d/xfree86-common \
        034165e48abb370e9c3e276850755219
-    # We have to remove non-obsolete conffiles here, rather than postinst,
-    # because otherwise they get deleted prematurely
-    remove_conffile_commit /etc/X11/rgb.txt 
   fi
 
   check_symlinks_and_warn /usr/bin/X11 \



Reply to: