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

[X Strike Force SVN Repository Admin]

Author: dnusinow
Date: 2005-09-27 20:48:52 -0500 (Tue, 27 Sep 2005)
New Revision: 630

Modified:
   trunk/debian/changelog
   trunk/debian/x11-common.preinst.in
Log:
* Only remove unmodified xfree86-common conffiles on new x11-common
  installation. Thanks Andreas Metzler.


Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog      2005-09-28 00:38:16 UTC (rev 629)
+++ trunk/debian/changelog      2005-09-28 01:48:52 UTC (rev 630)
@@ -31,8 +31,8 @@
     UTMP. Thanks Robert Millan. (Closes: #325615)
   * Have x11-common preinst check for xfree86-common conffile modification. If
     there are no modifications, remove them so that dpkg doesn't prompt the
-    user due to the package name change. Thanks Steve Langasek.
-    (closes: #318688)
+    user due to the package name change. Thanks Steve Langasek and Andreas
+    Metzler. (closes: #318688)
   * No longer refer to the removed Xsetup script in xdm.options.5. Thanks
     Bastian Kleineidam. (closes: #324887)
   * Update general/055_lnx_evdev_keyboard.diff to properly use the "less
@@ -51,7 +51,7 @@
   * Updated Czech translation (cs.po). Thanks, Miroslav Kure (closes:
     #327506).
 
- -- David Martínez Moreno <[EMAIL PROTECTED]>  Wed, 28 Sep 2005 02:34:04 +0200
+ -- David Nusinow <[EMAIL PROTECTED]>  Tue, 27 Sep 2005 21:48:25 -0400
 
 xorg-x11 (6.8.2.dfsg.1-7) unstable; urgency=high
 

Modified: trunk/debian/x11-common.preinst.in
===================================================================
--- trunk/debian/x11-common.preinst.in  2005-09-28 00:38:16 UTC (rev 629)
+++ trunk/debian/x11-common.preinst.in  2005-09-28 01:48:52 UTC (rev 630)
@@ -47,7 +47,7 @@
   # been modified from the stable sarge version. If they have been modified, 
we 
   # don't do anything, but if they are untouched then we remove them to let 
the 
   # upgrade continue without errors
-  if dpkg --compare-versions "$2" eq "4.3.0.dfsg.1-14"; then
+  if [ "$2" eq "" ]; then
     remove_conffile_prepare /etc/X11/Xresources/xfree86-common \
        a0f3911120c49038cb87607e3c545b90
     remove_conffile_prepare /etc/X11/Xsession \


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]