Author: fabbione
Date: 2004-10-30 01:10:44 -0500 (Sat, 30 Oct 2004)
New Revision: 1999
Modified:
branches/ubuntu/debian/CHANGESETS
branches/ubuntu/debian/MANIFEST.alpha.in
branches/ubuntu/debian/MANIFEST.amd64.in
branches/ubuntu/debian/MANIFEST.arm.in
branches/ubuntu/debian/MANIFEST.hppa.in
branches/ubuntu/debian/MANIFEST.hurd-i386.in
branches/ubuntu/debian/MANIFEST.i386.in
branches/ubuntu/debian/MANIFEST.ia64.in
branches/ubuntu/debian/MANIFEST.m68k.in
branches/ubuntu/debian/MANIFEST.mips.in
branches/ubuntu/debian/MANIFEST.mipsel.in
branches/ubuntu/debian/MANIFEST.powerpc.in
branches/ubuntu/debian/MANIFEST.s390.in
branches/ubuntu/debian/MANIFEST.sparc.in
branches/ubuntu/debian/TODO
branches/ubuntu/debian/changelog
branches/ubuntu/debian/local/FAQ.xhtml
branches/ubuntu/debian/patches/000_stolen_from_HEAD_xkb_data.diff
branches/ubuntu/debian/po/da.po
branches/ubuntu/debian/xlibs.install
branches/ubuntu/debian/xserver-xfree86.config.in
branches/ubuntu/debian/xserver-xfree86.postinst.in
Log:
Import 4.3.0.dfsg.1-6ubuntu23 release.
Modified: branches/ubuntu/debian/CHANGESETS
===================================================================
--- branches/ubuntu/debian/CHANGESETS 2004-10-30 06:07:03 UTC (rev 1998)
+++ branches/ubuntu/debian/CHANGESETS 2004-10-30 06:10:44 UTC (rev 1999)
@@ -8,58 +8,4 @@
(It should always be safe to merge the latest version of TODO or CHANGESETS
files anywhere.)
-Miscellaneous cosmetic fixes.
- 1811, 1812, 1815, 1816, 1828, 1829, 1830, 1842
-
-Update Danish debconf template translations (thanks, Claus Hindsgaul).
- 1806
-
-In the Xsession script, attempt to create a file of non-zero length in
-/tmp; a full filesystem can cause mysterious X session failures.
- 1808
-
-Create debian/tmp/usr/X11R6/lib/X11/doc when NOT_BUILDING_XFREE86_X_SERVER
-is defined. Fixes FTBFS on s390.
- 1814
-
-Grab /etc/X11/xkb/symbols/pc/us_intl from XFree86 CVS (2003-10-04). This
-makes us_intl multi-layout aware, and binds the right Meta key to
-Mode_Switch. (Closes: #271326, #234085)
- 1820, 1824
-
-Revert upstream change to altwin behavior applied in 4.3.0.dfsg.1-1.
-The Meta_* keysyms must be removed from the shift level of Alt keys when
-altwin:meta_win or altwin:left_meta_win are used; otherwise, XKB-unaware
-applications (like GNU Emacs) may believe that mod1 and mod4 are bound to
-Meta keys.
- 1821
-
-Fix inconsistencies in rules/xfree86* files:
-+ rules/xfree86: List in $oldlayouts all layouts which are currently not
- multi-layout aware in the Debian xlibs package, including hu_US (thanks,
- Veres Lajos). (Closes: #247463, #270810)
-+ rules/xfree86: Support the lv3:ralt_switch option, which exists in
- xfree86.lst but was forgotten in this file.
-+ rules/xfree86: Remove special case that causes PC keyboard models with
- the us_intl layout to load the us layout and add the us_intl layout to
- it. (Closes: #234085)
-+ rules/xfree86.{lst,xml}: Replace the options altwin:meta_super and
- altwin:meta_hyper with the correct names altwin:super_win and
- altwin:hyper_win. (Closes: #271259)
-+ rules/xfree86.{lst,xml}: Synchronize these files.
- 1822, 1825, 1826
-
-Add FAQ entry: My keyboard configuration worked with XFree86 4.2; why is
-it messed up now? (Closes: #259740)
- 1823, 1832, 1835, 1836, 1838, 1839
-
-Add FAQ entry: How does the keyboard work in the X Window System?
- 1840
-
-Make minor expansions and corrections to the FAQ.
- 1841
-
-Update Japanese debconf template translations (thanks, Kenshi Muto).
- 1843
-
vim:set ai et sts=4 sw=4 tw=80:
Modified: branches/ubuntu/debian/MANIFEST.alpha.in
===================================================================
--- branches/ubuntu/debian/MANIFEST.alpha.in 2004-10-30 06:07:03 UTC (rev
1998)
+++ branches/ubuntu/debian/MANIFEST.alpha.in 2004-10-30 06:10:44 UTC (rev
1999)
@@ -371,6 +371,7 @@
etc/X11/xkb/symbols/pc/tr
etc/X11/xkb/symbols/pc/ua
etc/X11/xkb/symbols/pc/us
+etc/X11/xkb/symbols/pc/us_intl
etc/X11/xkb/symbols/pc/yu
etc/X11/xkb/symbols/pc104
etc/X11/xkb/symbols/pl
Modified: branches/ubuntu/debian/MANIFEST.amd64.in
===================================================================
--- branches/ubuntu/debian/MANIFEST.amd64.in 2004-10-30 06:07:03 UTC (rev
1998)
+++ branches/ubuntu/debian/MANIFEST.amd64.in 2004-10-30 06:10:44 UTC (rev
1999)
@@ -371,6 +371,7 @@
etc/X11/xkb/symbols/pc/tr
etc/X11/xkb/symbols/pc/ua
etc/X11/xkb/symbols/pc/us
+etc/X11/xkb/symbols/pc/us_intl
etc/X11/xkb/symbols/pc/yu
etc/X11/xkb/symbols/pc104
etc/X11/xkb/symbols/pl
Modified: branches/ubuntu/debian/MANIFEST.arm.in
===================================================================
--- branches/ubuntu/debian/MANIFEST.arm.in 2004-10-30 06:07:03 UTC (rev
1998)
+++ branches/ubuntu/debian/MANIFEST.arm.in 2004-10-30 06:10:44 UTC (rev
1999)
@@ -371,6 +371,7 @@
etc/X11/xkb/symbols/pc/tr
etc/X11/xkb/symbols/pc/ua
etc/X11/xkb/symbols/pc/us
+etc/X11/xkb/symbols/pc/us_intl
etc/X11/xkb/symbols/pc/yu
etc/X11/xkb/symbols/pc104
etc/X11/xkb/symbols/pl
Modified: branches/ubuntu/debian/MANIFEST.hppa.in
===================================================================
--- branches/ubuntu/debian/MANIFEST.hppa.in 2004-10-30 06:07:03 UTC (rev
1998)
+++ branches/ubuntu/debian/MANIFEST.hppa.in 2004-10-30 06:10:44 UTC (rev
1999)
@@ -371,6 +371,7 @@
etc/X11/xkb/symbols/pc/tr
etc/X11/xkb/symbols/pc/ua
etc/X11/xkb/symbols/pc/us
+etc/X11/xkb/symbols/pc/us_intl
etc/X11/xkb/symbols/pc/yu
etc/X11/xkb/symbols/pc104
etc/X11/xkb/symbols/pl
Modified: branches/ubuntu/debian/MANIFEST.hurd-i386.in
===================================================================
--- branches/ubuntu/debian/MANIFEST.hurd-i386.in 2004-10-30 06:07:03 UTC
(rev 1998)
+++ branches/ubuntu/debian/MANIFEST.hurd-i386.in 2004-10-30 06:10:44 UTC
(rev 1999)
@@ -371,6 +371,7 @@
etc/X11/xkb/symbols/pc/tr
etc/X11/xkb/symbols/pc/ua
etc/X11/xkb/symbols/pc/us
+etc/X11/xkb/symbols/pc/us_intl
etc/X11/xkb/symbols/pc/yu
etc/X11/xkb/symbols/pc104
etc/X11/xkb/symbols/pl
Modified: branches/ubuntu/debian/MANIFEST.i386.in
===================================================================
--- branches/ubuntu/debian/MANIFEST.i386.in 2004-10-30 06:07:03 UTC (rev
1998)
+++ branches/ubuntu/debian/MANIFEST.i386.in 2004-10-30 06:10:44 UTC (rev
1999)
@@ -371,6 +371,7 @@
etc/X11/xkb/symbols/pc/tr
etc/X11/xkb/symbols/pc/ua
etc/X11/xkb/symbols/pc/us
+etc/X11/xkb/symbols/pc/us_intl
etc/X11/xkb/symbols/pc/yu
etc/X11/xkb/symbols/pc104
etc/X11/xkb/symbols/pl
Modified: branches/ubuntu/debian/MANIFEST.ia64.in
===================================================================
--- branches/ubuntu/debian/MANIFEST.ia64.in 2004-10-30 06:07:03 UTC (rev
1998)
+++ branches/ubuntu/debian/MANIFEST.ia64.in 2004-10-30 06:10:44 UTC (rev
1999)
@@ -371,6 +371,7 @@
etc/X11/xkb/symbols/pc/tr
etc/X11/xkb/symbols/pc/ua
etc/X11/xkb/symbols/pc/us
+etc/X11/xkb/symbols/pc/us_intl
etc/X11/xkb/symbols/pc/yu
etc/X11/xkb/symbols/pc104
etc/X11/xkb/symbols/pl
Modified: branches/ubuntu/debian/MANIFEST.m68k.in
===================================================================
--- branches/ubuntu/debian/MANIFEST.m68k.in 2004-10-30 06:07:03 UTC (rev
1998)
+++ branches/ubuntu/debian/MANIFEST.m68k.in 2004-10-30 06:10:44 UTC (rev
1999)
@@ -371,6 +371,7 @@
etc/X11/xkb/symbols/pc/tr
etc/X11/xkb/symbols/pc/ua
etc/X11/xkb/symbols/pc/us
+etc/X11/xkb/symbols/pc/us_intl
etc/X11/xkb/symbols/pc/yu
etc/X11/xkb/symbols/pc104
etc/X11/xkb/symbols/pl
Modified: branches/ubuntu/debian/MANIFEST.mips.in
===================================================================
--- branches/ubuntu/debian/MANIFEST.mips.in 2004-10-30 06:07:03 UTC (rev
1998)
+++ branches/ubuntu/debian/MANIFEST.mips.in 2004-10-30 06:10:44 UTC (rev
1999)
@@ -371,6 +371,7 @@
etc/X11/xkb/symbols/pc/tr
etc/X11/xkb/symbols/pc/ua
etc/X11/xkb/symbols/pc/us
+etc/X11/xkb/symbols/pc/us_intl
etc/X11/xkb/symbols/pc/yu
etc/X11/xkb/symbols/pc104
etc/X11/xkb/symbols/pl
Modified: branches/ubuntu/debian/MANIFEST.mipsel.in
===================================================================
--- branches/ubuntu/debian/MANIFEST.mipsel.in 2004-10-30 06:07:03 UTC (rev
1998)
+++ branches/ubuntu/debian/MANIFEST.mipsel.in 2004-10-30 06:10:44 UTC (rev
1999)
@@ -371,6 +371,7 @@
etc/X11/xkb/symbols/pc/tr
etc/X11/xkb/symbols/pc/ua
etc/X11/xkb/symbols/pc/us
+etc/X11/xkb/symbols/pc/us_intl
etc/X11/xkb/symbols/pc/yu
etc/X11/xkb/symbols/pc104
etc/X11/xkb/symbols/pl
Modified: branches/ubuntu/debian/MANIFEST.powerpc.in
===================================================================
--- branches/ubuntu/debian/MANIFEST.powerpc.in 2004-10-30 06:07:03 UTC (rev
1998)
+++ branches/ubuntu/debian/MANIFEST.powerpc.in 2004-10-30 06:10:44 UTC (rev
1999)
@@ -371,6 +371,7 @@
etc/X11/xkb/symbols/pc/tr
etc/X11/xkb/symbols/pc/ua
etc/X11/xkb/symbols/pc/us
+etc/X11/xkb/symbols/pc/us_intl
etc/X11/xkb/symbols/pc/yu
etc/X11/xkb/symbols/pc104
etc/X11/xkb/symbols/pl
Modified: branches/ubuntu/debian/MANIFEST.s390.in
===================================================================
--- branches/ubuntu/debian/MANIFEST.s390.in 2004-10-30 06:07:03 UTC (rev
1998)
+++ branches/ubuntu/debian/MANIFEST.s390.in 2004-10-30 06:10:44 UTC (rev
1999)
@@ -366,6 +366,7 @@
etc/X11/xkb/symbols/pc/tr
etc/X11/xkb/symbols/pc/ua
etc/X11/xkb/symbols/pc/us
+etc/X11/xkb/symbols/pc/us_intl
etc/X11/xkb/symbols/pc/yu
etc/X11/xkb/symbols/pc104
etc/X11/xkb/symbols/pl
Modified: branches/ubuntu/debian/MANIFEST.sparc.in
===================================================================
--- branches/ubuntu/debian/MANIFEST.sparc.in 2004-10-30 06:07:03 UTC (rev
1998)
+++ branches/ubuntu/debian/MANIFEST.sparc.in 2004-10-30 06:10:44 UTC (rev
1999)
@@ -371,6 +371,7 @@
etc/X11/xkb/symbols/pc/tr
etc/X11/xkb/symbols/pc/ua
etc/X11/xkb/symbols/pc/us
+etc/X11/xkb/symbols/pc/us_intl
etc/X11/xkb/symbols/pc/yu
etc/X11/xkb/symbols/pc104
etc/X11/xkb/symbols/pl
Modified: branches/ubuntu/debian/TODO
===================================================================
--- branches/ubuntu/debian/TODO 2004-10-30 06:07:03 UTC (rev 1998)
+++ branches/ubuntu/debian/TODO 2004-10-30 06:10:44 UTC (rev 1999)
@@ -14,15 +14,13 @@
scheduled. However, the package release manager can put an explicit freeze on
those by marking the package version section accordingly.
-4.3.0.dfsg.1-8
+4.3.0.dfsg.1-9
--------------
-* Fix Xpm library stack and integer overflow vulnerabilities. (#272493; woody
- security update already in progress)
-* Fix for the nv driver breakage, consider backporting the driver from
- x.org.
- See: #269025, #268759, #271235, #270228, #271071
* Add FAQ entry describing what has become of the XFree86 3.x packages.
+* Update xlibs's package description stop implying that *no* packages have
+ up-to-date dependencies on it (xbase-clients does, due to xkbcomp, which is
+ statically linked against libxkbfile).
* Rewrite xserver-xfree86 debconfage. Joey Hess, Eduard Bloch, and David
Nusinow have provided good input.
+ udev users will have "/dev/input/mousen" -- configure that as only mouse
@@ -55,15 +53,18 @@
+ Use /proc/hardware on m68k architecture to set a reasonable default mouse
port. See <URL: http://lists.debian.org/debian-68k/2004/08/msg00392.html>.
* Add FAQ entry describing Debian's plans in the X department.
+* Add Debian-specific patch to uxterm to call validlocale(8) before trying to
+ launch xterm, per recommendation from Recai Oktas. If a valid locale isn't
+ set, bail out (would resolve #246398). (This patch would be Debian-specific
+ because validlocale is a Perl utility provided by base-config.)
-4.3.0.dfsg.1-9
+4.3.0.dfsg.1-10
--------------
* #245541: Evaluate Sven Luther's driver DDK package patch:
http://lists.debian.org/debian-x/2003/debian-x-200311/msg00002.html
* #253480: xdm: XDM fails if the user is over disk quota, but empty files can
be created
-* update XTerm to #193
* #261163: xlibs: <KPDL> mapping wrong in Polish layouts [patch available]
* #255011: add macintosh/ca symbols file; awaiting keyboard photograph and test
cycle with [EMAIL PROTECTED]
Modified: branches/ubuntu/debian/changelog
===================================================================
--- branches/ubuntu/debian/changelog 2004-10-30 06:07:03 UTC (rev 1998)
+++ branches/ubuntu/debian/changelog 2004-10-30 06:10:44 UTC (rev 1999)
@@ -1,3 +1,27 @@
+xfree86 (4.3.0.dfsg.1-6ubuntu23) warty; urgency=low
+
+ Imported from Debian trunk:
+
+ * Update Danish debconf template translations (thanks, Claus Hindsgaul).
+ (Closes: #274101)
+
+ * Add FAQ entry: Why does composing characters work in some applications but
+ not others?
+
+ * List /etc/X11/xkb/symbols/pc/us_intl into xlibs.install, MANIFEST
+ files and xc/programs/xkbcomp/symbols/pc/Imakefile so that this keymap
+ gets shipped. (Closes: #271326, #274513, #1089)
+
+ Changes by Fabio Massimo Di Nitto:
+
+ * Fix Brazilian keyboard autodetection. (Closes: #1964)
+
+ * Always ask the user what driver to use in case we detect a via chipset.
+ * Probe via cards with vesa drivers.
+ (Closes: #1878)
+
+ -- Fabio M. Di Nitto <[EMAIL PROTECTED]> Mon, 04 Oct 2004 09:55:01 +0200
+
xfree86 (4.3.0.dfsg.1-6ubuntu22) warty; urgency=low
* Update 000_stolen_from_HEAD.diff:
Modified: branches/ubuntu/debian/local/FAQ.xhtml
===================================================================
--- branches/ubuntu/debian/local/FAQ.xhtml 2004-10-30 06:07:03 UTC (rev
1998)
+++ branches/ubuntu/debian/local/FAQ.xhtml 2004-10-30 06:10:44 UTC (rev
1999)
@@ -154,6 +154,8 @@
work on my ATI Radeon card. Can you help?</a></li>
<li><a href="#xkbnewlayout">My keyboard configuration worked with XFree86 4.2;
why is it messed up now?</a></li>
+<li><a href="#composeinput">Why does composing characters work in some
+ applications but not others?<a></li>
</ul>
<h2><a href="#acknowledgements">Acknowledgements</a></h2>
@@ -2897,12 +2899,66 @@
XKB options; for example, <kbd>Option "XkbOptions" "altwin:super_win"</kbd>
binds your logo keys to <code>Super</code> modifiers.</p>
+<h3><a id="composeinput">Why does composing characters work in some
applications
+ but not others?<a></h3>
+
+<p><em>Thanks to Jeff Licquia for contributing much of this entry.</em></p>
+
+<p>People sometimes find that they can use their <code>Compose</code> key as
+expected in some applications -- for instance, <code
+class="command">uxterm</code>, <code class="command">xterm</code>, and
+OpenOffice.Org Writer -- but not in others, such as Mozilla, Galeon, or <code
+class="command">gnome-terminal</code>.</p>
+
+<p>The difference is that the latter group of applications use the GTK+ input
+method framework, and the former group does not.</p>
+
+<p>GTK+ has its own input method framework that is separate from the X input
+methods. This is necessary because GTK+ is supposed to be independent of
+X.</p>
+
+<p>The default input method is, of course, Latin. When implementing this
+method, the GTK+ people focused on ISO 8859-1, and did not implement many of
+the other Latin character sets. This is why GTK+-based programs seem not to be
+able to type characters that other pure X programs can.</p>
+
+<p>There are several things you can do about the problem. All of them involve
+using a different GTK+ input method. You can test these by opening some GTK+
+app that takes input, such as gedit. Right-click on the edit box, and there
+should be a submenu for "Input Methods". The new input method should show up
+in that submenu.</p>
+
+<ul>
+ <li><p>Get a better GTK+ input method. The <a
+ href="http://gtk-im-extra.sourceforge.net/";><code
+ class="other">gtk-im-extra</code> Sourceforge project</a> contains a Latin
+ Plus input method, for example. While you're at it, you might also lobby the
+ GTK+ people to include <code class="other">gtk-im-extra</code>, and make
Latin
+ Plus the default.</p></li>
+ <li><p>There are alternative input method projects out there that provide
GTK+
+ IM shims; look for the packages <code class="package">iiimgcf</code>, <code
+ class="package">scim-gtk2-immodule</code>, and <code
+ class="package">uim-gtk2.0</code> in Debian testing or unstable. Most of
+ these, though, are aimed at non-Latin issues, so whether they're appropriate
+ for you depends on your needs.</li></p>
+ <li><p>GTK+ ships with a XIM shim module. This is the solution many Debian
+ developers use.</p></li>
+</ul>
+
+<p>If you want to make a certain input method the default system-wide, edit
+<code class="filespec">/etc/environment</code>, and set the environment
variable
+<code class="other">GTK_IM_MODULE</code> there to the input method module you
+want (Use <kbd>xim</kbd> for the XIM shim). Of course, you can do the same
+thing for just yourself by setting that environment variable in <code
+class="filespec">.profile</code>, <code class="filespec">.bashrc</code>, or
+whatever your shell uses as an initialization file.</p>
+
<h2><a id="acknowledgements">Acknowledgements</a></h2>
<p>The author would like to thank Andreas Metzler, Guillem Jover, Ingo Saitz,
Osamu Aoki, Matthew Arnison, Colin Walters, Steve Swales, Adam Jackson, Thomas
-Dickey, Paul Gotch, Albert Cahalan, Denis Barbier, and "ulisses" for their
-contributions to this document.</p>
+Dickey, Paul Gotch, Albert Cahalan, Denis Barbier, Jeff Licquia, and "ulisses"
+for their contributions to this document.</p>
<hr />
<p class="x-small">$Id$</p>
Modified: branches/ubuntu/debian/patches/000_stolen_from_HEAD_xkb_data.diff
===================================================================
--- branches/ubuntu/debian/patches/000_stolen_from_HEAD_xkb_data.diff
2004-10-30 06:07:03 UTC (rev 1998)
+++ branches/ubuntu/debian/patches/000_stolen_from_HEAD_xkb_data.diff
2004-10-30 06:10:44 UTC (rev 1999)
@@ -191,6 +191,9 @@
- Add to 'us' keymap backslash key that can be rewritten in other
layouts
(Bugzilla #976, B?rre Gaup).
+xc/programs/xkbcomp/symbols/pc/Imakefile
+ - Stolen from XOrg CVS @ 1.14: ship us_intl.
+
Index: xc/programs/xkbcomp/compat/iso9995
===================================================================
RCS file: /cvs/xc/programs/xkbcomp/compat/iso9995,v
@@ -4858,3 +4861,15 @@
+ include "level3(ralt_switch_multikey)"
};
-
+diff -Naurd xc.orig/programs/xkbcomp/symbols/pc/Imakefile
xc/programs/xkbcomp/symbols/pc/Imakefile
+--- xc.orig/programs/xkbcomp/symbols/pc/Imakefile 2004-10-04
05:57:48.000000000 +0000
++++ xc/programs/xkbcomp/symbols/pc/Imakefile 2004-10-04 06:03:48.000000000
+0000
+@@ -20,7 +20,7 @@
+ ro ru \
+ sapmi se si sk sk_qwerty sr syr syr_phonetic \
+ tel th th_tis th_pat tj tml tr \
+- ua us \
++ ua us us_intl \
+ yu
+
+ all::
Modified: branches/ubuntu/debian/po/da.po
===================================================================
--- branches/ubuntu/debian/po/da.po 2004-10-30 06:07:03 UTC (rev 1998)
+++ branches/ubuntu/debian/po/da.po 2004-10-30 06:10:44 UTC (rev 1999)
@@ -28,8 +28,8 @@
msgstr ""
"Project-Id-Version: xfree86_4.3.0-3_da\n"
"Report-Msgid-Bugs-To: [EMAIL PROTECTED]"
-"POT-Creation-Date: 2004-08-30 11:49+0000\n"
-"PO-Revision-Date: 2004-09-07 19:22+0200\n"
+"POT-Creation-Date: 2004-09-22 01:37:39-0500\n"
+"PO-Revision-Date: 2004-09-29 21:45+0200\n"
"Last-Translator: Claus Hindsgaul <[EMAIL PROTECTED]>\n"
"Language-Team: Danish <[EMAIL PROTECTED]>\n"
"MIME-Version: 1.0\n"
@@ -63,6 +63,9 @@
"Your system is using the old location, and some programs, such as those from "
"old or unofficial Debian packages, may continue to install files there."
msgstr ""
+"Dit system benytter den gamle placering, og visse programmer (som f.eks. dem "
+"fra gamle eller uofficielle Debianpakker) forts�tter muligvis med at "
+"installere filer der."
#. Type: boolean
#. Description
@@ -159,13 +162,13 @@
"logindh�ndteringenerne s�ttes op til det. Det g�r du ved at fjerne tjekket "
"for standard logindh�ndtering i deres initialiseringsskripter i /etc/init.d.)"
-#. Type: string
+#. Type: boolean
#. Description
#: ../xdm.templates:26
msgid "Do you wish to stop the xdm daemon?"
msgstr "Vil du stoppe xdm-d�monen?"
-#. Type: string
+#. Type: boolean
#. Description
#: ../xdm.templates:26
msgid ""
Modified: branches/ubuntu/debian/xlibs.install
===================================================================
--- branches/ubuntu/debian/xlibs.install 2004-10-30 06:07:03 UTC (rev
1998)
+++ branches/ubuntu/debian/xlibs.install 2004-10-30 06:10:44 UTC (rev
1999)
@@ -290,6 +290,7 @@
etc/X11/xkb/symbols/pc/tr
etc/X11/xkb/symbols/pc/ua
etc/X11/xkb/symbols/pc/us
+etc/X11/xkb/symbols/pc/us_intl
etc/X11/xkb/symbols/pc/yu
etc/X11/xkb/symbols/pc104
etc/X11/xkb/symbols/pl
Modified: branches/ubuntu/debian/xserver-xfree86.config.in
===================================================================
--- branches/ubuntu/debian/xserver-xfree86.config.in 2004-10-30 06:07:03 UTC
(rev 1998)
+++ branches/ubuntu/debian/xserver-xfree86.config.in 2004-10-30 06:10:44 UTC
(rev 1999)
@@ -732,6 +732,18 @@
observe "could not autodetect X server driver: discover not found"
fi
+# Specific via workaround:
+# the via driver sucks nuts and we can't rely on it. The user will
+# have to decide which cracks he prefers and he has 3 options:
+# - via
+# - vesa
+# - visa (or mastercard) to buy a serious video card
+
+if [ "$DEFAULT_DRIVER" = "via" ] || [ "$DEFAULT_DRIVER" = "vesa" ]; then
+ PRIORITY="high"
+ DEFAULT_DRIVER="vesa"
+fi
+
db_subst xserver-xfree86/config/device/driver choices "$DRIVER_LIST"
auto_answer db_input "$PRIORITY" \
xserver-xfree86/config/device/driver "$DEFAULT_DRIVER"
@@ -908,14 +920,30 @@
"nl_NL" ) LAYOUT="nl" XKBOPTIONS="" ;;
"nn_NO" ) LAYOUT="no" XKBOPTIONS="" ;;
"no_NO" ) LAYOUT="no" XKBOPTIONS="" ;;
- "pt_BR" ) LAYOUT="br" XKBOPTIONS="" ;;
+ "pt_BR" )
+ db_get debian-installer/keymap || true
+ if [ "$RET" = "br-abnt2" ]; then
+ LAYOUT="br"
+ else
+ LAYOUT="us_intl"
+ fi
+ 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="" ;;
+ *"BR"* )
+ db_get debian-installer/keymap || true
+ if [ "$RET" = "br-abnt2" ]; then
+ LAYOUT="br"
+ else
+ LAYOUT="us_intl"
+ fi
+ XKBOPTIONS=""
+ ;;
*"CA"* ) LAYOUT="us" XKBOPTIONS="" ;;
*"DE"* ) LAYOUT="de" XKBOPTIONS="" ;;
*"DK"* ) LAYOUT="dk" XKBOPTIONS="" ;;
Modified: branches/ubuntu/debian/xserver-xfree86.postinst.in
===================================================================
--- branches/ubuntu/debian/xserver-xfree86.postinst.in 2004-10-30 06:07:03 UTC
(rev 1998)
+++ branches/ubuntu/debian/xserver-xfree86.postinst.in 2004-10-30 06:10:44 UTC
(rev 1999)
@@ -200,6 +200,9 @@
# we know the driver from config.in
db_get xserver-xfree86/config/device/driver
DEVICE_DRIVER="$RET"
+ if [ "$DEVICE_DRIVER" = "via" ]; then
+ DEVICE_DRIVER="vesa"
+ fi
set +e
PROBE_DUMP=$(xresprobe "$DEVICE_DRIVER")
set -e
