X Strike Force XFree86 SVN commit: rev 691 - trunk/debian
Author: branden
Date: 2003-10-21 22:42:24 -0500 (Tue, 21 Oct 2003)
New Revision: 691
Modified:
trunk/debian/changelog
trunk/debian/xdm.postinst.in
Log:
Don't tell the user that the selected default display manager (if it's not
xdm) must be configured every time xdm's postinst runs.
(cosmetic) Fix some indentation.
- debian/xdm.postinst.in
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2003-10-22 03:35:13 UTC (rev 690)
+++ trunk/debian/changelog 2003-10-22 03:42:24 UTC (rev 691)
@@ -64,8 +64,12 @@
- debian/xdm.postinst.in
- debian/xdm.postrm.in
- -- Branden Robinson <branden@debian.org> Tue, 21 Oct 2003 19:06:02 -0500
+ * Don't tell the user that the selected default display manager (if it's not
+ xdm) must be configured every time xdm's postinst runs.
+ - debian/xdm.postinst.in
+ -- Branden Robinson <branden@debian.org> Tue, 21 Oct 2003 22:41:16 -0500
+
xfree86 (4.2.1-12.1) unstable; urgency=low
* Fix typo in xlibs preinst. Closes: #213774, #213776
Modified: trunk/debian/xdm.postinst.in
===================================================================
--- trunk/debian/xdm.postinst.in 2003-10-22 03:35:13 UTC (rev 690)
+++ trunk/debian/xdm.postinst.in 2003-10-22 03:42:24 UTC (rev 691)
@@ -36,9 +36,6 @@
if [ ! -e "$DEFAULT_DISPLAY_MANAGER_FILE" ]; then
safe_debconf db_get shared/default-x-display-manager
if [ -n "$RET" ]; then
- if [ "$THIS_PACKAGE" != "$RET" ]; then
- message "Please be sure to run \"dpkg --configure $RET\"."
- fi
safe_debconf db_get "$RET"/daemon_name
if [ -n "$RET" ]; then
echo "$RET" > "$DEFAULT_DISPLAY_MANAGER_FILE"
@@ -62,9 +59,9 @@
fi
# or if we're currently in X on the display it attempts to manage by default
for HOST in "" \
- "localhost" \
- "$(hostname 2> /dev/null)" \
- "$(hostname -f 2> /dev/null)"; do
+ "localhost" \
+ "$(hostname 2> /dev/null)" \
+ "$(hostname -f 2> /dev/null)"; do
if echo "$DISPLAY" | grep -q "^$HOST:0.*"; then
NOSTART=yes
break
Reply to: