debian/changelog | 7 +++++++
debian/xserver-xorg.postinst.in | 7 +++++++
debian/xsfbs/xsfbs.sh | 7 -------
3 files changed, 14 insertions(+), 7 deletions(-)
New commits:
commit d32b4dbb61ffaca1f6a9eaa2c88bf1b5ae547005
Author: Brice Goglin <[EMAIL PROTECTED]>
Date: Wed Aug 29 09:43:26 2007 +0200
Use laptop-detect in our postinst code instead of requiring xsfbs to call it
diff --git a/debian/changelog b/debian/changelog
index 7dbd466..48ddcb4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xorg (1:7.3~rc2) UNRELEASED; urgency=low
+
+ * Use laptop-detect in our postinst code instead of requiring xsfbs
+ to call it in all maintainer scripts of many packages.
+
+ -- Brice Goglin <[EMAIL PROTECTED]> Wed, 29 Aug 2007 09:41:50 +0200
+
xorg (1:7.3~rc1) experimental; urgency=low
* Bump driver ABI for xserver 1.3.99.0.
diff --git a/debian/xserver-xorg.postinst.in b/debian/xserver-xorg.postinst.in
index b9fdea4..887f76c 100644
--- a/debian/xserver-xorg.postinst.in
+++ b/debian/xserver-xorg.postinst.in
@@ -14,6 +14,13 @@ set -e
THIS_PACKAGE=xserver-xorg
THIS_SCRIPT=postinst
+LAPTOP=""
+if [ -n "$(which laptop-detect)" ]; then
+ if laptop-detect >/dev/null; then
+ LAPTOP=true
+ fi
+fi
+
#INCLUDE_SHELL_LIB#
if [ -e /etc/default/xorg ]; then
commit 575efb7249d7cf194f07e45db17e601d9c259231
Author: Brice Goglin <[EMAIL PROTECTED]>
Date: Wed Aug 29 09:36:00 2007 +0200
Do not call laptop-detect, let the only user call it directly
diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh
index 52473ca..a90ff7d 100644
--- a/debian/xsfbs/xsfbs.sh
+++ b/debian/xsfbs/xsfbs.sh
@@ -59,13 +59,6 @@ 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
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
