debian/changelog | 9 ++++ debian/control | 2 - debian/local/Failsafe/failsafeDexconf | 63 ++-------------------------------- debian/local/dexconf | 35 ++++++++++++++++++ 4 files changed, 49 insertions(+), 60 deletions(-)
New commits: commit f58c86952034cf3394a0502ba34a199df7ee2212 Author: Timo Aaltonen <[EMAIL PROTECTED]> Date: Thu Feb 28 12:57:10 2008 +0200 Prepare the changelog for upload diff --git a/debian/changelog b/debian/changelog index c8cffdc..3f60692 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,11 @@ -xorg (1:7.3+10ubuntu6) UNRELEASED; urgency=low +xorg (1:7.3+10ubuntu6) hardy; urgency=low * dexconf: Write a section for synaptics and ServerLayout again, since input-hotplug is not ready for public consumption. (LP: #173411) * debian/control: xserver-xorg Recommends laptop-detect again. * failsafeDexconf: sync with dexconf - -- Timo Aaltonen <[EMAIL PROTECTED]> Thu, 28 Feb 2008 11:30:08 +0200 + -- Timo Aaltonen <[EMAIL PROTECTED]> Thu, 28 Feb 2008 12:56:29 +0200 xorg (1:7.3+10ubuntu5) hardy; urgency=low commit d053aa0c43b41e1774b956b7d166849a36e7fd65 Author: Timo Aaltonen <[EMAIL PROTECTED]> Date: Thu Feb 28 11:46:39 2008 +0200 failsafeDexconf: sync with dexconf diff --git a/debian/changelog b/debian/changelog index c32981c..c8cffdc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,8 +3,9 @@ xorg (1:7.3+10ubuntu6) UNRELEASED; urgency=low * dexconf: Write a section for synaptics and ServerLayout again, since input-hotplug is not ready for public consumption. (LP: #173411) * debian/control: xserver-xorg Recommends laptop-detect again. + * failsafeDexconf: sync with dexconf - -- Timo Aaltonen <[EMAIL PROTECTED]> Thu, 28 Feb 2008 10:25:05 +0200 + -- Timo Aaltonen <[EMAIL PROTECTED]> Thu, 28 Feb 2008 11:30:08 +0200 xorg (1:7.3+10ubuntu5) hardy; urgency=low diff --git a/debian/local/Failsafe/failsafeDexconf b/debian/local/Failsafe/failsafeDexconf index 67cb81a..5dff847 100755 --- a/debian/local/Failsafe/failsafeDexconf +++ b/debian/local/Failsafe/failsafeDexconf @@ -85,43 +85,6 @@ cat <<SECTION >> ${OUTFILE} # sudo dpkg-reconfigure -phigh xserver-xorg SECTION -### FILES - -fetch xserver-$SERVER/config/write_files_section -if [ "$RET" = "true" ]; then - FONTSERVER="" - if db_get shared/fontpath/fontserver; then - if [ -n "$RET" ] ; then - FONTSERVER="$RET" - fi - fi - cat <<SECTION >> ${OUTFILE} -Section "Files" -SECTION - if [ -n "$FONTSERVER" ] ; then - cat <<SECTION >> ${OUTFILE} - FontPath "$FONTSERVER" -SECTION - fi - cat <<SECTION >> ${OUTFILE} -EndSection - -SECTION -fi - -# TODO: guidance is unable to parse 'disable' yet - -### MODULES -cat <<SECTION >> ${OUTFILE} -Section "Module" - Disable "dbe" - Disable "dri" - Disable "glx" - Disable "vbe" -EndSection - -SECTION - ### KEYBOARD / INPUTDEVICE fetch xserver-$SERVER/config/inputdevice/keyboard/rules @@ -140,7 +103,6 @@ cat <<SECTION >> ${OUTFILE} Section "InputDevice" Identifier "Generic Keyboard" Driver "kbd" - Option "CoreKeyboard" Option "XkbRules" "$XKB_RULES" Option "XkbModel" "$XKB_MODEL" Option "XkbLayout" "$XKB_LAYOUT" @@ -188,9 +150,8 @@ Section "InputDevice" Option "SendCoreEvents" "true" Option "Device" "/dev/psaux" Option "Protocol" "auto-dev" - Option "HorizScrollDelta" "0" + Option "HorizEdgeScroll" "0" EndSection - SECTION fi @@ -200,42 +161,30 @@ db_get xserver-$SERVER/config/device/bus_id DEVICE_BUSID="$RET" cat <<SECTION >> ${OUTFILE} Section "Device" - Identifier "Failsafe Device" + Identifier "Configured Video Device" Driver "$DEVICE_DRIVER" SECTION -if [ -n "$DEVICE_BUSID" ]; then - if [ ! "$DEVICE_BUSID" = "PCI:0:5:0" ]; then - # This seems to be what db_get returns when it has no clue - # We're better off ignoring it and leaving it blank for Xorg - # to figure out itself - printf "\tBusID\t\t\"$DEVICE_BUSID\"\n" >> ${OUTFILE} - fi -fi printf "EndSection\n\n" >> ${OUTFILE} ### MONITOR cat <<SECTION >> ${OUTFILE} Section "Monitor" - Identifier "Failsafe Monitor" - Option "DPMS" + Identifier "Configured Monitor" EndSection SECTION ### SCREEN -DISPLAY_DEPTH="16" DISPLAY_MODES="800x600" cat <<SECTION >> ${OUTFILE} Section "Screen" Identifier "Default Screen" - Device "Failsafe Device" - Monitor "Failsafe Monitor" - DefaultDepth $DISPLAY_DEPTH + Device "Configured Video Device" + Monitor "Configured Monitor" SubSection "Display" - Depth $DISPLAY_DEPTH Modes "$DISPLAY_MODES" EndSubSection EndSection @@ -248,8 +197,6 @@ cat <<SECTION >> ${OUTFILE} Section "ServerLayout" Identifier "Default Layout" Screen "Default Screen" - InputDevice "Generic Keyboard" - InputDevice "Configured Mouse" SECTION if [ -n "$LAPTOP" ]; then printf "\tInputDevice\t\"Synaptics Touchpad\"\n" >> ${OUTFILE} commit 16b26aab78857c6ccca2248d05e23004e7d15b74 Author: Timo Aaltonen <[EMAIL PROTECTED]> Date: Thu Feb 28 11:02:30 2008 +0200 dexconf: Write a section for synaptics and ServerLayout again input-hotplug is not ready for public consumption (LP: #173411) diff --git a/debian/changelog b/debian/changelog index 2e2360c..c32981c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +xorg (1:7.3+10ubuntu6) UNRELEASED; urgency=low + + * dexconf: Write a section for synaptics and ServerLayout again, since + input-hotplug is not ready for public consumption. (LP: #173411) + * debian/control: xserver-xorg Recommends laptop-detect again. + + -- Timo Aaltonen <[EMAIL PROTECTED]> Thu, 28 Feb 2008 10:25:05 +0200 + xorg (1:7.3+10ubuntu5) hardy; urgency=low * dexconf: Bring Device back to the Screen-section, nvidia-settings diff --git a/debian/control b/debian/control index 2f4cb49..f64ff0f 100644 --- a/debian/control +++ b/debian/control @@ -84,7 +84,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, ${F:XServer-Xorg-Detect-Depends}, displayconfig-gtk, mdetect +Recommends: libgl1-mesa-dri, udev, ${F:XServer-Xorg-Detect-Depends}, displayconfig-gtk, mdetect, laptop-detect 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/local/dexconf b/debian/local/dexconf index 8dd0404..4627cb2 100644 --- a/debian/local/dexconf +++ b/debian/local/dexconf @@ -104,6 +104,12 @@ if [ -n "$EARLYEXIT" ]; then exit 0 fi +if which laptop-detect >/dev/null 2>&1; then + if laptop-detect > /dev/null ; then + LAPTOP=true + fi +fi + DEXCONFTMPDIR= trap 'if [ -e "$DEXCONFTMPDIR/backup" ] && [ -n "$XF86CONFIG" ]; then \ @@ -233,6 +239,20 @@ if [ -n "$DO_EMULATE3BUTTONS" ]; then fi printf "EndSection\n" >&4 +if [ -n "$LAPTOP" ]; then + cat >&4 <<SECTION + +Section "InputDevice" + Identifier "Synaptics Touchpad" + Driver "synaptics" + Option "SendCoreEvents" "true" + Option "Device" "/dev/psaux" + Option "Protocol" "auto-dev" + Option "HorizEdgeScroll" "0" +EndSection +SECTION +fi + ### DEVICE db_get xserver-$SERVER/config/device/driver @@ -307,6 +327,19 @@ SUBSECTION fi printf "EndSection\n" >&4 +### SERVERLAYOUT + +exec 4>"$DEXCONFTMPDIR/ServerLayout" +cat >&4 <<SECTION +Section "ServerLayout" + Identifier "Default Layout" + Screen "Default Screen" +SECTION +if [ -n "$LAPTOP" ]; then + printf "\tInputDevice\t\"Synaptics Touchpad\"\n" >&4 +fi +printf "EndSection\n" >&4 + # Close file descriptor 4 before we delete temporary files exec 4<&- @@ -322,7 +355,7 @@ umask 022 SPACER= for SECTION in Header Files InputDeviceKeyboard InputDeviceMouse \ - Device Monitor Screen ; do + Device Monitor Screen ServerLayout; do if [ -e "$DEXCONFTMPDIR/$SECTION" ]; then eval $SPACER cat "$DEXCONFTMPDIR/$SECTION" >>"$OUTFILE" -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]