[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

X Strike Force XFree86 SVN commit: r2074 - in branches/4.3.0/sid/debian: . local local/xdm patches



Author: fabbione
Date: 2004-12-15 12:39:31 -0500 (Wed, 15 Dec 2004)
New Revision: 2074

Added:
   branches/4.3.0/sid/debian/patches/099m_mga_increase_minimum_pixel_clock.diff
   branches/4.3.0/sid/debian/patches/099n_fbdev_driver_message_improvements.diff
Modified:
   branches/4.3.0/sid/debian/CHANGESETS
   branches/4.3.0/sid/debian/TODO
   branches/4.3.0/sid/debian/changelog
   branches/4.3.0/sid/debian/local/FAQ.xhtml
   branches/4.3.0/sid/debian/local/xdm/Xstartup
   branches/4.3.0/sid/debian/xfs.init
Log:
Merge revisions 2053:HEAD from trunk in preparation for 4.3.0.dfsg.1-10
release.



Modified: branches/4.3.0/sid/debian/CHANGESETS
===================================================================
--- branches/4.3.0/sid/debian/CHANGESETS	2004-12-14 08:48:07 UTC (rev 2073)
+++ branches/4.3.0/sid/debian/CHANGESETS	2004-12-15 17:39:31 UTC (rev 2074)
@@ -9,357 +9,50 @@
 files anywhere.)
 
 Miscellaneous cosmetic fixes.
-    1915, 1916, 1919, 1920, 1932, 1934, 1940, 1951, 1960, 2008, 2014, 2015,
-    2016, 2020, 2021, 2022, 2028, 2030, 2047
+    2059, 2062
 
-Update Danish debconf template translations (thanks, Claus Hindsgaul).
-(Closes: #274101)
-    1905
+Make factual updates, clarifications, and wording corrections to the FAQ:
++ Point out that the X.Org relicensing debacle was back in 1998, not
+  recent.
++ Be more clear about why OS distributors stuck with XFree86 after it was
+  forked, but before it was relicensed.
++ Identify which license is referred to as the "XFree86 1.1 license".
++ Clarify the origin of the contradictory statements regarding the
+  GPL-compatibility of XFree86.
++ Clarify the discussion of the "relicensing pilot project" that was
+  performed on the XFree86 "auto-config" code.  The code was checked in,
+  *then* relicensed without other changes.
++ Point out that most distributors have settled on X.Org's X11R6.8.1 for
+  their X Window System implementation, at least for the time being.
++ Stress that XFree86 3.x is no longer supported.
++ Remove language that discusses future directions of XFree86 3.x support
+  in dexconf, since it is unlikely that that work is going to happen.
+    2054
 
-Edit xc/programs/xkbcomp/symbols/pc/Imakefile so that the new pc/us_intl
-layout file gets installed.  Update MANIFEST files and xlibs.install to
-ensure the file get shipped.
-+ Ship a multi-layout aware us_intl layout.  (Closes: #271326)
-+ Make us_intl work again.  (Closes: #274513)
-    1906, 1907, 1911, 1912, 1923
+Increase the minimum pixel clock for Matrox cards based on feedback from
+Teemu Ikonen.  (Closes: #261993)
+    2055, 2056
 
-Add FAQ entry: Why does composing characters work in some applications but
-not others?
-    1908, 1913
+Tidy up and improve fbdev driver messages, correcting spelling, adding
+information, and otherwise enhancing them.  (Closes: #275318)
+    2058
 
-Make Sun keyboards load srvr_ctrl(xfree86) symbol definitions to have
-access to standard Ctrl+Alt key sequences.  (Closes: #236086)
-    1914, 1942
+Make corrections to the "How does the keyboard work in the X Window
+System?" FAQ entry based on feedback from Frank Murphy.  Thanks, Frank!
+(Closes: #279055)
+    2068
 
-Apply patch from Jan Wilhelm Stumpel to correct miscoded Unicode Plane 1
-characters in en_US.UTF-8 compose map.  (Closes: #267321)
-    1917
+Expand discussion of configuring the mouse for left-handed use in the FAQ.
+Thanks to Marc-Aurèle DARCHE for the information!  (Closes: #281504)
+    2069
 
-Update wacom driver from http://linuxwacom.sourceforge.net/ up to 0.6.4.
-+ Remove now obsolete patch 036_wacom_usb_tablet_update.diff
-+ Add patch 000_stolen_from_sourceforge_wacom_driver.diff
-+ Fix input timeout problems if the device is not connected.
-  No references are available in upstream changelog, but tests do not
-  show this behavior anymore. (Closes: #231837)
-+ Fix compatibility with kernel 2.6 wacom driver. (Closes: #250331)
-+ Add support for Cintiq boards. According to #172526 logs the patch
-  has been included, reworked and cleaned by upstream a long time ago.
-  No references are available in upstream changelog. (Closes: #172526)
-+ A combination of new kernel, xfree86 and wacom driver appears to have
-  fixed the APM resume issue as described in #80140. Tests done
-  on a powerpc laptop do not show this problem anymore.
-  No references are available in upstream changelog. (Closes: #80140)
-    1921, 1924
+Fix syntax error in xfs package's init script.  (Closes: #285133)
+    2070
 
-Install xlibs's bug script in the binary-indep rule, not binary-arch,
-since xlibs is an architecture "all" package.  Now the script will
-actually be shipped.
-    1922
+Fix syntax error in xdm's Xstartup script.  (Closes: #285150)
+    2071
 
-Add workaround for the UseBIOS default setting in the savage driver:
-+ Add patch 099i_pro_savage_ddr_set_use_bios_to_false.diff
-+ Set UseBios default to "no" for PROSAVAGE_DDR and PROSAVAGE_DDRK, as
-  described at <URL: http://www.probo.com/timr/savage40.html >.
-    1925
+Set upload urgency to medium.
+    2072
 
-If the restorecon command is available, restore SELinux file security
-contexts after setting up X server and ICE socket directories
-(xfree86-common) and font server socket directories (xfs) after creating
-them in the init scripts.  (Closes: #268812, #271030)
-    1926, 2003
-
-Fix missing-word typo in xnest's package description.  Thanks to Roland
-Stigge for catching this.  (Closes: #268997)
-    1927
-
-Add several multi-layout aware layouts:
-+ ca (Canada) contains several variants: "fr" is meant as a replacement
-  for ca_enhanced, "fr-legacy" is another variant, and "multi" is an
-  implementation of CAN/CSA-Z243.200-92.  This standard requires two
-  groups, so it is in fact divided into "multi" and "multi-2gr" variants.
-  By default, "ca" loads both "multi" and "multi-2gr" to provide a
-  full-featured keyboard.  When it is combined with other layouts, the
-  simpler variant "fr" is used, but others can be explicitly specified.
-  (Closes: #245371, #252068, #258575)
-+ The new ca layout also fixes ISO_Level3_Shift, which was mapped to
-  <RCTL> instead of <RALT>.  (Closes: #274457)
-+ jp (Japan) also requires a combination of two variants.  When this is
-  the only loaded layout, the full combination is used.  When this layout
-  is combined with others, only the "jp106" variant is loaded.
-+ hu (Hungary) layout has been simplified; some variants have been removed.
-  (Closes: #263561)
-+ ch (Switzerland) replaces de_CH and fr_CH.
-+ mn (Mongolia) and vn (Vietnam) are simple layouts.
-    1930, 1935, 1936, 1938
-
-Remove build-dependency on libstdc++5-dev | libstdc++-dev.  A package
-providing libstdc++-dev is build-essential.  Thanks to Steve Langasek for
-his counsel on this issue.  (Closes: #268461)
-    1931
-
-In UTF-8 compose files, replace U00xx Unicode codepoints by the
-corresponding keysyms.  Otherwise the compose character is in
-the range 0x01000000-0x010000FF which is not valid according to
-appendix A of the X11 protocol.  Even if most applications are able
-to recognize these broken characters, few of them fail, most notably
-xemacs and users are then unable to use composition when in UTF-8
-locales.  (Closes: #235574)
-    1937
-
-Make xserver-common conflict with xserver-xfree86 and xserver-xfree86-dbg
-4.3.0.dfsg.1-[56] using exact versioned conflicts.  This prevents versions
-of the xserver-xfree86{,-dbg} packages that depend on a now-vanished
-interface in dexconf from being installed in conjunction with it.  See the
-changelog entry for 4.3.0.dfsg.1-7 for more information.  Thanks to Adrian
-Bunk for this suggestion.
-    1941
-
-Replace level3(ralt_switch_multikey) by level3(ralt_switch) in all
-layouts so that symbols on the 4th column may be accessed with
-Shift+Alt_R or Alt_R+Shift.  (Closes: #270235)
-    1943, 1944
-
-In /etc/X11/xkb/rules/xfree86, move lv3 definitions after altwin so
-that the former can override the latter.  See Bug#276143.
-    1945
-
-Grab from XFree86 CVS (no later than 2003-12-31) several updates to the
-Video4Linux (v4l) driver:
-+ [#include regionstr.h, not miscstruct.h.] (#A.1859, Alexander Stohr)
-  [David Dawes]
-+ [Update format string when reporting memPhysBase.] (David Dawes)
-+ Fix a problem with the v4l driver not seeing all the tv-norms available
-  under the bttv driver with the Linux 2.6.0-test11 kernel (#5976, Marco
-  Antonio Alvarez).  [David Dawes]
-+ Change v4l "norm" names to the bttv versions (#5993, Marco Antonio
-  Alvarez).  [David Dawes]
-(Closes: #270496)
-    1946
-
-Update "Further Information" section of FAQ.
-    1947
-
-Add FAQ entry: What are Debian's plans with respect to X.Org and
-XFree86?
-    1948, 1949, 1955
-
-Add FAQ entry: Sometimes I get garbage characters like 1;2c in my xterm
-windows; what's happening?
-    1954
-
-Update FAQ entry: My keyboard configuration worked with XFree86 4.2; why
-is it messed up now?
-Update FAQ entry: How does the keyboard work in the X Window System?
-    1956, 1958
-
-Apply patch (#036) submitted to XFree86 Bugzilla on 2003-04-03 by the DRI
-Developers to fix OpenGL application crashes with "Assertion `vb.context
-== ctx' failed." for ATI R200 DRI users (thanks, Martin Dickopp).
-(Closes: #241534)
-    1957
-
-Add copyright and (MIT/X11 style) license for Bitstream Type1 fonts to
-copyright file.  Thanks to Ben Harris for pointing this out.
-(Closes: #274018)
-    1959
-
-Clean up and expand xclock(1x) manpage to document the effects the RENDER
-extension has on command-line option and X resource handling.  Thanks to
-Vincent McIntyre for prompting this.  (Closes: #241566)
-    1962
-
-Use run() to unregister obsolete debconf templates in xserver-xfree86,
-since failure to do so is not fatal, and will occur if we are upgrading
-from a version of the package so old (pre-woody unstable) that the
-templates don't exist to be unregistered.  Thanks to Florian Laws for
-diagnosing this bug.  (Closes: #275710)
-    1963
-
-Stop manually compressing the plain text version of the Debian X FAQ;
-dh_compress will take care of that.  Tell dh_compress to avoid compressing
-the XHTML version of the FAQ.
-    1965, 2052
-
-Restore xdm's Xreset script, which was removed in 4.2.1-12.  If the
-use-sessreg option is set and the sessreg command is available, user X
-sessions will be de-registered from the utmp and wtmp files again.
-Update maintainer scripts to stop removing the conffile.  Update
-xdm.install and MANIFEST.* files to ship Xreset script.  The old
-xconsole-related logic is not restored.  (Closes: #275329)
-    1966
-
-Replace XFree86 X server pre-release banner message with long boilerplate
-that declaims the release as heavily modified by Debian, and directs users
-to the Debian Bug Tracking System and the Debian X FAQ instead of XFree86
-mailing lists; also replace an occurence of an XFree86 mailing list
-address in a tseng driver message (patch #914).
-    1967
-
-Update xlibs's package description to stop implying that *no* packages
-have up-to-date dependencies on it (xbase-clients does, due to xkbcomp,
-which is statically linked against libxkbfile).
-    1968
-
-Apply patch from Jeff Licquia to port the X configlet to python-configlet
-version 2 so that xserver-xfree86 package configuration
-doesn't crash for people who have the configlet infrastructure installed.
-Make xserver-common conflict with python-configlet (<< 2.0) accordingly.
-(Closes: #263076)
-    1969
-
-Apply patch from Jason Lunz for silly thinko that caused arguments to
-xvfb-run to be misparsed if they contained whitespace.  Thanks, Jason!
-(Closes: #276415)
-    1970
-
-Fix nl_BE locale alias information.
-    1971, 1972
-
-Update Dutch debconf template translations (thanks, Bart Cornelis).
-(Closes: #278714)
-    1973
-
-Tidy up and make consistent all Debian-specific manpages.
-    1964, 2002, 2012
-
-Use validate-posix-sh at build time to perform syntax check on generated
-maintainer scripts.  Increase verbosity of validate-posix-sh warnings.  Stop
-immediately exiting upon encountering the first shell interpeter that fails on
-the script; instead, attempt all the interpreters and report all that fail.
-    2004, 2005, 2006, 2007
-
-Update package descriptions to replace the term "pseudopackage" (which
-apparently only the xfree86 source package uses) with "dummy package" in
-the short description, and "transitional package" in the extended
-description, per section 6.7.7 of the Debian Developers' Reference.
-    2009
-
-Update patch #009 to improve the fix for the Rage128-specific problem with
-engine lockups; because CCE idle commands may never finish, eventually
-stop the engine altogether after a long enough period of inactivity.
-Thanks to Daniel Jacobowitz for the original patch, this improved version,
-and the real-world testing.  (Closes: #278654)
-    2011
-
-Add FAQ entry: What is the story with XFree86 3.x?
-    2013
-
-Apply some fixes to the XFree86 X server's ELF object loader:
-+ Stop conditionally #including <sys/mman.h> since it is unconditionally
-  imported earlier in the file.
-+ Perform an mprotect() for AMD64 Linux systems as well as OpenBSD to
-  prevent SEGVs on NX-enabled kernels.  (Closes: #277699)
-+ Fix a problem with parentheses when using the preprocessor (doesn't
-  affect Debian, but would cause unexpected behavior on OpenBSD).
-    2017
-
-Perform some cleanup work on the shared library maintainer scripts of
-libdps1, libxaw6, libxaw7, xlibmesa-gl, xlibmesa-glu, and xlibosmesa4;
-thanks to Fabio for noticing the inconsistencies.
-+ Call register_x_lib_dir_with_ld_so() before invoking ldconfig in the
-  post-installation scripts.
-+ Perform configuration actions regardless of the value of "$1" in the
-  post-installation scripts.
-+ Call deregister_x_lib_dir_with_ld_so() before invoking ldconfig in the
-  post-removal scripts.
-+ Move the #DEBHELPER# expando later in the scripts where applicable.
-    2019
-
-Perform some cleanup work on the update-fonts-{alias,dir,scale} utilities
-and their manual pages.
-+ Eliminate XSIisms (-a, -o) in uses of test(1)/[(1).
-+ Re-indent at four spaces.
-+ Query terminal for its width if $COLUMNS is not set, as shell-lib.sh
-  does.  Fall back to a width of 80 if stty returns garbage or nothing.
-+ Rename error() to die().
-+ Add usage() function and -h, --help option.
-+ Use exit status 2 to indicate usage errors as opposed to operational
-  failures.
-+ Be more careful with quoting shell variables.
-+ Add and expand comments.
-+ Add SVN Id keyword.
-+ Update Vim modeline.
-+ Update manual pages to document changes in interface and behavior (there
-  are no backwards-incomaptible changes).
-    2025, 2026
-
-Perform some cleanup work on the xvfb-run utility and its manual page.
-+ Query terminal for its width if $COLUMNS is not set, as shell-lib.sh
-  does.  Fall back to a width of 80 if stty returns garbage or nothing.
-+ Add message() and error() functions.
-+ Enhance usage() function to (additionally) display an error message
-  consisting of the function arguments, if any.
-+ Use error() and usage() instead of echo for error messages.
-+ Cosmetically tidy up usage message, and correct a typo.
-+ Declare locally-scoped variable in find_free_servernum().
-+ Store getopt's exit status and report it in an error message if it is
-  nonzero.
-+ Clarify the error message if getopt rearranges the command line in a way
-  we don't expect.
-+ Tidy up comment, shell function, and redirection style.  Wrap long
-  lines.  Quote variables that may have whitespace in them.  Update Vim
-  modeline.
-+ Describe effect of $COLUMNS environment variable in manpage.
-+ Remove erroneous description of exit status 1, and explain why it is not
-  used.
-+ Add description of exit statuses 0, 4, 5, and 6.
-+ Fix markup error.
-    2027
-
-Replace many occurences of XSI connectives in test(1) with POSIX shell
-connectives in scripts.
-    2029
-
-Apply patch from David Mosberger that replaces the fix for #225526 with
-one that works on systems that do not have a PCI bus numbered 0.  Thanks,
-David!  (Closes: #279436)
-    2031
-
-Update debian/patches/087_SECURITY_libXpm_vulnerabilities.diff to include
-the latest security fixes and rediff 200_alpha_xpm_get_long64.diff.
-    2035, 2042
-
-Sync debian/rules install-server target with install and make binary-server
-target work again.
-    2036
-
-Apply patch from Richard Mortimer to fix the XFree86 X server's ELF object
-loader to set the PROT_EXEC flag on mmap()ed modules regardless of machine
-architecture.  (It was already trying to do this, but there are three
-preprocessor statements involved, and we were only patching one.)
-(Closes: #280384)
-    2043
-
-Update XTerm to patch #197 (2004-09-30) from Thomas Dickey's website.
-+ Change default translations so a BtnDown which is not recognized is
-  simply ignored rather than emitting a bell.  That makes it less
-  obtrusive when the user tries to use a mouse which provides more
-  capabilities than the X mouse driver supports, e.g., one with a
-  horizontal scroll wheel.  (Closes: #265133)
-+ Note in xterm's manpage that "translations" is not specific to xterm.
-  (Closes: #278897)
-+ Modify uxterm script to use locale program to verify if the derived
-  locale is installed.  (Closes: #246398)
-+ Modify the criteria for disowning primary selection.  Previously, this
-  happened anytime the cursor was moved before the end of the selection.
-  That would ensure that any insert/delete of char or line, as well as
-  scrolling, would disown the selection.  The new criteria change this to
-  checking if the operations would modify the data which is highlighted.
-  (Closes: #277832)
-+ Correct handling selection of tabs over cleared space in UTF-8 mode.  In
-  this special case, xterm represents the whitespace with a null rather
-  than a space character.  (Closes: #276447)
-+ Amend fix for infinite loop from patch #192 to check if there is wrapped
-  text to output in a following iteration.  (Closes: #273202)
-+ Amend solution for Debian #252873, #260471 from patch #194 by making the
-  cursor not explicitly colored if only the foreground color is set, and
-  the cursor is on a blank space.  (Closes: #275473)
-    2046
-
-Add magic register poke to neomagic driver which apparently speeds up DVD
-playback operations.  Thanks to Tony Hill for finding this patch.
-Unfortunately, despite efforts to locate some, there appears to be no
-documentation of why this register poke works.  (Closes: #277038)
-    2048
-
 vim:set ai et sts=4 sw=4 tw=80:

Modified: branches/4.3.0/sid/debian/TODO
===================================================================
--- branches/4.3.0/sid/debian/TODO	2004-12-14 08:48:07 UTC (rev 2073)
+++ branches/4.3.0/sid/debian/TODO	2004-12-15 17:39:31 UTC (rev 2074)
@@ -14,9 +14,6 @@
 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-9
---------------
-
 4.3.0.dfsg.1-10
 --------------
 

Modified: branches/4.3.0/sid/debian/changelog
===================================================================
--- branches/4.3.0/sid/debian/changelog	2004-12-14 08:48:07 UTC (rev 2073)
+++ branches/4.3.0/sid/debian/changelog	2004-12-15 17:39:31 UTC (rev 2074)
@@ -1,3 +1,46 @@
+xfree86 (4.3.0.dfsg.1-10) unstable; urgency=medium
+
+  * Upload urgency set to medium due to fix for stable-release-critical bugs
+    (#285133 and #285150; see below).
+
+  Changes by Branden Robinson:
+
+  * Make factual updates, clarifications, and wording corrections to the FAQ:
+    + Point out that the X.Org relicensing debacle was back in 1998, not
+      recent.
+    + Be more clear about why OS distributors stuck with XFree86 after it was
+      forked, but before it was relicensed.
+    + Identify which license is referred to as the "XFree86 1.1 license".
+    + Clarify the origin of the contradictory statements regarding the
+      GPL-compatibility of XFree86.
+    + Clarify the discussion of the "relicensing pilot project" that was
+      performed on the XFree86 "auto-config" code.  The code was checked in,
+      *then* relicensed without other changes.
+    + Point out that most distributors have settled on X.Org's X11R6.8.1 for
+      their X Window System implementation, at least for the time being.
+    + Stress that XFree86 3.x is no longer supported.
+    + Remove language that discusses future directions of XFree86 3.x support
+      in dexconf, since it is unlikely that that work is going to happen.
+
+  * Increase the minimum pixel clock for Matrox cards based on feedback from
+    Teemu Ikonen.  (Closes: #261993)
+
+  * Tidy up and improve fbdev driver messages, correcting spelling, adding
+    information, and otherwise enhancing them.  (Closes: #275318)
+
+  * Make corrections to the "How does the keyboard work in the X Window
+    System?" FAQ entry based on feedback from Frank Murphy.  Thanks, Frank!
+    (Closes: #279055)
+
+  * Expand discussion of configuring the mouse for left-handed use in the FAQ.
+    Thanks to Marc-Aurèle DARCHE for the information!  (Closes: #281504)
+
+  * Fix syntax error in xfs package's init script.  (Closes: #285133)
+
+  * Fix syntax error in xdm's Xstartup script.  (Closes: #285150)
+
+ -- Branden Robinson <branden@debian.org>  Sun, 12 Dec 2004 15:39:46 -0500
+
 xfree86 (4.3.0.dfsg.1-9) unstable; urgency=high
 
   * Security update release.  Resolves CAN-2004-0914 (several Xpm library
@@ -12,7 +55,7 @@
     not others?
 
   * Apply patch from Jan Wilhelm Stumpel to correct miscoded Unicode Plane 1
-    characters in en_US.UTF-8 compose map.  (Closes: #267321)
+    characters in en_US.UTF-8 compose map.  (Closes: #267231)
 
   * Install xlibs's bug script in the binary-indep rule, not binary-arch,
     since xlibs is an architecture "all" package.  Now the script will
@@ -319,7 +362,11 @@
     Thomas Beige.  Resolves CAN-2004-0914: memory leak, improper use of signed
     integers, and overflows in the Xpm library.  Resync offset in patch #200.
 
+<<<<<<< .working
  -- Fabio M. Di Nitto <fabbione@fabbione.net>  Thu, 09 Dec 2004 17:14:45 +0100
+=======
+ -- Fabio M. Di Nitto <fabbione@fabbione.net>  Thu,  9 Dec 2004 17:14:45 +0100
+>>>>>>> .merge-right.r2073
 
 xfree86 (4.3.0.dfsg.1-8) unstable; urgency=high
 

Modified: branches/4.3.0/sid/debian/local/FAQ.xhtml
===================================================================
--- branches/4.3.0/sid/debian/local/FAQ.xhtml	2004-12-14 08:48:07 UTC (rev 2073)
+++ branches/4.3.0/sid/debian/local/FAQ.xhtml	2004-12-15 17:39:31 UTC (rev 2074)
@@ -470,9 +470,9 @@
 X Consortium.  In the period 1998 to 1999, X.Org established greater autonomy
 for itself in part due to the unpopularity &mdash; among vendors and the
 community alike &mdash; of the Open Group's decision to change the licensing of
-the X Window System SI.  However, as presently constitued, and as described in
-its <a href="http://www.x.org/XOrg_By-laws.html";>by-laws</a>, X.Org continues to
-be managed at an organizational level by the Open Group.</p>
+the X Window System SI back in 1998.  However, as presently constitued, and as
+described in its <a href="http://www.x.org/XOrg_By-laws.html";>by-laws</a>, X.Org
+continues to be managed at an organizational level by the Open Group.</p>
 
 <p>In January 2004, the members of X.Org announced the formation of the X.Org
 Foundation, a U.S. not-for-profit corporation and scientific charity which
@@ -530,7 +530,7 @@
 href="http://www.xouvert.org";>Xouvert</a>, had also undertaken to fork the
 XFree86 codebase.)  While this development was lauded by many redistributors and
 feature-hungry end users, its short-term practical impact was fairly small.  OS
-distributors stuck with XFree86 because it was "ready" and it worked.
+distributors stuck with XFree86 because it was familiar and functional.
 Futhermore, the continued use of the MIT/X11 license terms ensured that
 cross-pollination between the projects would work to everyone's benefit.  The
 redistributors, and thus most end users, were expected to continue using
@@ -547,15 +547,15 @@
 and <code class="other">freedesktop.org</code> forks changed in January 2004,
 when the XFree86 project <a
 href="http://www.xfree86.org/pipermail/forum/2004-January/001892.html";>announced
-its intention to change the license on its codebase</a>.  The license combined
-elements of the traditional MIT/X11 license, the original 4-clause BSD license
-(containing the infamous "<a
+its intention to change the license on its codebase</a>.  The license, called
+the "XFree86 1.1 license", combined elements of the traditional MIT/X11 license,
+the original 4-clause BSD license (containing the infamous "<a
 href="http://www.gnu.org/philosophy/bsd.html";>advertising clause</a>"), and the
 Apache Software License in a novel way.  The new license was <a
 href="http://www.xfree86.org/pipermail/forum/2004-February/003974.html";>found to
 be GPL-incompatible by Richard Stallman of the Free Software Foundation</a> and
 most OS distributors, including Debian, whereas the XFree86 project makes
-contrary and confusing claims.</p>
+contradictory and confusing claims.</p>
 
 <p>Compare:</p>
 
@@ -570,12 +570,13 @@
 <em>The XFree86 Project maintains that the 4.4.0 release of XFree86 is as GPL
 compatible as any and all previous versions were.</em></a></blockquote>
 
-<p>While the former is an unequivocal "yes" to the question of whether the
-software under the new XFree86 license is GPL-compatibile, the latter is, of
-course, neither a "yes" nor a "no".  Moreover, it is the copyright holders in
-GPL-licensed works whose opinions matter, because it is their license terms, not
-XFree86's, which would be violated by intermixing code (in source or binary
-form) under the GNU GPL with code under the new XFree86 license.</p>
+<p>Both of the above statements come from XFree86's website.  While the former
+is an unequivocal "yes" to the question of whether the software under the new
+XFree86 license is GPL-compatibile, the latter is, of course, neither a "yes"
+nor a "no".  Moreover, it is the copyright holders in GPL-licensed works whose
+opinions matter, because it is their license terms, not XFree86's, which would
+be violated by intermixing code (in source or binary form) under the GNU GPL
+with code under the new XFree86 license.</p>
 
 <p>On top of this, when OS distributors have requested clarification as to the
 precise and practical meaning of XFree86's new license from the XFree86 project,
@@ -585,26 +586,31 @@
 decision by many OS vendors, including Debian, to avoid code under this
 license.</p>
 
-<p>Debian has noted that code under a <a
+<p>On 11 December 2003 &mdash; prior to the mass-relicensing of the code in
+XFree86 CVS &mdash; a <a
 href="http://lists.debian.org/debian-legal/2004/02/msg00229.html";>license nearly
-identical to the new XFree86 license</a> was applied to changes made in an
-XFree86 CVS commit on 8 October 2003, credited to <a
+identical to the new XFree86 license</a> was applied to changes which had been
+made two months earlier, on 8 October 2003, and which were credited to <a
 href="http://www.x-oz.com/";>X-Oz Technologies, Inc.</a>, a consulting company
-co-founded by the President of The XFree86 Project, Inc.  It went unnoticed at
-the time, but that license suffers from the same deficiencies as the new XFree86
-license.  Debian cannot include code under the terms of either license in its
-OS.</p>
+co-founded by the President of The XFree86 Project, Inc.  This relicensing,
+which did not accompany any changes to code, went largely unnoticed at the time,
+but that license &mdash; sometimes referred to as the "X-Oz License" &mdash;
+suffers from the same deficiencies as the new XFree86 license.  Debian will not
+include code under the terms of either the X-Oz or XFree86 1.1 licenses in its
+OS (see the <a href="http://www.debian.org/social_contract";>Debian Social
+Contract</a>).</p>
 
 <p>Despite the outcry regarding the XFree86 project's decision (which reminded
-some of X.Org's own ill-fated change to its SI's license terms), it
-went ahead and <a
+some of X.Org's own ill-fated change to its SI's license terms in 1998), it went
+ahead and <a
 href="http://www.mail-archive.com/cvs-commit@xfree86.org/msg03271.html";>applied
-it to its CVS repository</a> on 13 Feburary 2004.  Many OS distributors,
-including Debian, have resolved to not distribute any version of the XFree86
-codebase using the new license.  Consequently, as of this writing (June 2004),
-these vendors are seeking alternatives.  It remains to be seen whether the
-community will coalesce around a single X Window System SI as it did around
-XFree86, or whether the environment will be competitive.</p>
+the new license to the code in its CVS repository</a> on 13 Feburary 2004.  Many
+OS distributors, including Debian, elected not to distribute any version of the
+XFree86 codebase using the new license.  Consequently, those distributors sought
+alternatives.  As of this writing (December 2004), most of the community appears
+to have settled around the <code>freedesktop.org</code>/X.Org "monolithic"
+release series, the most recent of which is <a
+href="http://www.x.org/X11R6.8.1/";>X11R6.8.1</a>.</p>
 
 <h3><a id="debianplans">What are Debian's plans with respect to X.Org and
   XFree86?</a></h3>
@@ -884,8 +890,8 @@
 
 <p><em>It will take some time to write a comprehensive entry on this subject,
 but in the meantime it is hoped that the information presented here is useful.
-Thanks to Denis Barbier and Andrew Suffield for their patience and
-explanations.</em></p>
+Thanks to Denis Barbier, Andrew Suffield, and Frank Murphy for their patience
+and explanations.</em></p>
 
 <h4>Glossary</h4>
 
@@ -1017,54 +1023,60 @@
 class="command">setxkbmap</code> command, which in turn depends on <code
 class="command">xkbcomp</code>, the XKB data files, and the X libraries.</p>
 
-<p>Many users of the X Window System, particularly outside the United States,
-find that they need support for multiple <em>group</em>s on their keyboards.
-A group a set of two keyboard symbols paired so that pressing an unshifted key
-gets you the first symbol in the group, and pressing the same key with the
-<code>Shift</code> key held down give you the second symbol in the group.</p>
+<p>Many non-US keyboards need to support more than two glyphs per key.  On a
+typical U.S. keyboard, there are at most two glyphs on each keycap &mdash; one
+is accessed with a <code>Shift</code> or <code>Caps Lock</code> key, and one
+without.  To enable access to third, fourth, or fifth glyphs, other modifiers
+are used.</p>
 
-<p>A U.S. keyboard has only one group &mdash; this is sufficient to type all of
-the symbols in the ASCII character set.  Elsewhere in the world, however,
-keyboards frequently have keys engraved with more than two glyphs.  A third and
-often a fourth glyph appear.  These comprise the <em>alternate group</em>, which
-is usually accessed with a modifier key not found on most U.S. keyboards:
-<code>AltGr</code>.  When the <code>AltGr</code> key is pressed, the third and
-fourth glyphs on the keycap can be entered: <kbd>AltGr + <em>key</em></kbd>
-gives you the third, and if a fourth is engraved, it is entered with <kbd>AltGr
-+ Shift + <em>key</em></kbd>.  For example, on many European keyboards, one can
+<p>PC Keyboards for Latin-script characters ususally have an <kbd>AltGr</kbd>
+(alternate graphic) key that replaces the right <kbd>Alt</kbd> key.  When a key
+is pressed while the <kbd>AltGr</kbd> key is down will generate the third glyph,
+and when <kbd>Shift</kbd> <em>and</em> <kbd>AltGr</kbd> are down, it will
+generate the fourth glyph.  For example, on many European keyboards, one can
 press <kbd>AltGr + E</kbd> to produce the Euro sign (&euro;).  Sometimes the
-<code>Alt</code> key on the right-hand side of the keyboard is used as
-<code>AltGr</code> if there is no key actually engraved with
-<code>AltGr</code>.</p>
+<kbd>Alt</kbd> key on the right-hand side of the keyboard is used as
+<kbd>AltGr</kbd> if there is no key actually engraved as <kbd>AltGr</kbd>.</p>
 
-<p>If even an alternate group does not suffice to let users type all of the
-symbols they need to, the entire keyboard mapping can be switched out with a
-single keystroke using what the X KEYBOARD Extension (XKB) refers to as a
-"level".  This is typically done with a <code>Mode Switch</code> key, which is
-somewhat analogous to <code>Caps Lock</code>.  When this key is pressed, the X
-Window System toggles the second level.  This approach is often taken with
-keyboards that need to type in both the Cyrillic and Latin alphabets.  A Russian
-user, for example, might use a French keyboard layout (complete with alternate
-group symbols) on the first level to correspond with Western European friends
-via email, but then press <code>Mode Switch</code> to change to the second
-level, featuring Cyrillic letters, to write messages to Russian friends.</p>
+<p>Non-Latin keyboards can have most of the keys engraved with both non-Latin
+<em>and</em> Latin glyphs.  For example, Russian keyboards often work this way
+because they must support both the Latin and Cyrillic alphabets.  As a
+consequence, users of the X Window System need a way to <em>combine
+layouts</em>.  Combined layouts are often useful for users who need to type in
+multiple languages.  A Russian user might use a French keyboard layout (complete
+with third and fourth glyphs) to correspond with Western European friends via
+email, but then switch to another layout with Cyrillic letters to write messages
+to Russian friends.</p>
 
-<p>XKB supports up to four keysyms per level (two groups of two symbols each),
-and up to four levels.  In such situations, rather than having a <code>Mode
-Switch</code> key, there might be <code>Next Mode</code> and <code>Previous
-Mode</code> keys that cycle through the available levels.</p>
+<p>There are two ways to specify a more than two glyphs: levels and groups.  The
+core X protocol uses groups, but XKB (as of XFree86 4.3.0 and X.Org X11R6.7.0)
+uses levels.  XKB changed in order to better support combined layouts.  To
+specify a third glyph with groups, a second group is assigned to a key and the
+glyph is assigned to the first shift-level of the second group.  To use levels,
+a third level is assigned to a key.  The keysym used to generate these third
+glyphs also changes.  When groups are used, the <kbd>AltGr</kbd> key is assigned
+the keysym <code>Mode_switch</code>, and with levels it uses the keysym
+<code>ISO_Level3_Shift</code>.  By moving from the muliple-group to the
+shift-level method, combined layouts become much more flexible and easier to
+maintain.  With the old multiple-group approach, it was impossible to combine
+layouts that had more than two glyphs per key.</p>
 
-<p>A U.S. keyboard, even if keys are remapped so that <code>AltGr</code> and/or
-<code>Mode Switch</code> keys are available, does not acquire much meaningful
-additional functionality unless an alternate group and/or multiple levels are
-defined in software, so that "the keys know what to do" when the alternate group
-is activated or the level is changed.</p>
+<p>XKB supports up to four keysyms per group and up to four groups per layout.
+In situations with three or four groups, rather than using
+<code>Mode_switch</code>, a keyboard can be configured to use the keysyms
+<code>ISO_Next_Group</code> and <code>ISO_Prev_Group</code> to cycle through the
+available groups.</p>
 
-<p>A separate approach to typing symbols not engraved on the keyboard is to use
-the <code>Multi_key</code>.  This enables you to use two keys to type any symbol
-defined by Compose sequences for your locale.  For most layouts, the
-<code>Multi_key</code> keysym is bound to <kbd>Shift + AltGr</kbd>.  Note that
-<kbd>AltGr + Shift</kbd> means something else; see above.</p>
+<p>Another approach to typing symbols not engraved on the keyboard &mdash; which
+is completely independent of levels and groups, and which may be used with
+either of them &mdash; is the <em>compose sequence</em>.  The keysym
+<code>Multi_key</code> enables two keys to generate any symbol defined by
+Compose sequences for your locale.  Keyboards that have a <kbd>Compose</kbd> key
+often have the <code>Multi_key</code> keysym bound to it.  For example, to type
+&Ccedil; in the C locale, first type <code>Multi_key</code>, then
+<code>comma</code> followed by capital <code>C</code>.  The order of the
+<code>comma</code> and <code>C</code> can be reversed.  Yet another way to
+define these kinds of symbols is with the XIM (X Input Method) extension.</p>
 
 <h3><a id="xfree86_3x">What is the story with XFree86 3.<em>x</em>?</a></h3>
 
@@ -1175,7 +1187,8 @@
 <p>You can find out which version you are using by running "X -version" (you do
 not need to be root to execute this command).</p>
 
-<h4>For version 3.x XFree86 X servers:</h4>
+<h4>For version 3.x XFree86 X servers (which are <a href="#xfree86_3x">no longer
+supported</a>):</h4>
 
 <p>The best way to change the default color depth of the X server is to add a
 "DefaultColorDepth" line to the "Screen" section that corresponds to the X
@@ -1294,28 +1307,34 @@
 <h3><a id="lefthandmouse">How do I set up the mouse buttons for left-handed
 use?</a></h3>
 
-<p><em>Thanks to "ulisses" for suggesting this question for the FAQ, and
-providing some of the information given.</em></p>
+<p><em>Thanks to Osamu Aoki, Marc-Aur&egrave;le Darche and "ulisses" for
+providing much of the information in this entry.</em></p>
 
-<p>This depends on how many buttons your mouse has.  If it has two or three, I
-have an answer.  If it has more than three, and/or a wheel, I'd appreciate
-submissions from lefties with such mice who have gotten them reconfigured.</p>
+<p>For a quick fix in XFree86 3.<em>x</em>, you can use one of the following
+commands, depending on how many buttons your mouse has:</p>
 
-<p>For a quick fix, you can execute the following while in an X session:</p>
-
 <table border="1">
   <tr>
     <td><kbd>xmodmap -e "pointer = 2 1"</kbd></td><td>(for two-button mice)</td>
   </tr>
   <tr>
-    <td><kbd>xmodmap -e "pointer = 3 2 1"</kbd></td><td>(for three-button mice)</td>
+    <td><kbd>xmodmap -e "pointer = 3 2 1"</kbd></td><td>(for three-button
+    mice)</td>
   </tr>
+  <tr>
+    <td><kbd>xmodmap -e "pointer = 3 2 1 4 5"</kbd></td><td>(for three-button
+    mice with a scroll wheel)</td>
+  </tr>
 </table>
 
-<p>To have the pointer buttons remapped for all of your X sessions, add the
-following line to your <code class="filespec">$HOME/.Xmodmap</code> file
-(creating the file if necessary):</p>
+<p>Note that buttons 4 and 5 correspond to the "wheel up" and "wheel down"
+actions, and should not be modified for left-handed use.</p>
 
+<p>To remap the mouse buttons for all of your X sessions (under XFree86
+3.<em>x</em>, add the following line to your <code
+class="filespec">$HOME/.Xmodmap</code> file (creating the file if
+necessary):</p>
+
 <table border="1">
   <tr>
     <td><samp>pointer = 2 1</samp></td><td>(for two-button mice)</td>
@@ -1323,9 +1342,13 @@
   <tr>
     <td><samp>pointer = 3 2 1</samp></td><td>(for three-button mice)</td>
   </tr>
+  <tr>
+    <td><samp>pointer = 3 2 1 4 5</samp></td><td>(for three-button mice with a
+    scroll wheel)</td>
+  </tr>
 </table>
 
-<p>and call <kbd>xmodmap $HOME/.Xmodmap</kbd> from your <code
+<p>...and call <kbd>xmodmap $HOME/.Xmodmap</kbd> from your <code
 class="filespec"><var>$HOME</var>/.xsession</code> file.  Note, however, that
 the system administrator can configure the X Window System such that users'
 <code class="filespec">.xsession</code> files in their <var>$HOME</var>
@@ -1335,16 +1358,61 @@
 <p>For more information about <code class="command">xmodmap</code>, see <code
 class="manpage">xmodmap(1x)</code>.</p>
 
-<p><em>The following information is courtesy of <a
-href="mailto:osamu@debian.org";>Osamu Aoki</a>.</em></p>
+<p>The above <code class="command">xmodmap</code>-based approach for setting up
+a left-handed mouse only works for the XFree86 3.<em>x</em> series.  It results
+in bad behavior when used with the XFree86 4.<em>x</em> series and XOrg
+X11R6.7.0 and later.  If you are using one of these more recent versions of the
+X Window System, use the <code class="command">gpm</code>-based approach,
+described below.</p>
 
-<p>There is a <code class="command">gpm</code>-based approach to solving this
-problem if the XFree86 X server is configured to use <code
-class="filespec">/dev/gpmdata</code> for a mouse device.  The <kbd>-B</kbd>
-option to gpm should help.  You can use it by adding it to the <code
-class="other">append</code> line in <code
-class="filespec">/etc/gpm.conf</code>.</p>
+<p>The <code class="command">gpm</code> approach is to feed X with the mouse data
+coming from <code class="command">gpm</code>, a cut-and-paste utility and mouse
+server for virtual consoles.  The <code class="command">gpm</code> utility is of
+interest here because it can be configured to handle left-handed mouse devices.
+This approach has the drawback that all the users of the system have to share
+the same <code class="command">gpm</code> configuration, while with <code
+class="command">xmodmap</code> every user could have his or her own <code
+class="filespec">.Xmodmap</code> file.</p>
 
+<p>To use the <code class="command">gpm</code> approach, you must modify two
+files: your <code class="command">gpm</code> configuration and your X server
+configuration.  The examples provided below are for a Logitech three-button
+mouse with a scroll wheel.  One can easily adapt this configuration by changing
+<code class="other">device</code>, <code class="other">type</code> and <code
+class="other">Option "Protocol"</code> parameters according to the type of
+mouse device you are using.</p>
+
+<p><strong>Example: <code class="filespec">/etc/gpm.conf</code></strong></p>
+
+<pre>device=/dev/input/mice
+repeat_type=ms3
+type=imps2
+append='-B 321'</pre>
+
+<p><strong>Example: <code
+class="filespec">/etc/X11/XF86Config-4</code></strong></p>
+
+<pre>Section "InputDevice"
+        Identifier      "GPM repeater"
+        Driver          "mouse"
+        Option          "CorePointer"
+        Option          "Device" "/dev/gpmdata"
+        Option          "Protocol" "IntelliMouse"
+        Option          "ZAxisMapping" "4 5"
+EndSection</pre>
+
+<p>Note that in XFree86 4.3.0 (and therefore in X.Org X11R6.7.0 and later), the
+X server's mouse driver was rewritten in such a way that using any protocol
+other than <code class="other">IntelliMouse</code> on the XFree86 side and <code
+class="other">ms3</code> on the GPM side does not work well.  If you are using
+anything other than <code class="other">ms3</code> as the repeating protocol
+(<code class="other">repeat_type</code>), you will likely want to change it to
+<code class="other">ms3</code>.  If your <code
+class="filespec">XF86Config-4</code> file is automatically handled by <code
+class="other">debconf</code> and uses <code class="filespec">/dev/gpmdata</code>
+as the port for the configured mouse, the protocol will automatically be
+migrated to <code class="other">IntelliMouse</code> if necessary.</p>
+
 <h3><a id="nostartxdm">How do I stop <code class="command">xdm</code> from
 starting at boot?</a></h3>
 
@@ -2648,12 +2716,6 @@
 because, by modifying the configuration file, the user has expressed his or
 her desire to have the packaging system abandon control of the file.</p>
 
-<p>It is expected that the XFree86 3.x Debian packages will be updated to work as
-above but as of this writing they retain the previous behavior, which attempts
-to use debconf markers to ascertain whether the <code
-class="filespec">/etc/X11/XF86Config</code> file has been customized by the
-user.</p>
-
 <p>People writing installers for the Debian OS should note that
 pre-configuration of the XFree86 X server is now as simple as creating an <code
 class="filespec">/etc/X11/X</code> symlink and <code
@@ -2729,14 +2791,8 @@
 class="filespec">XF86Config</code> or <code class="filespec">XF86Config-4</code>
 file?</a></h3>
 
-<p>For <code class="filespec">XF86Config</code> files used by the Debian
-packages of the XFree86 3.x servers, the <code class="command">dexconf</code>
-utility only writes to part of the X server configuration file, instead of
-claiming the entire file for itself.  (<code class="command">dexconf</code> will
-change in the future to work for <code class="filespec">XF86Config</code> files
-just as it does for <code class="filespec">XF86Config-4</code> files.)</p>
-
-<p>For XFree86 3.x servers, this is mostly useful for adding <code
+<p>For XFree86 3.x servers (which are <a href="#xfree86_3x">no longer
+supported</a>), this is mostly useful for adding <code
 class="other">XInput</code> and <code class="other">ServerFlags</code> sections,
 and for replacing the <code class="other">Files</code> and <code
 class="other">Modules</code> sections with something more to the user's
@@ -3166,8 +3222,8 @@
 <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, Jeff Licquia, Fabio Massimo
-Di Nitto, Andrew Suffield, and "ulisses" for their contributions to this
-document.</p>
+Di Nitto, Andrew Suffield, Frank Murphy, Marc-Aurèle Darche, and "ulisses" for
+their contributions to this document.</p>
 
 <hr />
 <p class="x-small">$Id$</p>

Modified: branches/4.3.0/sid/debian/local/xdm/Xstartup
===================================================================
--- branches/4.3.0/sid/debian/local/xdm/Xstartup	2004-12-14 08:48:07 UTC (rev 2073)
+++ branches/4.3.0/sid/debian/local/xdm/Xstartup	2004-12-15 17:39:31 UTC (rev 2074)
@@ -21,7 +21,7 @@
 # Insert a utmp entry for the session.
 if grep -qs '^use-sessreg' /etc/X11/xdm/xdm.options \
   && which sessreg >/dev/null 2>&1; then
-    exec sessreg -a -l "$DISPLAY" -u /var/run/utmp
+    exec sessreg -a -l "$DISPLAY" -u /var/run/utmp \
                  -x /etc/X11/xdm/Xservers "$USER"
   # NOTREACHED
 fi

Copied: branches/4.3.0/sid/debian/patches/099m_mga_increase_minimum_pixel_clock.diff (from rev 2073, trunk/debian/patches/099m_mga_increase_minimum_pixel_clock.diff)


Property changes on: branches/4.3.0/sid/debian/patches/099m_mga_increase_minimum_pixel_clock.diff
___________________________________________________________________
Name: svn:keywords
   + Id

Copied: branches/4.3.0/sid/debian/patches/099n_fbdev_driver_message_improvements.diff (from rev 2073, trunk/debian/patches/099n_fbdev_driver_message_improvements.diff)


Property changes on: branches/4.3.0/sid/debian/patches/099n_fbdev_driver_message_improvements.diff
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: branches/4.3.0/sid/debian/xfs.init
===================================================================
--- branches/4.3.0/sid/debian/xfs.init	2004-12-14 08:48:07 UTC (rev 2073)
+++ branches/4.3.0/sid/debian/xfs.init	2004-12-15 17:39:31 UTC (rev 2074)
@@ -21,7 +21,7 @@
 
 set_up_socket_dir () {
   echo -n "Setting up X font server socket directory $SOCKET_DIR..."
-  if [ -e $SOCKET_DIR && ! [ -d $SOCKET_DIR ]; then
+  if [ -e $SOCKET_DIR ] && ! [ -d $SOCKET_DIR ]; then
     mv $SOCKET_DIR $SOCKET_DIR.$$
   fi
   mkdir -p $SOCKET_DIR



Reply to: