X Strike Force X.Org X11 SVN commit: r2890 - trunk/debian/xorg/debian
Author: dnusinow
Date: 2006-08-21 23:14:36 -0400 (Mon, 21 Aug 2006)
New Revision: 2890
Modified:
trunk/debian/xorg/debian/changelog
trunk/debian/xorg/debian/x11-common.postinst.in
Log:
* Pull patch from Ubuntu to xserver-xorg postins to correctly update the
config file on upgrades
Modified: trunk/debian/xorg/debian/changelog
===================================================================
--- trunk/debian/xorg/debian/changelog 2006-08-22 03:10:59 UTC (rev 2889)
+++ trunk/debian/xorg/debian/changelog 2006-08-22 03:14:36 UTC (rev 2890)
@@ -25,8 +25,10 @@
* Update xsfbs with patch from ubuntu to support ARCHITECTURE, LAPTOP,
RECONFIGURE, FIRSTINST, and UPGRADE variables for use in the xserver-xorg
config scripting
+ * Pull patch from Ubuntu to xserver-xorg postins to correctly update the
+ config file on upgrades
- -- David Nusinow <dnusinow@debian.org> Mon, 21 Aug 2006 23:10:04 +0000
+ -- David Nusinow <dnusinow@debian.org> Mon, 21 Aug 2006 23:13:31 +0000
xorg (1:7.0.23) unstable; urgency=low
Modified: trunk/debian/xorg/debian/x11-common.postinst.in
===================================================================
--- trunk/debian/xorg/debian/x11-common.postinst.in 2006-08-22 03:10:59 UTC (rev 2889)
+++ trunk/debian/xorg/debian/x11-common.postinst.in 2006-08-22 03:14:36 UTC (rev 2890)
@@ -52,16 +52,16 @@
# only mess with config file it exists; otherwise, assume that's the way the
-# user wants it
-if [ -e "$XWRAPPER_CONFIG" ]; then
+# user wants it, but only if upgrading
+if [ -e "$XWRAPPER_CONFIG" ] || [ -z "$UPGRADE" ]; then
# similarly, check for the existence of the checksum file; if it doesn't
- # exist, assume that's the way the user wants it
- if [ -e "$XWRAPPER_CONFIG_CHECKSUM" ]; then
+ # exist, assume that's the way the user wants it, but only if upgrading
+ if [ -e "$XWRAPPER_CONFIG_CHECKSUM" ] || [ -z "$UPGRADE" ]; 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)" ] || \
- [ -n "$2" ]; then
+ [ -z "$UPGRADE" ]; then
# they match; prepare a new version of the config file
ALLOWED_USERS=
if db_get x11-common/xwrapper/actual_allowed_users; then
Reply to: