[SCM] UNNAMED PROJECT branch, debian-unstable, updated. 3ee9d5a018d873823da8cc9551a66bd401d167af

[David Nusinow]

The following commit has been merged in the debian-unstable branch:
commit d5595eaaa4dc5d692ead5d2889513d325142e4db
Author: David Nusinow <dnusinow at debian.org>
Date:   Tue Aug 22 03:04:13 2006 +0000

    Pull patches from ubuntu for ARCHITECTURE, LAPTOP, RECONFIGURE, FIRSTINST, and UPGRADE variables

diff --git a/xsfbs.sh b/xsfbs.sh
index 382b6ec..52473ca 100644
--- a/xsfbs.sh
+++ b/xsfbs.sh
@@ -57,6 +57,29 @@ EOF
   exit $SHELL_LIB_USAGE_ERROR
 fi
 
+ARCHITECTURE="$(dpkg --print-installation-architecture)"
+
+LAPTOP=""
+if [ -n "$(which laptop-detect)" ]; then
+    if laptop-detect >/dev/null; then
+	LAPTOP=true
+    fi
+fi
+
+if [ "$1" = "reconfigure" ] || [ -n "$DEBCONF_RECONFIGURE" ]; then
+  RECONFIGURE="true"
+else
+  RECONFIGURE=
+fi
+
+if ([ "$1" = "install" ] || [ "$1" = "configure" ]) && [ -z "$2" ]; then
+  FIRSTINST="yes"
+fi
+
+if [ -z "$RECONFIGURE" ] && [ -z "$FIRSTINST" ]; then
+  UPGRADE="yes"
+fi
+
 trap "message;\
       message \"Received signal.  Aborting $THIS_PACKAGE package $THIS_SCRIPT script.\";\
       message;\

-- 
UNNAMED PROJECT