X Strike Force X.Org X11 SVN commit: r2097 - trunk/debian/xorg/debian
Author: dnusinow
Date: 2006-05-04 22:55:36 -0400 (Thu, 04 May 2006)
New Revision: 2097
Modified:
trunk/debian/xorg/debian/changelog
trunk/debian/xorg/debian/x11-common.postinst.in
trunk/debian/xorg/debian/xserver-xorg.postinst.in
trunk/debian/xorg/debian/xserver-xorg.preinst.in
Log:
* Tell the configuration scripts that we're upgrading properly. The variable
that was being used to test this was never set for some reason.
Modified: trunk/debian/xorg/debian/changelog
===================================================================
--- trunk/debian/xorg/debian/changelog 2006-05-05 02:16:37 UTC (rev 2096)
+++ trunk/debian/xorg/debian/changelog 2006-05-05 02:55:36 UTC (rev 2097)
@@ -18,8 +18,10 @@
[ David Nusinow ]
* Have x11-common move Xsession.xfree86 back to Xsession if Xsession doesn't
exist. This is to clean up the mess made on last upload
+ * Tell the configuration scripts that we're upgrading properly. The variable
+ that was being used to test this was never set for some reason.
- -- David Nusinow <dnusinow@debian.org> Thu, 4 May 2006 20:26:57 -0400
+ -- David Nusinow <dnusinow@debian.org> Thu, 4 May 2006 22:54:51 -0400
xorg (1:7.0.16) unstable; urgency=low
Modified: trunk/debian/xorg/debian/x11-common.postinst.in
===================================================================
--- trunk/debian/xorg/debian/x11-common.postinst.in 2006-05-05 02:16:37 UTC (rev 2096)
+++ trunk/debian/xorg/debian/x11-common.postinst.in 2006-05-05 02:55:36 UTC (rev 2097)
@@ -59,15 +59,15 @@
# 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" ] || [ -z "$UPGRADE" ]; then
+if [ -e "$XWRAPPER_CONFIG" ] || [ -n "$2" ]; 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" ] || [ -z "$UPGRADE" ]; then
+ if [ -e "$XWRAPPER_CONFIG_CHECKSUM" ] || [ -n "$2" ]; 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)" = \
"$(cat "$XWRAPPER_CONFIG_CHECKSUM" 2>/dev/null)" ] || \
- [ -z "$UPGRADE" ]; then
+ [ -n "$2" ]; then
# they match; prepare a new version of the config file
ALLOWED_USERS=
if db_get x11-common/xwrapper/actual_allowed_users; then
Modified: trunk/debian/xorg/debian/xserver-xorg.postinst.in
===================================================================
--- trunk/debian/xorg/debian/xserver-xorg.postinst.in 2006-05-05 02:16:37 UTC (rev 2096)
+++ trunk/debian/xorg/debian/xserver-xorg.postinst.in 2006-05-05 02:55:36 UTC (rev 2097)
@@ -20,6 +20,10 @@
. /etc/default/xorg
fi
+if [ "$1" = "configure" ] && [ -n "$2"]; then
+ UPGRADE='true'
+fi
+
if [ "x$XORG_CONFIG" = "xcustom" ]; then
# leave configuration alone
warn "not updating configuration as per \$XORG_CUSTOM"
Modified: trunk/debian/xorg/debian/xserver-xorg.preinst.in
===================================================================
--- trunk/debian/xorg/debian/xserver-xorg.preinst.in 2006-05-05 02:16:37 UTC (rev 2096)
+++ trunk/debian/xorg/debian/xserver-xorg.preinst.in 2006-05-05 02:55:36 UTC (rev 2097)
@@ -52,7 +52,7 @@
# the transition from /var/lib/xfree86 to /var/lib/x11 occurred in
# 7.0.0-0ubuntu1 and 1:7.0.0
- if [ -n "$UPGRADE" ] && \
+ if [ -n "$2" ] && \
dpkg --compare-versions "$2" lt "1:7.0.11"; then
if [ -e "/var/lib/xfree86" ]; then
if [ -e "/var/lib/xfree86/$SERVER_SYMLINK_ROSTER_BASE" ]; then
Reply to: