xorg (1:7.1.1ubuntu6) edgy; urgency=low

  * debian/control: fix Replaces typo for xinit's version.

 -- Kees Cook <kees@ubuntu.com>  Fri, 20 Oct 2006 09:00:43 -0700

xorg (1:7.1.1ubuntu5) edgy; urgency=low

  * debian/local/dexconf: close fd 4 before rm.  Patch from Roshan Shariff
    (Closes Malone #65763).

 -- Kees Cook <kees@ubuntu.com>  Tue, 17 Oct 2006 12:09:06 -0700

xorg (1:7.1.1ubuntu4) edgy; urgency=low

  * Restore xbase-clients, xlibs-dev, and xutils transitional packages for
    now, since many packages in Edgy still depend or build-depend on them.

 -- Colin Watson <cjwatson@ubuntu.com>  Mon, 16 Oct 2006 21:01:43 +0100

xorg (1:7.1.1ubuntu3) edgy; urgency=low

  * SECURITY UPDATE: Fix race condition when chown'ing .xsession-errors.
  * debian/local/Xsession: set temporary umask when creating $ERRFILE.
  * References:
    CVE-2006-5214

 -- Kees Cook <kees@ubuntu.com>  Thu, 12 Oct 2006 08:34:57 -0700

xorg (1:7.1.1ubuntu2) edgy; urgency=low

  * 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).
    Closes: LP#60448

 -- Martin Pitt <martin.pitt@ubuntu.com>  Thu,  5 Oct 2006 14:00:47 +0200

