X Strike Force XFree86 SVN commit: rev 905 - branches/4.3.0/sid/debian
Author: branden
Date: 2004-01-13 08:42:08 -0500 (Tue, 13 Jan 2004)
New Revision: 905
Modified:
branches/4.3.0/sid/debian/changelog
branches/4.3.0/sid/debian/xdm.config.in
branches/4.3.0/sid/debian/xdm.postinst.in
branches/4.3.0/sid/debian/xdm.postrm.in
branches/4.3.0/sid/debian/xdm.prerm.in
Log:
Stop short-circuiting past update of debconf choices information for
share/default-x-display-manager template if either the existing owners or
choices information are null -- doing so was causing some people not to be
prompted to set their default X display manager when they should have
been. (Closes: #226292)
Improve debugging output.
Modified: branches/4.3.0/sid/debian/changelog
===================================================================
--- branches/4.3.0/sid/debian/changelog 2004-01-12 22:14:35 UTC (rev 904)
+++ branches/4.3.0/sid/debian/changelog 2004-01-13 13:42:08 UTC (rev 905)
@@ -37,8 +37,17 @@
+ update build-dependency from libxrender-dev to libxrender-dev
(>= 0.8.3)
- -- Branden Robinson <branden@debian.org> Wed, 7 Jan 2004 12:38:20 -0500
+ * Stop short-circuiting past update of debconf choices information for
+ share/default-x-display-manager template if either the existing owners or
+ choices information are null -- doing so was causing some people not to be
+ prompted to set their default X display manager when they should have
+ been. Improve debugging output. (Closes: #226292)
+ - debian/xdm.config.in
+ - debian/xdm.{postinst,postrm,prerm}.in: add observe() calls to default
+ display manager file updates
+ -- Branden Robinson <branden@debian.org> Tue, 13 Jan 2004 08:39:37 -0500
+
xfree86 (4.3.0-0pre1v5) experimental; urgency=low
* Grab fixes to upstream CVS xf-4_3-branch since last pull.
Modified: branches/4.3.0/sid/debian/xdm.config.in
===================================================================
--- branches/4.3.0/sid/debian/xdm.config.in 2004-01-12 22:14:35 UTC (rev 904)
+++ branches/4.3.0/sid/debian/xdm.config.in 2004-01-13 13:42:08 UTC (rev 905)
@@ -29,37 +29,36 @@
CHOICES="$RET"
fi
-if [ -n "$OWNERS" -a -n "$CHOICES" ]; then
- if [ "$OWNERS" != "$CHOICES" ]; then
- safe_debconf db_subst shared/default-x-display-manager choices "$OWNERS"
- safe_debconf db_fset shared/default-x-display-manager seen false
- fi
+if [ "$OWNERS" != "$CHOICES" ]; then
+ observe "X display managers now available are \"$OWNERS\""
+ safe_debconf db_subst shared/default-x-display-manager choices "$OWNERS"
+ safe_debconf db_fset shared/default-x-display-manager seen false
+fi
- # debconf is not a registry; use the current contents of the default display
- # manager file to pre-answer the question if possible
- if [ -e "$DEFAULT_DISPLAY_MANAGER_FILE" ]; then
- CURRENT_DEFAULT=$(basename "$(grep -v '^[[:space:]]*#' \
- "$DEFAULT_DISPLAY_MANAGER_FILE" |
- head -n 1)")
- if [ -n "$CURRENT_DEFAULT" ]; then
- if ! which "$CURRENT_DEFAULT" > /dev/null 2>&1; then
- observe "default display manager \"$CURRENT_DEFAULT\" specified in" \
- "$DEFAULT_DISPLAY_MANAGER_FILE does not exist or is not" \
- "executable"
- fi
- safe_debconf db_set shared/default-x-display-manager "$CURRENT_DEFAULT"
+# debconf is not a registry; use the current contents of the default display
+# manager file to pre-answer the question if possible
+if [ -e "$DEFAULT_DISPLAY_MANAGER_FILE" ]; then
+ CURRENT_DEFAULT=$(basename "$(grep -v '^[[:space:]]*#' \
+ "$DEFAULT_DISPLAY_MANAGER_FILE" |
+ head -n 1)")
+ if [ -n "$CURRENT_DEFAULT" ]; then
+ if ! which "$CURRENT_DEFAULT" > /dev/null 2>&1; then
+ observe "default display manager \"$CURRENT_DEFAULT\" specified in" \
+ "$DEFAULT_DISPLAY_MANAGER_FILE does not exist or is not" \
+ "executable"
fi
- else
- CURRENT_DEFAULT=
- if db_get shared/default-x-display-manager; then
- CURRENT_DEFAULT="$RET"
- fi
+ safe_debconf db_set shared/default-x-display-manager "$CURRENT_DEFAULT"
fi
-
- safe_debconf db_input high shared/default-x-display-manager
- safe_debconf db_go
+else
+ CURRENT_DEFAULT=
+ if db_get shared/default-x-display-manager; then
+ CURRENT_DEFAULT="$RET"
+ fi
fi
+safe_debconf db_input high shared/default-x-display-manager
+safe_debconf db_go
+
# using this display manager?
NEW_DEFAULT=
if db_get shared/default-x-display-manager; then
@@ -70,6 +69,8 @@
if [ -n "$NEW_DEFAULT" ]; then
if [ "$NEW_DEFAULT" != "$CURRENT_DEFAULT" ]; then
if [ -e "$DEFAULT_DISPLAY_MANAGER_FILE" ]; then
+ observe "preparing to change default X display manager from"
+ "\"$CURRENT_DEFAULT\" to \"$NEW_DEFAULT\""
mv "$DEFAULT_DISPLAY_MANAGER_FILE" \
"$DEFAULT_DISPLAY_MANAGER_FILE.dpkg-tmp"
fi
Modified: branches/4.3.0/sid/debian/xdm.postinst.in
===================================================================
--- branches/4.3.0/sid/debian/xdm.postinst.in 2004-01-12 22:14:35 UTC (rev 904)
+++ branches/4.3.0/sid/debian/xdm.postinst.in 2004-01-13 13:42:08 UTC (rev 905)
@@ -54,6 +54,7 @@
fi
fi
if [ -n "$DAEMON_NAME" ]; then
+ observe "committing change of default X display manager"
echo "$DAEMON_NAME" > "$DEFAULT_DISPLAY_MANAGER_FILE"
fi
fi
Modified: branches/4.3.0/sid/debian/xdm.postrm.in
===================================================================
--- branches/4.3.0/sid/debian/xdm.postrm.in 2004-01-12 22:14:35 UTC (rev 904)
+++ branches/4.3.0/sid/debian/xdm.postrm.in 2004-01-13 13:42:08 UTC (rev 905)
@@ -28,6 +28,7 @@
# roll back displacement of default display manager file
if [ -e "$DEFAULT_DISPLAY_MANAGER_FILE.dpkg-tmp" ]; then
+ observe "rolling back change of default X display manager"
mv "$DEFAULT_DISPLAY_MANAGER_FILE.dpkg-tmp" "$DEFAULT_DISPLAY_MANAGER_FILE"
fi
fi
Modified: branches/4.3.0/sid/debian/xdm.prerm.in
===================================================================
--- branches/4.3.0/sid/debian/xdm.prerm.in 2004-01-12 22:14:35 UTC (rev 904)
+++ branches/4.3.0/sid/debian/xdm.prerm.in 2004-01-13 13:42:08 UTC (rev 905)
@@ -92,6 +92,7 @@
# does the question still exist?
if db_get shared/default-x-display-manager; then
if db_metaget shared/default-x-display-manager owners; then
+ observe "X display managers now available are \"$OWNERS\""
safe_debconf db_subst shared/default-x-display-manager choices "$RET"
fi
DEFAULT_DISPLAY_MANAGER=
Reply to: