debian/changelog | 5 ++++-
debian/control | 2 +-
debian/xserver-xorg.postinst.in | 12 ------------
3 files changed, 5 insertions(+), 14 deletions(-)
New commits:
commit bc74cec927578873eacc292a2fbacc1eeba1d876
Author: David Nusinow <[EMAIL PROTECTED]>
Date: Wed Dec 12 21:53:03 2007 -0500
Don't recommend laptop-detect any more or look for it in server postinst
diff --git a/debian/changelog b/debian/changelog
index e5d0645..4318b37 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -27,10 +27,11 @@ xorg (1:7.3+8) UNRELEASED; urgency=low
undoubtedly be bugs uncovered by this change, but we need to find and fix
the actual bugs in the drivers and server in order to move forward.
+ Don't recommend xresprobe any more
- * Don't set fbdev in the postinst for r128 on ppc.
+ + Don't recommend laptop-detect any more or look for it in server postinst
+ * Don't set fbdev in the postinst for r128 on ppc.
The driver will do this automatically if no option is specified by the user
- -- David Nusinow <[EMAIL PROTECTED]> Wed, 12 Dec 2007 21:46:58 -0500
+ -- David Nusinow <[EMAIL PROTECTED]> Wed, 12 Dec 2007 21:51:26 -0500
xorg (1:7.3+7) unstable; urgency=low
diff --git a/debian/control b/debian/control
index a860259..e9658ab 100644
--- a/debian/control
+++ b/debian/control
@@ -83,7 +83,7 @@ Conflicts: xserver-xfree86 (<< 6.8.2.dfsg.1-1), xserver-common
Replaces: xserver-common
Pre-Depends: x11-common (>= 1:7.3+3)
Depends: xserver-xorg-core (>= 2:1.4-3), xserver-xorg-video-all |
xserver-xorg-video-2, xserver-xorg-input-all | xserver-xorg-input-2,
${misc:Depends}, xkb-data | xkb-data-legacy, x11-xkb-utils
-Recommends: libgl1-mesa-dri, udev, laptop-detect, discover1 | discover,
${F:XServer-Xorg-Detect-Depends}
+Recommends: libgl1-mesa-dri, udev, discover1 | discover,
${F:XServer-Xorg-Detect-Depends}
Description: the X.Org X server
This package depends on the full suite of the server and drivers for the
X.Org X server, as well as providing a configuration infrastructure to manage
diff --git a/debian/xserver-xorg.postinst.in b/debian/xserver-xorg.postinst.in
index 5ad19be..abb9e20 100644
--- a/debian/xserver-xorg.postinst.in
+++ b/debian/xserver-xorg.postinst.in
@@ -14,13 +14,6 @@ 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 f9811a8f57a8578a1787098d24e39282c4611c03
Author: David Nusinow <[EMAIL PROTECTED]>
Date: Wed Dec 12 21:47:37 2007 -0500
* Don't set fbdev in the postinst for r128 on ppc.
The driver will do this automatically if no option is specified by the
user
diff --git a/debian/changelog b/debian/changelog
index c3e2510..e5d0645 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -27,8 +27,10 @@ xorg (1:7.3+8) UNRELEASED; urgency=low
undoubtedly be bugs uncovered by this change, but we need to find and fix
the actual bugs in the drivers and server in order to move forward.
+ Don't recommend xresprobe any more
+ * Don't set fbdev in the postinst for r128 on ppc.
+ The driver will do this automatically if no option is specified by the user
- -- David Nusinow <[EMAIL PROTECTED]> Sun, 09 Dec 2007 22:32:27 -0500
+ -- David Nusinow <[EMAIL PROTECTED]> Wed, 12 Dec 2007 21:46:58 -0500
xorg (1:7.3+7) unstable; urgency=low
diff --git a/debian/xserver-xorg.postinst.in b/debian/xserver-xorg.postinst.in
index 602295c..5ad19be 100644
--- a/debian/xserver-xorg.postinst.in
+++ b/debian/xserver-xorg.postinst.in
@@ -814,11 +814,6 @@ if [ -n "$FIRSTINST" ] || [ -n "$RECONFIGURE" ]; then
USE_FBDEV=true
fi
fi
- # Make sure to force UseFBDev with Rage 128 or stuff will go bad in some
- # old Macs.
- if echo "$DEVICE_IDENTIFIER" | grep -q "Rage 128"; then
- USE_FBDEV=true
- fi
fi
if [ -n "$XORG_USE_FBDEV" ] && [ "$XORG_USE_FBDEV" = "no" ]; then
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
