X Strike Force XFree86 SVN commit: r1988 - in branches/ubuntu/debian: . local
Author: fabbione
Date: 2004-10-30 00:36:23 -0500 (Sat, 30 Oct 2004)
New Revision: 1988
Modified:
branches/ubuntu/debian/changelog
branches/ubuntu/debian/control
branches/ubuntu/debian/local/dexconf
branches/ubuntu/debian/xserver-xfree86.config.in
Log:
Import 4.3.0.dfsg.1-6ubuntu12 release.
Modified: branches/ubuntu/debian/changelog
===================================================================
--- branches/ubuntu/debian/changelog 2004-10-30 05:33:16 UTC (rev 1987)
+++ branches/ubuntu/debian/changelog 2004-10-30 05:36:23 UTC (rev 1988)
@@ -1,3 +1,14 @@
+xfree86 (4.3.0.dfsg.1-6ubuntu12) warty; urgency=low
+
+ * Always feed bus_id questions. Useful when reconfiguring.
+ * Set default keyboard model to pc105 on all layout other than "us".
+ * "Recommends:" hw detection tools instead of "Suggests:"
+ * Turned the video driver question back on if there is no autodetection.
+ DEFAULT=vesa is not enough.
+ * Add defoma font patchs to dexconf output. (Closes #953)
+
+ -- Fabio M. Di Nitto <fabbione@fabbione.net> Wed, 01 Sep 2004 14:41:50 +0200
+
xfree86 (4.3.0.dfsg.1-6ubuntu11) warty; urgency=low
* Resync changes with Debian r1777.
Modified: branches/ubuntu/debian/control
===================================================================
--- branches/ubuntu/debian/control 2004-10-30 05:33:16 UTC (rev 1987)
+++ branches/ubuntu/debian/control 2004-10-30 05:36:23 UTC (rev 1988)
@@ -1600,7 +1600,8 @@
Package: xserver-xfree86
Architecture: alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel netbsd-i386 powerpc sh3 sh4 sparc
Depends: xserver-common (>= ${Source-Version}), ${shlibs:Depends}, ${misc:Depends}
-Suggests: discover, mdetect, xresprobe, libglide2 (>> 2001.01.26), laptop-detect
+Recommends: discover1, mdetect, xresprobe, laptop-detect
+Suggests: libglide2 (>> 2001.01.26)
Conflicts: libxfont-xtt
Replaces: xserver-common (<< 4.0), libxfont-xtt
Provides: xserver
@@ -1616,10 +1617,10 @@
<http://www.xfree86.org/4.3.0/Status.html> for information on its support for
your particular hardware.
.
- If the discover, mdetect and xresprobe packages are installed, this package's
- configuration script will use them to attempt automatic configuration of the
- X server based on your information returned by your video card, mouse, and
- monitor.
+ If the discover, mdetect, laptop-detect and xresprobe packages are installed,
+ this package's configuration script will use them to attempt automatic
+ configuration of the X server based on your information returned by your
+ video card, mouse, and monitor.
.
Note that on the HP-PA, MIPS, and SuperH architectures, the server's
loadable module support is not present, and therefore the XFree86 server is a
@@ -1634,8 +1635,7 @@
Priority: extra
Architecture: alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel netbsd-i386 powerpc sh3 sh4 sparc
Depends: xserver-common (>= ${Source-Version}), ${shlibs:Depends}, ${misc:Depends}
-Recommends: xserver-xfree86
-Suggests: discover, mdetect, xresprobe, laptop-detect
+Recommends: xserver-xfree86, discover1, mdetect, xresprobe, laptop-detect
Conflicts: libxfont-xtt
Replaces: xserver-common (<< 4.0), libxfont-xtt
Provides: xserver, xserver-xfree86
Modified: branches/ubuntu/debian/local/dexconf
===================================================================
--- branches/ubuntu/debian/local/dexconf 2004-10-30 05:33:16 UTC (rev 1987)
+++ branches/ubuntu/debian/local/dexconf 2004-10-30 05:36:23 UTC (rev 1988)
@@ -218,6 +218,9 @@
FontPath "/usr/lib/X11/fonts/Speedo"
FontPath "/usr/lib/X11/fonts/100dpi"
FontPath "/usr/lib/X11/fonts/75dpi"
+ # paths to defoma fonts
+ FontPath "/var/lib/defoma/x-ttcidfont-conf.d/dirs/TrueType"
+ FontPath "/var/lib/defoma/x-ttcidfont-conf.d/dirs/CID"
EndSection
SECTION
fi
Modified: branches/ubuntu/debian/xserver-xfree86.config.in
===================================================================
--- branches/ubuntu/debian/xserver-xfree86.config.in 2004-10-30 05:33:16 UTC (rev 1987)
+++ branches/ubuntu/debian/xserver-xfree86.config.in 2004-10-30 05:36:23 UTC (rev 1988)
@@ -612,7 +612,7 @@
# video driver selection
# priority of xserver-xfree86/config/device/driver
-PRIORITY=medium
+PRIORITY=high
DRIVER_DIR=/usr/X11R6/lib/modules/drivers
@@ -713,7 +713,7 @@
fi
db_subst xserver-xfree86/config/device/driver choices "$DRIVER_LIST"
-auto_answer db_input "$(priority_ceil medium)" \
+auto_answer db_input "$PRIORITY" \
xserver-xfree86/config/device/driver "$DEFAULT_DRIVER"
# card identifier; try to set a sensible default
@@ -754,6 +754,8 @@
# only one in the machine (broken PCI bus code in the XFree86 X server, most
# likely). If there are multiple video cards, we need to configure one as the
# primary head.
+# Warty: always feed this info.
+MULTIHEAD=yes
if [ "$ARCH" = "powerpc" -o "$MULTIHEAD" = "yes" ]; then
if [ "$ARCH" = "powerpc" ]; then
PRIORITY=medium
@@ -845,6 +847,77 @@
# keyboard setup
+# Warty change: try to guess keyboard layout from $LANG
+case "$LANG" in
+ "ca_ES@euro" ) LAYOUT="es" XKBOPTIONS="" ;;
+ "da_DK" ) LAYOUT="dk" XKBOPTIONS="" ;;
+ "de_BE@euro" ) LAYOUT="de" XKBOPTIONS="" ;;
+ "de_DE@euro" ) LAYOUT="de" XKBOPTIONS="" ;;
+ "el_GR.UTF-8" ) LAYOUT="us,el" XKBOPTIONS="grp:ctrl_shift_toggle" ;;
+ "en_AU" ) LAYOUT="us" XKBOPTIONS="" ;;
+ "en_CA" ) LAYOUT="us" XKBOPTIONS="" ;;
+ "en_DK" ) LAYOUT="dk" XKBOPTIONS="" ;;
+ "en_IE@euro" ) LAYOUT="us" XKBOPTIONS="" ;;
+ "en_GB" ) LAYOUT="gb" XKBOPTIONS="" ;;
+ "en_US" ) LAYOUT="us" XKBOPTIONS="" ;;
+ "es_AR" ) LAYOUT="es" XKBOPTIONS="" ;;
+ "es_ES@euro" ) LAYOUT="es" XKBOPTIONS="" ;;
+ "es_MX" ) LAYOUT="la" XKBOPTIONS="" ;;
+ "es_PE" ) LAYOUT="es_la" XKBOPTIONS="" ;;
+ "fi_FI@euro" ) LAYOUT="fi" XKBOPTIONS="" ;;
+ "fr_BE@euro" ) LAYOUT="be" XKBOPTIONS="" ;;
+ "fr_CA" ) LAYOUT="us" XKBOPTIONS="" ;;
+ "fr_FR@euro" ) LAYOUT="fr" XKBOPTIONS="" ;;
+ "it_IT@euro" ) LAYOUT="it" XKBOPTIONS="" ;;
+ "ja_JP" ) LAYOUT="jp" XKBOPTIONS="" ;;
+ "ko_KR" ) LAYOUT="us" XKBOPTIONS="" ;;
+ "lv_LV" ) LAYOUT="lv" XKBOPTIONS="" ;;
+ "nb_NO" ) LAYOUT="no" XKBOPTIONS="" ;;
+ "nds_DE" ) LAYOUT="de" XKBOPTIONS="" ;;
+ "nl_BE@euro" ) LAYOUT="be" XKBOPTIONS="" ;;
+ "nl_NL@euro" ) LAYOUT="nl" XKBOPTIONS="" ;;
+ "nn_NO" ) LAYOUT="no" XKBOPTIONS="" ;;
+ "no_NO" ) LAYOUT="no" XKBOPTIONS="" ;;
+ "pt_BR" ) LAYOUT="br" XKBOPTIONS="" ;;
+ "se_NO" ) LAYOUT="sapmi" XKBOPTIONS="" ;;
+ "sv_SE" ) LAYOUT="se" XKBOPTIONS="" ;;
+ "tr_TR" ) LAYOUT="tr" XKBOPTIONS="grp_led:caps" ;;
+ *"AR"* ) LAYOUT="es" XKBOPTIONS="" ;;
+ *"AU"* ) LAYOUT="us" XKBOPTIONS="" ;;
+ *"BE"* ) LAYOUT="de" XKBOPTIONS="" ;;
+ *"BR"* ) LAYOUT="br" XKBOPTIONS="" ;;
+ *"CA"* ) LAYOUT="us" XKBOPTIONS="" ;;
+ *"DE"* ) LAYOUT="de" XKBOPTIONS="" ;;
+ *"DK"* ) LAYOUT="dk" XKBOPTIONS="" ;;
+ *"ES"* ) LAYOUT="es" XKBOPTIONS="" ;;
+ *"FI"* ) LAYOUT="fi" XKBOPTIONS="" ;;
+ *"FR"* ) LAYOUT="fr" XKBOPTIONS="" ;;
+ *"GB"* ) LAYOUT="gb" XKBOPTIONS="" ;;
+ *"GR"* ) LAYOUT="us,el" XKBOPTIONS="grp:ctrl_shift_toggle" ;;
+ *"IE"* ) LAYOUT="us" XKBOPTIONS="" ;;
+ *"IT"* ) LAYOUT="it" XKBOPTIONS="" ;;
+ *"JP"* ) LAYOUT="jp" XKBOPTIONS="" ;;
+ *"KR"* ) LAYOUT="us" XKBOPTIONS="" ;;
+ *"LV"* ) LAYOUT="lv" XKBOPTIONS="" ;;
+ *"MX"* ) LAYOUT="la" XKBOPTIONS="" ;;
+ *"NL"* ) LAYOUT="nl" XKBOPTIONS="" ;;
+ *"NO"* ) LAYOUT="no" XKBOPTIONS="" ;;
+ *"PE"* ) LAYOUT="es_la" XKBOPTIONS="" ;;
+ *"SE"* ) LAYOUT="se" XKBOPTIONS="" ;;
+ *"TR"* ) LAYOUT="tr" XKBOPTIONS="grp_led:caps" ;;
+ *"US"* ) LAYOUT="us" XKBOPTIONS="" ;;
+ * ) LAYOUT="UNKNOWN" XKBOPTIONS="" ;;
+esac
+
+if [ "$LAYOUT" = "UNKNOWN" ]; then
+ PRIORITY=high
+ LAYOUT="us"
+else
+ PRIORITY=low
+fi
+
+MAY_BE_NULL= auto_answer validate_string_db_input "$(priority_ceil $PRIORITY)" xserver-xfree86/config/inputdevice/keyboard/layout "$LAYOUT"
+
# these questions require input validation
PRIORITY=medium
@@ -868,82 +941,16 @@
fi
fi
else
- DEFAULT=pc104
+ db_get xserver-xfree86/config/inputdevice/keyboard/layout
+ if [ "$RET" = "us" ]; then
+ DEFAULT=pc104
+ else
+ DEFAULT=pc105
+ fi
fi
fi
MAY_BE_NULL= auto_answer validate_string_db_input "$(priority_ceil $PRIORITY)" xserver-xfree86/config/inputdevice/keyboard/model "$DEFAULT"
-# Warty change: try to guess keyboard layout from $LANG
-case "$LANG" in
-"ca_ES@euro" ) LAYOUT="es" XKBOPTIONS="" ;;
-"da_DK" ) LAYOUT="dk" XKBOPTIONS="" ;;
-"de_BE@euro" ) LAYOUT="de" XKBOPTIONS="" ;;
-"de_DE@euro" ) LAYOUT="de" XKBOPTIONS="" ;;
-"el_GR.UTF-8" ) LAYOUT="us,el" XKBOPTIONS="grp:ctrl_shift_toggle" ;;
-"en_AU" ) LAYOUT="us" XKBOPTIONS="" ;;
-"en_CA" ) LAYOUT="us" XKBOPTIONS="" ;;
-"en_DK" ) LAYOUT="dk" XKBOPTIONS="" ;;
-"en_IE@euro" ) LAYOUT="us" XKBOPTIONS="" ;;
-"en_GB" ) LAYOUT="gb" XKBOPTIONS="" ;;
-"en_US" ) LAYOUT="us" XKBOPTIONS="" ;;
-"es_AR" ) LAYOUT="es" XKBOPTIONS="" ;;
-"es_ES@euro" ) LAYOUT="es" XKBOPTIONS="" ;;
-"es_MX" ) LAYOUT="la" XKBOPTIONS="" ;;
-"es_PE" ) LAYOUT="es_la" XKBOPTIONS="" ;;
-"fi_FI@euro" ) LAYOUT="fi" XKBOPTIONS="" ;;
-"fr_BE@euro" ) LAYOUT="be" XKBOPTIONS="" ;;
-"fr_CA" ) LAYOUT="us" XKBOPTIONS="" ;;
-"fr_FR@euro" ) LAYOUT="fr" XKBOPTIONS="" ;;
-"it_IT@euro" ) LAYOUT="it" XKBOPTIONS="" ;;
-"ja_JP" ) LAYOUT="jp" XKBOPTIONS="" ;;
-"ko_KR" ) LAYOUT="us" XKBOPTIONS="" ;;
-"lv_LV" ) LAYOUT="lv" XKBOPTIONS="" ;;
-"nb_NO" ) LAYOUT="no" XKBOPTIONS="" ;;
-"nds_DE" ) LAYOUT="de" XKBOPTIONS="" ;;
-"nl_BE@euro" ) LAYOUT="be" XKBOPTIONS="" ;;
-"nl_NL@euro" ) LAYOUT="nl" XKBOPTIONS="" ;;
-"nn_NO" ) LAYOUT="no" XKBOPTIONS="" ;;
-"no_NO" ) LAYOUT="no" XKBOPTIONS="" ;;
-"pt_BR" ) LAYOUT="br" XKBOPTIONS="" ;;
-"se_NO" ) LAYOUT="sapmi" XKBOPTIONS="" ;;
-"sv_SE" ) LAYOUT="se" XKBOPTIONS="" ;;
-"tr_TR" ) LAYOUT="tr" XKBOPTIONS="grp_led:caps" ;;
-*"AR"* ) LAYOUT="es" XKBOPTIONS="" ;;
-*"AU"* ) LAYOUT="us" XKBOPTIONS="" ;;
-*"BE"* ) LAYOUT="de" XKBOPTIONS="" ;;
-*"BR"* ) LAYOUT="br" XKBOPTIONS="" ;;
-*"CA"* ) LAYOUT="us" XKBOPTIONS="" ;;
-*"DE"* ) LAYOUT="de" XKBOPTIONS="" ;;
-*"DK"* ) LAYOUT="dk" XKBOPTIONS="" ;;
-*"ES"* ) LAYOUT="es" XKBOPTIONS="" ;;
-*"FI"* ) LAYOUT="fi" XKBOPTIONS="" ;;
-*"FR"* ) LAYOUT="fr" XKBOPTIONS="" ;;
-*"GB"* ) LAYOUT="gb" XKBOPTIONS="" ;;
-*"GR"* ) LAYOUT="us,el" XKBOPTIONS="grp:ctrl_shift_toggle" ;;
-*"IE"* ) LAYOUT="us" XKBOPTIONS="" ;;
-*"IT"* ) LAYOUT="it" XKBOPTIONS="" ;;
-*"JP"* ) LAYOUT="jp" XKBOPTIONS="" ;;
-*"KR"* ) LAYOUT="us" XKBOPTIONS="" ;;
-*"LV"* ) LAYOUT="lv" XKBOPTIONS="" ;;
-*"MX"* ) LAYOUT="la" XKBOPTIONS="" ;;
-*"NL"* ) LAYOUT="nl" XKBOPTIONS="" ;;
-*"NO"* ) LAYOUT="no" XKBOPTIONS="" ;;
-*"PE"* ) LAYOUT="es_la" XKBOPTIONS="" ;;
-*"SE"* ) LAYOUT="se" XKBOPTIONS="" ;;
-*"TR"* ) LAYOUT="tr" XKBOPTIONS="grp_led:caps" ;;
-*"US"* ) LAYOUT="us" XKBOPTIONS="" ;;
-* ) LAYOUT="UNKNOWN" XKBOPTIONS="" ;;
-esac
-
-if [ "$LAYOUT" = "UNKNOWN" ]; then
- PRIORITY=high
- LAYOUT="us"
-else
- PRIORITY=low
-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
Reply to: