X Strike Force X.Org X11 SVN commit: r1959 - trunk/debian/xorg/debian
Author: dnusinow
Date: 2006-04-24 20:46:38 -0400 (Mon, 24 Apr 2006)
New Revision: 1959
Modified:
trunk/debian/xorg/debian/changelog
trunk/debian/xorg/debian/xserver-xorg.config.in
Log:
* Re-add XF86Config-4 -> xorg.conf code in xserver-xorg.config. Thanks to
Steve Langasek for catching this. (closes: #362728)
Modified: trunk/debian/xorg/debian/changelog
===================================================================
--- trunk/debian/xorg/debian/changelog 2006-04-25 00:17:43 UTC (rev 1958)
+++ trunk/debian/xorg/debian/changelog 2006-04-25 00:46:38 UTC (rev 1959)
@@ -45,8 +45,10 @@
Thanks Ren?? van Bevern. (closes: #364475)
* Add x11-common conflicts with beaver, lsb-core, and yank. Thanks Aaron M.
Ucko. (closes: #364113)
+ * Re-add XF86Config-4 -> xorg.conf code in xserver-xorg.config. Thanks to
+ Steve Langasek for catching this. (closes: #362728)
- -- David Nusinow <dnusinow@debian.org> Mon, 24 Apr 2006 20:17:15 -0400
+ -- David Nusinow <dnusinow@debian.org> Mon, 24 Apr 2006 20:46:19 -0400
xorg (1:7.0.14) unstable; urgency=low
Modified: trunk/debian/xorg/debian/xserver-xorg.config.in
===================================================================
--- trunk/debian/xorg/debian/xserver-xorg.config.in 2006-04-25 00:17:43 UTC (rev 1958)
+++ trunk/debian/xorg/debian/xserver-xorg.config.in 2006-04-25 00:46:38 UTC (rev 1959)
@@ -411,12 +411,90 @@
FIRSTINST=yes
fi
+# Migrate debconf templates from xserver-xfree86 to xserver-xorg
+XF86TEMPLATELIST=$(debconf-show xserver-xfree86 | sed -e 's/^\*//g' | awk '{print $1}' | sed -e 's/\:$//g')
+
+if [ -n "$FIRSTINST" ] && [ -z "$RECONFIGURE" ] && [ -n "$XF86TEMPLATELIST" ]; then
+ MIGRATE_XF86=true
+ warn "Migrating xserver-xfree86 debconf values to xserver-xorg."
+ # set +e is required otherwise debconf will kick us out if the template is not
+ # there.
+ set +e
+ for XF86TEMPLATE in $XF86TEMPLATELIST; do
+ XORGTEMPLATE=$(echo "$XF86TEMPLATE" | sed -e 's/xserver-xfree86/xserver-xorg/g')
+ # db_get doesn't need checking. If we are here is because it is in the list.
+ db_get "$XF86TEMPLATE"
+ db_set "$XORGTEMPLATE" "$RET"
+ if [ "$RET" = "10 $XORGTEMPLATE doesn't exist" ]; then
+ debug_echo "$XF86TEMPLATE is not mapped to $XORGTEMPLATE"
+ else
+ db_fset "$XORGTEMPLATE" seen true
+ fi
+ done
+ # migrate special cases
+ db_metaget xserver-xfree86/config/display/modes choices
+ if [ "$RET" != "10 xserver-xfree86/config/display/modes doesn't exist" ]; then
+ db_subst xserver-xorg/config/display/modes choices "$RET"
+ else
+ db_subst xserver-xorg/config/display/modes choices @DEFAULT_DCRESOLUTIONS@
+ fi
+ # migrate keyboard/rules
+ db_get xserver-xorg/config/inputdevice/keyboard/rules
+ if [ "$RET" = "xfree86" ]; then
+ db_set xserver-xorg/config/inputdevice/keyboard/rules "xorg"
+ fi
+ db_set xserver-xorg/config/monitor/use_sync_ranges true
+ set -e
+ if [ -e "$XF86CONFIG" ] && [ ! -e "$XORGCONFIG" ]; then
+ touch "$CONFIG_AUX_DIR/.migrateconfig"
+ cp "$XF86CONFIG" "$XORGCONFIG"
+ if [ -e "$XF86CONFIG_CHECKSUM" ] && [ ! -e "$XORGCONFIG_CHECKSUM" ]; then
+ cat "$XF86CONFIG_CHECKSUM" | sed -e 's/XF86Config-4/xorg\.conf/' > "$XORGCONFIG_CHECKSUM"
+ fi
+ if [ -e "$XF86CONFIG_ROSTER" ] && [ ! -e "$XORGCONFIG_ROSTER" ]; then
+ echo "$THIS_PACKAGE" > "$XORGCONFIG_ROSTER"
+ fi
+ fi
+fi
+
+# migrate from old select-type templates
+for TEMPLATE in xserver-xorg/config/inputdevice/mouse/emulate3buttons \
+ xserver-xorg/config/inputdevice/mouse/zaxismapping; do
+ db_get "$TEMPLATE"
+ if [ "$RET" = "Yes" ]; then
+ db_set $TEMPLATE "true"
+ elif [ "$RET" = "No" ]; then
+ db_set $TEMPLATE "false"
+ fi
+done
+
# migrate from "expert" to "advanced"
db_get xserver-xorg/config/monitor/selection-method
if [ "$RET" = "Expert" ]; then
db_set xserver-xorg/config/monitor/selection-method "Advanced"
fi
+# migrate to X.Org 6.8.1, where there are no pex, xtt or xie modules
+db_get xserver-xorg/config/modules
+SELECTED_MODULES="$(echo $RET | awk 'BEGIN { RS=", "} {print $1}')"
+# are the pex or xie modules selected?
+if echo "$SELECTED_MODULES" | egrep -q "(pex|xie|xtt)"; then
+ # get rid of them
+ SELECTED_MODULES=$(echo "$SELECTED_MODULES" | egrep -v "(pex|xie|xtt)")
+ SELECTED_MODULES=$(echo $SELECTED_MODULES | sed 's/ /, /g')
+ db_set xserver-xorg/config/modules "$SELECTED_MODULES"
+fi
+
+# migrate from ATI driver sub-modules to ATI driver
+db_get xserver-xorg/config/device/driver
+case "$RET" in
+ atimisc|r128|radeon)
+ db_set xserver-xorg/config/device/driver "ati"
+ ;;
+ *)
+ ;;
+esac
+
# The only supported protocol (per Zephaniah Hull) for the GPM repeater is
# IntelliMouse; migrate anyone using that mouse device to that protocol. Other
# values used to work as well, but no longer do since the XFree86 mouse driver
Reply to: