X Strike Force XFree86 SVN commit: r1983 - in branches/ubuntu/debian: . local
Author: fabbione
Date: 2004-10-30 00:08:28 -0500 (Sat, 30 Oct 2004)
New Revision: 1983
Modified:
branches/ubuntu/debian/changelog
branches/ubuntu/debian/control
branches/ubuntu/debian/local/Xsession.options
branches/ubuntu/debian/local/dexconf
branches/ubuntu/debian/xserver-xfree86.config.in
branches/ubuntu/debian/xserver-xfree86.postinst.in
Log:
Import 4.3.0.dfsg.1-6ubuntu7 release.
Modified: branches/ubuntu/debian/changelog
===================================================================
--- branches/ubuntu/debian/changelog 2004-10-30 05:06:29 UTC (rev 1982)
+++ branches/ubuntu/debian/changelog 2004-10-30 05:08:28 UTC (rev 1983)
@@ -1,3 +1,25 @@
+xfree86 (4.3.0.dfsg.1-6ubuntu7) warty; urgency=low
+
+ The "ThomB0T was kinda upset" upload.
+
+ Changes by Fabio M. Di Nitto:
+
+ * Fix dexconf to survive xresprobe crack.
+ * Ban via driver from autoprobe.
+ * Do NOT probe again on upgrades.
+ * Lower "No X Server detected" priority.
+ * Be sure to ask all questions on reconfiguration.
+ * Bump dependencies on xserver-common to ubuntu7. ubuntu6 is doomed.
+
+ Changes by Daniel Stone:
+
+ * debian/patches/914_novtswitch_option.diff:
+ + Add option to prevent VT switch away from the current VT.
+ * debian/local/Xsession.options:
+ + Add use-session-dbus, so D-BUS can start its session bus.
+
+ -- Fabio M. Di Nitto <fabbione@fabbione.net> Fri, 20 Aug 2004 11:15:23 +0200
+
xfree86 (4.3.0.dfsg.1-6ubuntu6) warty; urgency=low
* Bump dependencies on xserver-common to ensure better autoreconfigure
@@ -14,6 +36,7 @@
* xserver-xfree86{,-dbg} now Suggests laptop-detect.
* Re-enable use of mdetect as a possible backup for /dev/input/mice.
* Add LANG to X keyboard layout mapping to xserver-xfree86.config.in
+ inspired by Konstantinos Margaritis
* Attempt to detect the keyboard layout from $LANG
* Select always the first video card if more than one is present in the
machine. discover is supposed to give us the best one available.
Modified: branches/ubuntu/debian/control
===================================================================
--- branches/ubuntu/debian/control 2004-10-30 05:06:29 UTC (rev 1982)
+++ branches/ubuntu/debian/control 2004-10-30 05:08:28 UTC (rev 1983)
@@ -1599,7 +1599,7 @@
Package: xserver-xfree86
Architecture: alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel netbsd-i386 powerpc sh3 sh4 sparc
-Depends: xserver-common (>= 4.3.0.dfsg.1-6ubuntu5), ${shlibs:Depends}, ${misc:Depends}
+Depends: xserver-common (>= 4.3.0.dfsg.1-6ubuntu7), ${shlibs:Depends}, ${misc:Depends}
Suggests: discover, mdetect, xresprobe, libglide2 (>> 2001.01.26), laptop-detect
Conflicts: libxfont-xtt
Replaces: xserver-common (<< 4.0), libxfont-xtt
@@ -1633,7 +1633,7 @@
Package: xserver-xfree86-dbg
Priority: extra
Architecture: alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel netbsd-i386 powerpc sh3 sh4 sparc
-Depends: xserver-common (>= 4.3.0.dfsg.1-6ubuntu5), ${shlibs:Depends}, ${misc:Depends}
+Depends: xserver-common (>= 4.3.0.dfsg.1-6ubuntu7), ${shlibs:Depends}, ${misc:Depends}
Recommends: xserver-xfree86
Suggests: discover, mdetect, xresprobe, laptop-detect
Conflicts: libxfont-xtt
Modified: branches/ubuntu/debian/local/Xsession.options
===================================================================
--- branches/ubuntu/debian/local/Xsession.options 2004-10-30 05:06:29 UTC (rev 1982)
+++ branches/ubuntu/debian/local/Xsession.options 2004-10-30 05:08:28 UTC (rev 1983)
@@ -6,3 +6,4 @@
allow-user-resources
allow-user-xsession
use-ssh-agent
+use-session-dbus
Modified: branches/ubuntu/debian/local/dexconf
===================================================================
--- branches/ubuntu/debian/local/dexconf 2004-10-30 05:06:29 UTC (rev 1982)
+++ branches/ubuntu/debian/local/dexconf 2004-10-30 05:08:28 UTC (rev 1983)
@@ -143,61 +143,6 @@
bomb "creation of temporary work directory \"$TDIR\" failed."
fi
-if [ "`which laptop-detect`" ]; then
- if laptop-detect > /dev/null ; then
- LAPTOP=true
- fi
-fi
-
-NRES=0
-MONITOR_IDENTIFIER=
-if [ "`which xresprobe`" ]; then
- fetch xserver-xfree86/config/device/driver
- DEVICE_DRIVER="$RET"
- PROBE_DUMP=$(xresprobe "$DEVICE_DRIVER")
- MONITOR_IDENTIFIER=$(echo "$PROBE_DUMP" | grep "^id:" | sed -e 's/^id: //g')
- RESOLUTION=$(echo "$PROBE_DUMP" | grep "^res:" | sed -e 's/^res: //g' -e 's/\ /\,\ /g')
- NRES=0
- for i in $RESOLUTION; do
- NRES=$(expr $NRES + 1)
- done
-fi
-if [ -z "$MONITOR_IDENTIFIER" ]; then
- case "${LC_ALL:-${LC_MESSAGES:-$LANG}}" in
- ca_*) DEFAULT="Monitor gen�c" ;;
- # da
- de_*) DEFAULT="Standardbildschirm" ;;
- es_*) DEFAULT="Monitor gen�co" ;;
- # fr
- # gl
- it_*) DEFAULT="Monitor Generico" ;;
- # ja
- # nl
- pt_BR) DEFAULT="Monitor Gen�co" ;;
- # ru
- # sv
- *) DEFAULT="Generic Monitor" ;;
- esac
- MONITOR_IDENTIFIER="$DEFAULT"
-fi
-
-db_set xserver-xfree86/config/monitor/identifier "$MONITOR_IDENTIFIER"
-
-if [ "$NRES" = "0" ]; then
- # we need to ask... no other way around
- db_input high xserver-xfree86/config/display/modes
- db_go
-else
- db_set xserver-xfree86/config/display/modes "$RESOLUTION"
-fi
-
-# special case:
-JEFFCRACK=
-if [ "$(echo $RESOLUTION | grep 1280x800)" ]; then
- JEFFCRACK=yes
-fi
-
-
# Format 3:
# Files File pathnames
# Module Dynamic module loading
@@ -690,7 +635,9 @@
#MONITOR_VERT_REFRESH="$RET"
printf "Section \"Monitor\"\n" > "$DEXCONFTMPDIR/Monitor"
printf "\tIdentifier\t\"$MONITOR_IDENTIFIER\"\n">> "$DEXCONFTMPDIR/Monitor"
- if [ -n "$JEFFCRACK" ]; then
+ db_get xserver-xfree86/config/display/modes
+ JEFFCRACK="$RES"
+ if [ "$(echo "$JEFFCRACK" | grep 1280x800)" ]; then
printf "\tModeline\t\"1280x800@60\" 83.91 1280 1312 1624 1656 800 816 824 841\n" >> "$DEXCONFTMPDIR/Monitor"
fi
#printf "\tHorizSync\t$MONITOR_HORIZ_SYNC\n" >> "$DEXCONFTMPDIR/Monitor"
Modified: branches/ubuntu/debian/xserver-xfree86.config.in
===================================================================
--- branches/ubuntu/debian/xserver-xfree86.config.in 2004-10-30 05:06:29 UTC (rev 1982)
+++ branches/ubuntu/debian/xserver-xfree86.config.in 2004-10-30 05:08:28 UTC (rev 1983)
@@ -554,7 +554,7 @@
if [ $NSERVERS -eq 0 ]; then
debug_echo "could not autodetect X server: no video card detected," \
"or no server known for it"
- db_input "$(priority_ceil high)" shared/no_known_x-server || debug_report_status "db_input $(priority_ceil high) shared/no_known_x-server" "$?"
+ db_input "$(priority_ceil medium)" shared/no_known_x-server || debug_report_status "db_input $(priority_ceil medium) shared/no_known_x-server" "$?"
db_go
elif [ $NSERVERS -eq 1 ]; then
debug_echo "autodetected X server: $SERVERS"
@@ -941,12 +941,13 @@
if [ "$LAYOUT" = "UNKNOWN" ]; then
PRIORITY=high
- MAY_BE_NULL= auto_answer validate_string_db_input "$(priority_ceil $PRIORITY)" xserver-xfree86/config/inputdevice/keyboard/layout "us"
+ LAYOUT="us"
else
PRIORITY=low
- db_set xserver-xfree86/config/inputdevice/keyboard/layout "$LAYOUT"
fi
+MAY_BE_NULL= auto_answer validate_string_db_input "$(priority_ceil $PRIORITY)" xserver-xfree86/config/inputdevice/keyboard/layout "$LAYOUT"
+
db_get xserver-xfree86/config/inputdevice/keyboard/layout
if [ "$RET" != "us" ]; then
PRIORITY=medium
@@ -965,7 +966,7 @@
# Let's keep the changes not intrusive, even if less elegant.
# priority of xserver-xfree86/config/inputdevice/mouse/{port,protocol}
-PRIORITY=high
+PRIORITY=medium
AUTODETECTED_PORT=
AUTODETECTED_PROTOCOL=
@@ -987,11 +988,10 @@
# if configuring for the first time, ask if user wants to autodetect
if [ -z "$RECONFIGURE" ]; then
# this will exit the loop immediatly
- db_set xserver-xfree86/autodetect_mouse "true"
+ auto_answer db_input "$(priority_ceil $PRIORITY)" xserver-xfree86/autodetect_mouse "true"
while :; do
# bail out if autodetection tool not available
which mdetect > /dev/null 2>&1 || break
- #auto_answer db_input "$(priority_ceil $PRIORITY)" xserver-xfree86/autodetect_mouse "true"
db_get xserver-xfree86/autodetect_mouse
if [ "$RET" = "true" ]; then
set +e
@@ -1039,14 +1039,11 @@
debug_echo "not prompting for mouse autodetection; reconfiguring"
fi
-#db_subst xserver-xfree86/config/inputdevice/mouse/port choices $MOUSE_PORT_CHOICES
-#auto_answer db_input "$(priority_ceil $PRIORITY)" xserver-xfree86/config/inputdevice/mouse/port "${AUTODETECTED_PORT:-$DEFAULT_PORT}"
-db_set xserver-xfree86/config/inputdevice/mouse/port "/dev/input/mice"
-if [ -n "$AUTODETECTED_PORT" ]; then
- if [ "$AUTODETECTED_PORT" != "/dev/input/mice" ]; then
- db_set xserver-xfree86/config/inputdevice/mouse/port "$AUTODETECTED_PORT"
- fi
+db_subst xserver-xfree86/config/inputdevice/mouse/port choices $MOUSE_PORT_CHOICES
+if [ -z "$AUTODETECTED_PORT" ]; then
+ AUTODETECTED_PORT="/dev/input/mice"
fi
+auto_answer db_input "$(priority_ceil $PRIORITY)" xserver-xfree86/config/inputdevice/mouse/port "${AUTODETECTED_PORT:-$DEFAULT_PORT}"
db_get xserver-xfree86/config/inputdevice/mouse/port
case "$RET" in
@@ -1072,16 +1069,12 @@
;;
esac
db_subst xserver-xfree86/config/inputdevice/mouse/protocol choices $MOUSE_PROTOCOL_CHOICES
-#if ! expr "$MOUSE_PROTOCOL_CHOICES" : ".*,.*" > /dev/null 2>&1; then
-# debug_echo "\$MOUSE_PROTOCOL_CHOICES has only one value; setting xserver-xfree86/config/inputdevice/mouse/protocol to \"$DEFAULT_PROTOCOL\""
- if [ -n "$AUTODETECTED_PROTOCOL" ]; then
- db_set xserver-xfree86/config/inputdevice/mouse/protocol "$AUTODETECTED_PROTOCOL"
- else
- db_set xserver-xfree86/config/inputdevice/mouse/protocol "$DEFAULT_PROTOCOL"
- fi
-#else
-# auto_answer db_input "$(priority_ceil $PRIORITY)" xserver-xfree86/config/inputdevice/mouse/protocol "${AUTODETECTED_PROTOCOL:-$DEFAULT_PROTOCOL}"
-#fi
+if ! expr "$MOUSE_PROTOCOL_CHOICES" : ".*,.*" > /dev/null 2>&1; then
+ debug_echo "\$MOUSE_PROTOCOL_CHOICES has only one value; setting xserver-xfree86/config/inputdevice/mouse/protocol to \"$DEFAULT_PROTOCOL\""
+ db_set xserver-xfree86/config/inputdevice/mouse/protocol "$DEFAULT_PROTOCOL"
+else
+ auto_answer db_input "$(priority_ceil $PRIORITY)" xserver-xfree86/config/inputdevice/mouse/protocol "${AUTODETECTED_PROTOCOL:-$DEFAULT_PROTOCOL}"
+fi
db_input "$(priority_ceil low)" xserver-xfree86/config/inputdevice/mouse/emulate3buttons || debug_report_status "db_input $(priority_ceil low) xserver-xfree86/config/inputdevice/mouse/emulate3buttons" "$?"
db_input "$(priority_ceil low)" xserver-xfree86/config/inputdevice/mouse/zaxismapping || debug_report_status "db_input $(priority_ceil low) xserver-xfree86/config/inputdevice/mouse/zaxismapping" "$?"
Modified: branches/ubuntu/debian/xserver-xfree86.postinst.in
===================================================================
--- branches/ubuntu/debian/xserver-xfree86.postinst.in 2004-10-30 05:06:29 UTC (rev 1982)
+++ branches/ubuntu/debian/xserver-xfree86.postinst.in 2004-10-30 05:08:28 UTC (rev 1983)
@@ -27,8 +27,76 @@
XF86CONFIG_ROSTER="$CONFIG_AUX_DIR/${XF86CONFIG##*/}.roster"
THIS_SERVER=/usr/bin/X11/XFree86
+NOPROBE="$2"
+
#DEBHELPER#
+xresprobeint() {
+ if [ "`which laptop-detect`" ]; then
+ if laptop-detect > /dev/null ; then
+ LAPTOP=true
+ fi
+ fi
+
+ NRES=0
+ MONITOR_IDENTIFIER=
+ if [ "`which xresprobe`" ]; then
+ db_get xserver-xfree86/config/device/driver
+ DEVICE_DRIVER="$RET"
+ if [ -n "$NOPROBE" ]; then
+ # we are reconfiguring
+ db_get xserver-xfree86/config/monitor/identifier
+ MONITOR_IDENTIFIER="$RES"
+ db_get xserver-xfree86/config/display/modes
+ RESOLUTION="$RES"
+ else
+ # detecting via = crash
+ if [ "$DEVICE_DRIVER" != "via" ]; then
+ set +e
+ PROBE_DUMP=$(xresprobe "$DEVICE_DRIVER")
+ set -e
+ fi
+ MONITOR_IDENTIFIER=$(echo "$PROBE_DUMP" | grep "^id:" | sed -e 's/^id: //g')
+ RESOLUTION=$(echo "$PROBE_DUMP" | grep "^res:" | sed -e 's/^res: //g' -e 's/\ /\,\ /g')
+ fi
+ NRES=0
+ for i in $RESOLUTION; do
+ NRES=$(expr $NRES + 1)
+ done
+ fi
+ if [ -z "$MONITOR_IDENTIFIER" ]; then
+ case "${LC_ALL:-${LC_MESSAGES:-$LANG}}" in
+ ca_*) DEFAULT="Monitor gen�c" ;;
+ # da
+ de_*) DEFAULT="Standardbildschirm" ;;
+ es_*) DEFAULT="Monitor gen�co" ;;
+ # fr
+ # gl
+ it_*) DEFAULT="Monitor Generico" ;;
+ # ja
+ # nl
+ pt_BR) DEFAULT="Monitor Gen�co" ;;
+ # ru
+ # sv
+ *) DEFAULT="Generic Monitor" ;;
+ esac
+ MONITOR_IDENTIFIER="$DEFAULT"
+ fi
+
+ db_set xserver-xfree86/config/monitor/identifier "$MONITOR_IDENTIFIER"
+ db_input low xserver-xfree86/config/monitor/identifier || true
+
+ if [ "$NRES" -gt "0" ]; then
+ db_set xserver-xfree86/config/display/modes "$RESOLUTION"
+ PRIORITY=medium
+ else
+ PRIORITY=high
+ fi
+ db_input $PRIORITY xserver-xfree86/config/display/modes || true
+ db_go
+}
+
+
# only mess with config files if the configuration file auxiliary directory
# exists; if it does not, assume that's the way the user wants it
if [ -d "$CONFIG_AUX_DIR" ]; then
@@ -103,6 +171,7 @@
if [ "$(md5sum "$XF86CONFIG")" = "$(cat "$XF86CONFIG_CHECKSUM")" ]; then
# they match; prepare a new version of the config file
NEW_XF86CONFIG=$(tempfile)
+ xresprobeint
if dexconf --stdout >>"$NEW_XF86CONFIG"; then
if ! cmp -s "$XF86CONFIG" "$NEW_XF86CONFIG"; then
cp "$NEW_XF86CONFIG" "$XF86CONFIG.dpkg-new"
Reply to: