Comment 5 for bug 89835

xorg (1:7.2-3ubuntu1) gutsy; urgency=low

  * Merge from Debian unstable. Remaining changes:
    - debian/control, debian/scripts/vars.sparc, debian/rules:
      + Makes xorg Architecture: any and use an extra variable
        to not Depends on type-handling.
    - debian/control:
      + Keep meta-packages for xbase-clients, xutils.
      + Change the Maintainer-field.
      + Add replaces for xinit since we now ship Xsession from x11-common.
        Ditto for xrgb as we ship rgb.txt in x11-common.
      + xserver-xorg: Add dependancy "OR xserver-xorg-video" because
        the restricted drivers provide that.
    - debian/local/Xsession:
      + If ~/.xsession-errors is bigger than 0.5MiB, truncate it to the last
        0.5MiB to avoid having it grow indefinitively. (This does not happen
        with gdm anyway since gdm cleans the file on login). (LP #60448)
    - debian/local/dexconf:
      + Uncoditionally re-enable ZAxisMapping in dexconf. (LP: #31827)
      + Add InputDevice entries for wacom.
      + Add extra bits for ps3fb xorg.conf.
      + Read xserver-xorg/config/device/extra_options key, parse it
        (first token is option name, rest of the line after first space
        is value), and add it as Option lines to the device section.
        (LP: #90109)
      + Add special case for i810 with 3M TouchScreen monitors to set a
        resolution of 800x600 and avoid probing since it will fail miserably
        in xserver-xorg.postinst. Also make sure to write Option "DisplayInfo"
        "False" in Device Section in dexconf if the above combination is
        matched otherwise the card will display extra unrequired info each
        time X attempts a startup. (touches also xserver-xorg.postinst.in)
      + Due to a very annoying DRI/DRM bug, make sure to use OldDmaInit
        when writing down the Device section for mga driver. This will make
        DRI working at least for AGP cards. PCI didn't work before and it will
        keep not working since the option does explicitly disable DRI for PCI.
        (LP: #27442)
      + Enable elographics driver when matching known machines.
      + Disable composite when using the fglrx driver. It does not support
        composition, and enabling it by default (as recently done in
        xorg-server) breaks DRI for fglrx. (LP: #90688)
    - debian/scripts/vars.i386:
      + Add xserver-xorg-input-elographics to XSERVER_XORG_INPUT_DEPENDS.
    - debian/xserver-xorg.postinst.in:
      + Add lt to list of non-Latin keymaps (LP: #38931).
      + Make sure to ask video driver on sparc even if autodetected. Some
        cards still require weird overrides (ati -> fbdev) that are not
        100% known in all combinations.
      + Skip video card autodetection if xforcevesa is set
        (LP #27020, #59618).
      + Detect keyboard layout configuration using /etc/default/console-setup
        if available.
      + Clean up duplicate keymaps in xserver-xorg.config.in and make sure
        they're all neatly alphabetised.
      + Map cf console keymap to ca(fr).
      + Map croat console keymap to hr. (LP: #43598)
      + Set default keyboard variant for French to oss (LP: #89835).
      + Map et console keymap to ee. (LP: #42800)
      + Map mk console keymap to mk.
      + Map nl console keymap to nl. (LP: #26552)
      + Map ru console keymap to ru.
      + Map slovene console keymap to si. (LP: #27509)
      + Map sr-cy console keymap to map to cs, not sr, following
        xkeyboard-config changes.
      + Handle trfu/trqu console keymaps the same way as trf/trq.
        (LP #37867)
      + Map uk console keymap to gb, not gb(intl). (LP: #58016)
      + Try autodetecting South Korean keyboards. They have to be detected
        from LANG since they use US keymaps on the console.
      + Fix sanity-checking logic for French Canadian vs. US-layout
        keyboards. (LP: #34627)
      + Sparc doesn't need sun types keyboard since 2.6 kernel come to play
        in the game. Make it use pc105 instead with xorg rules.
      + Use fbset for HPPA.
      + Write down sync ranges for sis driver. Too many reports on sis driver
        not being able to get a clue on the connected monitor. (LP: #30489)
      + Some ati cards require a kick (sync ranges) when using DVI output.
        (LP: #39570)
      + Make sure to write sync values for Intel Corporation 82852/855GM
        Integrated Graphics Device when monitor is LCV/LDVS.
        (Closes: LP #13846)
      + Write sync values for Intel Mobile 945GM. (LP: #62002)
      + Make sure to write sync ranges with CTX S501A LCD monitor since it
        seems to return 2 sets of sync ranges but only one is valid and of
        course the drivers pick up the wrong one. (Closes: LP #38772)
      + On fresh installs, if the display is not a lcd/lvds, there are no
        known syncs frequencies for the monitor and the card is mga, do NOT
        write SYNC_RANGES. It appears that mga can cope just fine parting
        vesa info too. (Closes: LP #19098)
    - debian/xserver-xorg.templates:
      + Add xserver-xorg/config/device/extra_options so that extra graphics
        driver options can be set through debconf and respected by dexconf.
        We need this in restricted-manager to make restricted drivers like
        nvidia work OOTB for compiz, but it is certainly useful for other
        things, too. (NB that the question is never asked interactively).
  * debian/control:
    - Drop xlibs-dev, since no package Build-depends on it anymore
      (other than via alternatives).
  * debian/rules:
    - Drop change in SERVERABIVER, not used anywhere.
  * debian/xserver-xorg.links:
    - Drop the symlink "usr/share/X11/fonts -> usr/share/fonts/X11", since
      the server default path is correct and always used now.

 -- Timo Aaltonen <email address hidden> Mon, 4 Jun 2007 11:20:17 +0300