X Strike Force XFree86 SVN commit: rev 877 - in branches/4.3.0/sid/debian: . local patches
Author: branden
Date: 2003-12-31 07:04:01 -0500 (Wed, 31 Dec 2003)
New Revision: 877
Added:
branches/4.3.0/sid/debian/patches/011a_recognize_glibc_2.3.2_locale_names.diff
branches/4.3.0/sid/debian/patches/315_arm_fix_up_lnx_video_io_access.diff
Removed:
branches/4.3.0/sid/debian/patches/011a_recognize_euro_modifier_locales.diff
Modified:
branches/4.3.0/sid/debian/changelog
branches/4.3.0/sid/debian/local/dexconf
branches/4.3.0/sid/debian/shell-lib.sh
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.prerm.in
branches/4.3.0/sid/debian/xserver-common.config.in
branches/4.3.0/sid/debian/xserver-common.postinst.in
Log:
Merge changes between tags/4.2.1-14 and tags/4.2.1-15.
Modified: branches/4.3.0/sid/debian/changelog
===================================================================
--- branches/4.3.0/sid/debian/changelog 2003-12-31 11:46:20 UTC (rev 876)
+++ branches/4.3.0/sid/debian/changelog 2003-12-31 12:04:01 UTC (rev 877)
@@ -817,6 +817,52 @@
-- Branden Robinson <branden@debian.org> Thu, 26 Jun 2003 10:14:27 -0500
+xfree86 (4.2.1-15) unstable; urgency=medium
+
+ * Urgency due to fix for FTBFS triggered by libfreetype6-dev package.
+
+ * Fix corrupted error message text in check_symlinks_and_warn().
+ (Closes: #220713)
+ - debian/shell-lib.sh
+
+ * Fix bogus invocation of "head" in xdm's configuration script.
+ (Closes: #223038)
+ - debian/xdm.config.in
+
+ * Change maintainer scripts to never use safe_debconf() with db_get or
+ db_metaget. Instead, check the exit status of these commands normally
+ with an if statement and only take the appropriate actions if the command
+ succeeds. For extra paranoia (in the event code is changed to live inside
+ a loop in the future), clear variables we'll be filling with db_get or
+ db_metaget output before using them. (Closes: #217605)
+ - debian/xdm.config.in
+ - debian/xdm.postinst.in
+ - debian/xdm.prerm.in
+ - debian/xserver-common.config.in
+ - debian/xserver-common.postinst.in
+
+ * Don't make I/O permission and interrupt-related system calls meant for the
+ x86 architecture on ARM machines (thanks, Peter Naulls).
+ (Closes: #223567)
+ - debian/patches/315_arm_fix_up_lnx_video_io_access.diff
+
+ * Add aliases for more locale names supported by glibc 2.3.2 (thanks, Robert
+ McQueen). (Closes: #121900)
+ - debian/patches/011a_recognize_glibc_2.3.2_locale_names.diff (renamed
+ from debian/patches/011a_recognize_euro_modifier_locales.diff)
+
+ * Ship the font encoding map for Microsoft Windows 3.1. (Closes: #221773)
+ - debian/patches/064_ship_microsoft_win3.1_encodings_file.diff
+ - debian/MANIFEST.*: updated
+ - debian/xfonts-base.install: ship new file in xfonts-base package
+
+ * Do not include <freetype/freetype.h> directly; use the macro FT_FREETYPE_H
+ to include it instead, as required by FreeType 2.1.7 (thanks, Tore
+ Anderson). Fixes FTBFS caused by new version of FreeType.
+ - debian/patches/099b_Xft_FreeType_2.1.7_build_fix.diff
+
+ -- Branden Robinson <branden@debian.org> Wed, 17 Dec 2003 13:55:13 -0500
+
xfree86 (4.2.1-14) unstable; urgency=medium
* Urgency due to fix for FTBFS triggered by linux-kernel-headers package.
Modified: branches/4.3.0/sid/debian/local/dexconf
===================================================================
--- branches/4.3.0/sid/debian/local/dexconf 2003-12-31 11:46:20 UTC (rev 876)
+++ branches/4.3.0/sid/debian/local/dexconf 2003-12-31 12:04:01 UTC (rev 877)
@@ -170,9 +170,11 @@
if [ "$FORMAT" = "3" ]; then
cat > "$DEXCONFTMPDIR/Header" << SECTION
### BEGIN DEBCONF SECTION
-# XF86Config (XFree86 X server configuration file) generated by dexconf, the
-# Debian X Configuration tool, using values from the debconf database.
+# XF86Config (XFree86 X Window System server configuration file)
#
+# This file was generated by dexconf, the Debian X Configuration tool, using
+# values from the debconf database.
+#
# Edit this file with caution, and see the XF86Config-v3 manual page.
# (Type "man XF86Config-v3" at the shell prompt.)
#
@@ -187,9 +189,11 @@
SECTION
else
cat > "$DEXCONFTMPDIR/Header" << SECTION
-# XF86Config-4 (XFree86 X server configuration file) generated by dexconf, the
-# Debian X Configuration tool, using values from the debconf database.
+# XF86Config-4 (XFree86 X Window System server configuration file)
#
+# This file was generated by dexconf, the Debian X Configuration tool, using
+# values from the debconf database.
+#
# Edit this file with caution, and see the XF86Config-4 manual page.
# (Type "man XF86Config-4" at the shell prompt.)
#
Deleted: branches/4.3.0/sid/debian/patches/011a_recognize_euro_modifier_locales.diff
===================================================================
--- branches/4.3.0/sid/debian/patches/011a_recognize_euro_modifier_locales.diff 2003-12-31 11:46:20 UTC (rev 876)
+++ branches/4.3.0/sid/debian/patches/011a_recognize_euro_modifier_locales.diff 2003-12-31 12:04:01 UTC (rev 877)
@@ -1,57 +0,0 @@
-$Id$
-
-Add a bunch of aliases to support locale settings that use the "@euro"
-modifier. From Debian bug report #208137.
-
-Not submitted upstream yet.
-
---- xc/nls/locale.alias~ 2003-10-23 00:19:45.000000000 -0500
-+++ xc/nls/locale.alias 2003-10-23 00:25:15.000000000 -0500
-@@ -884,3 +884,47 @@
- japan: ja_JP.U90
- #endif
- Japanese-EUC: ja_JP.eucJP
-+# additions for GNU C library 2.3.2 compatibility
-+br_FR.ISO-8859-15@euro: br_FR.ISO8859-15
-+ca_ES.ISO-8859-15@euro: ca_ES.ISO8859-15
-+ca_ES.UTF-8@euro: ca_ES.UTF-8
-+de_AT.ISO-8859-15@euro: de_AT.ISO8859-15
-+de_AT.UTF-8@euro: de_AT.UTF-8
-+de_BE.ISO-8859-15@euro: de_BE.ISO8859-15
-+de_BE.UTF-8@euro: de_BE.UTF-8
-+de_DE.ISO-8859-15@euro: de_DE.ISO8859-15
-+de_DE.UTF-8@euro: de_DE.UTF-8
-+de_LU.ISO-8859-15@euro: de_LU.ISO8859-15
-+de_LU.UTF-8@euro: de_LU.UTF-8
-+el_GR.ISO-8859-15@euro: el_GR.ISO8859-15
-+en_IE.ISO-8859-15@euro: en_IE.ISO8859-15
-+en_IE.UTF-8@euro: en_IE.UTF-8
-+es_ES.ISO-8859-15@euro: es_ES.ISO8859-15
-+es_ES.UTF-8@euro: es_ES.UTF-8
-+eu_ES.ISO-8859-15@euro: eu_ES.ISO8859-15
-+eu_ES.UTF-8@euro: eu_ES.UTF-8
-+fi_FI.ISO-8859-15@euro: fi_FI.ISO8859-15
-+fi_FI.UTF-8@euro: fi_FI.UTF-8
-+fr_BE.ISO-8859-15@euro: fr_BE.ISO8859-15
-+fr_BE.UTF-8@euro: fr_BE.UTF-8
-+fr_FR.ISO-8859-15@euro: fr_FR.ISO8859-15
-+fr_FR.UTF-8@euro: fr_FR.UTF-8
-+fr_LU.ISO-8859-15@euro: fr_LU.ISO8859-15
-+fr_LU.UTF-8@euro: fr_LU.UTF-8
-+ga_IE.ISO-8859-15@euro: ga_IE.ISO8859-15
-+ga_IE.UTF-8@euro: ga_IE.UTF-8
-+gl_ES.ISO-8859-15@euro: gl_ES.ISO8859-15
-+gl_ES.UTF-8@euro: gl_ES.UTF-8
-+it_IT.ISO-8859-15@euro: it_IT.ISO8859-15
-+it_IT.UTF-8@euro: it_IT.UTF-8
-+nl_BE.ISO-8859-15@euro: nl_BE.ISO8859-15
-+nl_BE.UTF-8@euro: nl_BE.UTF-8
-+nl_NL.ISO-8859-15@euro: nl_NL.ISO8859-15
-+nl_NL.UTF-8@euro: nl_NL.UTF-8
-+oc_FR.ISO-8859-15@euro: oc_FR.ISO8859-15
-+pt_PT.ISO-8859-15@euro: pt_PT.ISO8859-15
-+pt_PT.UTF-8@euro: pt_PT.UTF-8
-+sv_FI.ISO-8859-15@euro: sv_FI.ISO8859-15
-+sv_FI.UTF-8@euro: sv_FI.UTF-8
-+sv_SE.ISO-8859-15@euro: sv_SE.ISO8859-15
-+wa_BE.ISO-8859-15@euro: wa_BE.ISO8859-15
Copied: branches/4.3.0/sid/debian/patches/011a_recognize_glibc_2.3.2_locale_names.diff (from rev 875, tags/4.2.1-15/debian/patches/011a_recognize_glibc_2.3.2_locale_names.diff)
===================================================================
--- tags/4.2.1-15/debian/patches/011a_recognize_glibc_2.3.2_locale_names.diff 2003-12-28 09:19:46 UTC (rev 875)
+++ branches/4.3.0/sid/debian/patches/011a_recognize_glibc_2.3.2_locale_names.diff 2003-12-31 12:04:01 UTC (rev 877)
@@ -0,0 +1,80 @@
+$Id$
+
+Add a bunch of aliases to support locale settings that use the "@euro"
+modifier. From Debian bug report #208137.
+
+Also add other aliases supported by glibc 2.3.2; from Debian bug report
+#121900.
+
+Not submitted upstream yet.
+
+--- xc/nls/locale.alias~ 2003-12-16 12:58:34.000000000 -0500
++++ xc/nls/locale.alias 2003-12-16 12:59:31.000000000 -0500
+@@ -884,3 +884,67 @@
+ japan: ja_JP.U90
+ #endif
+ Japanese-EUC: ja_JP.eucJP
++XCOMM for compatibility with the GNU C Library, version 2.3.2
++br_FR.ISO-8859-15@euro: br_FR.ISO8859-15
++ca_ES.ISO-8859-15@euro: ca_ES.ISO8859-15
++ca_ES.ISO-8859-1: ca_ES.ISO8859-1
++ca_ES.UTF-8@euro: ca_ES.UTF-8
++cs_CZ.ISO-8859-2: cs_CZ.ISO8859-2
++de_AT.ISO-8859-15@euro: de_AT.ISO8859-15
++de_AT.UTF-8@euro: de_AT.UTF-8
++de_BE.ISO-8859-15@euro: de_BE.ISO8859-15
++de_BE.UTF-8@euro: de_BE.UTF-8
++de_DE.ISO-8859-15@euro: de_DE.ISO8859-15
++de_DE.UTF-8@euro: de_DE.UTF-8
++de_LU.ISO-8859-15@euro: de_LU.ISO8859-15
++de_LU.UTF-8@euro: de_LU.UTF-8
++el_GR.ISO-8859-15@euro: el_GR.ISO8859-15
++el_GR.ISO-8859-7: el_GR.ISO8859-7
++en_IE.ISO-8859-15@euro: en_IE.ISO8859-15
++en_IE.UTF-8@euro: en_IE.UTF-8
++es_ES.ISO-8859-15@euro: es_ES.ISO8859-15
++es_ES.ISO-8859-1: es_ES.ISO8859-1
++es_ES.UTF-8@euro: es_ES.UTF-8
++eu_ES.ISO-8859-15@euro: eu_ES.ISO8859-15
++eu_ES.UTF-8@euro: eu_ES.UTF-8
++fi_FI.ISO-8859-15@euro: fi_FI.ISO8859-15
++fi_FI.ISO-8859-1: fi_FI.ISO8859-1
++fi_FI.UTF-8@euro: fi_FI.UTF-8
++fr_BE.ISO-8859-15@euro: fr_BE.ISO8859-15
++fr_BE.UTF-8@euro: fr_BE.UTF-8
++fr_FR.ISO-8859-15@euro: fr_FR.ISO8859-15
++fr_FR.UTF-8@euro: fr_FR.UTF-8
++fr_LU.ISO-8859-15@euro: fr_LU.ISO8859-15
++fr_LU.UTF-8@euro: fr_LU.UTF-8
++ga_IE.ISO-8859-15@euro: ga_IE.ISO8859-15
++ga_IE.UTF-8@euro: ga_IE.UTF-8
++gl_ES.ISO-8859-15@euro: gl_ES.ISO8859-15
++gl_ES.UTF-8@euro: gl_ES.UTF-8
++he_IL.ISO-8859-8: he_IL.ISO8859-8
++hu_HU.ISO-8859-2: hu_HU.ISO8859-2
++is_IS.ISO-8859-1: is_IS.ISO8859-1
++it_IT.ISO-8859-15@euro: it_IT.ISO8859-15
++it_IT.ISO-8859-1: it_IT.ISO8859-1
++it_IT.UTF-8@euro: it_IT.UTF-8
++lt_LT.ISO-8859-13: lt_LT.ISO8859-13
++nl_BE.ISO-8859-15@euro: nl_BE.ISO8859-15
++nl_BE.UTF-8@euro: nl_BE.UTF-8
++nl_NL.ISO-8859-15@euro: nl_NL.ISO8859-15
++nl_NL.ISO-8859-1: nl_NL.ISO8859-1
++nl_NL.UTF-8@euro: nl_NL.UTF-8
++nn_NO.ISO-8859-1: nn_NO.ISO8859-1
++oc_FR.ISO-8859-15@euro: oc_FR.ISO8859-15
++pl_PL.ISO-8859-2: pl_PL.ISO8859-2
++pt_PT.ISO-8859-15@euro: pt_PT.ISO8859-15
++pt_PT.ISO-8859-1: pt_PT.ISO8859-1
++pt_PT.UTF-8@euro: pt_PT.UTF-8
++ro_RO.ISO-8859-2: ro_RO.ISO8859-2
++ru_RU.ISO-8859-5: ru_RU.ISO8859-5
++sk_SK.ISO-8859-2: sk_SK.ISO8859-2
++sv_FI.ISO-8859-15@euro: sv_FI.ISO8859-15
++sv_FI.UTF-8@euro: sv_FI.UTF-8
++sv_SE.ISO-8859-15@euro: sv_SE.ISO8859-15
++sv_SE.ISO-8859-1: sv_SE.ISO8859-1
++th_TH.TIS-620: th_TH.TIS620
++tr_TR.ISO-8859-9: tr_TR.ISO8859-9
++wa_BE.ISO-8859-15@euro: wa_BE.ISO8859-15
Property changes on: branches/4.3.0/sid/debian/patches/011a_recognize_glibc_2.3.2_locale_names.diff
___________________________________________________________________
Name: svn:keywords
+ Id
Copied: branches/4.3.0/sid/debian/patches/315_arm_fix_up_lnx_video_io_access.diff (from rev 875, tags/4.2.1-15/debian/patches/315_arm_fix_up_lnx_video_io_access.diff)
===================================================================
--- tags/4.2.1-15/debian/patches/315_arm_fix_up_lnx_video_io_access.diff 2003-12-28 09:19:46 UTC (rev 875)
+++ branches/4.3.0/sid/debian/patches/315_arm_fix_up_lnx_video_io_access.diff 2003-12-31 12:04:01 UTC (rev 877)
@@ -0,0 +1,77 @@
+$Id$
+
+The file xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_video.c
+requires some checks for the ARM architecture to prevent the X server from
+trying to execute code meant only for x86. This is consistent with other
+non-x86 platforms.
+
+This patch by Peter Naulls. Not submitted upstream yet.
+
+--- xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_video.c~ 2003-12-31 06:56:51.000000000 -0500
++++ xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_video.c 2003-12-31 06:56:53.000000000 -0500
+@@ -522,7 +522,7 @@
+ #endif
+ }
+ close(fd);
+-#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__hppa__)
++#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__hppa__) && !defined(__arm__)
+ if (ioperm(0, 1024, 1) || iopl(3)) {
+ if (errno == ENODEV)
+ ErrorF("xf86EnableIOPorts: no I/O ports found\n");
+@@ -548,7 +548,7 @@
+ #if defined(__powerpc__)
+ munmap(ioBase, 0x20000);
+ ioBase = NULL;
+-#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__hppa__)
++#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__hppa__) && !defined(__arm__)
+ iopl(0);
+ ioperm(0, 1024, 0);
+ #endif
+@@ -567,12 +567,12 @@
+ Bool
+ xf86DisableInterrupts()
+ {
+-#if !defined(__mc68000__) && !defined(__powerpc__) && !defined(__sparc__) && !defined(__mips__) && !defined(__ia64__) && !defined(__sh__) && !defined(__hppa__)
++#if !defined(__mc68000__) && !defined(__powerpc__) && !defined(__sparc__) && !defined(__mips__) && !defined(__ia64__) && !defined(__sh__) && !defined(__hppa__) && !defined(__arm__)
+ if (!ExtendedEnabled)
+ if (iopl(3) || ioperm(0, 1024, 1))
+ return (FALSE);
+ #endif
+-#if defined(__alpha__) || defined(__mc68000__) || defined(__powerpc__) || defined(__sparc__) || defined(__mips__) || defined(__arm__) || defined(__sh__) || defined(__ia64__) || defined(__hppa__)
++#if defined(__alpha__) || defined(__mc68000__) || defined(__powerpc__) || defined(__sparc__) || defined(__mips__) || defined(__arm__) || defined(__sh__) || defined(__ia64__) || defined(__hppa__) || defined(__arm__)
+ #else
+ # ifdef __GNUC__
+ # if defined(__ia64__)
+@@ -586,7 +586,7 @@
+ asm("cli");
+ # endif
+ #endif
+-#if !defined(__mc68000__) && !defined(__powerpc__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__ia64__) && !defined(__hppa__)
++#if !defined(__mc68000__) && !defined(__powerpc__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__ia64__) && !defined(__hppa__) && !defined(__arm__)
+ if (!ExtendedEnabled) {
+ iopl(0);
+ ioperm(0, 1024, 0);
+@@ -599,12 +599,12 @@
+ void
+ xf86EnableInterrupts()
+ {
+-#if !defined(__mc68000__) && !defined(__powerpc__) && !defined(__sparc__) && !defined(__mips__) && !defined(__ia64__) && !defined(__sh__) && !defined(__hppa__)
++#if !defined(__mc68000__) && !defined(__powerpc__) && !defined(__sparc__) && !defined(__mips__) && !defined(__ia64__) && !defined(__sh__) && !defined(__hppa__) && !defined(__arm__)
+ if (!ExtendedEnabled)
+ if (iopl(3) || ioperm(0, 1024, 1))
+ return;
+ #endif
+-#if defined(__alpha__) || defined(__mc68000__) || defined(__powerpc__) || defined(__sparc__) || defined(__mips__) || defined(__arm__) || defined(__sh__) || defined(__ia64__) || defined(__hppa__)
++#if defined(__alpha__) || defined(__mc68000__) || defined(__powerpc__) || defined(__sparc__) || defined(__mips__) || defined(__arm__) || defined(__sh__) || defined(__ia64__) || defined(__hppa__) || defined(__arm__)
+ #else
+ # ifdef __GNUC__
+ # if defined(__ia64__)
+@@ -618,7 +618,7 @@
+ asm("sti");
+ # endif
+ #endif
+-#if !defined(__mc68000__) && !defined(__powerpc__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__ia64__) && !defined(__hppa__)
++#if !defined(__mc68000__) && !defined(__powerpc__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__ia64__) && !defined(__hppa__) && !defined(__arm__)
+ if (!ExtendedEnabled) {
+ iopl(0);
+ ioperm(0, 1024, 0);
Modified: branches/4.3.0/sid/debian/shell-lib.sh
===================================================================
--- branches/4.3.0/sid/debian/shell-lib.sh 2003-12-31 11:46:20 UTC (rev 876)
+++ branches/4.3.0/sid/debian/shell-lib.sh 2003-12-31 12:04:01 UTC (rev 877)
@@ -297,7 +297,7 @@
fi
elif [ -e "$symlink" ]; then
errmsg="$symlink exists and is not a symbolic link; this package cannot"
- errmsg="be installed until this"
+ errmsg="$errmsg be installed until this"
if [ -f "$symlink" ]; then
errmsg="$errmsg file"
elif [ -d "$symlink" ]; then
@@ -501,6 +501,10 @@
#
# Run specified debconf command with (optional) specified arguments, guarding
# ourselves against abnormal exits.
+ #
+ # NOTE: Do *not* use this function with db_get or db_metaget commands; in
+ # those cases the return value of the debconf command *must* be checked
+ # before the string returned by debconf is used for anything.
local retval
Modified: branches/4.3.0/sid/debian/xdm.config.in
===================================================================
--- branches/4.3.0/sid/debian/xdm.config.in 2003-12-31 11:46:20 UTC (rev 876)
+++ branches/4.3.0/sid/debian/xdm.config.in 2003-12-31 12:04:01 UTC (rev 877)
@@ -19,11 +19,16 @@
# set default display manager
DEFAULT_DISPLAY_MANAGER_FILE=/etc/X11/default-display-manager
-safe_debconf db_metaget shared/default-x-display-manager owners
-OWNERS="$RET"
-safe_debconf db_metaget shared/default-x-display-manager choices
-CHOICES="$RET"
+OWNERS=
+if db_metaget shared/default-x-display-manager owners; then
+ OWNERS="$RET"
+fi
+CHOICES=
+if db_metaget shared/default-x-display-manager choices; then
+ 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"
@@ -35,7 +40,7 @@
if [ -e "$DEFAULT_DISPLAY_MANAGER_FILE" ]; then
CURRENT_DEFAULT=$(basename "$(grep -v '^[[:space:]]*#' \
"$DEFAULT_DISPLAY_MANAGER_FILE" |
- head -n -1)")
+ 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" \
@@ -45,8 +50,10 @@
safe_debconf db_set shared/default-x-display-manager "$CURRENT_DEFAULT"
fi
else
- safe_debconf db_get shared/default-x-display-manager
- CURRENT_DEFAULT="$RET"
+ 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
@@ -54,8 +61,10 @@
fi
# using this display manager?
-safe_debconf db_get shared/default-x-display-manager
-NEW_DEFAULT="$RET"
+NEW_DEFAULT=
+if db_get shared/default-x-display-manager; then
+ NEW_DEFAULT="$RET"
+fi
# move the default display manager file if we're going to change it
if [ -n "$NEW_DEFAULT" ]; then
Modified: branches/4.3.0/sid/debian/xdm.postinst.in
===================================================================
--- branches/4.3.0/sid/debian/xdm.postinst.in 2003-12-31 11:46:20 UTC (rev 876)
+++ branches/4.3.0/sid/debian/xdm.postinst.in 2003-12-31 12:04:01 UTC (rev 877)
@@ -33,11 +33,15 @@
# does not exist
DEFAULT_DISPLAY_MANAGER_FILE=/etc/X11/default-display-manager
if [ ! -e "$DEFAULT_DISPLAY_MANAGER_FILE" ]; then
- safe_debconf db_get shared/default-x-display-manager
- DEFAULT_DISPLAY_MANAGER="$RET"
+ DEFAULT_DISPLAY_MANAGER=
+ if db_get shared/default-x-display-manager; then
+ DEFAULT_DISPLAY_MANAGER="$RET"
+ fi
if [ -n "$DEFAULT_DISPLAY_MANAGER" ]; then
- safe_debconf db_get "$DEFAULT_DISPLAY_MANAGER"/daemon_name
- DAEMON_NAME="$RET"
+ DAEMON_NAME=
+ if db_get "$DEFAULT_DISPLAY_MANAGER"/daemon_name; then
+ DAEMON_NAME="$RET"
+ fi
if [ ! -n "$DAEMON_NAME" ]; then
# if we were unable to determine the name of the selected daemon (for
# instance, if the selected default display manager doesn't provide a
Modified: branches/4.3.0/sid/debian/xdm.prerm.in
===================================================================
--- branches/4.3.0/sid/debian/xdm.prerm.in 2003-12-31 11:46:20 UTC (rev 876)
+++ branches/4.3.0/sid/debian/xdm.prerm.in 2003-12-31 12:04:01 UTC (rev 877)
@@ -57,8 +57,10 @@
safe_debconf db_input high xdm/stop_running_server_with_children
safe_debconf db_go
# what did the user say?
- safe_debconf db_get xdm/stop_running_server_with_children
- ANSWER="$RET"
+ ANSWER=
+ if db_get xdm/stop_running_server_with_children; then
+ ANSWER="$RET"
+ fi
if [ "$ANSWER" = "true" ]; then
STOP=yes
fi
@@ -89,20 +91,24 @@
safe_debconf db_unregister shared/default-x-display-manager
# does the question still exist?
if db_get shared/default-x-display-manager; then
- safe_debconf db_metaget shared/default-x-display-manager owners
- safe_debconf db_subst shared/default-x-display-manager choices "$RET"
- safe_debconf db_get shared/default-x-display-manager
- DEFAULT_DISPLAY_MANAGER="$RET"
+ if db_metaget shared/default-x-display-manager owners; then
+ safe_debconf db_subst shared/default-x-display-manager choices "$RET"
+ fi
+ DEFAULT_DISPLAY_MANAGER=
+ if db_get shared/default-x-display-manager; then
+ DEFAULT_DISPLAY_MANAGER="$RET"
+ fi
# are we removing the currently selected display manager?
if [ -n "$DEFAULT_DISPLAY_MANAGER" ]; then
if [ "$THIS_PACKAGE" = "$DEFAULT_DISPLAY_MANAGER" ]; then
if [ -e "$DEFAULT_DISPLAY_MANAGER_FILE" ]; then
- safe_debconf db_get "$DEFAULT_DISPLAY_MANAGER/daemon_name"
- # does the display manager file reference the current default? if
- # so, remove it because it will now be wrong
- if [ -n "$RET" ]; then
- if [ "$(cat "$DEFAULT_DISPLAY_MANAGER_FILE")" = "$RET" ]; then
- rm "$DEFAULT_DISPLAY_MANAGER_FILE"
+ if db_get "$DEFAULT_DISPLAY_MANAGER/daemon_name"; then
+ # does the display manager file reference the current default? if
+ # so, remove it because it will now be wrong
+ if [ -n "$RET" ]; then
+ if [ "$(cat "$DEFAULT_DISPLAY_MANAGER_FILE")" = "$RET" ]; then
+ rm "$DEFAULT_DISPLAY_MANAGER_FILE"
+ fi
fi
fi
fi
@@ -113,14 +119,18 @@
# if the default display manager file doesn't exist, write it with
# the path to the new default display manager
if [ ! -e "$DEFAULT_DISPLAY_MANAGER_FILE" ]; then
- safe_debconf db_get shared/default-x-display-manager
- DEFAULT_DISPLAY_MANAGER="$RET"
+ DEFAULT_DISPLAY_MANAGER=
+ if db_get shared/default-x-display-manager; then
+ DEFAULT_DISPLAY_MANAGER="$RET"
+ fi
if [ -n "$DEFAULT_DISPLAY_MANAGER" ]; then
warn "new default display manager has been selected; please be" \
"sure to run \"dpkg-reconfigure $RET\" to ensure that it" \
"is configured"
- safe_debconf db_get "$DEFAULT_DISPLAY_MANAGER"/daemon_name
- DAEMON_NAME="$RET"
+ DAEMON_NAME=
+ if db_get "$DEFAULT_DISPLAY_MANAGER"/daemon_name; then
+ DAEMON_NAME="$RET"
+ fi
if [ ! -n "$DAEMON_NAME" ]; then
# if we were unable to determine the name of the selected daemon (for
# instance, if the selected default display manager doesn't provide a
Modified: branches/4.3.0/sid/debian/xserver-common.config.in
===================================================================
--- branches/4.3.0/sid/debian/xserver-common.config.in 2003-12-31 11:46:20 UTC (rev 876)
+++ branches/4.3.0/sid/debian/xserver-common.config.in 2003-12-31 12:04:01 UTC (rev 877)
@@ -136,21 +136,27 @@
safe_debconf db_input low xserver-common/xwrapper/allowed_users
safe_debconf db_go
-safe_debconf db_get xserver-common/xwrapper/allowed_users
-if [ -n "$RET" ]; then
- safe_debconf db_set xserver-common/xwrapper/actual_allowed_users \
- $(allowed_users_english_to_actual "$RET")
+RET=
+if db_get xserver-common/xwrapper/allowed_users; then
+ if [ -n "$RET" ]; then
+ safe_debconf db_set xserver-common/xwrapper/actual_allowed_users \
+ $(allowed_users_english_to_actual "$RET")
+ fi
fi
-# next question requires input validation
-# save valid value already present (possibly the template default)
-safe_debconf db_get xserver-common/xwrapper/nice_value
-SAFE="$RET"
+# next question requires input validation; assume safe valid value already
+# present (possibly the template default)
+SAFE=
+if db_get xserver-common/xwrapper/nice_value; then
+ SAFE="$RET"
+fi
+
# make sure it's really safe; if not, use the default
if ! validate_nice_value "$RET"; then
SAFE="$NICE_DEFAULT"
safe_debconf db_set xserver-common/xwrapper/nice_value "$SAFE"
fi
+
set +e
while :; do
safe_debconf db_input low xserver-common/xwrapper/nice_value
@@ -159,20 +165,22 @@
break # no; bail out of validation loop
fi
safe_debconf db_go
- safe_debconf db_get xserver-common/xwrapper/nice_value
- # string, needs input validation
- if validate_nice_value "$RET"; then
- # valid input from user
- break
- else
- # the input was invalid; restore the known good value in case we are
- # interrupted before the user provides a valid one
- safe_debconf db_set xserver-common/xwrapper/nice_value "$SAFE"
- safe_debconf db_fset xserver-common/xwrapper/nice_value seen false
- # now display the error message
- safe_debconf db_fset xserver-common/xwrapper/nice_value/error seen false
- safe_debconf db_input critical xserver-common/xwrapper/nice_value/error
- safe_debconf db_go
+ RET=
+ if db_get xserver-common/xwrapper/nice_value; then
+ # string, needs input validation
+ if validate_nice_value "$RET"; then
+ # valid input from user
+ break
+ else
+ # the input was invalid; restore the known good value in case we are
+ # interrupted before the user provides a valid one
+ safe_debconf db_set xserver-common/xwrapper/nice_value "$SAFE"
+ safe_debconf db_fset xserver-common/xwrapper/nice_value seen false
+ # now display the error message
+ safe_debconf db_fset xserver-common/xwrapper/nice_value/error seen false
+ safe_debconf db_input critical xserver-common/xwrapper/nice_value/error
+ safe_debconf db_go
+ fi
fi
done
set -e
Modified: branches/4.3.0/sid/debian/xserver-common.postinst.in
===================================================================
--- branches/4.3.0/sid/debian/xserver-common.postinst.in 2003-12-31 11:46:20 UTC (rev 876)
+++ branches/4.3.0/sid/debian/xserver-common.postinst.in 2003-12-31 12:04:01 UTC (rev 877)
@@ -52,13 +52,33 @@
if [ "$(md5sum "$XWRAPPER_CONFIG")" = \
"$(cat "$XWRAPPER_CONFIG_CHECKSUM")" ]; then
# they match; prepare a new version of the config file
- safe_debconf db_get xserver-common/xwrapper/actual_allowed_users
- ALLOWED_USERS="$RET"
- safe_debconf db_get xserver-common/xwrapper/nice_value
- NICE_VALUE="$RET"
+ ALLOWED_USERS=
+ if db_get xserver-common/xwrapper/actual_allowed_users; then
+ ALLOWED_USERS="$RET"
+ fi
+ NICE_VALUE=
+ if db_get xserver-common/xwrapper/nice_value; then
+ NICE_VALUE="$RET"
+ fi
if [ -n "$ALLOWED_USERS" -a -n "$NICE_VALUE" ]; then
NEW_XWRAPPER_CONFIG=$(tempfile)
cat > "$NEW_XWRAPPER_CONFIG" << EOF
+# Xwrapper.config (Debian X Window System server wrapper configuration file)
+#
+# This file was generated by the post-installation script of the xserver-common
+# package using values from the debconf database.
+#
+# See the Xwrapper.config(5) manual page for more information.
+#
+# This file is automatically updated on upgrades of the xserver-common package
+# *only* if it has not been modified since the last upgrade of that package.
+#
+# If you have edited this file but would like it to be automatically updated
+# again, run the following commands as root:
+#
+# cp /etc/X11/Xwrapper.config /etc/X11/Xwrapper.config.custom
+# md5sum /etc/X11/Xwrapper.config > /var/lib/xfree86/Xwrapper.config.md5sum
+# dpkg-reconfigure xserver-common
allowed_users=$ALLOWED_USERS
nice_value=$NICE_VALUE
EOF
Reply to: