X Strike Force X.Org X11 SVN commit: r2290 - trunk/debian/xorg/debian
Author: dnusinow
Date: 2006-06-07 23:10:41 -0400 (Wed, 07 Jun 2006)
New Revision: 2290
Modified:
trunk/debian/xorg/debian/changelog
trunk/debian/xorg/debian/x11-common.postinst.in
Log:
* 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.
Modified: trunk/debian/xorg/debian/changelog
===================================================================
--- trunk/debian/xorg/debian/changelog 2006-06-07 04:43:03 UTC (rev 2289)
+++ trunk/debian/xorg/debian/changelog 2006-06-08 03:10:41 UTC (rev 2290)
@@ -16,13 +16,16 @@
[ David Nusinow ]
* Add conflicts on some old woody stuff, including xftp, xext, xpaste, and
ghostview. Thanks Carl Miller and Roger Leigh. (closes: #362915, #370088)
+ * 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.
[ 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.
- -- Steve Langasek <vorlon@debian.org> Tue, 6 Jun 2006 17:58:47 -0700
+ -- David Nusinow <dnusinow@debian.org> Wed, 7 Jun 2006 23:08:28 -0400
xorg (1:7.0.20) unstable; urgency=low
Modified: trunk/debian/xorg/debian/x11-common.postinst.in
===================================================================
--- trunk/debian/xorg/debian/x11-common.postinst.in 2006-06-07 04:43:03 UTC (rev 2289)
+++ trunk/debian/xorg/debian/x11-common.postinst.in 2006-06-08 03:10:41 UTC (rev 2290)
@@ -52,11 +52,11 @@
# only mess with config file it exists; otherwise, assume that's the way the
-# user wants it, but only if upgrading
-if [ -e "$XWRAPPER_CONFIG" ] || [ -n "$2" ]; then
+# user wants it
+if [ -e "$XWRAPPER_CONFIG" ]; then
# similarly, check for the existence of the checksum file; if it doesn't
- # exist, assume that's the way the user wants it, but only if upgrading
- if [ -e "$XWRAPPER_CONFIG_CHECKSUM" ] || [ -n "$2" ]; then
+ # exist, assume that's the way the user wants it
+ if [ -e "$XWRAPPER_CONFIG_CHECKSUM" ]; then
# next, compare the current and stored checksums; if they do not match,
# assume that's the way the user wants it ... upgrading etc
if [ "$(md5sum "$XWRAPPER_CONFIG" 2>/dev/null)" = \
Reply to: