X Strike Force X.Org X11 SVN commit: r2291 - trunk/debian/xorg/debian
Author: dnusinow
Date: 2006-06-07 23:45:33 -0400 (Wed, 07 Jun 2006)
New Revision: 2291
Modified:
trunk/debian/xorg/debian/changelog
trunk/debian/xorg/debian/x11-common.preinst.in
Log:
* Move test to create Xwrapper.config to do it on either install or upgrade,
not in the migration code
Modified: trunk/debian/xorg/debian/changelog
===================================================================
--- trunk/debian/xorg/debian/changelog 2006-06-08 03:10:41 UTC (rev 2290)
+++ trunk/debian/xorg/debian/changelog 2006-06-08 03:45:33 UTC (rev 2291)
@@ -19,13 +19,15 @@
* Revert Xrapper.config modification during x11-common postinst to 6.9
behavior. We now only if the file exists and the md5sum is not altered, we
no longer only do this on upgrades This should unbreak fresh installs.
+ * Move test to create Xwrapper.config to do it on either install or upgrade,
+ not in the migration code
[ Josh Triplett ]
* Add conflicts on the old non-free package xv, no longer in Debian,
which broke upgrading on at least one system.
* Remove duplicated dependency on libx11-dev from xorg-dev.
- -- David Nusinow <dnusinow@debian.org> Wed, 7 Jun 2006 23:08:28 -0400
+ -- David Nusinow <dnusinow@debian.org> Wed, 7 Jun 2006 23:31:33 -0400
xorg (1:7.0.20) unstable; urgency=low
Modified: trunk/debian/xorg/debian/x11-common.preinst.in
===================================================================
--- trunk/debian/xorg/debian/x11-common.preinst.in 2006-06-08 03:10:41 UTC (rev 2290)
+++ trunk/debian/xorg/debian/x11-common.preinst.in 2006-06-08 03:45:33 UTC (rev 2291)
@@ -105,12 +105,12 @@
rmdir /var/lib/xfree86 2>/dev/null || true
fi
+ fi
- # place config files under management if they do *not* already exist
- if ! [ -e "$XWRAPPER_CONFIG" ]; then
- touch "$XWRAPPER_CONFIG"
- md5sum "$XWRAPPER_CONFIG" > "$XWRAPPER_CONFIG_CHECKSUM"
- fi
+ # place config files under management if they do *not* already exist
+ if ! [ -e "$XWRAPPER_CONFIG" ]; then
+ touch "$XWRAPPER_CONFIG"
+ md5sum "$XWRAPPER_CONFIG" > "$XWRAPPER_CONFIG_CHECKSUM"
fi
fi
Reply to: