Author: branden
Date: 2003-08-18 17:11:11 -0500 (Mon, 18 Aug 2003)
New Revision: 393
Modified:
trunk/debian/xdm.config.in
trunk/debian/xdm.postinst.in
trunk/debian/xdm.prerm.in
trunk/debian/xfree86-common.config.in
trunk/debian/xfree86-common.postinst.in
trunk/debian/xserver-common.config.in
trunk/debian/xserver-common.postinst.in
trunk/debian/xserver-common.preinst.in
Log:
debian/{xdm.{config,postinst,prerm}.in,xfree86-common.{config,postinst}.in,
xserver-common.{config,postinst,preinst}.in}: be sure to source the debconf
confmodule *before* setting any variables local to the maintainer script;
the way confmodule works causes the values of any unexported variables
already set to be lost (I tremble at how many subtle bugs and how much
wacky behavior must have been caused by this). Thanks to Eduard Bloch for
noticing odd dexconf behavior which led me to this realization.
debian/{xdm.{config,postinst,prerm}.in,xfree86-common.{config,postinst}.in:
- set svn:keywords property to "Id"
- add "$Id$" expando
- update copyright notice
Modified: trunk/debian/xdm.config.in
===================================================================
--- trunk/debian/xdm.config.in 2003-08-16 05:02:47 UTC (rev 392)
+++ trunk/debian/xdm.config.in 2003-08-18 22:11:11 UTC (rev 393)
@@ -1,21 +1,21 @@
#!/bin/sh
# Debian xdm package configuration script
-# Copyright 2000-2002 Branden Robinson.
+# Copyright 2000--2003 Branden Robinson.
# Licensed under the GNU General Public License, version 2. See the file
# /usr/share/common-licenses/GPL or <http://www.gnu.org/copyleft/gpl.txt>.
+# $Id$
+
set -e
+# source debconf library
+. /usr/share/debconf/confmodule
+
THIS_PACKAGE=xdm
THIS_SCRIPT=config
#INCLUDE_SHELL_LIB#
-DEFAULT_DISPLAY_MANAGER_FILE=/etc/X11/default-display-manager
-
-# source debconf library
-. /usr/share/debconf/confmodule
-
# set default display manager
db_get shared/default-x-display-manager
Property changes on: trunk/debian/xdm.config.in
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: trunk/debian/xdm.postinst.in
===================================================================
--- trunk/debian/xdm.postinst.in 2003-08-16 05:02:47 UTC (rev 392)
+++ trunk/debian/xdm.postinst.in 2003-08-18 22:11:11 UTC (rev 393)
@@ -1,20 +1,22 @@
#!/bin/sh
# Debian xdm package post-installation script
-# Copyright 1998-2001 Branden Robinson.
+# Copyright 1998--2001, 2003 Branden Robinson.
# Licensed under the GNU General Public License, version 2. See the file
# /usr/share/common-licenses/GPL or <http://www.gnu.org/copyleft/gpl.txt>.
# Acknowlegements to Stephen Early, Mark Eichin, and Manoj Srivastava.
+# $Id$
+
set -e
+# source debconf library
+. /usr/share/debconf/confmodule
+
THIS_PACKAGE=xdm
THIS_SCRIPT=postinst
#INCLUDE_SHELL_LIB#
-# source debconf library
-. /usr/share/debconf/confmodule
-
check_symlinks_and_bomb /usr/X11R6/lib/X11/xdm
# now safe to remove old xserver dir
Property changes on: trunk/debian/xdm.postinst.in
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: trunk/debian/xdm.prerm.in
===================================================================
--- trunk/debian/xdm.prerm.in 2003-08-16 05:02:47 UTC (rev 392)
+++ trunk/debian/xdm.prerm.in 2003-08-18 22:11:11 UTC (rev 393)
@@ -1,17 +1,14 @@
#!/bin/sh
# Debian xdm package pre-removal script
-# Copyright 1998-2002 Branden Robinson.
+# Copyright 1998--2003 Branden Robinson.
# Licensed under the GNU General Public License, version 2. See the file
# /usr/share/common-licenses/GPL or <http://www.gnu.org/copyleft/gpl.txt>.
# Acknowlegements to Stephen Early, Mark Eichin, and Manoj Srivastava.
+# $Id$
+
set -e
-THIS_PACKAGE=xdm
-THIS_SCRIPT=prerm
-
-#INCLUDE_SHELL_LIB#
-
# debconf may not be available if some massive purging is going on
HAVE_DEBCONF=
if [ -e /usr/share/debconf/confmodule ]; then
@@ -19,6 +16,11 @@
HAVE_DEBCONF=yes
fi
+THIS_PACKAGE=xdm
+THIS_SCRIPT=prerm
+
+#INCLUDE_SHELL_LIB#
+
case "$1" in
# we NEVER want to unconditionally stop xdm; see below
upgrade|failed-upgrade)
Property changes on: trunk/debian/xdm.prerm.in
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: trunk/debian/xfree86-common.config.in
===================================================================
--- trunk/debian/xfree86-common.config.in 2003-08-16 05:02:47 UTC (rev 392)
+++ trunk/debian/xfree86-common.config.in 2003-08-18 22:11:11 UTC (rev 393)
@@ -1,19 +1,21 @@
#!/bin/sh
# Debian xfree86-common package configuration script
-# Copyright 2002 Branden Robinson.
+# Copyright 2002, 2003 Branden Robinson.
# Licensed under the GNU General Public License, version 2. See the file
# /usr/share/common-licenses/GPL or <http://www.gnu.org/copyleft/gpl.txt>.
+# $Id$
+
set -e
+# source debconf library
+. /usr/share/debconf/confmodule
+
THIS_PACKAGE=xfree86-common
THIS_SCRIPT=config
#INCLUDE_SHELL_LIB#
-# source debconf library
-. /usr/share/debconf/confmodule
-
# is this an unofficial Debian package?
if [ -z "$OFFICIAL_BUILD" ]; then
db_register xfree86-common/experimental_packages xfree86-common/nag
Property changes on: trunk/debian/xfree86-common.config.in
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: trunk/debian/xfree86-common.postinst.in
===================================================================
--- trunk/debian/xfree86-common.postinst.in 2003-08-16 05:02:47 UTC (rev 392)
+++ trunk/debian/xfree86-common.postinst.in 2003-08-18 22:11:11 UTC (rev 393)
@@ -1,20 +1,22 @@
#!/bin/sh
# Debian xfree86-common package post-installation script
-# Copyright 1998-2001 Branden Robinson.
+# Copyright 1998--2001, 2003 Branden Robinson.
# Licensed under the GNU General Public License, version 2. See the file
# /usr/share/common-licenses/GPL or <http://www.gnu.org/copyleft/gpl.txt>.
# Acknowlegements to Stephen Early, Mark Eichin, and Manoj Srivastava.
+# $Id$
+
set -e
+# source debconf library
+. /usr/share/debconf/confmodule
+
THIS_PACKAGE=xfree86-common
THIS_SCRIPT=postinst
#INCLUDE_SHELL_LIB#
-# source debconf library
-. /usr/share/debconf/confmodule
-
check_symlinks_and_bomb /usr/bin/X11 \
/usr/include/X11 \
/usr/lib/X11
Property changes on: trunk/debian/xfree86-common.postinst.in
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: trunk/debian/xserver-common.config.in
===================================================================
--- trunk/debian/xserver-common.config.in 2003-08-16 05:02:47 UTC (rev 392)
+++ trunk/debian/xserver-common.config.in 2003-08-18 22:11:11 UTC (rev 393)
@@ -8,6 +8,9 @@
set -e
+# source debconf library
+. /usr/share/debconf/confmodule
+
THIS_PACKAGE=xserver-common
THIS_SCRIPT=config
@@ -42,9 +45,6 @@
set -e;
}
-# source debconf library
-. /usr/share/debconf/confmodule
-
# if one were going to parse the on-disk Xwrapper.config file and set the
# debconf template values to match, one would do so here; but we're not
Modified: trunk/debian/xserver-common.postinst.in
===================================================================
--- trunk/debian/xserver-common.postinst.in 2003-08-16 05:02:47 UTC (rev 392)
+++ trunk/debian/xserver-common.postinst.in 2003-08-18 22:11:11 UTC (rev 393)
@@ -9,6 +9,9 @@
set -e
+# source debconf library
+. /usr/share/debconf/confmodule
+
THIS_PACKAGE=xserver-common
THIS_SCRIPT=postinst
@@ -19,9 +22,6 @@
XWRAPPER_CONFIG_CHECKSUM="$CHECKSUM_DIR/$(basename "$XWRAPPER_CONFIG").md5sum"
XWRAPPER_CONFIG_ROSTER="$CHECKSUM_DIR/$(basename "$XWRAPPER_CONFIG").roster"
-# source debconf library
-. /usr/share/debconf/confmodule
-
check_symlinks_and_bomb /usr/X11R6/lib/X11/xserver
# now safe to remove old xserver dir
Modified: trunk/debian/xserver-common.preinst.in
===================================================================
--- trunk/debian/xserver-common.preinst.in 2003-08-16 05:02:47 UTC (rev 392)
+++ trunk/debian/xserver-common.preinst.in 2003-08-18 22:11:11 UTC (rev 393)
@@ -9,6 +9,9 @@
set -e
+# source debconf library
+. /usr/share/debconf/confmodule
+
THIS_PACKAGE=xserver-common
THIS_SCRIPT=preinst
@@ -18,9 +21,6 @@
CHECKSUM_DIR=/var/lib/xfree86
XWRAPPER_CONFIG_CHECKSUM="$CHECKSUM_DIR/$(basename "$XWRAPPER_CONFIG").md5sum"
-# source debconf library
-. /usr/share/debconf/confmodule
-
if [ "$1" = "install" -o "$1" = "upgrade" ]; then
# xserver dir moved to /etc/X11 in 4.x
if [ -e /usr/X11R6/lib/X11/xserver -a ! -L /usr/X11R6/lib/X11/xserver ]; then
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