xorg (1:7.1.1ubuntu1) edgy; urgency=low
  
  * Make discover call non-fatal on sparc to fix dist-upgrades.

  * Increase version number to match current X version.
  (Closes Ubuntu: #58700)

  * Fix debian/rules clean target.

 -- Fabio M. Di Nitto <fabbione@ubuntu.com>  Tue, 03 Oct 2006 06:56:47 +0200

xorg (1:7.0.22ubuntu10) edgy; urgency=low

  * debian/xserver-xorg.config.in: Translate debian-installer/keymap=uk to
    gb, not gb(intl) (closes: Malone #58016).

 -- Colin Watson <cjwatson@ubuntu.com>  Mon, 18 Sep 2006 14:17:04 +0100

xorg (1:7.0.22ubuntu9) edgy; urgency=low

  * debian/x11-common.init: Only source /etc/default/rcS if it exists,
    allowing x11-common to be installed by debootstrap.

 -- Colin Watson <cjwatson@ubuntu.com>  Sun, 10 Sep 2006 15:23:02 +0100

xorg (1:7.0.22ubuntu8) edgy; urgency=low

  * Detect keyboard layout configuration using /etc/default/console-setup if
    available.

 -- Colin Watson <cjwatson@ubuntu.com>  Thu,  7 Sep 2006 09:36:45 +0100

xorg (1:7.0.22ubuntu7) edgy; urgency=low

  * Added Replaces: xserver-xorg-driver-all to xserver-xorg-video-all
  * Added Conflicts: xserver-xorg-driver-all to xserver-xorg-video-all

 -- Rodrigo Parra Novo <rodarvus@ubuntu.com>  Thu, 27 Jul 2006 20:34:26 -0300

xorg (1:7.0.22ubuntu6) edgy; urgency=low

  * remove bashism in xserver-xorg.postinst.in

 -- Oliver Grawert <ogra@ubuntu.com>  Mon, 17 Jul 2006 21:13:25 +0200

xorg (1:7.0.22ubuntu5) edgy; urgency=low

  * Remove broken upgrade detection from debian/xserver-xorg.postinst.in;
    debian/xsfbs/xsfbs.sh does a better job. See Debian #375689.

 -- Colin Watson <cjwatson@ubuntu.com>  Mon, 17 Jul 2006 11:28:27 +0100

xorg (1:7.0.22ubuntu4) edgy; urgency=low

  * Added xserver-xorg-input-elographics to debian/scripts/i386.vars, to let
    xserver-xorg-input-all on i386) to Require it correctly

 -- Rodrigo Parra Novo <rodarvus@ubuntu.com>  Thu, 13 Jul 2006 18:08:26 -0300

xorg (1:7.0.22ubuntu3) edgy; urgency=low
  
  * sparc doesn't have newport and tga video drivers.

 -- Fabio M. Di Nitto <fabbione@ubuntu.com>  Wed, 12 Jul 2006 12:56:20 +0200

xorg (1:7.0.22ubuntu2) edgy; urgency=low

  * Renamed package xserver-xorg-driver-all to xserver-xorg-video-all
  * Moved requirements of above package from *-driver-* to *-video-*

 -- Rodrigo Parra Novo <rodarvus@ubuntu.com>  Tue, 11 Jul 2006 14:03:28 -0300

xorg (1:7.0.22ubuntu1) edgy; urgency=low

  * Merge with Debian
  * Add replaces for xinit since we now ship Xsession from x11-common.
  * Ditto for xrgb as we ship rgb.txt in x11-common.
  * Make conflict with xbase-clients and xutils looser for now.  They will
    be tightened again once we have synced those from Debian.

 -- Tollef Fog Heen <tfheen@ubuntu.com>  Wed,  5 Jul 2006 15:42:58 +0200

xorg (1:7.0.22) unstable; urgency=low

  [ David Nusinow ]
  * Correct the sections on the transitional packages
  * Make sure grepping for smoking guns in x11-common.postinst (or anywhere
    else that the find_culprits shell function is used) no longer dies due to
    a grep not returning anything. Thanks Joey Hess. (closes: #371152)
  * During x11-common preinst, handle /usr/X11R6/bin before anything else to
    try and prevent serious problems during error unwind. Thanks Steve
    Langasek, Eugene Konev, Henk Boom, and Joey Hess. (closes: #371874)

 -- David Nusinow <dnusinow@debian.org>  Sun, 11 Jun 2006 23:39:46 -0400

xorg (1:7.0.21) unstable; urgency=low

  [ Christian Perrier ]
  * Debconf translation updates
    - Basque (Piarres Beobide)
    - Galician (Jacobo Tarrio). Closes: #369509
    - Norwegian Bokmal (Bjørn Steensrud). Closes: #369515

  [ Steve Langasek ]
  * Conflict with ppxp (<= 0.2001080415-14), thanks to Florian Ludwig.
  * Conflict with guitar, which also ships an empty /usr/X11R6/bin.
  * Bump conflict with xorg 6.9 packages to (<< 7.0), thanks to amd64
    binNMUs. :/  Closes: #370215.
  * Fix bad shell in the x11-common.preinst.

  [ David Nusinow ]
  * Add conflicts on some old woody stuff, including xftp, xext, xpaste, and
    ghostview. Thanks Carl Miller and Roger Leigh. (closes: #362915, #370088)
  * Revert Xrapper.config modification during x11-common postinst to 6.9
    behavior. We now only if the file exists and the md5sum is not altered, we
    no longer only do this on upgrades This should unbreak fresh installs.
  * Move test to create Xwrapper.config to do it on either install or upgrade,
    not in the migration code

  [ Josh Triplett ]
  * Add conflicts on the old non-free package xv, no longer in Debian,
    which broke upgrading on at least one system.
  * Remove duplicated dependency on libx11-dev from xorg-dev.

 -- David Nusinow <dnusinow@debian.org>  Wed,  7 Jun 2006 23:46:04 -0400

xorg (1:7.0.20) unstable; urgency=low

  [ Christian Perrier ]
  * Debconf translation updates
    - Vietnamese (Clytie Siddall).
    - Russian (Yuri Kozlov).
    - Brazilian (André Luis Lopes).
    - Czech (Miroslav Kure).

  [ David Nusinow ]
  * Add x11-common conflict with ivtools-dev. Thanks Julien Danjou.
    (closes: #368298)
  * Re-add accidentally removed (wtf happened?) xlibmesa-gl-dev transitional
    package. Thanks Steve Langasek.

 -- David Nusinow <dnusinow@debian.org>  Sun, 21 May 2006 15:46:40 -0400

xorg (1:7.0.19) unstable; urgency=low

  [ Christian Perrier ]
  * Rewrite templates to make them more compliant with Developer's Reference
    6.5
    - Update Japanese translation (Kenshi Muto).
    - Update French translation (Christian Perrier).
    - Update Galician translation (Jacobo Tarrio).
    - Update Hungarian translation (SZERVÁC Attila).

  [ David Nusinow ]
  * Add x11-common template to warn people that on upgrade their server may be
    removed. This template also tells people to install the xorg package to
    fix the problem. This is an ugly workaround and I welcome a better
    solution if someone can find it. (closes: #363169)
  * Allow ICE and Socket dir to be set up in non-verbose mode. Thanks Gilmar
    Santos Jr, Frank Mehnert, and Aleksey Midenkov for the reports and the
    patches.  (closes: #367556, #363427, #366378)
  * Implement a status call in x11-common's init script for LSB compliance
  * Add LSB dependency info to x11-common init script. Note that I have no way
    of testing it but the submitter claims that it's partially tested
    elsewhere. Thanks Petter Reinholdtsen. (closes: #335348)
  * Set +e in Xsession prior to executing anything in Xsession.d. This should
    prevent any one bad script from killing the X startup process. Thanks
    Eduard Bloch. (closes: #331553)
  * Recover old changelog entries from the 6.8 and 6.9 era and put in to
    changelog.Debian.old. Install this file in the x11-common package. Thanks
    Kevin B. McCarty. (closes: #364087)
  * Make several improvements to the code that makes /usr/X11R6/bin a symlink
    + Move the logic to perform the switch to the x11-common preinst
    + If the rmdir command fails, use debconf to inform the user
    + Use debhelper's normal methods to create the symlink, so that the
      packaging infrastructure is aware of it
    Thanks to Eduard Bloch, Steve Langasek, Daniel Stone, and Vincent Lefevre
    for helping hammer this out. (closes: #362885, #363699)
  * Add missing quotes in 20x11-common_process-args. Thanks Greg Kochanski.
    (closes: #347481)
  * Re-add call to update-rc.d and invoke-rc.d in x11-common postinst
  * Bump standards version to 3.7.2.0
  * Increment version with xdm conflict to the current version in testing and
    unstable. (closes: #363462)

 -- David Nusinow <dnusinow@debian.org>  Thu, 18 May 2006 22:45:40 -0400

xorg (1:7.0.18) unstable; urgency=low

  [ Steve Langasek ]
  * Fix dexconf to supply the same backwards-compatible FontPath rules
    on upgrade as the ones we're forcing in the postinst for non-dexconf
    users.

  [ David Nusinow ]
  * Add xlibmesa-glu transitional package

 -- David Nusinow <dnusinow@debian.org>  Tue,  9 May 2006 00:57:44 -0400

xorg (1:7.0.17) unstable; urgency=high

  [ Steve Langasek ]
  * High-urgency upload for RC bugfix.
  * Drop the xfree86-common transitional package again, because the
    solution implemented for 354146 was broken and redundant -- bug
    #354146 hasn't been a real issue since x11-common started
    conflicting with xfree86-common, and people tend to miss their
    /etc/X11/Xsession when it's moved out from under them.
    Closes: #365948, reopens: #318294.

  [ David Martínez Moreno ]
  * debian/control: Fixed several short descriptions.
  * debian/scripts/vars*: Updated xserver-xorg-input-all dependencies to
    include xserver-xorg-input-synaptics on m68k and the newly released
    xserver-xorg-input-wacom driver.

  [ David Nusinow ]
  * Have x11-common move Xsession.xfree86 back to Xsession if Xsession doesn't
    exist. This is to clean up the mess made on last upload
  * Tell the configuration scripts that we're upgrading properly. The variable
    that was being used to test this was never set for some reason.
  * Fix test bug during upgrade when we made sure to only do certain
    operations when we're upgrading from before a fixed package number. This
    bug was uncovered by the fix above about the upgrade.

 -- David Nusinow <dnusinow@debian.org>  Fri,  5 May 2006 00:10:33 -0400

xorg (1:7.0.16) unstable; urgency=low

  [ David Nusinow ]
  * Define the backup config file name before we tell people where we're
    backing up :-) Thanks Frans Pop and Flavio Stanchin. (closes: 365278)
  * Prevent the xserver-xorg config from failing during migration of
    emulate3buttons questions when they don't exist. Thanks Rodney Gordon II,
    Adam Borowski. Thanks to Steven Brown for a fix.  (closes: #365282)
  * Remove obsolete zaxismapping debconf question all together during
    xserver-xorg config.
  * Add xfree86-common transitional package. This package is meant to remove
    files that were moved to x11-common, like Xsession. Thanks Frank Küster.
    Thanks to Daniel Stone for the fix. (closes: #354146)
    * Remove xfree86-common stuff from /etc/X11/Xsession.d when the new
      xfree86-common package is purged. Thanks Joe Drew. (closes: #318294)
  * Add x11-common conflict with xpmumon. Thanks Jack Bates.
  * Have the xserver-xorg-video-all metapackages depend on
    xserver-xorg-video-v4l now that it's in the archive

  * [ Debconf translations ]
    - Updated Brazilian (André Luis Lopes). Closes: #365531

 -- David Nusinow <dnusinow@debian.org>  Wed,  3 May 2006 00:21:11 -0400

xorg (1:7.0.15) unstable; urgency=low
  
  * The "Happy Birthday Steve!" release

  [ Christian Perrier ]
  * Debconf translations:
    - Merge translations from the 6.9 branch. Most of them were pending
      there and have not been merged when 7.0 came in
      Closes: #363051
    - French translation completed (Christian Perrier)
    - Add Hungarian translation (SZERVAC Attila). Closes: #352471
    - Update Dutch translation (Bart Cornelis). Closes: #358171
    - Update Catalan translation (Jordi Mallach). Closes: #350765
    - Update German translation (Jens Seidel). Closes: #341003
    - Update Polish translation (Bartosz Fenski). Closes: #359746
    - Update Czech translation (Miroslav Kure). Closes: #362495
    - Update Danish translation (Claus Hindsgaul). Closes: #362570
    - Update Galician translation (Jacobo Tarrio). Closes: #362821
    - Update Romanian translation (Eddy Petrisor).
    - Update Vietnamese translation (Clytie Siddall).Closes: #364538
    - Update Basque translation (Piarres Beobide).Closes: #364568
    - Update Russian translation (Yuri Kozlov).Closes: #364642
  * Fix typo in templates and avoid fuzzying translations
    Closes: 364641

  [ Steve Langasek ]
  * Add pmud-utils (<= 0.10-9) to the conflicts list for x11-common;
    missed earlier because the package only exists on !i386
  * Also conflict with wmnet 1.0.5-12, which is still shipping
    /usr/X11R6/bin; thanks to Roger Leigh.  Closes: #364007.
  * Increment the conflict with xfs-xtt, because -6 existed in the
    archive even if it wasn't released with sarge.  Closes: #364056.
  * Add additional conflicts for xnest (<= 6.9.0.dfsg.1-6)
    (closes: #364210), xterm (<< 208-1), and xmh (<= 6.8.2.dfsg.1-4);
    these packages all depended on a package that x11-common already
    conflicted with, but that's only enough to force deconfiguration, not
    removal.

  [ ISHIKAWA Mutsumi ]
  * Debconf translations:
    - Update Japanese translation (Kenshi Muto).

  [ David Nusinow ]
  * Add vars.hurd-i386 to allow this package to build on that arch. Thanks
    Samuel Thibault and Michael Banck. (closes: #358692)
  * Allow the xorg metapackage to be satisfied by any terminal emulator.
    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)
  * On upgrade, we now are forcing people with custom configs to have some
    upgrading done on their xorg.confs. Naturally, we back up modified
    xorg.conf's before modifying them. We now do the following:
    + Remove lines to load the glcore and speedo modules
    + Update the font paths for misc, cyrillic, Type1, 100dpi, and 75dpi fonts
      to be /usr/share/fonts/X11 rather than /usr/lib/X11/fonts
    + Remove the ModulePath and RgbPath directives if present
    Thanks Steve Langasek for re-working my primitive sed.
    (closes: #362894, #363667, #364692, #364689, #363436, #357714, #363571)
  * Document the above in NEWS.Debian

  [ David Martínez Moreno ]
  * Update Spanish translation.

 -- David Nusinow <dnusinow@debian.org>  Fri, 28 Apr 2006 00:16:30 -0400

xorg (1:7.0.14) unstable; urgency=low

  * Add more versioned conflicts (libmotif-dev, motif-clients, xslideshow,
    xtrkcad). Thanks Steve Langasek.
  * Grab discover_video function from xserver-xorg.config.in from 6.9. The
    discover2 support was dropped solely in favor of discover1. This caused
    people with discover installed instead of discover1 to have an error
    returning 64 on their xserver-xorg postinstall. Thanks to Daniele
    Venzano for the bug report. Thanks to Steve Gran and Steve Langasek for
    tracking this down. (closes: #362891, #363021)
  * Make x11-common pre-depend on debconf | debconf-2.0. Thanks Steve
    Langasek. (closes: #362992)
  * Make x-window-system and x-window-system-core transitional packages that
    depend on the xorg package. These packages will smooth upgrades from sarge
    and will be removed upon the release of etch.
  * Make x11-common not depend on laptop-detect. This is now only recommended
    by xserver-xorg. Thanks Marc Wilson. (closes: #363081)
  * Have xserver-xorg-input-all pull in synaptics driver on all arches that
    it's set to build on. This required not loading the plain vars file in
    debian/rules, and having the variable listing the input drivers moved to
    the arch-specific vars files.

 -- David Nusinow <dnusinow@debian.org>  Mon, 17 Apr 2006 12:30:06 -0400

xorg (1:7.0.13) unstable; urgency=low

  * Fix shell snippet that provides the /usr/X11R6/bin dir->symlink
    transition. This prevents the test from succeeding incorrectly.
    Thanks Steve Langasek. (closes: #362940)
  * Fix case on xfs-xtt conflict for x11-common. Thanks Mike Furr.
    (closes: #362955)
  * Add x11-common conflict on xearth. Thanks Steve M. Robbins.
    (closes: #362524)

 -- David Nusinow <dnusinow@debian.org>  Sun, 16 Apr 2006 17:45:49 -0400

xorg (1:7.0.12) unstable; urgency=low

  * Move hardware autodetection stuff to Recommends rather than Depends.
    Also allow discover in addition to discover1. Thanks a lot of people.
    (closes: #322659, #362060,#362253)
  * Update list of x11-common conflicts. Thanks Steve Langasek.
    (closes: #362711)
  * Better document what can be done in the event that x11-common isn't empty
    on upgrade. Tell people in the error message that they can move the items
    there back after the installation has finished.
  * Make xserver-xorg-(input|video)-all arch: any rather than all, to let them
    build properly. Thanks Eugene Konev for the fix. Thanks Paul Wise and LIU
    Xin. (closes: #362719, #362720, #362694, #362672)
  * Remove the /usr/X11R6/bin/X symlink from xserver-xorg. Also bump the
    x11-common conflicts with xserver-xorg to this version. Thanks Joey Hess
    and Christian Hammers. Thanks to Steve Langasek for the fix.
    (closes: #362713, #362672)
  * Add pgaccess to the list of packages to conflict with. Thanks Bas
    Couwenberg. (closes: #362685)
  * Have safer and better logic for replacing the /usr/X11R6/bin dir with a
    symlink. Handle new installs. Thanks Bart Vanhaute. (closes: #362780)

 -- David Nusinow <dnusinow@debian.org>  Sat, 15 Apr 2006 12:41:32 -0400

xorg (1:7.0.11) unstable; urgency=low

  * Have xserver-xorg depend on xkb-data | xkb-data-legacy. Not a recommends
    any more. Thanks to a lot of people. (closes: #362112, #362105, #362521)
  * Make various metapackages arch: any rather than arch: all
  * Add s390 vars script source to allow the package to build on that arch.
    Provides only the dummy video driver currently.
    (closes: #361908, #361909)
  * On xserver-xorg postinst, reconfigure for all versions less than or equal
    to this one. This will only occur if the file is not customized. This will
    automatically correct for new font and xkb data paths. Users with
    customized files will have to make the necessary changes, documented in
    the NEWS.Debian file for the xserver-xorg-core package.
  * Have x11-common conflict with packages installing binaries to
    /usr/X11R6/bin. We need to remove them in order to install a proper
    symlink at this location to /usr/bin. Packages will still be able to
    install to /usr/X11R6/bin, but they need to be removed from the system
    first so that we can set up the symlink and not drop them out of the path.
    Thanks Steve Langasek. (closes: #362524, #362200)
  * Symlink /usr/X11R6/bin to /usr/bin in x11-common.postinst. Thanks Steve
    Langasek.
  * Several fixes for fonts. Include /usr/X11R6/lib/X11/fonts as a directory
    in x11-common for font packages that have not transitioned to the new
    directory. /usr/lib/X11/fonts symlinks to this directory. Both of these
    used to be symlinks to /usr/share/fonts/X11 but no longer. We explicitly
    remove the symlink at /usr/X11R6/lib/X11/fonts in the x11-common preinst
    to ensure this transition. Thanks Eugene Konev.
  * Document the change of PATH to /usr/X11R6/bin in x11-common NEWS.Debian
    file. Thanks Joey Hess. (closes: #362222)
  * Have x11-common conflict with libxft-dev <= 2.1.8.2-5. Thanks Margarita
    Manterola. (closes: #362255)
  * Document the metapackage name change in x11-common's NEWS.Debian.
  * Have xserver-xorg depend on xbase-clients
  * Ensure that config file md5sum gets migrated from /var/lib/xfree86 to
    /var/libx11. To do so, separate the test for it from the roster file in
    the xserver-xorg preinst. Properly handle the migration itself as well by
    using better variables in the mv command. Thanks Justin Pryzby.
    (closes: #331690)
  * Similarly separate the md5sum for the server symlink from the roster. Also
    handle the case where the server symlink md5sum is removed but the symlink
    itself is in place. Here we just remake the md5sum using that symlink
    silently.

 -- David Nusinow <dnusinow@debian.org>  Fri, 14 Apr 2006 01:38:14 -0400

xorg (1:7.0.10) unstable; urgency=low

  * Force migration of symlink if it points to /bin/true. Thanks Sune Vuorela
    for the bug report and Ari Pollak for the fix.
  * Upload to unstable

 -- David Nusinow <dnusinow@debian.org>  Sat,  8 Apr 2006 13:28:17 -0400

xorg (1:7.0.9) experimental; urgency=low

  * Put the Xsession stuff back in to x11-common. Thanks Arjan Oosting.
    (closes: #361025)

 -- David Nusinow <dnusinow@debian.org>  Fri,  7 Apr 2006 00:27:00 -0400

xorg (1:7.0.8) experimental; urgency=low

  * Add vars files for alpha, m68k, mips, mipsel, and arm. These are crude
    currently and definitely need refining from actual porters. If we're
    building useless drivers for your arch and including them in the
    metapackage, let us know and we'll disable them. Thanks Julien Cristau and
    Martin Michlmayr.

 -- David Nusinow <dnusinow@debian.org>  Tue,  4 Apr 2006 23:06:38 -0400

xorg (1:7.0.7) experimental; urgency=low

  * Add x11-common conflicts with monolithic versions of xserver-xorg. This
    will prevent the modular packages from screwing up old installations due
    to a partial install. Thanks Steve Langasek.
  * Add xlibs-static-dev transitional metapackage

 -- David Nusinow <dnusinow@debian.org>  Sun, 26 Mar 2006 19:18:31 -0500

xorg (1:7.0.6) experimental; urgency=low

  * At the urgent request of the release and ftp teams, xlibs must die. Have
    the xserver-xorg package recommend xkb-data instead. xkb-data should
    already be pulled in by several pieces including the xorg metapackage,
    xutils, and xbase-clients
  * Double the font compatibility symlink. One set at /usr/X11R6/lib/X11/fonts
    and one at /usr/lib/X11/fonts. Both point to /usr/share/fonts/X11, which
    is our home for the fonts.

 -- David Nusinow <dnusinow@debian.org>  Tue, 21 Mar 2006 23:29:42 -0500

xorg (1:7.0.5) experimental; urgency=low

  * Have xserver-xorg conflict and replace xserver-common. Thanks Miles Bader.
    (closes: #356781)

 -- David Nusinow <dnusinow@debian.org>  Sun, 19 Mar 2006 23:57:10 -0500

xorg (1:7.0.4) experimental; urgency=low

  * Name rgb.txt symlink properly so that the xserver actually finds it.
    Thanks Luca Capello.

 -- David Nusinow <dnusinow@debian.org>  Sun, 12 Mar 2006 12:58:04 -0500

xorg (1:7.0.3) experimental; urgency=low

  * Include rgb.txt from rgb 1.0.0 upstream release. Also provide symlink to
    /usr/share/X11 so that the server knows where to look. Thanks Lukasz
    Panowski. (closes: #356039)
  * Update dexconf for new font location. Thanks Svante Signell.
    (closes: #356181)

 -- David Nusinow <dnusinow@debian.org>  Sat, 11 Mar 2006 19:04:46 -0500

xorg (1:7.0.2) experimental; urgency=low

  * Have xorg-dev only depend on libxaw7-dev, not 6. Thanks Carsten Luedtke.
    (closes: #355703)

 -- David Nusinow <dnusinow@debian.org>  Tue,  7 Mar 2006 20:12:28 -0500

xorg (1:7.0.1) experimental; urgency=low

  * xorg depends on libgl1-mesa-glx now instead of the ubuntu package name.
    Thanks anonymous dude on my blog who should have used reportbug instead.
  * Provide compatibility packages for the Xorg 6.9 mesa packages. This
    package will be the only source of mesa packages in Debian for the
    present, and these packages will provide for smooth upgrades and
    compatibility.
  * Provide versioned dependencies for all the stuff xorg depends on.

 -- David Nusinow <dnusinow@debian.org>  Fri, 24 Feb 2006 01:13:18 -0500

xorg (1:7.0.0) experimental; urgency=low

  * First upload to Debian
  * Add an epoch due to idiocy while working on aborted experimental packages
  * This is a Debian-native package so version it accordingly
  * Remove xbase-clients and xutils metapackages. We're just bundling the apps
    in to one big source package right now
  * Convert to xsfbs
    + shell-lib.sh deleted in favor of xsfbs/xsfbs.sh
    + use targets for script generation and such from xsfbs/xsfbs.mk
  * Change driver metapackage naming to match individual packages:
    + xserver-xorg-driver -> xserver-xorg-video
    + Update the packaging variables that define arch-specific drivers to
      include in the metapackage as well to match these names
  * Remove extra depends on x11-common from xserver-xorg
  * Add debconf dependency for xserver-xorg
  * setuid for /usr/bin/X (stolen from monolith's debian/rules)
  * Provide xlibs and xlibs-data transitional packages. These are empty
    packages that depend on the packages that replace them.
  * Create an xorg metapackage that provides x-window-system(-core). This is a
    simpler name and should suffice. We don't need this split between -system
    and -system-core. If people want twm and so forth they can install it.
    This package installs -core plus xterm currently.
  * Re-add x-window-system-dev package under the new name of xorg-dev. Note to
    packagers: this is not meant to be build-dep'ed on, but is a convenience
    package for users.
  * Provide a compatibility symlink to /usr/lib/X11/fonts (their new home) at
    /usr/X11R6/lib/X11/fonts. This will let external fonts work as expected.
    Thanks Eugene Konev.

 -- David Nusinow <dnusinow@debian.org>  Mon, 20 Feb 2006 22:10:54 -0500

xorg (7.0.0-0ubuntu45) dapper; urgency=low

  * Apply patch from LaMont to skip Xorg configuration in the absense
    of /dev/fb0, so the server can be installed on headless machines
    like, oh, say, the livefs buildd (closes: launchpad.net/46496)

 -- Adam Conrad <adconrad@ubuntu.com>  Mon, 29 May 2006 03:56:19 +1000

xorg (7.0.0-0ubuntu44) dapper; urgency=low

  * Map cf console keymap to ca(fr), and fix sanity-checking logic for
    French Canadian vs. US-layout keyboards.
  (Closes Ubuntu: #34627)

 -- Colin Watson <cjwatson@ubuntu.com>  Wed, 17 May 2006 13:06:11 +0100

xorg (7.0.0-0ubuntu43) dapper; urgency=low

  * Kill possible loop when asking nice values.
  (Closes Ubuntu: #41976)

 -- Fabio M. Di Nitto <fabbione@ubuntu.com>  Tue, 09 May 2006 09:02:41 +0200

xorg (7.0.0-0ubuntu42) dapper; urgency=low

  * Map et console keymap to ee.
  (Closes Ubuntu: #42800)

  * Handle fi-latin1 console keymap the same way as fi.
  (Closes Ubuntu: #42650)

  * Map nl console keymap to nl.
  (Closes Ubuntu: #26552)

  * Map gr console keymap to gr, and add it to the list of non-Latin
    keymaps.

  * Map mk, ro, and ru console keymaps to mk, ro, and ru respectively.

  * Change sr-cy console keymap to map to cs, not sr, following
    xkeyboard-config changes. Add this to the list of non-Latin keymaps.

 -- Colin Watson <cjwatson@ubuntu.com>  Mon,  8 May 2006 16:56:19 +0100

xorg (7.0.0-0ubuntu41) dapper; urgency=low

  * Handle trfu/trqu console keymaps the same way as trf/trq.
  (Closes Ubuntu: #37867)

  * Map croat console keymap to hr.
  (Closes Ubuntu: #43598)

 -- Colin Watson <cjwatson@ubuntu.com>  Mon,  8 May 2006 14:24:48 +0100

xorg (7.0.0-0ubuntu40) dapper; urgency=low

  * Write down sync ranges for sis driver. Too many reports on sis driver not
    being able to get a clue on the connected monitor.
  (Closes at least Ubuntu: #30489)

  * Change xutils/xbase-clients descriptions since they can't be really
    removed as claimed. Tho packages should really stop depending on them.
  (Closes Ubuntu: 42910)

  * Fix regex match for HPPADEPTH.
  (thanks to LaMont Jones for the patch)

 -- Fabio M. Di Nitto <fabbione@ubuntu.com>  Fri, 05 May 2006 09:03:34 +0200

xorg (7.0.0-0ubuntu39) dapper; urgency=low

  * Make sure to set UseFBDev on MacMini and old Macs that use r128 driver.
  (Thanks to Benh for the report and the fix and being such a cool guy)

  * 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 Ubuntu: #38772)

 -- Fabio M. Di Nitto <fabbione@ubuntu.com>  Thu, 04 May 2006 10:11:43 +0200

xorg (7.0.0-0ubuntu38) dapper; urgency=low

  * Some ati cards require a kick (sync ranges) when using DVI output.
  (Closes Ubuntu: #39570)

 -- Fabio M. Di Nitto <fabbione@ubuntu.com>  Wed, 03 May 2006 11:10:28 +0200

xorg (7.0.0-0ubuntu37) dapper; urgency=low

  * Make sure to write sync values for Intel Corporation 82852/855GM
    Integrated Graphics Device when monitor is LCV/LDVS.
  (Closes Ubuntu: #13846)

 -- Fabio M. Di Nitto <fabbione@ubuntu.com>  Wed, 03 May 2006 09:35:49 +0200

xorg (7.0.0-0ubuntu36) dapper; urgency=low

  * Depends on xserver-xorg-input-elographics required to drive touchscreens
    on IBM Point Of Sales.

  * Enable elographics driver in dexconf when matching known machines.

 --  Fabio M. Di Nitto <fabbione@ubuntu.com>  Tue, 02 May 2006 09:52:34 +0200

xorg (7.0.0-0ubuntu35) dapper; urgency=low

  * Sync xorg-dev package from Debian and make it Arch: all.
  (Closes Ubuntu: #39613)

 -- Fabio M. Di Nitto <fabbione@ubuntu.com>  Mon, 01 May 2006 08:44:03 +0200

xorg (7.0.0-0ubuntu34) dapper; urgency=low

  * On some upgrades the X symlink checksum has been lost for unknown
    reasons. Make sure to recreate it if that's the case.

  * Partially revert the patch introduced in 7.0.0-0ubuntu33 that forces sync
    rages for all ati.
    Peter Schewenke (author of the original patch) did provide a better one
    after investigating one possible regression.
  (Closes Ubuntu: #29970)

 -- Fabio M. Di Nitto <fabbione@ubuntu.com>  Fri, 28 Apr 2006 08:35:38 +0200

xorg (7.0.0-0ubuntu33) dapper; urgency=low

  * Make sure to always write sync rages with ati driver and lcd/lvds
    monitors. According to #39762 this is always required.
    Also cleanup the ati code that was forcing MONITOR_SYNC_RANGE later
    in the process since it is now catched by the more generic one.
  (Closes Ubuntu: #39762, #37025)

  * Simply the ati powerpc MONITOR_SYNC_RANGE code.

  * Remove unused var from xserver-xorg.postinst.in.

  * Invoke dmidecode when ARCH != ia64 at least untill dmidecode is fixed
    since ia64 does not really need it yet.
  (Closes Ubuntu: #40659)

  * Make hppa users happy with a catch all config:
    - Add Depends: fbset for hppa.
    - update debian/scripts/vars.hppa.
    - update debian/xserver-xorg.postinst.in.
    (thanks to LaMont Jones for the patch)

  NOTE: this code should probably move to xresprobe to return proper info
        directly, but it might be too intrusive to do it at this point
        of the release.

 -- Fabio M. Di Nitto <fabbione@ubuntu.com>  Thu, 27 Apr 2006 08:18:16 +0200

xorg (7.0.0-0ubuntu32) dapper; urgency=low

  * Fix typo in xserver-xorg.in.

 -- Tollef Fog Heen <tfheen@ubuntu.com>  Wed, 26 Apr 2006 18:03:20 +0200

xorg (7.0.0-0ubuntu31) dapper; urgency=low

  * Add Slovenian, Swiss French and Swiss German keyboard layout
    detection.  Malone: #27509

 -- Tollef Fog Heen <tfheen@ubuntu.com>  Wed, 26 Apr 2006 11:49:18 +0200

xorg (7.0.0-0ubuntu30) dapper; urgency=low

  * Remove init script messages from x11-common; it basically amounts to a
    mkdir and the user doesn't need to be specially informed

 -- Matt Zimmerman <mdz@ubuntu.com>  Mon, 24 Apr 2006 10:53:55 -0700

xorg (7.0.0-0ubuntu29) dapper; urgency=low

  * On fresh installs, if the display is not a lcd/lvds, there are not know
    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 Ubuntu: #19098)

  * 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.
    (Closes Ubuntu: #27442)

 -- Fabio M. Di Nitto <fabbione@ubuntu.com>  Tue, 18 Apr 2006 09:07:57 +0200

xorg (7.0.0-0ubuntu28) dapper; urgency=low

  * Autogenerate Wacom support 

 -- Matthew Garrett <mjg59@srcf.ucam.org>  Sun,  9 Apr 2006 17:10:27 +0100

xorg (7.0.0-0ubuntu27) dapper; urgency=low

  * Make discover_video attempt first pci and in case of failure sbus
    on sparc and sparc only.

  * 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 combinantions.

  * 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.

  * 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.

  * Readd Depends: xserver-xorg-input-wacom to xserver-xorg-input-all.

  * Make xserver-xorg Arch: any. We need dmidecode on i386.

  * Add -VF:XServer-Xorg-Detect-Depends=$(XSERVER_XORG_DETECT_DEPENDS) all
    over vars.*

  * Readd xserver-xorg-driver-vmware to vars.amd64 and remove it from non x86*
    arches.
    (Closes Ubuntu: #38070)

  * Make sure that ARCH is defined in postinst so that we can actually realize
    that we are installing on powerpc and write syncs.
    (Closes Ubuntu: #29540)

  * Allow XFORCEVESA envvar or xforcevesa in /proc/cmdline to force X to use
    vesa driver on i386 and amd64.
    (Closes Ubuntu: #27020)

 -- Fabio M. Di Nitto <fabbione@ubuntu.com>  Fri, 07 Apr 2006 09:04:48 +0200

xorg (7.0.0-0ubuntu26) dapper; urgency=low

  * Make xutils depend on imake (>= 1:1.0.0) | xmkmf, since newer versions
    of imake now provide xmkmf, and this confuses the heck out of apt.

 -- Adam Conrad <adconrad@ubuntu.com>  Thu,  6 Apr 2006 17:25:09 +1000

xorg (7.0.0-0ubuntu25) dapper; urgency=low

  * Remove stray esac from xserver-xorg.config.in

 -- Adam Conrad <adconrad@ubuntu.com>  Sat, 25 Mar 2006 06:31:19 +1100

xorg (7.0.0-0ubuntu24) dapper; urgency=low

  * Harder, harder.  As Korean uses US keymaps on the console, we
    special-case that.  This sucks a bit, but is the only way to get
    Korean maps working out of the box.

 -- Tollef Fog Heen <tfheen@ubuntu.com>  Fri, 24 Mar 2006 11:07:27 +0100

xorg (7.0.0-0ubuntu23) dapper; urgency=low

  * Try harder to autodetect Korean keyboards.

 -- Tollef Fog Heen <tfheen@ubuntu.com>  Thu, 23 Mar 2006 12:39:55 +0100

xorg (7.0.0-0ubuntu22) dapper; urgency=low

  * Fix usage of laptop-detect.
  (Closes Ubuntu: #29483, #32422)

  * Readd xserver-xorg-driver-v4l to xserver-xorg-driver-all.

 -- Fabio M. Di Nitto <fabbione@ubuntu.com>  Wed, 22 Mar 2006 10:59:20 +0100

xorg (7.0.0-0ubuntu21) dapper; urgency=low

  * Uncoditionally re-enable ZAxisMapping in dexconf.
  (Closes Ubuntu: 31827)

 -- Fabio M. Di Nitto <fabbione@ubuntu.com>  Wed, 22 Mar 2006 10:36:10 +0100

xorg (7.0.0-0ubuntu20) dapper; urgency=low

  * Try autodetecting South Korean keyboards.  They have to be detected
    from LANG since they use US keymaps on the console.

 -- Tollef Fog Heen <tfheen@ubuntu.com>  Wed, 22 Mar 2006 08:04:48 +0100

xorg (7.0.0-0ubuntu19) dapper; urgency=low

  * Clean up duplicates in xserver-xorg.config.in and make sure they're
    all neatly alphabetised.

 -- Tollef Fog Heen <tfheen@ubuntu.com>  Tue, 21 Mar 2006 14:27:06 +0100

xorg (7.0.0-0ubuntu18) dapper; urgency=low

  * Make the postinst.in be valid utf, which means we now are generating
    configuration files which are valid UTF8.  Malone #35045

 -- Tollef Fog Heen <tfheen@ubuntu.com>  Fri, 17 Mar 2006 13:15:29 +0100

xorg (7.0.0-0ubuntu17) dapper; urgency=low

  * Get rid of duplicate dependencies for xbase-clients.

 -- Tollef Fog Heen <tfheen@ubuntu.com>  Sat, 18 Feb 2006 20:48:25 +0100

xorg (7.0.0-0ubuntu16) dapper; urgency=low

  * debian/rules:
    - set X setgid (Ubuntu: #31756)

 -- Sebastien Bacher <seb128@canonical.com>  Fri, 17 Feb 2006 17:54:17 +0100

xorg (7.0.0-0ubuntu15) dapper; urgency=low

  * Strip "-latin1" off the end of the keymap name we get from d-i, not
    from the beginning of the name.
  * Make debug info when failing to detect keyboard not talk about
    $REALLANG, but just $DI_KEYMAP.

 -- Tollef Fog Heen <tfheen@ubuntu.com>  Tue, 14 Feb 2006 10:57:13 +0100

xorg (7.0.0-0ubuntu14) dapper; urgency=low

  * Support preseeding of xserver-xorg/config/display/default_depth even
    when autodetecting video. (Unfortunately, this will mean that people get
    the wrong default presented on second and subsequent low-priority
    reconfigures, though.)

 -- Colin Watson <cjwatson@ubuntu.com>  Fri,  3 Feb 2006 12:29:00 +0000

xorg (7.0.0-0ubuntu13) dapper; urgency=low

  * Would be nice if we would still exit 0, however...

 -- Adam Conrad <adconrad@ubuntu.com>  Tue, 31 Jan 2006 09:48:00 +0000

xorg (7.0.0-0ubuntu12) dapper; urgency=low

  * Make /etc/init.d/x11-common completely silent unless running VERBOSE.

 -- Adam Conrad <adconrad@ubuntu.com>  Mon, 30 Jan 2006 15:03:15 +0000

xorg (7.0.0-0ubuntu11) dapper; urgency=low

  * Fix first-installation logic to cope with being called from the postinst
    too (closes: Malone #29564).

 -- Colin Watson <cjwatson@ubuntu.com>  Fri, 27 Jan 2006 18:22:46 +0000

xorg (7.0.0-0ubuntu10) dapper; urgency=low

  * Remove xserver-xorg-driver-v4l and xserver-xorg-driver-glide from the
    Depends field of xserver-xorg-driver-all
  * Remove xserver-xorg-input-wacom from the Depends field of
    xserver-xorg-input-all
  * Add zlib1g-dev to the dependency list of xlibs-dev and remove
    xlibs-static-dev, since the latter no longer exists.
    
 -- Tollef Fog Heen <tfheen@ubuntu.com>  Fri, 20 Jan 2006 11:25:57 +0100

xorg (7.0.0-0ubuntu9) dapper; urgency=low

  * Re-add xutils and xbase-clients metapackages.

 -- Daniel Stone <daniel.stone@ubuntu.com>  Fri, 20 Jan 2006 16:39:24 +1100

xorg (7.0.0-0ubuntu8) dapper; urgency=low

  * Add xserver-xorg-driver-sisusb to amd64, i386 and powerpc; add
    -driver-voodoo to amd64 and i386.

 -- Daniel Stone <daniel.stone@ubuntu.com>  Fri, 20 Jan 2006 15:27:03 +1100

xorg (7.0.0-0ubuntu7) dapper; urgency=low

  * Add dh_install call to binary-arch instead of just being in -indep
    (thanks, Andres Salomon).

 -- Daniel Stone <daniel.stone@ubuntu.com>  Fri, 20 Jan 2006 10:21:13 +1100

xorg (7.0.0-0ubuntu6) dapper; urgency=low

  * Change xserver-xorg's dependency on x-common to x11-common.

 -- Daniel Stone <daniel.stone@ubuntu.com>  Fri, 20 Jan 2006 01:39:58 +1100

xorg (7.0.0-0ubuntu5) dapper; urgency=low

  * Also check that /usr/bin/X11 isn't a symlink, since -d covers both
    directories, and symlinks to directories.

 -- Daniel Stone <daniel.stone@ubuntu.com>  Fri, 20 Jan 2006 00:00:58 +1100

xorg (7.0.0-0ubuntu4) dapper; urgency=low

  * Clean debian/local/X instead of debian/local/xserver-wrapper, and make
    x11-common Arch: any instead of all.  I am clever.  (closes: Malone#28967)

 -- Daniel Stone <daniel.stone@ubuntu.com>  Thu, 19 Jan 2006 23:00:03 +1100

xorg (7.0.0-0ubuntu3) dapper; urgency=low

  * Perform x-common-esque symlink<->dir transitions in x11-common; add
    Conflicts on x-common.
  * Trim default set of input drivers down to evdev, keyboard, mouse, wacom.
  * Rejig handling of x-window-system-core depends.

 -- Daniel Stone <daniel.stone@ubuntu.com>  Thu, 19 Jan 2006 17:06:53 +1100

xorg (7.0.0-0ubuntu2) dapper; urgency=low

  * Add laptop-detect dependency to x11-common, make preinst slightly more,
    er, robust, in the face of failure (closes: Malone#28911).
  * Add dependencies in laptop-detect, xresprobe, mdetect and discover1 to
    xserver-xorg.

 -- Daniel Stone <daniel.stone@ubuntu.com>  Thu, 19 Jan 2006 08:33:23 +1100

xorg (7.0.0-0ubuntu1) dapper; urgency=low

  * This package now only provides metapackages; we're now modular for real
    real, not for play play.
  * The xlibs, xlibs-data, xlibs-static-dev, xlibs-static-pic, xbase-clients,
    xutils, and x-window-system-dev packages have been removed.  xlibs-dev
    remains.  For now.
  * Merge xserver-common and xorg-common packages into x11-common.
  * Rewrite keyboard detection list to work off d-i keymap only, not language
    too.
  * Drop support for upgrades from pre-sarge, remove support for
    XORG_FORCE_PROBE environment variable.  Remove support for
    non-multiplexed mice in dexconf.
  * Prune unneeded bits of shell-lib.sh (which turns out to be most of it).
  * Move xserver-xorg.config.in detection bits into .postinst.in, so it all
    happens in the one place, and we can use the X server to configure itself
    by detecting its own driver if need be.
  * Move all previous changelog entries to changelog.Debian.old.
  * neomagic is also special, in terms of mode validation on laptops
    (closes: Ubuntu#18957).
  * Move update-linux-hardened-support call from xserver-xorg postinst to
    xserver-xorg-core.
  * Move md5sum/roster directory to /var/lib/x11 from /var/lib/xfree86, and
    use /usr/bin/Xorg, instead of /usr/bin/X11/Xorg.
  * I don't think the following:
     Users of SGI Indigo2 XL machines, or machines with other buses not yet
     fully supported, should specify simply "1" here.  (This is not
     guaranteed to work.)
     was really necessary to have in a Debconf note, so let's remove it.
  * Get rid of write_dri_section question, and just always write it.
  * Replace $NOPROBE with $AUTODETECT_VIDEO, and $DOPROBE with $UPGRADE,
    inverting the senses of both variables.
  * Remove support for DEBUG_XFREE86_* variables (has been DEBUG_XORG_* for a
    while now).
  * Remove compatibility code for xresprobe < 0.4.13.
  * Remove long-unused 'are you on an LCD?' question.
  * Don't touch the config file when we're upgrading.  Specific migrations
    needed can be done in-place.
  * Add seconds to the backup xorg.conf file's name, so you can do multiple
    reconfigures in the same minute.
  * Remove language -> keymap 'smarts'.
  * Make xserver-xorg depend on either the full set of drivers
    (xserver-xorg-driver-all, xserver-xorg-input-all), or any individual
    driver (xserver-xorg-driver, xserver-xorg-input).
  * Remove all dependencies on -driver-atimisc, as it is part of -ati.
  * Nuke irrelevant history section and segue into xf86cfg description from
    dexconf's manpage, update XF86Config-4 references to talk about xorg.conf
    instead.
  * Remove code which checked if a given directory didn't exist ... right
    after it ensured it had been created.
  * Change default mouse protocol to ExplorerPS/2 (closes: Ubuntu#4106).
  * Remove support in dexconf for CID fonts, since mkcfm is wildly non-free.
  * Remove support for ZAxisMapping.
  * Ensure GLcore is removed from the module list when upgrading.
  * Remove XFree86 history spiel from x11-common description.
  * Add /usr/X11R6/bin/X -> /usr/bin/X link.
  * Ask the 'which server?' question at priority low.
  * Remove hppa's hardcoded null _INPUT_DEPENDS, as the libdl-based loader has
    dragged the rest of this architecture kicking and screaming into 1983.
    Unfortunately LaMont is still stuck in 1975, but you can't expect me to
    fix that.

 -- Daniel Stone <daniel.stone@ubuntu.com>  Thu,  13 Oct 2005 10:06:23 +1000

  Older changelog entries (back to 4.0.1) can be found in changelog.Debian.old.
  Releases previous to this fixed the following security issues (details in
  changelog.Debian.old): CAN-2004-0419, CAN-2004-0083, CAN-2004-0084,
  CAN-2004-0106, CAN-2003-0690, CAN-2003-0730, CAN-2003-0690, CAN-2003-0063,
  CAN-2003-0071, CAN-2004-0093, CAN-2004-0094, CAN-2004-0093, CAN-2004-0094.
  These should all be moved to their respective source packages. -daniels
