xorg (1:7.6+4ubuntu3.2+5.0trisquel1) dagda; urgency=low

  * Compiled for Trisquel

 -- Trisquel GNU/Linux developers <trisquel-devel@listas.trisquel.info>  Sat, 04 Feb 2012 02:52:05 +0000

xorg (1:7.6+4ubuntu3.2) natty-security; urgency=low

  * SECURITY UPDATE: console requirement bypass (LP: #918332)
    - debian/local/xserver-wrapper.c: drop alternative TTY support, and
      also reset effective group id. Patch obtained from Debian squeeze
      update.
    - CVE-2011-4613

 -- Marc Deslauriers <marc.deslauriers@ubuntu.com>  Wed, 18 Jan 2012 13:30:25 -0500

xorg (1:7.6+4ubuntu3.1) natty-proposed; urgency=low

  * apport/source_xorg.py:
    - Simplify answers for bug reporters filing post-release reports.
      (LP: #778758)
    - Remove attach_drm_info().  This is useful info but we use it very
      infrequently, and it is already available in other log files.  But the
      call makes bug reports a bit cluttered since it adds a lot of lines to
      the report itself.

 -- Bryce Harrington <bryce@ubuntu.com>  Thu, 07 Apr 2011 14:02:40 -0700

xorg (1:7.6+4ubuntu3) natty; urgency=low

  * apport/source_xorg.py:  Fix typo in previous upload

 -- Bryce Harrington <bryce@ubuntu.com>  Tue, 05 Apr 2011 11:57:48 -0700

xorg (1:7.6+4ubuntu2) natty; urgency=low

  * apport/source_xorg.py:
    + Wildcarding package names doesn't seem to work.  Look for dri
      experimental package directly.
      (LP: #749809, #747725)
    + Include compiz version tag if the problem is a compiz crash
      (LP: #744355)

 -- Bryce Harrington <bryce@ubuntu.com>  Mon, 04 Apr 2011 19:01:36 -0700

xorg (1:7.6+4ubuntu1) natty; urgency=low

  [ Timo Aaltonen ]
  * Merge from Debian unstable. Remaining Ubuntu changes:
    - Add apport hook
    - Demote xfonts-{75DPI,100DPI} to Suggests. Demote xfonts-scalable to
      Recommends.
    - debian/local/Failsafe*: Failsafe X hookup.
    - debian/local/Xsession: Truncate xsession-errors on startup if too big
    - debian/local/Xsession.d/20x11-common_process-args: Add support for
      session command containing args.
    - debian/local/Xsession.d/60x11-common_localhost: Authorise all processes
      running with the user's credentials to connect to the server.
    - debian/rules, debian/control:
      + Add dependencies on x11-common, and symlink /usr/share/doc directories
        of all packages to x11-common's.
    - debian/scripts/vars.*: Don't drop wacom, synaptics from *-all
    - debian/xserver-xorg.postinst.in: Also migrate users from psb → vesa.
  * Removed transitional xlibmesa-gl*, libglu1-* packages, they have only
    'Suggests' or 'Recommends' rdepends left, and other packages available
    that replace them.
  * x11-common: Remove obsolete failsafe configuration files from /etc/gdm.
    (LP: #654353)
  * x11-common: Clean up old configuration file removals from
    {preinst,postinst,postrm}.in.
  * control, rules: Don't build xsf-docs, markdown and wkhtmltopdf are in
    universe.

  [ Bryce Harrington ]
  * apport/source_xorg.py:
    - Include 'xinput list' output for input device issues.
    - For amd64 arch's, include version of ia32-libs package.
  * scripts/vars.amd64, scripts/vars.i386:
    - Include the -qxl video driver in video-all for amd64 and i386, to
      provide remote graphical desktop functionality for KVM.
  * scripts/vars.arm, scripts/vars.armeb, scripts/vars.armel:
    - Drop obscure drivers that are likely irrelevant for ARM.

 -- Bryce Harrington <bryce@ubuntu.com>  Fri, 01 Apr 2011 00:05:38 -0700

xorg (1:7.6+4) unstable; urgency=low

  [ Steve Langasek ]
  * Mark x11-common as Multi-Arch: foreign, so foreign-architecture libs
    have their dependency satisfied by it.

  [ Cyril Brulebois ]
  * Merge xsf-docs up to the 4d4bfa3eaf commit:
    - Add: faq/general
    - Add: reference/squeeze-backports
    - Update: howto/configure-input
    - Update: howto/triage-bugs
    - Update: howto/use-gdb (mention getting/using a core file)

 -- Cyril Brulebois <kibi@debian.org>  Fri, 25 Feb 2011 21:05:36 +0100

xorg (1:7.6+3) unstable; urgency=low

  * Merge xsf-docs up to the 8fc70f1e37 commit:
    - Add: howtos/build-mesa
    - Add: reference/upstream-contacts
    - Update: howtos/report-bugs
  * rules: Get rid of DEFAULT_DCRESOLUTIONS, unused since 2009.
  * Fix /etc/X11/Xwrapper.config handling:
    - Don't forget to copy the new configuration file if there was none
      previously. Thanks to Kyle Dassoff (Closes: #612979).
  * As a consequence of this bug, users having installed x11-common using
    version 1:7.6+1 or 1:7.6+2 want to run “dpkg-reconfigure x11-common”
    to generate the Xwrapper.config file.
  * Use “tempfile -m 644” to generate the temporary file which gets copied
    back into place. There's no secret in there (Closes: #581338).
  * 50x11-common_determine-startup: Take $SHELL into account, defaulting
    to sh if SHELL is unset or null (Closes: #604010).
  * Fix FTBFS on sparc{,64} by working around wkhtmltopdf's #613141:
    remove the SVG file from the CSS on these architectures.

 -- Cyril Brulebois <kibi@debian.org>  Sun, 13 Feb 2011 07:34:14 +0100

xorg (1:7.6+2) unstable; urgency=low

  * Merge xsf-docs documentation. That's an offline copy of the
    documentation available online (http://pkg-xorg.alioth.debian.org/) in
    the following formats: HTML, PDF, and TXT.
  * Call make/make clean in xsf-docs/ accordingly. Do the “make” part
    under xvfb-run since wkhtmltopdf requires a working display, at least
    at the moment.
  * Ship xsf-docs in the xserver-xorg metapackage, under the following
    directory: /usr/share/doc/xorg
  * Add build-deps accordingly:
    - markdown: .mdwn to .html
    - wkhtmltopdf: .html to .pdf
    - xvfb: wkhtmltopdf needs a display.
    - xauth: xvfb-run needs it.
  * Remove xbase-clients maintainer scripts: Stop caring about
    /etc/X11/app-defaults/Beforelight, which was needed while upgrading
    from versions earlier than 1:7.4+2. Now even squeeze has a newer
    version.
  * Ditto for xutils: Stop caring about /etc/X11/rstart, 1:7.3+11 was a
    long time ago.
  * Tighten the dependency between xorg and xserver-xorg, to prevent from
    being able to upgrade xorg only (e.g. to X11R7.6) while still having
    xserver-xorg and xserver-xorg-core in a lower version (e.g. X11R7.5).
  * Ship a bug control file for xorg, making it report-with: xserver-xorg,
    which gives us the exact version of the server (the bug script isn't
    always sufficient), but also the drivers.
  * Remove obsolete material:
    - dexconf: Good bye!
    - xorg.conf: No real need for an example, with autodetection. If some
      documentation is still needed, it can be added to xsf-docs.

 -- Cyril Brulebois <kibi@debian.org>  Tue, 08 Feb 2011 16:32:29 +0100

xorg (1:7.6+1) unstable; urgency=low

  [ Julien Cristau ]
  * x11-common: drop usage of /var/lib/x11/Xwrapper.config.{md5sum,roster}.
    Since sarge (I think), no other package has been handling
    /etc/X11/Xwrapper.config, so assume we're the only owner, remove the state
    files on upgrade.  The checksum is also not needed, we read the
    allowed_users value from the file in the config script and preserve it.
    Closes: #611271.

  [ Cyril Brulebois ]
  * Make xserver-xorg-video-nouveau a dependency again.
  * Make xserver-xorg-video-geode a recommended package. It's not
    maintained by the X Strike Force, and that shouldn't prevent
    xserver-xorg-video-all from being installable.
  * xserver-wrapper.c: Fix compilation warnings.
  * Update Uploaders list. Thanks, David & Brice!
  * Bump Standards-Version to 3.9.1 (no changes needed).

 -- Cyril Brulebois <kibi@debian.org>  Sat, 05 Feb 2011 15:23:23 +0100

xorg (1:7.6~3ubuntu11) natty; urgency=low

  * apport/source_xorg.py:
    - Fix typo in nvidia data collection
    - Only collect gdm logs if gdm appears to be present, so as not to
      cause "file not found" errors when it isn't.
      (LP: #722914)

 -- Bryce Harrington <bryce@ubuntu.com>  Wed, 02 Mar 2011 10:56:02 -0800

xorg (1:7.6~3ubuntu10) natty; urgency=low

  * apport/source_xorg.py:
    - Refactor command_output_quiet() to attach_command_output().
      attach_command_output() is designed to follow the API style of
      apport's attach_file() and attach_root_commands_output(), and is less
      susceptible to faults caused by assigning None to elements of the
      report[] dictionary.
      (LP: #712109)
    - Replace remaining calls to command_output_quiet() with specialized
      routine is_process_running().

 -- Bryce Harrington <bryce@ubuntu.com>  Tue, 01 Mar 2011 18:15:59 -0800

xorg (1:7.6~3ubuntu9) natty; urgency=low

  * apport/source_xorg.py:
    - Collect jockey info in the case of proprietary drivers
    - Collect update-alternatives info in case of proprietary drivers
    - Generate nvidia-bug-report.log.gz if -nvidia loaded
    - Don't quell errors calling unity_support_test (LP: #710630)
    - Check for null when checking for upgrades.  Can fail if apt.log is
      empty or unreadable. (LP: #723061)

 -- Bryce Harrington <bryce@ubuntu.com>  Tue, 01 Mar 2011 16:58:31 -0800

xorg (1:7.6~3ubuntu8) natty; urgency=low

  [Brian Murray]
  * apport/source_xorg.py: Fix compiz bug tagging to tag 'compiz-0.9'
    rather than 'compiz-0.9.2'
    (LP: #724598)

 -- Bryce Harrington <bryce@ubuntu.com>  Thu, 24 Feb 2011 18:27:30 -0800

xorg (1:7.6~3ubuntu7) natty; urgency=low

  * Mark x11-common as Multi-Arch: foreign, so foreign-architecture libs
    have their dependency satisfied by it.

 -- Steve Langasek <steve.langasek@ubuntu.com>  Tue, 22 Feb 2011 03:41:05 +0000

xorg (1:7.6~3ubuntu6) natty; urgency=low

  * apport/source_xorg.py:
    - Fix typo in pci parsing so it correctly gets gpu pci id

 -- Bryce Harrington <bryce@ubuntu.com>  Fri, 18 Feb 2011 16:10:53 -0800

xorg (1:7.6~3ubuntu5) natty; urgency=low

  * apport/source_xorg.py:
    - Add 'locale' information (for keyboards)
    - Drop 'glxinfo' since it's been demoted to universe (LP: #714784)
    - Switch to new attach_root_command_outputs() call.  Prevents prompting
      for password 3 times for 3 gdm files (thanks Pitti!) (LP: #716595)

 -- Bryce Harrington <bryce@ubuntu.com>  Thu, 17 Feb 2011 11:42:58 -0800

xorg (1:7.6~3ubuntu4) natty; urgency=low

  * apport/source_xorg.py:
    - Fix misspelling of CompositorRunning
    - report[compiz_version] should just be compiz_version (LP: #716733)

 -- Bryce Harrington <bryce@ubuntu.com>  Thu, 10 Feb 2011 19:07:11 -0800

xorg (1:7.6~3ubuntu3) natty; urgency=low

  * apport/source_xorg.py:
    - Tag bugs with compiz version
    - Trim out colored output from unity_support_test, which causes apport
      to choke when reporting compiz bugs.
      (LP: #710630)

 -- Bryce Harrington <bryce@ubuntu.com>  Wed, 02 Feb 2011 16:03:57 -0800

xorg (1:7.6~3ubuntu1) natty; urgency=low

  * Merge from (unreleased) Debian experimental.  Remaining Ubuntu changes:
    - Add apport hook
    - Demote xfonts-{75DPI,100DPI} to Suggests.  Demote xfonts-scalable to
      Recommends.
    - Keep old transitional packages; these still have rdepends in Ubuntu
      + xlibmesa-gl
      + xlibmesa-gl-dev
      + xlibmesa-glu
      + libglu1-xorg
      + libglu1-xorg-dev
    - debian/local/Failsafe*: Failsafe X hookup.
    - debian/local/Xsession: Truncate xsession-errors on startup if too big
    - debian/local/Xsession.d/20x11-common_process-args: Add support for
      session command containing args.
    - debian/local/Xsession.d/60x11-common_localhost: Authorise all processes
      running with the user's credentials to connect to the server.
    - debian/local/dexconf: Add rules for QEMU and VirtualBox virtual devices
      when generating xorg.conf
    - debian/rules, debian/control:
      + Add dependencies on x11-common, and symlink /usr/share/doc directories
        of all packages to x11-common's.
    - debian/scripts/vars.*: Don't drop nouveau, wacom, synaptics from *-all
    - debian/xserver-xorg.postinst.in:  Also migrate users from psb → vesa.
    - debian/x11-common.postinst.in,
      debian/x11-common.postrm.in,
      debian/x11-common.preinst.in: Remove obsolete conffiles from xinit.
  * Bump Xserver dependency to 1.10RC1

 -- Christopher James Halse Rogers <raof@ubuntu.com>  Mon, 31 Jan 2011 21:29:57 +1100

xorg (1:7.6~2) experimental; urgency=low

  * Drop xserver-xorg-video-nv, it's no longer supported.
  * Add variables to handle Recommends.
  * Downgrade xserver-xorg-video-nouveau from Depends to Recommends. The
    frequent ABI changes make it difficult to manage, but that shouldn't
    stop people from using the xserver-xorg-video-all metapackage.
  * Downgrade xserver-xorg-input-wacom from Depends to Recommends. This is
    only an interim measure aiming at making xserver-xorg-input-all
    installable again. This input driver will probably be promoted to
    Depends again when it is ready™.

 -- Cyril Brulebois <kibi@debian.org>  Tue, 09 Nov 2010 16:13:06 +0100

xorg (1:7.6~1) experimental; urgency=low

  [ Julien Cristau ]
  * Bump version number, we're getting close to X11R7.6.
  * Drop obsolete Breaks/Replaces/Conflicts from x11-common and xserver-xorg.
  * Drop xlibmesa-gl, xlibmesa-gl-dev, xlibmesa-glu, libglu1-xorg and
    libglu1-xorg-dev.  These were already transitional packages in etch, so
    it's high time people updated their dependencies.
  * Use non-versioned driver virtual packages for xserver-xorg dependencies.

 -- Cyril Brulebois <kibi@debian.org>  Sat, 16 Oct 2010 15:57:09 +0200

xorg (1:7.5+9) experimental; urgency=low

  * Depend on Xserver 1.9.1 rc1. Bump input and video driver ABI.

 -- Cyril Brulebois <kibi@debian.org>  Wed, 13 Oct 2010 00:47:47 +0200

xorg (1:7.5+8) unstable; urgency=low

  [ Julien Cristau ]
  * Add support for sparc64 (closes: #596828).  Thanks, Aurélien Jarno!
  * Use linux-any instead of an ever-changing list of architectures for the
    xserver-xorg-input-evdev dependency.

  [ Cyril Brulebois ]
  * Add a symlink to use xserver-xorg-core’s bug script so that we get
    more info when one runs “reportbug xorg”.

 -- Cyril Brulebois <kibi@debian.org>  Sat, 02 Oct 2010 14:20:28 +0200

xorg (1:7.5+7) unstable; urgency=low

  [ Julien Cristau ]
  * Nuke x11-common's Conflicts.  This was needed for upgrades from the
    monolith, which aren't relevant anymore.
  * Also drop Pre-Depends on debconf.  The debconf interaction in
    x11-common.preinst was removed in 1:7.4+2.
  * Drop versioned build-dep on dpkg 1.7.0.  Even woody had that..
  * Drop x11-common Depends on debianutils 1.13.  That was also in woody.
  * Add xserver-xorg-video-geode to -all on i386 (closes: #567909).

  [ Cyril Brulebois ]
  * Add myself to Uploaders.
  * Update Debian po files by running debconf-updatepo (through
    debian/rules clean).

 -- Cyril Brulebois <kibi@debian.org>  Sat, 04 Sep 2010 19:39:41 +0200

xorg (1:7.5+6ubuntu9) natty; urgency=low

  [Didier Roche]
  * debian/apport/source_xorg.py:
    - Fix unity_support_test call
    - Fix gconftool call to get active_plugins
    - Add Compiz internal state if compiz crashed

 -- Bryce Harrington <bryce@ubuntu.com>  Thu, 20 Jan 2011 11:29:23 -0800

xorg (1:7.5+6ubuntu8) natty; urgency=low

  * debian/apport/source_xorg.py: Fix tagging for bugs filed on machines
    with manually-installed -nvidia drivers.
    (LP: #704848)

 -- Bryce Harrington <bryce@ubuntu.com>  Wed, 19 Jan 2011 12:40:38 -0800

xorg (1:7.5+6ubuntu7) natty; urgency=low

  * debian/control: Drop xfonts-{75,100}dpi from Depends: to Suggests:. We
    don't need them for a normal desktop installation, and even xcalc/xterm
    don't need them, but they are quite sizable.

 -- Martin Pitt <martin.pitt@ubuntu.com>  Tue, 11 Jan 2011 18:41:09 -0600

xorg (1:7.5+6ubuntu6) natty; urgency=low

  * debian/apport/source_xorg.py:
    + Fix formatting of some dialogs
    + Suppress some debugging output, fix typos

 -- Bryce Harrington <bryce@ubuntu.com>  Thu, 23 Dec 2010 21:19:22 -0800

xorg (1:7.5+6ubuntu5) natty; urgency=low

  * debian/apport/source_xorg.py:
    + Add compiz configuration data
    + Detect whether compiz or kwin are actively running
    + Detect software rendering and display in the report
    + Detect the Ubuntu release version and if it is a non-development
      release, suggest using technical support channels if appropriate.
      Otherwise, give tags to bug reports so they're not lost in noise.
    + Give reporter some feedback when software rendering is enabled
    + Restructure code for clarity
  * debian/x11-common.links:
    + Add several more X packages to handle with the xorg apport hook

 -- Bryce Harrington <bryce@ubuntu.com>  Thu, 23 Dec 2010 18:16:22 -0800

xorg (1:7.5+6ubuntu4) natty; urgency=low

  * debian/local/Failsafe/failsafeXinit:
    + Fix variable escaping so shows file name for debugging tarball
      (LP: #596819)
  * debian/apport/source_xorg.py:
    + Extract VGA pci info
    + Quell display of errors when glxinfo, gdm logs, etc. aren't present
    + Check for dist-upgraded systems
    + Attach plymouth logs if present

 -- Bryce Harrington <bryce@ubuntu.com>  Wed, 22 Dec 2010 12:03:51 -0800

xorg (1:7.5+6ubuntu3) maverick; urgency=low

  [ Bryce Harrington ]
  * debian/apport/source_xorg.py:
    + Include .drirc if present
    + Include gconf's /desktop/gnome/peripherals data
    + Quell DkmsStatus no such file error message
  * debian/x11-common.links:
    + Add source package apport hook for xorg-server.  Otherwise,
      apport-collect fails when used on bugs against xorg-server package.

  [ Christopher James Halse Rogers ]
  * Depend on xserver 1.9RC5, bump video and input ABI's

 -- Christopher James Halse Rogers <raof@ubuntu.com>  Mon, 09 Aug 2010 20:34:00 +1000

xorg (1:7.5+6ubuntu2) maverick; urgency=low

  * debian/apport/source_xorg.py:
    + Detect a previous manual install of the nvidia.com drivers, and ask the
      user if they have uninstalled them.
    + Attach the neccesary information for upstreaming nvidia binary bugs.
    + Attach KMS connector information if available.

 -- Christopher James Halse Rogers <raof@ubuntu.com>  Wed, 23 Jun 2010 17:07:53 +1000

xorg (1:7.5+6ubuntu1) maverick; urgency=low

  * Merge from Debian unstable.
  * Depend on xserver 1.8, bump video and input ABI's.

 -- Robert Hooker <sarvatt@ubuntu.com>  Sun, 06 Jun 2010 21:11:01 -0400

xorg (1:7.5+6) unstable; urgency=medium

  * Drop radeonhd from xserver-xorg-video-all.  We switched to kernel
    modesetting for radeon, and that clashes with this driver.
  * Drop v4l from xserver-xorg-video-all.  It depends on the obsolete V4L1
    API, see #569103.
  * Add nouveau to xserver-xorg-video-all on linux x86 and powerpc.  Other
    arches can be added later if needed.
  * x11-common.init: don't include /usr/{s,}bin in PATH, since we only depend
    on $local_fs [lintian].

 -- Julien Cristau <jcristau@debian.org>  Fri, 07 May 2010 13:34:32 +0200

xorg (1:7.5+5ubuntu1) lucid; urgency=low

  * Merge from Debian unstable.

 -- Timo Aaltonen <tjaalton@ubuntu.com>  Thu, 01 Apr 2010 14:27:16 +0300

xorg (1:7.5+5) unstable; urgency=low

  * Fix typo in Xsession.d/50x11-common_determine-startup, closes: #573899.
  * Bump Standards-Version to 3.8.4, no changes needed.

 -- Brice Goglin <bgoglin@debian.org>  Sun, 14 Mar 2010 22:45:09 +0100

xorg (1:7.5+4) unstable; urgency=low

  * Add Xreset and Xreset.d support, closes: #230422.
  * Improve startup speed of Xsession.d scripts by eliminating all unnecessary
    external program calls, thanks Martin Pitt, closes: #570447.
    - In 20x11-common_process-args, cat $OPTIONFILE once into a variable and
      use POSIX variable substitution in all scripts instead of calling grep
      for every single test.
    - Use shell built in "type" instead of external "which" to test for
      programs.
    - 30x11-common_xresources: Swap the order of tests to keep the most
      unlikely (like "~/.Xresources exists") outside, to avoid running the
      other tests (like "xrdb exists") on systems which don't use Xresources.

 -- Brice Goglin <bgoglin@debian.org>  Sun, 14 Mar 2010 11:15:07 +0100

xorg (1:7.5+3ubuntu1) lucid; urgency=low

  [Timo Aaltonen]
  * Merge from debian unstable
  * 50x11-common_determine-startup: Fix a typo in the option name
    (LP: #526532)

  [Bryce Harrington]
  * debian/apport/source_xorg.py: Fix proprietary module detection logic to
    not send all crash bugs to -nvidia.

 -- Bryce Harrington <bryce@ubuntu.com>  Tue, 09 Mar 2010 13:09:08 -0800

xorg (1:7.5+3) unstable; urgency=low

  * Remove the obsolete x11proto-evie-dev from xorg-dev dependencies.

 -- Brice Goglin <bgoglin@debian.org>  Wed, 27 Jan 2010 16:54:23 +0100

xorg (1:7.5+2) unstable; urgency=low

  * Fix typo in debian/scripts/vars.hurd-i386.  Thanks, Samuel Thibault!
  * Add fbdev and vmware video drivers to -all on hurd.  Requested by Samuel
    Thibault.
  * Remove myself from Uploaders
  * Kill xorg-dev dependency on x11proto-fontcache-dev.

 -- Julien Cristau <jcristau@debian.org>  Sat, 23 Jan 2010 03:34:30 +0100

xorg (1:7.5+1ubuntu12) lucid; urgency=low

  * debian/local/Failsafe:
    + udev rules don't have a particular environment set, so we must
      set it up ourselves in order to get $LANG and $LANGUAGE so that
      translations work properly.
      (LP: #528908)
  * debian/apport/source_xorg.py:
    + Only file crash bugs with no traceback against nvidia/fglrx

 -- Bryce Harrington <bryce@ubuntu.com>  Wed, 03 Mar 2010 15:36:28 -0800

xorg (1:7.5+1ubuntu11) lucid; urgency=low

  * Reapply changes from 1:7.5+1ubuntu6, which got clobbered by a later
    upload:
    - Introduce an Xsession.d function has_option() to simplify option
      checking. (LP: #530675)
    - Fix $OPTIONFILE parsing to only match keywords on the beginning of
      lines.

 -- Martin Pitt <martin.pitt@ubuntu.com>  Tue, 02 Mar 2010 15:42:08 +0100

xorg (1:7.5+1ubuntu10) lucid; urgency=low

  * debian/apport/source_xorg.py
    + Fix various small problems which caused the hook to fail.
    + Use root_command_outupt to read gdm log files, as they require root to
      read.

 -- Christopher James Halse Rogers <raof@ubuntu.com>  Mon, 01 Mar 2010 18:40:57 +1100

xorg (1:7.5+1ubuntu9) lucid; urgency=low

  [ Bryce Harrington ]
  * debian/x11-common.links:
    + Update links for renamed packages
    + Add apport hook for nvidia-graphics-drivers
    + Add apport hook for -vmmouse (LP: #517664)
    + Remove apport hooks for packages now removed from repository
  * debian/apport/source_xorg.py:
    + Add tagging of release codename
    + Collect gdm logs as root
    + Remove extraneous checking of $DISPLAY
    + Detect vbox, fglrx, and nvidia and file bugs against the respective
      packages instead.
      (LP: #516264)
  
  [ Timo Aaltonen ]
  * debian/x11-common.links: Add xf86-input-evtouch and -wacom.

 -- Bryce Harrington <bryce@ubuntu.com>  Tue, 23 Feb 2010 18:45:03 -0800

xorg (1:7.5+1ubuntu8) lucid; urgency=low

  * debian/scripts/vars.powerpc, debian/scripts/vars.ppc64: Remove the
    dependency on xserver-xorg-video-nouveau. Xserver-xorg-video-nouveau
    depends on linux backport modules packages that are unavailable on
    powerpc. (LP: #525683)

 -- Luke Yelavich <themuso@ubuntu.com>  Tue, 23 Feb 2010 19:24:12 +1100

xorg (1:7.5+1ubuntu7) lucid; urgency=low

  * debian/local/Failsafe/failsafeXServer:
    + Actually produce xorg.conf.failsafe with the detected driver.
      Important for failures while running in KMS mode.
      (LP: #496773)
    + Force overwrite of existing xorg.conf.failsafe.  Since above
      change produces different xorg.conf.failsafe's depending on
      what driver was selected, we must force it to regen each time.
      (LP: #480747)

 -- Bryce Harrington <bryce@ubuntu.com>  Mon, 22 Feb 2010 22:38:22 -0800

xorg (1:7.5+1ubuntu6) lucid; urgency=low

  * debian/scripts/*: Revert last change; we still need -nv for riva and a
    few other oddball cases.

 -- Bryce Harrington <bryce@ubuntu.com>  Thu, 18 Feb 2010 23:57:54 -0800

xorg (1:7.5+1ubuntu5) lucid; urgency=low

  * debian/scripts/*: Drop -nv from xserver-xorg-video-all

 -- Bryce Harrington <bryce@ubuntu.com>  Thu, 18 Feb 2010 19:57:10 -0800

xorg (1:7.5+1ubuntu4) lucid; urgency=low

    * debian/scripts/*: Add -nouveau to xserver-xorg-video-all.
    * debian/apport/source_xorg.py: Check if dkms is present before pulling
      info from it, to avoid error messages on FOSS-only systems.
  
 -- Bryce Harrington <bryce@ubuntu.com>  Thu, 11 Feb 2010 17:26:07 -0800

xorg (1:7.5+1ubuntu3) lucid; urgency=low

  * Improve startup speed of Xsession.d scripts by eliminating all unnecessary
    external program calls:
    - In 20x11-common_process-args, cat $OPTIONFILE once into a variable and
      use POSIX variable substitution in all scripts instead of calling grep
      for every single test.
    - Use shell built in "type" instead of external "which" to test for
      programs.
    - 30x11-common_xresources: Swap the order of tests to keep the most
      unlikely (like "~/.Xresources exists") outside, to avoid running the
      other tests (like "xrdb exists") on systems which don't use Xresources.

 -- Martin Pitt <martin.pitt@ubuntu.com>  Thu, 18 Feb 2010 23:02:22 +0100

xorg (1:7.5+1ubuntu2) lucid; urgency=low

  [ David Planella ]
  * Completed internationalisation support for failsafeXinit (LP: #335678) 
  
  [ Didier Roche ]
  * debian/local/Xsession.d/20x11-common_process-args: Add support for
    session command containing args (LP: #512235)

  [ Bryce Harrington ]
  * debian/local/Failsafe/failsafeXinit: Remove all use of dexconf, as it
    no longer does anything interesting.  Instead, to restore a system to
    default configuration, just remove the xorg.conf after backing it up.
  * debian/local/Failsafe/failsafeDexconf: Drop script since it is no
    longer needed by failsafe.
  * debian/apport/source_xorg.py: Update info apport collects on X issues
    - Include make.log and dkms status info for proprietary drivers
    - Collect -nouveau version
    - Don't expect xorg.conf or Xorg.0.log.old to always be present
    - Don't run commands that need X if X is not available (LP: #368282)

  [ Timo Aaltonen ]
  * Add wacom back to -input-all.

 -- Bryce Harrington <bryce@ubuntu.com>  Mon, 25 Jan 2010 15:33:13 -0800

xorg (1:7.5+1ubuntu1) lucid; urgency=low

  * Merge from Debian unstable.

 -- Timo Aaltonen <tjaalton@ubuntu.com>  Sat, 09 Jan 2010 00:38:46 +0200

xorg (1:7.5+1) unstable; urgency=low

  * Drop xorg-dev dependency on x11proto-xf86misc-dev and libxxf86misc-dev,
    which are obsolete.
  * Same with x11proto-trap-dev and libxtrap-dev.
  * The call to udevadm trigger has moved to xserver-xorg-core and the
    drivers, remove it from xserver-xorg.postinst.
  * Upload to unstable.

 -- Julien Cristau <jcristau@debian.org>  Wed, 06 Jan 2010 16:45:28 +0000

xorg (1:7.5~3ubuntu4) lucid; urgency=low

  * debian/x11-common.failsafe-x.upstart:
    - Revert the changes from the last upload since it's been decided that
      there won't be a DKMS upstart task.

 -- Mario Limonciello <mario_limonciello@dell.com>  Tue, 15 Dec 2009 15:38:36 -0600

xorg (1:7.5~3ubuntu3) lucid; urgency=low

  * debian/x11-common.failsafe-x.upstart: (LP: #453365)
    - Start on the build-failed signal that DKMS may emit
      during a failed build for nvidia or fglrx.

 -- Mario Limonciello <mario_limonciello@dell.com>  Mon, 14 Dec 2009 14:17:21 -0600

xorg (1:7.5~3ubuntu2) lucid; urgency=low

  * scripts/vars.*: Drop wacom from input-all until it builds again.

 -- Timo Aaltonen <tjaalton@ubuntu.com>  Mon, 07 Dec 2009 23:28:53 +0200

xorg (1:7.5~3ubuntu1) lucid; urgency=low

  * Merge from Debian experimental. Remaining changes:
    - apport/source_xorg.py, x11-common.install, x11-common.links:
      + apport hook for xorg-server crashes
    - control:
      + Add xqbiff (<= 0.75-4) to x11-common Conflicts (LP 217724).
      + Add xinput to xorg Depends so it will stay in main
      + Move xfonts-scalable to Recommends (LP 84938)
    - rules, control: 
      + Add a dependency to x11-common for each binary built to save
        disk/livecd space.
      + Symlink the doc directories to x11-common, explicitly remove the
        doc directories on upgrade for the now symlinked doc directories
    - local/Failsafe/*, x11-common.install, x11-common.failsafe-x.upstart,
      rules: Bulletproof-X.
    - 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).
    - local/Xsession.d/60x11-common_localhost: Allow X connections from
      local unix domain sockets instead of forcing TCP since hostname
      validation is not necessary in this case. (LP 276357)
    - local/dexconf:
      + Add extra bits for ps3fb xorg.conf.
      + dexconf: Bring Device back to the Screen-section, nvidia-settings
        and aticonfig need that.
      + Add customizations to detect if running in KVM/VBOX environment
        and specify the driver, H/V rates, DefaultDepth, etc.
    - local/xserver-wrapper.c: Stop handling -config specifically in the
      wrapper, as Xorg now handles this itself.
    - scripts/vars.*: Don't include radeonhd in video-all.
    - scripts/vars.i386: Add geode to video-all.
    - scripts/vars.{i386,amd64}: Add vmmouse (LP 407816).
    - x11-common.postinst.in, postrm.in, preinst.in: Remove old configuration
      files.
    - xserver-xorg.postinst.in: Migrate psb users to vesa.
  * control: Drop Breaks on gdm, since it was only needed during karmic.
    Likewise for Conflicts/Replaces hal.
  * control, local/debian-setup-keyboard: Use console-setup, until the
    new version is merged.

 -- Timo Aaltonen <tjaalton@ubuntu.com>  Mon, 07 Dec 2009 14:53:09 +0200

xorg (1:7.5~3) experimental; urgency=low

  [ Julien Cristau ]
  * On upgrade, restart hal on kfreebsd and run udevadm trigger on linux to
    make sure we can pick up input devices correctly.
  * Because of the above, move udev and hal from Recommends back to Depends.

  [ Brice Goglin ]
  * Add myself to Uploaders, remove Branden with his permission.

 -- Brice Goglin <bgoglin@debian.org>  Wed, 02 Dec 2009 16:27:15 +0100

xorg (1:7.5~2) experimental; urgency=low

  * Drop xorg-dev dependency on libxkbui-dev, which has no users.
  * Update xorg-dev long description.  There are no static-only X libs
    nowadays.
  * xorg-dev: don't depend on libxevie-dev.
  * xserver-xorg-video-all: don't depend on -intel on non-linux.
  * Switch hal dependency to a recommends, and make it kfreebsd-only (closes:
    #515214).
  * Only install the hal fdi and callout on kfreebsd.
  * Add 'Old Changelog' in debian/changelog to make lintian happy.
  * Add ${misc:Depends} to all packages' Depends fields.
  * Drop dependency on console-setup, xserver-xorg-core now pulls in
    keyboard-configuration (closes: #558236, #523960).
  * Depend on xserver-xorg-core 1.7.
  * xserver-xorg.NEWS: /etc/default/console-setup moved to
    /etc/default/keyboard.  Also note that evdev is Linux-only.
  * x11-common.NEWS: fix syntax (lintian).
  * x11-common.templates: use "for internal use" instead of "internal use
    only" in Description (lintian).
  * Add lintian overrides for xorg, x11-common and xserver-xorg.
  * Bump Standards-Version to 3.8.3.

 -- Julien Cristau <jcristau@debian.org>  Sat, 28 Nov 2009 20:10:31 +0100

xorg (1:7.5~1) experimental; urgency=low

  [ Julien Cristau ]
  * Depend on xserver 1.7 RC.  Bump video and input driver ABI.

  [ David Nusinow ]
  * Update xsfbs to 5693792171d885769e58dcccc053c08b11acd12a
  * Revert dh_clean change from last upload but use dh_prep instead

 -- Julien Cristau <jcristau@debian.org>  Tue, 29 Sep 2009 22:17:04 +0200

xorg (1:7.4+4) unstable; urgency=low

  [ Timo Aaltonen ]
  * debian-x11-keymap.fdi: Check for input.keys from info.capabilities.
    (closes: #535291)
  * control: Move xserver-xorg dependency on evdev after -input-all.
    Otherwise only evdev is installed by default.

  [ Julien Cristau ]
  * xserver-wrapper: recognize /usr/bin/X as a path to the wrapper.
  * xserver-wrapper: don't print an error message if Xwrapper.config doesn't
    exist.
  * xserver-wrapper: allow unprivileged -showDefaultModulePath and
    -showDefaultLibPath options
  * xserver-wrapper: don't check the mode of /dev/dri.  It leads to a spurious
    error message in some cases, and isn't necessary.
  Thanks to Pierre-Loup A. Griffais for pointing out the three above items
  (closes: #540932).

  [ David Nusinow ]
  * Bump debhelper compat to v7. No changes necessary.
  * Rename stamps to take advantage of dh_clean v7 handling them automatically
  * Bump standards version to 3.8.2. No changes necessary.
  
 -- David Nusinow <dnusinow@debian.org>  Thu, 13 Aug 2009 21:19:12 -0400

xorg (1:7.4+3ubuntu10) karmic-proposed; urgency=low

  * local/Failsafe/failsafeXServer:  Since dexconf no longer produces
    an xorg.conf, it will neither generate a failsafe xorg.conf, so now
    we just generate one directly.  Otherwise X won't start a failsafe
    session properly.
    (LP: #477149)

 -- Bryce Harrington <bryce@ubuntu.com>  Mon, 09 Nov 2009 15:39:57 -0800

xorg (1:7.4+3ubuntu9) karmic-proposed; urgency=low

  * Restore 60x11-common_localhost.  I dropped this before because the
    file was not in git so assumed it was stray.  On further review I
    see this was intentionally added, just not to git, and was not stray.
    (LP: #340807)
  * control:  Add Vcs-git tags

 -- Bryce Harrington <bryce@ubuntu.com>  Wed, 04 Nov 2009 18:54:26 -0800

xorg (1:7.4+3ubuntu8) karmic-proposed; urgency=low

  * debian/local/Failsafe/failsafe{XServer,Xinit},
    debian/x11-common.failsafe-x.upstart: convert Bulletproof-X support over
    to upstart, for compatibility with gdm in karmic.  LP: #474806.
  * debian/rules: install the new upstart job with dh_installinit.
  * debian/control: bump the debhelper versioned build-dependency for the
    same

 -- Steve Langasek <steve.langasek@ubuntu.com>  Wed, 04 Nov 2009 18:00:49 -0800

xorg (1:7.4+3ubuntu7) karmic; urgency=low

  * Remove stray 60x11-common_localhost and dexconf.patch from prior upload.

 -- Bryce Harrington <bryce@ubuntu.com>  Mon, 19 Oct 2009 19:41:23 -0700

xorg (1:7.4+3ubuntu6) karmic; urgency=low

  * apport/source_xorg.py: Do not file bug if VirtualBox is in use, since
    it provides its own video driver.
  * vars.*: Add explicit dependency on xserver-xorg-input-vmmouse to
    ensure it stays in main.
    (LP: #407816)

 -- Bryce Harrington <bryce@ubuntu.com>  Mon, 19 Oct 2009 18:52:55 -0700

xorg (1:7.4+3ubuntu5) karmic; urgency=low

  * control: Move xserver-xorg dependency on evdev after -input-all.
    Otherwise only evdev is installed by default.

 -- Timo Aaltonen <tjaalton@ubuntu.com>  Tue, 07 Jul 2009 22:50:19 +0300

xorg (1:7.4+3ubuntu4) karmic; urgency=low

  * debian/local/debian-x11-keymap.fdi: Do not check for existing 
    input.xkb.layout property; this was only set by the previous
    10-keymap.fdi, which got disabled together with hal-setup-keymap.
    Directly check for input.keys capabilities, to make the fdi
    independent. This restores proper X.org keyboard layout setting
    from console-setup. (LP: #375618, again)

 -- Timo Aaltonen <tjaalton@ubuntu.com>  Wed, 01 Jul 2009 00:19:16 +0300

xorg (1:7.4+3ubuntu3) karmic; urgency=low

  * control: Change the gdm Breaks to match our version.

 -- Timo Aaltonen <tjaalton@ubuntu.com>  Tue, 30 Jun 2009 23:03:37 +0300

xorg (1:7.4+3ubuntu2) karmic; urgency=low

  * control: Add Conflicts/Replaces hal (<= 0.5.12+git20090626-0ubuntu1) 
    because xserver-xorg ships the callout script now (and the fdi file
    too).

 -- Timo Aaltonen <tjaalton@ubuntu.com>  Tue, 30 Jun 2009 19:22:08 +0300

xorg (1:7.4+3ubuntu1) karmic; urgency=low

  * Merge from Debian unstable. Remaining changes:
    - apport/xorg-server-core.py, x11-common.install, x11-common.links:
      + apport hook for xorg-server crashes
    - control:
      + Add xqbiff (<= 0.75-4) to the list of x11-common Conflicts.
      + Add a dependency to x11-common for each binary built to save
        disk/livecd space.
      + Move xfonts-scalable to Recommends.	
    - local/Failsafe/*, x11-common.install:
      + Bulletproof-X.
    - 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).
    - local/dexconf:
      + Add extra bits for ps3fb xorg.conf.
      + dexconf: Bring Device back to the Screen-section, nvidia-settings
        and aticonfig need that.
      + Add customizations to detect if running in KVM/VBOX environment
        and specify the driver, H/V rates, DefaultDepth, etc.
    - local/xserver-wrapper.c:
      + Stop handling -config specifically in the wrapper, as Xorg now
        handles this itself.
    - rules:
      + Symlink the doc directories to x11-common, explicitly remove the
        doc directories on upgrade for the now symlinked doc
        directories, to save disk/livecd space.
    - scripts/vars.*:
      + Don't include radeonhd in video-all.
    - scripts/vars.i386:
      + Add geode to video-all.
    - scripts/vars.lpia:
      + Copied from vars.i386.
    - x11-common.postinst.in, postrm.in, preinst.in:
      + Remove old configuration files.
    - xserver-xorg.postinst.in:
      + Migrate psb users to vesa.
	
 -- Timo Aaltonen <tjaalton@ubuntu.com>  Tue, 30 Jun 2009 17:14:18 +0300

xorg (1:7.4+3) unstable; urgency=low

  * Call db_stop at the end of xserver-xorg.postinst, otherwise debconf gets
    confused and makes the postinst hang after restarting hal
    (closes: #532623).

 -- Julien Cristau <jcristau@debian.org>  Wed, 10 Jun 2009 16:50:27 +0200

xorg (1:7.4+2) unstable; urgency=low

  [ David Nusinow ]
  * Don't discuss removal of xserver-xorg in its description. 
    It remains tied to -core at this point. (closes: #523630).
  * Add libgl1-mesa-dri to the depends of the xorg package to ensure that
    it gets pulled in even if Recommends are disabled
  * Make xorg depend on xorg-docs-core and move xorg-docs to be a
    suggests.  This makes for a slimmer default while providing the
    necessary manpages that we expect to be present on every install
    (closes: #388308).

  [ Julien Cristau ]
  * Update the NEWS entry for xserver-xorg 1:7.4+1 to include a warning about
    keycode changes breaking Xmodmaps (closes: #523562).  Thanks, Manoj
    Srivastava!
  * Restart hal from xserver-xorg.postinst.  hal's trigger gets run too early,
    when console-setup is not yet configured, so it doesn't pick up the keymap
    correctly (closes: #524076).
  * Mention the requirement for a CONFIG_INPUT_EVDEV-enabled kernel in
    xserver-xorg.NEWS.
  * Get rid of the remaining xserver-xorg debconf question (Bus ID).
    Detection of the primary device should happen in the kernel and/or X
    server.  With this change, we don't generate any xorg.conf anymore.
  * On upgrade, remove leftover conffile from beforelight (closes: #454219).
  * Add a console-setup-mini alternative to xserver-xorg's Depends
    (closes: #527124).
  * xsfbs: don't call dpkg --print-installation-architecture
    (closes: #531294).
  * Add README.source, and bump Standards-Version to 3.8.1.
  * xsfbs: kill custom readlink function (closes: #498890).  Thanks, Jonas
    Smedegaard!
  * x11-common: drop migration code from xfree86, and related debconf
    templates.
  * Drop support for renicing the X server from the wrapper.  Remove related
    debconf templates and maintainer scripts handling.
  * Don't ship the /usr/X11R6/bin symlink in x11-common.  Break gdm <<
    2.20.7-5.
  * xserver-xorg.preinst: drop migration code from /var/lib/xfree86 to
    /var/lib/x11.
  * xserver-xorg.{pre,post}inst: drop xorg.conf checksum handling.  Stop
    creating an empty xorg.conf in preinst.  Now that we don't run dexconf, we
    don't need to keep a checksum of the config file to know whether the user
    customized it.
  * xserver-xorg.{preinst,postinst,postrm}: stop using /var/lib/x11.
  * control: xserver-xorg doesn't provide infrastructure for managing
    xorg.conf anymore, remove that from the description.
  * Stop depending on sparc-utils.  xserver-xorg.postinst doesn't run any
    detection programs anymore.

  [ Debconf translations ]
  * Bengali added
  * Slovak updated (closes: #523448).

 -- Julien Cristau <jcristau@debian.org>  Tue, 09 Jun 2009 17:32:10 +0200

xorg (1:7.4+1) unstable; urgency=low

  [ Timo Aaltonen ]
  * scripts/vars.sparc: Remove sunbw2 from video-all, since monochrome
    support has been deleted from xserver 1.6.
  * scripts/vars.*: Drop mouse & kbd from input-all except for non-Linux
    archs.
  * scripts/vars, rules: Remove scripts/vars, hasn't been used since
    it was split.

  [ Julien Cristau ]
  * Xsession(5): fix the manpage references.
  * Xwrapper.config(5): X is installed as /usr/bin/X, not /usr/bin/X11R6/X.
  * Use case-insensitive matching when trying to replace obsolete drivers in
    xorg.conf.  Use the C locale to make sure this works as expected.
  * xserver-xorg.postinst: drop duplicate definitions of the debug_echo and
    validate_string_db_input shell functions.
  * dexconf: don't try to get the driver from debconf.
  * xserver-xorg.postinst: drop the code to pick a driver on sparc.  The
    server now autoconfigures sbus devices.
  * As a result of the previous change, remove the
    xserver-xorg/config/device/driver debconf template, and unregister it on
    upgrade.
  * We don't use dmidecode and fbset anymore (they were used for hardware
    detection), so stop adding Recommends on them.
  * dexconf: don't write empty Monitor and Screen sections.
  * dexconf: don't output an InputDevice section for mice.
  * dexconf: don't output an InputDevice section for keyboards.
  * xserver-xorg.postinst: don't configure the keyboard layout.
  * remove keyboard-related debconf templates; unregister them on upgrade.
  * xserver-xorg.templates: don't give an ISA example for the BusID question,
    ISA support has been removed from the server.
  * xserver-xorg.postinst: don't accept BusID values matching "ISA:*".
  * Don't set the UseFBDev option.  Remove the detection code from
    xserver-xorg.postinst, kill the debconf template and unregister it.
  * xserver-xorg.postinst: remove unused input validation functions.  Also
    remove the corresponding debconf templates.
  * Set the BusID in xorg.conf if we find more than one graphics card, to work
    around breakage in post-pciaccess xserver (can't find the primary PCI
    device).
  * xserver-xorg.postinst: allow setting the PCI domain in the BusID string.
  * Install a callout and an fdi file to read the configured keymap from
    /etc/default/console-setup, and set the corresponding keymap for keyboards
    in hal.  Both stolen from Ubuntu's hal package.
  * Depend on hal (>= 0.5.12~git20090406) for hal-set-property --direct.
  * Depend on console-setup (>= 1.29) to handle upgrades from lenny.
  * Add a NEWS entry to document the changes regarding configuration of input
    devices.
  * Re-add rgb.txt, some clients still use it, even though the server doesn't.
  * Upload to unstable.

  [ David Nusinow ]
  * Add an example xorg.conf to /usr/share/doc/xserver-xorg/examples. 
    This will give people something to copy from and modify for their own
    configurations

  [ Debconf translations ]
  * Esperanto. Closes: #503039
  * Asturian. Closes: #511623
  * Kazakh added. Closes: #521001

 -- Julien Cristau <jcristau@debian.org>  Thu, 09 Apr 2009 00:52:17 +0100

xorg (1:7.4~5ubuntu21) karmic; urgency=low

  * apport/source_xorg.py: Remove some redundant fglrx detection bits
    (LP: #382868)

 -- Bryce Harrington <bryce@ubuntu.com>  Thu, 04 Jun 2009 11:30:28 -0700

xorg (1:7.4~5ubuntu20) karmic; urgency=low

  * apport/source_xorg.py: Rewrite to make use of apport.hookutils to
    simplify the code a bit.

 -- Bryce Harrington <bryce@ubuntu.com>  Mon, 11 May 2009 00:44:24 -0700

xorg (1:7.4~5ubuntu19) UNRELEASED; urgency=low

  * apport/source_xorg.py: Detect ext4, which can indicate freeze bugs due
    to ext4 bug 354822.

 -- Bryce Harrington <bryce@ubuntu.com>  Sat, 04 Apr 2009 00:16:48 -0700

xorg (1:7.4~5ubuntu18) jaunty; urgency=low

  * local/dexconf: Don't use cirrus on kvm (Technical Corp. Device 1111)
    (LP: #338219)
  
 -- Bryce Harrington <bryce@ubuntu.com>  Fri, 03 Apr 2009 00:35:49 -0700

xorg (1:7.4~5ubuntu17) jaunty; urgency=low

  * apport/source_xorg.py:
    - Include monitors.xml in apport reports.
  * local/Failsafe/failsafeXinit:
    - Fix typo in xorg.conf filename (LP: #348639)
    - Fix mismatched quotes (Ref. 335678)
    - Handle ESC key hits in zenity to not create a 0-length xorg.conf

 -- Bryce Harrington <bryce@ubuntu.com>  Sun, 29 Mar 2009 14:13:23 -0700

xorg (1:7.4~5ubuntu16) jaunty; urgency=low

  [Tormod Volden]
  * apport/source_xorg.py: Use grep directly instead of shelling out, and
    look in /proc/modules as well.  Also only set 'fglrx-installed' if
    there was a definite match.

  [Bryce Harrington]
  * x11-common.links: Add apport support for a several more packages.
  * local/Xsession.d/60x11-common_localhost:
    - Rename from 60x11-localhost for consistency (LP: #340807)
    - Redirect stderr in an sh-safe fashion
  * x11-common.postinst.in, x11-common.preinst.in, x11-common.postrm.in:
    - Remove renamed 60x11-localhost; handle upgrade failures gracefully
  * local/dexconf, local/Failsafe/failsafeDexconf:
    - Add hooks for Sun's virtualbox (LP: #319373)
  * local/Failsafe/failsafeXinit:
    - Use zenity for viewing logs, and vt2 for console login
      (LP: #310126)
    - Make translatable (LP: #335678)
  * apport/source_xorg.py: Suppress warning about keyboard geometry on :0
    (LP: #315777)

 -- Bryce Harrington <bryce@ubuntu.com>  Wed, 18 Mar 2009 13:54:27 -0700

xorg (1:7.4~5ubuntu15) jaunty; urgency=low

  * local/Xsession.d/60x11-localhost: Change redirection to fix bashism
    (LP: #340676)

 -- Bryce Harrington <bryce@ubuntu.com>  Tue, 10 Mar 2009 11:39:40 -0700

xorg (1:7.4~5ubuntu14) jaunty; urgency=low

  * Add local/Xsession.d/60x11-localhost: Allow X connections from local
    unix domain sockets instead of forcing TCP since hostname validation
    is not necessary in this case.
    (LP: #276357)
  * apport/source_xorg.py: Detect presence of fglrx loaded in kernel

 -- Bryce Harrington <bryce@ubuntu.com>  Tue, 10 Mar 2009 09:56:15 -0700

xorg (1:7.4~5ubuntu13) jaunty; urgency=low

  * debian/xserver-xorg.postinst.in: Set USE_FBDEV to false by default on lpia
    as well (just like on i386, amd64 etc.); should fix vesa usage on Poulsbo
    systems, it would work fine in the live session but not after install;
    LP: #335308.

 -- Loic Minier <lool@dooz.org>  Fri, 27 Feb 2009 08:19:27 +0100

xorg (1:7.4~5ubuntu12) jaunty; urgency=low

  * control: Reverse the -evdev /-input-all Depends order, hopefully
    the livecd build will pick -all now, and not just -evdev.

 -- Timo Aaltonen <tjaalton@ubuntu.com>  Wed, 04 Feb 2009 12:08:04 +0200

xorg (1:7.4~5ubuntu11) jaunty; urgency=low

  [ Bryce Harrington ]
  * apport/source_xorg.py:
    - Adding system environment items recommended at
      http://intellinuxgraphics.org/how_to_report_bug.html
    - Add lshal
    - Add debug test code
    - Drop use of intel_reg_dumper since it requires root (LP: #311560)
  * scripts/vars.sparc:  Drop sunbw2.  It's dead jim.  (LP: #314539)

  [ Timo Aaltonen ]
  * Merge with Debian experimental.
  * debian/control: xserver-xorg doesn't need to depend on mdetect
    anymore.
  * x11-common.links: Don't install the symlink to rgb.txt (LP: #300935)

 -- Bryce Harrington <bryce@ubuntu.com>  Fri, 30 Jan 2009 13:42:37 -0800

xorg (1:7.4~5ubuntu10) jaunty; urgency=low

  * apport/source_xorg.py:  Fix arg list to prevent error
    'Error: Cannot open display ":0 -"'
    (LP: #311442)

 -- Bryce Harrington <bryce@ubuntu.com>  Tue, 06 Jan 2009 01:56:25 -0800

xorg (1:7.4~5ubuntu9) jaunty; urgency=low

  * Disable terminal function entirely
  * Add x11fnc.sh to provide several general purpose X bash functions

 -- Bryce Harrington <bryce@ubuntu.com>  Mon, 22 Dec 2008 00:22:22 -0800

xorg (1:7.4~5ubuntu8) jaunty; urgency=low

  * Disable terminal to prevent root access (LP: #310126)

 -- Bryce Harrington <bryce@ubuntu.com>  Sun, 21 Dec 2008 00:05:19 -0800

xorg (1:7.4~5ubuntu7) jaunty; urgency=low

  * debian/scripts: Drop vmmouse from -input-all for now, doesn't build
    against the new SDK.

 -- Timo Aaltonen <tjaalton@ubuntu.com>  Wed, 17 Dec 2008 01:12:40 +0200

xorg (1:7.4~5ubuntu6) jaunty; urgency=low

  * xserver-xorg: Bump the depends on xserver-xorg-core, and require
    xserver-xorg-video-5, xserver-xorg-input-4.

 -- Timo Aaltonen <tjaalton@ubuntu.com>  Mon, 15 Dec 2008 12:57:18 +0200

xorg (1:7.4~5ubuntu5) jaunty; urgency=low

  * debian/local/Failsafe/failsafeXinit:
    - Provide option to launch a terminal window (LP: #275866)
    - Add some additional useful files/data to the failsafe tarball
    - Make wait dialog show progress bar (LP: #290250)
  
 -- Bryce Harrington <bryce@ubuntu.com>  Fri, 05 Dec 2008 15:59:23 -0800

xorg (1:7.4~5ubuntu4) jaunty; urgency=low

  * Depend on hal.  Otherwise, if launching X without hal installed you
    won't get any input devices.
  * Remove displayconfig-gtk from Suggests since it is no longer present
    in the archive anyway

 -- Bryce Harrington <bryce@ubuntu.com>  Wed, 19 Nov 2008 10:26:14 -0800

xorg (1:7.4~5ubuntu3) intrepid; urgency=low

  * debian/control:
    - Depend on -evdev so it will get installed on upgrades.
      Otherwise, in certain upgrade scenarios this can result in
      non-functioning keyboard/mouse.
      (LP: #271138)

 -- Bryce Harrington <bryce@ubuntu.com>  Tue, 21 Oct 2008 16:16:10 -0700

xorg (1:7.4~5ubuntu2) intrepid; urgency=low

  * debian/xserver-xorg.postinst.in: If xforcevesa is set on the kernel
    cmdline, feed DRIVERS_LIST with vesa so that setting the DRIVER works.
    Debconf refuses to obey if the list of choices is empty.
    (LP: #285562)

 -- Timo Aaltonen <tepsipakki@ubuntu.com>  Mon, 20 Oct 2008 09:53:29 +0300

xorg (1:7.4~5ubuntu1) intrepid; urgency=low

  * Fix leftover conflicts in debian/changelog.
  * Merge from debian-experimental.
  * Bump the version check for upgrades to "lt-nl 1:7.4~5ubuntu1" and also
    change psb to vesa in xorg.conf in upgrades.

 -- Loic Minier <lool@dooz.org>  Wed, 15 Oct 2008 22:13:23 +0200

xorg (1:7.4~5) experimental; urgency=low

  [ Loic Minier ]
  * Also upgrade Driver i810 or via lines which have trailing comments.
  * Shut up rmdir errors with 2>/dev/null in all maintainer scripts when
    trying to remove dirs; this might confuse debconf.

  [ Julien Cristau ]
  * xserver-xorg Depends on hal.
  * xserver-xorg Depends on xserver-xorg-input-evdev on Linux (except for
    s390).
  * Update input (4) and video (5) ABIs for xserver 1.6.
  * xserver-xorg Depends on xkb-data >= 1.4.
  * xserver-xorg Depends on xserver-xorg-core 1.6 rc1.

 -- Julien Cristau <jcristau@debian.org>  Wed, 21 Jan 2009 22:41:41 +0100

xorg (1:7.4~4ubuntu2) intrepid; urgency=low

  * Drop i810, nsc, and tga for lpia as well.  (Concerning tga, lpia is of
    course !alpha.)

 -- Loic Minier <lool@dooz.org>  Wed, 15 Oct 2008 12:58:22 +0200

xorg (1:7.4~4ubuntu1) intrepid; urgency=low

  * Merge from debian-experimental.

 -- Loic Minier <lool@dooz.org>  Wed, 24 Sep 2008 18:24:58 +0200

xorg (1:7.4~4) experimental; urgency=low

  [ Loic Minier ]
  * Allow alternate tty devices as consoles; fixes usage of startx in upstart.

  [ Julien Cristau ]
  * Merge changes from 1:7.3+18.

 -- Julien Cristau <jcristau@debian.org>  Sat, 11 Oct 2008 02:24:19 +0200

xorg (1:7.4~3) experimental; urgency=low

  [ Timo Aaltonen ]
  * vars.*: Drop cyrix, imstt from video-all. Not ported to pciaccess.

  [ Julien Cristau ]
  * vars.*: Drop nsc from video-all.  It was only ever useful on i386 anyway,
    and should get integrated into geode at some point.
  * vars.*: Drop the via alternative, it's dead upstream and we have
    openchrome now.
  * xserver-xorg.postinst:
    - drop support for upgrades from X11R6;
    - when upgrading from a version earlier than 1:7.4~3, replace uses of the
      "i810" and "via" drivers with "intel" and "openchrome", respectively
      (closes: #492913).
  * Pull changes from 1:7.3+17 (debconf translation updates).
  * vars.*: Drop the -i810 alternatives, only -intel is left these days.

 -- Julien Cristau <jcristau@debian.org>  Mon, 15 Sep 2008 13:57:52 +0200

xorg (1:7.4~2ubuntu7) intrepid; urgency=low

  * Drop xserver-xorg-video-openchrome | xserver-xorg-video-via and
    xserver-xorg-video-geode from video-all on lpia as they don't exist on
    lpia; they would build, but it's not clear whether anyone is interested in
    using lpia on devices with this video hardware.

 -- Loic Minier <lool@dooz.org>  Fri, 10 Oct 2008 20:51:47 +0200

xorg (1:7.4~2ubuntu6) intrepid; urgency=low

  [ Bryce Harrington ]
  * failsafeXinit:  'Standby' should be 'Stand by'

  [ Timo Aaltonen ]
  * scripts/vars*: Drop radeonhd from video-all, otherwise it would end
    up being used instead of radeon. (LP: #279707)

 -- Bryce Harrington <bryce@ubuntu.com>  Wed, 08 Oct 2008 10:03:36 -0700

xorg (1:7.4~2ubuntu5) intrepid; urgency=low

  [ Bryce Harrington ]
  * local/Failsafe/failsafeXinit:
    - Add option to run Ubuntu in low-graphics mode one time
    - Add default radio button settings

  [ Loic Minier ]
  * Drop xserver-xorg-video-psb for now as it's broken with intrepid's kernel
    and vesa should be preferred; LP: #274833.

 -- Loic Minier <lool@dooz.org>  Tue, 30 Sep 2008 19:25:54 +0200

xorg (1:7.4~2ubuntu4) intrepid; urgency=low

  * local/Failsafe/failsafeXServer:
    - 'discover' is no longer used, so disable the pci-id based detection
      of alternate fallback driver.  (LP: #272086)
    - Add detection of ppc hardware and prefer 'fbdev' instead of 'vesa'
      in this case (LP: #155685)
    - Send log to Xorg.failsafe.log when in failsafe mode (LP: #179164)
  * local/Failsafe/failsafeDexconf:
    - Re-sync with dexconf; use input-hotplug for devices.  (LP: #227818)
  * local/Failsafe/failsafeXinit:
    - Display the X errors on initial dialog.  (LP: #148122)
    - Specify /etc/X11/xorg.conf exactly, rather than $xorg_conf, which
      actually points to xorg.conf.failsafe
  * local/dexconf:
    - Remove duplicate line if generating an xorg.conf for KVM sessions
    - Note that some settings can't be set in xorg.conf any longer
      (LP: #263124)

 -- Bryce Harrington <bryce@ubuntu.com>  Fri, 19 Sep 2008 21:08:52 -0700

xorg (1:7.4~2ubuntu3) intrepid; urgency=low

  [Michael Larabel]
  * local/Failsafe/failsafeXinit: Add option to enable user to archive the
    relevant log files for bug reporting purposes.

 -- Bryce Harrington <bryce@ubuntu.com>  Fri, 19 Sep 2008 12:17:46 -0700

xorg (1:7.4~2ubuntu2) intrepid; urgency=low

  [Loic Minier]
  * local/xserver-wrapper.c: Add support for /dev/console and other
    alternate TTY devices such as /dev/console, /dev/tty, or all other
    char devices with major 5 and minur < 64 for the onConsole() check.

 -- Bryce Harrington <bryce@ubuntu.com>  Tue, 16 Sep 2008 14:22:57 -0700

xorg (1:7.4~2ubuntu1) intrepid; urgency=low

  [ Bryce Harrington ]
  * local/Failsafe/failsafeXinit:  Replace use of displayconfig-gtk with
    a simple troubleshooting/reconfiguration menu.
  * apport/source_xorg.py:
    - Add Xorg.0.log.old
    - Add xkbcomp and setxkbmap for keyboard bugs.
    - Add intel_reg_dumper for -intel bugs.
  * control:
    - Add xinput to xorg Depends so xinput is included in main

  [ Timo Aaltonen ]
  * x11-common.{preinst.in,postrm.in,postinstall.in}
    - Remove old conffiles that used to be in our xinit but have been
      left behind on upgrade. (LP: #243690)
  * control: move xfonts-scalable to Recommends (LP: #84938)

 -- Bryce Harrington <bryce@ubuntu.com>  Thu, 11 Sep 2008 17:33:40 -0700

xorg (1:7.4~2) experimental; urgency=low

  * Drop the tga driver from xserver-xorg-video-all Depends on !alpha.
  * Bump xserver-xorg's dependency on xserver-xorg-core, to make sure we're
    at least on 1.5.
  * Merge changes from the unstable branch up to 1:7.3+16.
  * Update for 1.5 final: require xserver-xorg-video-4.

 -- Julien Cristau <jcristau@debian.org>  Thu, 04 Sep 2008 02:24:54 +0200

xorg (1:7.4~1ubuntu1) intrepid; urgency=low

  [ Bryce Harrington ]
  * apport/source_xorg.py:  Cleanup, add xdpyinfo, xrandr, fix
    lspci args.  Renamed from xserver-xorg-core.py.
  * x11-common.install, x11-common.links:  Add symlinks for using apport
    across the major X source pkgs.

  [ Timo Aaltonen ]
  * Don't Recommend laptop-detect anymore.
  * dexconf:
    - remove laptop-detect/synaptics related cruft.
    - remove keyboard and mouse sections.

 -- Bryce Harrington <bryce@ubuntu.com>  Thu, 14 Aug 2008 20:28:22 -0700

xorg (1:7.4~1) experimental; urgency=low

  [ Julien Cristau ]
  * X.Org 7.4 release candidate
  * Drop the vga, glint and dummy drivers from xserver-xorg-video-all Depends
    (except dummy on s390).
  * Bump videoabi to 2.9, inputabi to 2.1.
  * xserver 1.5 doesn't use an external rgb database, don't bother installing
    it.
  * Move dexconf from x11-common to xserver-xorg.
  * Remove pre-dependency on x11-common from xserver-xorg.
  * Bump x11-common's conflict with xserver-xorg to << 1:7.4~.

  [ Brice Goglin ]
  * Remove the dependency of xutils against xutils-dev, it was only useful
    for transitional purpose in Etch, closes: #418123.
  * Remove the obsolete /etc/init.d/xserver-xorg, closes: #459507.
  * Add xutils preinst to drop obsolete /etc/X11/rstart/ files,
    closes: #382360.

  [ Timo Aaltonen ]
  * Split the variables in vars.* files to span multiple lines. Makes
    them a lot easier to read and merge.

 -- Julien Cristau <jcristau@debian.org>  Mon, 14 Jul 2008 02:34:00 +0200

xorg (1:7.4~0ubuntu2) intrepid; urgency=low

  * debian/control: Moving displayconfig-gtk to Suggests.  We are
    phasing this out.  Purportedly this will enable Kubuntu to fit on
    the CD.

 -- Bryce Harrington <bryce@ubuntu.com>  Fri, 18 Jul 2008 04:31:44 -0700

xorg (1:7.4~0ubuntu1) intrepid; urgency=low
  
  [ Bryce Harrington ]
  * Merge from debian unstable, remaining changes:
    - apport/xorg-server-core.py, x11-common.install:
      + apport hook for xorg-server crashes
    - control:
      + Change maintainer address.
      + xserver-xorg: Recommends displayconfig-gtk and laptop-detect
      + Move xorg-docs Recommends to Suggests, because xorg-docs is in
        universe.
      + Add a dependency to x11-common for each binary built to save
        disk/livecd space.
      + Add xqbiff (<= 0.75-4) to the list of x11-common Conflicts.
      + Add replaces for xinit since we now ship Xsession from x11-common.
      + xserver-xorg needs to Depend on mdetect instead of Recommends.
    - local/Failsafe/*, x11-common.install:
      + Bulletproof-X.
    - 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).
    - local/dexconf:
      + Added support for vmmouse_detect (if present) to override mouse
        driver with vmware. Depends on mdetect.
        (LP: #216667, #216276, #197337)
      + Add extra bits for ps3fb xorg.conf. (LP: #230091)
      + Add CorePointer to the default mouse section, otherwise
        the server defaults are used. (LP: #197337)
      + dexconf: Bring Device back to the Screen-section, nvidia-settings
        and aticonfig need that. (LP: #181405)
      + Add customizations to detect if running in KVM environment
        (CPU = "QEMU") and specify the H/V rates, DefaultDepth, etc.
    - local/xserver-wrapper.c:
      + Stop handling -config specifically in the wrapper, as Xorg now
        handles this itself.
    - rules:
      + Symlink the doc directories to x11-common, explicitly remove the
        doc directories on upgrade for the now symlinked doc
        directories, to save disk/livecd space.
    - scripts/vars.amd64:
      + Add vmmouse.
    - scripts/vars.i386:
      + Add vmmouse.
      + Add xserver-xorg-video-psb.
    - scripts/vars.lpia:
      + Copied from vars.i386.
    - x11-common.install:
      + Add installation of apport hooks and bulletproof-X scripts
    - xserver-xorg.postinst.in:
      + Skip video card autodetection if xforcevesa is set.
  * control:
    - Drop Ubuntu addition of xserver-xorg-driver-all (obsolete)
  * local/dexconf:
    + Drop synaptics section and ServerLayout line to re-enable
      input-hotplug (Reverts LP: #173411)
  * x11-common.preinst.in, x11-common.templates:
    + Drop ubuntu addition to not fail if /usr/X11R6/bin is not empty
      but move it away instead and tell the user about it 
      since it was only needed for Dapper->Hardy upgrades. (LP: 217724)

  [ Timo Aaltonen ]
  * control:
    - Drop x11-common Replaces on xrgb, since rgb.txt is obsolete with the
      new xserver and thus not shipped anymore.
  * vars.*: Drop cyrix, imstt from video-all. Deprecated upstream.

 -- Timo Aaltonen <tepsipakki@ubuntu.com>  Tue, 08 Jul 2008 10:03:15 +0300

xorg (1:7.3+18) unstable; urgency=low

  [ Debconf translations ]
  * Wolof. Closes: #500669

  [ Julien Cristau ]
  * Version the Replaces/Conflicts on xserver-common, so we can reintroduce it
    later if needed.

 -- Julien Cristau <jcristau@debian.org>  Sun, 05 Oct 2008 20:26:08 +0200

xorg (1:7.3+17) unstable; urgency=low

  [ Debconf translations ]
  * Croatian. Closes: #498054
  * Spanish. Closes: #498435
  * Greek. Closes: #498465

 -- Julien Cristau <jcristau@debian.org>  Mon, 15 Sep 2008 13:35:44 +0200

xorg (1:7.3+16) unstable; urgency=low

  [ Debconf translations ]
  * Lithuanian. Closes: #497314
  * Norwegian Bokmal. Closes: #497315
  * Polish. Closes: #497162

 -- Julien Cristau <jcristau@debian.org>  Wed, 03 Sep 2008 14:01:38 +0200

xorg (1:7.3+15) unstable; urgency=low

  [ Debconf translations]
  * Finnish. Closes: #491323
  * Korean. Closes: #491519
  * Gujarati. Closes: #492097

  [ Julien Cristau ]
  * If the TMPDIR environment variable is set, preserve it across the
    invocation of ssh-agent (closes: #355923).  Thanks, Sam Morris!
  * On sparc, don't put the driver description in the Driver field, using
    patch from Bernhard R. Link (closes: #469299).

 -- Julien Cristau <jcristau@debian.org>  Sat, 02 Aug 2008 23:13:25 +0200

xorg (1:7.3+14) unstable; urgency=low

  * Ignore errors from update-rc.d remove (closes: #490595).

 -- Julien Cristau <jcristau@debian.org>  Sun, 13 Jul 2008 10:42:05 +0200

xorg (1:7.3+13) unstable; urgency=low

  [ Debconf translations]
  * Malayalam. Closes: #486830
  * Italian. Closes: #487877
  * Swedish. Closes: #488550
  * Dzongkha.
  * Traditional Chinese. Closes: #486490

  [ Brice Goglin ]
  * Remove obsolete xserver-xorg startup links, closes: #487453.

  [ Julien Cristau ]
  * Map the ca-multi d-i keymap to XkbLayout "ca", XkbVariant "multi"
    (closes: #466226).

 -- Julien Cristau <jcristau@debian.org>  Sat, 12 Jul 2008 16:38:55 +0200

xorg (1:7.3+12ubuntu2) intrepid; urgency=low

  * scripts/vars.i386:  Add xserver-xorg-video-geode

 -- Bryce Harrington <bryce@ubuntu.com>  Wed, 25 Jun 2008 16:28:06 -0700

xorg (1:7.3+12ubuntu1) intrepid; urgency=low
  
  * Merge from debian unstable, remaining changes:
    - apport/xorg-server-core.py, x11-common.install:
      + apport hook for xorg-server crashes
    - control:
      + Change maintainer address.
      + xserver-xorg: Recommends displayconfig-gtk and laptop-detect
      + Move xorg-docs Recommends to Suggests, because xorg-docs is in
        universe.
      + Add a dependency to xserver-xorg for each binary built to save
        disk/livecd space.
      + Add xqbiff (<= 0.75-4) to the list of x11-common Conflicts.
      + Add replaces for xinit since we now ship Xsession from x11-common.
        Ditto for xrgb as we ship rgb.txt in x11-common.
      + Add an epoch to the "x11-common Replaces xrgb" version.
        (LP: #212672)
      + xserver-xorg needs to Depend on mdetect instead of Recommends.
    - local/Failsafe/*, x11-common.install:
      + Bulletproof-X.
    - 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).
    - local/dexconf:
      + Added support for vmmouse_detect (if present) to override mouse
        driver with vmware. Depends on mdetect.
        (LP: #216667, #216276, #197337)
      + Add extra bits for ps3fb xorg.conf. (LP: #230091)
      + Add CorePointer to the default mouse section, otherwise
        the server defaults are used. (LP: #197337)
      + dexconf: Bring Device back to the Screen-section, nvidia-settings
        and aticonfig need that. (LP: #181405)
      + Add customizations to detect if running in KVM environment
        (CPU = "QEMU") and specify the H/V rates, DefaultDepth, etc.
    - local/xserver-wrapper.c:
      + Stop handling -config specifically in the wrapper, as Xorg now
        handles this itself.
    - rules:
      + Symlink the doc directories to xserver-xorg, explicitly remove the
        doc directories on upgrade for the now symlinked doc
        directories, to save disk/livecd space.
    - scripts/vars.amd64:
      + Add vmmouse.
    - scripts/vars.i386:
      + Add vmmouse.
      + Add xserver-xorg-video-psb.
    - scripts/vars.lpia:
      + Copied from vars.i386.
    - x11-common.install:
      + Add installation of apport hooks and bulletproof-X scripts
    - xserver-xorg.postinst.in:
      + Skip video card autodetection if xforcevesa is set.
  * control:
    - Drop Ubuntu addition of xserver-xorg-driver-all (obsolete)
  * local/dexconf:
    + Drop synaptics section and ServerLayout line to re-enable
      input-hotplug (Reverts LP: #173411)
  * x11-common.preinst.in, x11-common.templates:
    + Drop ubuntu addition to not fail if /usr/X11R6/bin is not empty
      but move it away instead and tell the user about it 
      since it was only needed for Dapper->Hardy upgrades. (LP: 217724)

 -- Bryce Harrington <bryce@ubuntu.com>  Tue, 24 Jun 2008 20:58:58 -0700

xorg (1:7.3+12) unstable; urgency=low

  [ Debconf translations]
  * Belarusian. Closes: #483697
  * French
  * Basque. Closes: #485293
  * Galician. Closes: #485292
  * Tamil. Closes: #485376
  * Thai. Closes: #485385
  * Simplified Chinese. Closes: #485389
  * Hebrew. Closes: #485390
  * Bulgarian. Closes: #485391
  * Catalan. Closes: #485394
  * Vietnamese. Closes: #485404
  * Belarusian. Closes: #485405
  * German. Closes: #485461
  * Portuguese. Closes: #485486
  * Indonesian. Closes: #485746
  * Arabic. Closes: #485865
  * Russian. Closes: #485976
  * Slovak. Closes: #486186
  * Hungarian. Closes: #486189
  * Korean. Closes: #486279
  * Japanese. Closes: #486281
  * Brazilian Portuguese. Closes: #486294
  * Czech. Closes: #486358, #486456, #486472
  * Dutch. Closes: #486459
  * Turkish. Closes: #486462
  * Romanian. Closes: #486636

  [ Julien Cristau ]
  * Don't recommend the 'sun' xkb rule set, they're handled by 'xorg' now,
    with the type4 and type5 models (closes: #483946).  Thanks, Bernhard R.
    Link!
  * Re-add the xutils-dev dependency to xutils.  There are still too many
    packages build-depending on xutils and expecting imake to be available.
    We'll drop it again after the lenny release (closes: #485184).
  * xserver-xorg-video-all: don't depend on the via driver on non-x86
    architectures; change the via dependency on x86 to openchrome | via.

  [ Brice Goglin ]
  * Add SH4 support script, thanks Nobuhiro Iwamatsu, closes: #473582.

 -- Brice Goglin <bgoglin@debian.org>  Tue, 17 Jun 2008 21:56:20 +0200

xorg (1:7.3+11) unstable; urgency=low

  [ David Nusinow ]
  * Add radeonhd to the -video-all depends

  [ Brice Goglin ]
  * Remove $named from the Should-Start/Stop LSB dependency info of the
    x11-common init script, closes: #463630.
  * Remove $remote_fs from Required-Start/Stop LSB dependency info of
    the x11-common init script, closes: #470940.
  * Remove the dependency of xutils against xutils-dev, it was only useful
    for transitional purpose in Etch, closes: #418123.
  * Remove the obsolete /etc/init.d/xserver-xorg, closes: #459507.
  * Add xutils preinst to drop obsolete /etc/X11/rstart/ files,
    closes: #382360.

  [ David Nusinow ]
  * Ship the X server wrapper in xserver-xorg rather than x11-common. This
    avoids having an unnecessary SUID binary on some systems. Thanks Stephen
    Frost. closes: #400632
    + Have x11-common conflict with older xserver-xorg and vice-versa. Also
      have xserver-xorg replace older x11-common
    + Set x11-common to arch: all and xserver-xorg to arch: any
    + Move ${shlib:Depends} from x11-common to xserver-xorg

  [ Julien Cristau ]
  * Use root:root instead of 0:0 in chown calls in x11-common's init script.
    This should prevent remote nss lookups and timeouts in some environments.
    Closes: #407788.
  * Add Kurdish debconf translation from Erdal Ronahi (closes: #477492).
  * Move dexconf and its manpage from x11-common to xserver-xorg.
  * Remove pre-dependency on x11-common from xserver-xorg.
  * Drop the xlibs-data and xlibs-static-dev transitional packages.  These
    were kept around for the sarge->etch upgrade, so it's past time they went
    away (closes: #477547, #477550).
  * xserver-xorg-video-newport is mips-only, don't depend on it on other
    architectures.
  * dexconf, xserver-xorg.postinst: the emulate3buttons question is gone,
    don't ask about it and don't add the corresponding option in the generated
    xorg.conf.  The option is on by default, and the only thing we used to do
    in dexconf is to explicitly enable it anyway.
  * Run dh_installman in binary-indep as well, as x11-common is now built
    there.
  * Use the XSF shell library to remove obsolete conffiles.  It seems less
    fragile than the version recommended on
    http://wiki.debian.org/DpkgConffileHandling and should handle failed
    upgrades.

  [ Christian Perrier ]
  * Debconf translations:
    - Indonesian added. Closes: #469972
    - Polish. Closes: #478035

  [ Raphael Geissert ]
  * Fix bashism in xserver-xorg postinst script, closes: #473701.

 -- Julien Cristau <jcristau@debian.org>  Fri, 30 May 2008 15:15:33 +0200

xorg (1:7.3+10ubuntu11) intrepid; urgency=low

  * dexconf:
    - The output of cat /proc/fb on 2.6.24 is "0 ps3fb". Dexconf was
      searching for "PS3" and was therefore failing to detect the platform
      correctly. (LP: #230091)

 -- Bryce Harrington <bryce@ubuntu.com>  Tue, 13 May 2008 13:27:16 -0700

xorg (1:7.3+10ubuntu10) hardy; urgency=low

  [ Michael Vogt ]
  * do not fail if /usr/X11R6/bin is not empty but move it
    away instead and tell the user about it (LP: #217724)

  [ Timo Aaltonen ]
  * control: Add xqbiff (<= 0.75-4) to the list of x11-common Conflicts.

 -- Timo Aaltonen <tepsipakki@ubuntu.com>  Wed, 16 Apr 2008 01:04:54 +0300

xorg (1:7.3+10ubuntu9) hardy; urgency=low

  * control: Add an epoch to the "x11-common Replaces xrgb" version.
    (LP: #212672)
  * dexconf, failsafeDexconf: Revert back to using "mouse" by default, and
    use vmmouse_detect to determine if the system is a virtual machine and
    if yes, use vmmouse and set the device path. (LP: #216667, #216276)
  * control: xserver-xorg needs to Depend on mdetect instead of Recommends.

 -- Timo Aaltonen <tepsipakki@ubuntu.com>  Mon, 14 Apr 2008 16:35:12 +0300

xorg (1:7.3+10ubuntu8) hardy; urgency=low

  * dexconf: Add CorePointer to the default mouse section, otherwise
    the server defaults are used. (LP: #197337)

 -- Timo Aaltonen <tepsipakki@ubuntu.com>  Thu, 10 Apr 2008 14:54:29 +0300

xorg (1:7.3+10ubuntu7) hardy; urgency=low

  * dexconf, failsafeDexconf: Default to using vmmouse, which is able to
    fall back to mouse if the system is not a virtual machine. Detecting
    it otherwise proved to be unreliable. (LP: #197337) 

 -- Timo Aaltonen <tepsipakki@ubuntu.com>  Thu, 13 Mar 2008 18:16:50 +0200

xorg (1:7.3+10ubuntu6) hardy; urgency=low

  * dexconf: Write a section for synaptics and ServerLayout again, since
    input-hotplug is not ready for public consumption. (LP: #173411)
  * debian/control: xserver-xorg Recommends laptop-detect again.
  * failsafeDexconf: sync with dexconf

 -- Timo Aaltonen <tepsipakki@ubuntu.com>  Thu, 28 Feb 2008 12:56:29 +0200

xorg (1:7.3+10ubuntu5) hardy; urgency=low

  * dexconf: Bring Device back to the Screen-section, nvidia-settings
    and aticonfig need that. (LP: #181405)

 -- Timo Aaltonen <tepsipakki@ubuntu.com>  Tue, 19 Feb 2008 18:19:19 +0200

xorg (1:7.3+10ubuntu4) hardy; urgency=low

  * failsafeDexconf: Update mouse section.
    - Don't try to use removed debconf keys.
    - Make the section identical with the normal dexconf.

 -- Timo Aaltonen <tepsipakki@ubuntu.com>  Tue, 29 Jan 2008 12:29:02 +0200

xorg (1:7.3+10ubuntu3) hardy; urgency=low

  * dexconf: Add customizations to detect if running in KVM environment
    (CPU = "QEMU") and specify the H/V rates, DefaultDepth, etc.

 -- Bryce Harrington <bryce@ubuntu.com>  Thu, 24 Jan 2008 17:31:15 +0000

xorg (1:7.3+10ubuntu2) hardy; urgency=low

  * vars.{i386,amd64}: add vmmouse.

 -- Timo Aaltonen <tepsipakki@ubuntu.com>  Tue, 08 Jan 2008 10:21:31 +0200

xorg (1:7.3+10ubuntu1) hardy; urgency=low

  * Merge with Debian unstable, remaining changes:
    - apport/xorg-server.py, debian/x11-common.install:
      + apport hook for xorg-server crashes
    - local/Failsafe/*, x11-common.install:
      + Bulletproof-X.
    - control:
      + Change maintainer address.
      + xserver-xorg: Recommends displayconfig-gtk
      + Move xorg-docs Recommends to Suggests, because xorg-docs is in
        universe.
      + Add "xserver-xorg-driver-all" transitional package to make
        dapper->hardy upgrades work.
    - control, rules:
      + Add a dependency to x11-common for each binary built to save
        disk/livecd space.
      + Symlink the doc directories to x11-common, explicitly remove the
        doc directories on upgrade for the now symlinked doc directories.
    - local/xserver-wrapper.c:
      + Stop handling -config specifically in the wrapper, as Xorg now
        handles this itself.
    - local/dexconf, control:
      + Added support for vmmouse_detect (if present) to override mouse
        driver with vmware. Depends on mdetect.
    - local/dexconf:
      + Add extra bits for ps3fb xorg.conf.
    - scripts/vars.{amd64,i386}:
      + Install both xserver-xorg-video-intel AND xserver-xorg-video-i810,
        instead of OR.
    - scripts/vars.i386:
      + Add xserver-xorg-video-amd and xserver-xorg-video-psb.
    - scripts/vars.lpia:
      + Copied from vars.i386.
    - 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).
    - xserver-xorg.postinst.in:
      + Skip video card autodetection if xforcevesa is set.
  * vars.{i386,amd64}: add openchrome.

 -- Timo Aaltonen <tepsipakki@ubuntu.com>  Mon, 07 Jan 2008 18:10:18 +0200

xorg (1:7.3+10) unstable; urgency=low

  * Just write a default video card identifier
  * Only run driver autodetection on sparc hardware
    All other archictectures should be better supported by having the server
    do it at startup.
    Closes: #442892, #448845, #410889, #443397, #242952, #271599
    + Remove discover and discover1 from the xserver-xorg recommends
    + Remove autodetect_video_card and multiple_possible_x-driver templates
  * Don't ask the bus ID question to anyone who it's not necessary for
    Hardcoding the bus ID is bad. The server already uses the same algorithm
    and more to figure out which PCI ID's have video cards, so don't replicate
    it. Currently we only ask people who have ppc, SGI indigos, and multiple
    heads on sparc.
  * Don't write the DPMS option to the monitor section of xorg.conf.
    The xserver already defaults to enabling DPMS

 -- David Nusinow <dnusinow@debian.org>  Sun, 06 Jan 2008 15:17:14 -0500

xorg (1:7.3+9ubuntu2) hardy; urgency=low

  [ Basilio Kublik ]
  * failsafeXServer: Add quotation marks to serverargs variable
    (LP: #151388).

 -- Timo Aaltonen <tepsipakki@ubuntu.com>  Sat, 05 Jan 2008 10:06:24 +0200

xorg (1:7.3+9ubuntu1) hardy; urgency=low

  * Merge with Debian unstable, remaining changes:
    - apport/xorg-server.py, debian/x11-common.install:
      + apport hook for xorg-server crashes
    - local/Failsafe/*, x11-common.install:
      + Bulletproof-X.
    - control:
      + Change maintainer address.
      + xserver-xorg: Recommends displayconfig-gtk
      + Move xorg-docs Recommends to Suggests, because xorg-docs is in
        universe.
      + Add "xserver-xorg-driver-all" transitional package to make
        dapper->hardy upgrades work.
    - control, rules:
      + Add a dependency to x11-common for each binary built to save
        disk/livecd space.
      + Symlink the doc directories to x11-common, explicitly remove the
        doc directories on upgrade for the now symlinked doc directories.
    - local/xserver-wrapper.c:
      + Stop handling -config specifically in the wrapper, as Xorg now
        handles this itself.
    - local/dexconf, control:
      + Added support for vmmouse_detect (if present) to override mouse
        driver with vmware. Depends on mdetect.
    - local/dexconf:
      + Add extra bits for ps3fb xorg.conf.
    - scripts/vars.{amd64,i386}:
      + Install both xserver-xorg-video-intel AND xserver-xorg-video-i810,
        instead of OR.
    - scripts/vars.i386:
      + Add xserver-xorg-video-amd and xserver-xorg-video-psb.
    - scripts/vars.lpia:
      + Copied from vars.i386.
    - 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).
    - xserver-xorg.postinst.in:
      + 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.
  * failsafeDexconf: Don't try to fetch() default-x-server, which is no more.
    Just use xorg/xserver-xorg where appropriate, and fix variables.

 -- Timo Aaltonen <tepsipakki@ubuntu.com>  Sat, 05 Jan 2008 00:56:50 +0200

xorg (1:7.3+9) unstable; urgency=low

  [ Julien Cristau ]
  * Deregister old debconf questions before calling dexconf.  dexconf calls
    db_stop, and we can't use debconf after that.  Add a comment to that
    effect above the dexconf call in debian/xserver-xorg.postinst.in, to try
    to prevent future mistakes.  Thanks, Michael Vogt!

  [ Timo Aaltonen ]
  * dexconf: Remove reference to xserver-xorg/config/display/modes,
    which is no longer used.

  [ Brice Goglin ]
  * Fix "no video driver modules found" message, thanks Robert Millan,
    closes: #453930.
  * Fix dexconf to write in /etc/X11/xorg.conf by default again,
    closes: #456925.

  [ David Nusinow ]
  * Don't force fbdev on mac mini ppc any more. The ati driver no longer uses
    fbdev, and it has been reported to work on mac minis without it.
  * Add support for $HOME/.xsessionrc. Closes: #411639
    This file, if present, will get sourced during the start of your X
    session. This allows you to set session-wide environment variables easily
    for things like locale information. Patch adapted from one by Yves-Alexis
    Perez. Thanks also to Holger Levsen and Osamu Aoki for advice.
    + Adds 40x11-common_xsessionrc to /etc/X11/Xsession.d
    + Document this in Xsession.5 manpage
    + Add a NEWS.Debian entry about it
    + Modifies /etc/X11/Xsession to declare the location of ~/.xsessionrc.
      Custom versions of Xsession (like gdm's) will need an update
  * Use run-parts --list instead of a custom run_parts function.
    Thanks Vagrant Cascadi for the patch. Closes: #458345, #457606

 -- David Nusinow <dnusinow@debian.org>  Sun, 30 Dec 2007 23:01:52 -0500

xorg (1:7.3+8ubuntu2) hardy; urgency=low

  * dexconf:
    - Remove reference to xserver-xorg/config/display/modes, which is no
      longer used.

 -- Timo Aaltonen <tepsipakki@ubuntu.com>  Thu, 20 Dec 2007 20:01:03 +0200

xorg (1:7.3+8ubuntu1) hardy; urgency=low

  * Merge with Debian unstable, remaining changes:
    - apport/xorg-server.py, debian/x11-common.install:
      + apport hook for xorg-server crashes
    - local/Failsafe/*, x11-common.install:
      + Bulletproof-X.
    - control:
      + Change maintainer address.
      + xserver-xorg: Recommends displayconfig-gtk
      + Move xorg-docs Recommends to Suggests, because xorg-docs is in
        universe.
      + Add "xserver-xorg-driver-all" transitional package to make
        dapper->hardy upgrades work.
    - control, rules:
      + Add a dependency to x11-common for each binary built to save
        disk/livecd space.
      + Symlink the doc directories to x11-common, explicitly remove the
        doc directories on upgrade for the now symlinked doc directories.
    - local/xserver-wrapper.c:
      + Stop handling -config specifically in the wrapper, as Xorg now
        handles this itself.
    - local/dexconf, control:
      + Added support for vmmouse_detect (if present) to override mouse
        driver with vmware. Depends on mdetect.
    - local/dexconf:
      + Add extra bits for ps3fb xorg.conf.
    - scripts/vars.{amd64,i386}:
      + Install both xserver-xorg-video-intel AND xserver-xorg-video-i810,
        instead of OR.
    - scripts/vars.i386:
      + Add xserver-xorg-video-amd and xserver-xorg-video-psb.
    - scripts/vars.lpia:
      + Copied from vars.i386.
    - 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).
    - xserver-xorg.postinst.in:
      + 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.

  [ Julien Cristau ]
  * Deregister old debconf questions before calling dexconf.  dexconf calls
    db_stop, and we can't use debconf after that.  Add a comment to that
    effect above the dexconf call in debian/xserver-xorg.postinst.in, to try
    to prevent future mistakes.  Thanks, Michael Vogt!

 -- Timo Aaltonen <tepsipakki@ubuntu.com>  Tue, 18 Dec 2007 01:19:37 +0200

xorg (1:7.3+8) unstable; urgency=low

  [ Julien Cristau ]
  * Make xorg Architecture: any.  Depend on sparc-utils [sparc] instead of
    sparc-utils | not+sparc.
  * dexconf: Use xorg.conf/xserver-xorg instead of $REALCONFIG/$XSERVERPKG.
    Thanks, Timo Aaltonen!

  [ Tormod Volden ]
  * xserver-xorg.postinst.in: Narrow down the drivers to filter from the list,
    because otherwise radeonhd would not be selectable.
    (Closes: #446441, LP: #174311)

  [ David Nusinow ]
  * Don't write the default depth to xorg.conf any more.
    The drivers should choose the appropriate depth by default now.
  * Don't bother with resolutions in xorg.conf
    We now rely on the server and drivers to do the right thing. Previously,
    our best-case scenario was to have the xserver-xorg postinstall script ask
    the monitor what the optimal values were, and if that wasn't possible to
    give the user a default list of resolutions and a best-guess hsync and
    vrefresh values that the user could override. The server and almost all
    drivers will do this on boot anyway using properly maintained code, which
    allows them to better adapt to changes. randr 1.2-compliant drivers will
    do this even better than we possibly could. Finally, the server will
    provide a better list of defaults than we were doing anyway. There will
    undoubtedly be bugs uncovered by this change, but we need  to find and fix
    the actual bugs in the drivers and server in order to move forward.
    + Don't recommend xresprobe any more
    + Don't recommend laptop-detect any more or look for it in server postinst
  * Don't set fbdev in the postinst for r128 on ppc.
    The driver will do this automatically if no option is specified by the user
  * Allow cross-building. Thanks Neil Williams. Closes: #451293
  * Bump standards version to 3.7.3.0. No changes needed.

 -- David Nusinow <dnusinow@debian.org>  Sun, 16 Dec 2007 10:35:08 -0500

xorg (1:7.3+7ubuntu3) hardy; urgency=low

  [ Michael Vogt ]
  * Add "xserver-xorg-driver-all" transitional package to make
    dapper->hardy upgrades work.

  [ Tormod Volden ]
  * xserver-xorg.postinst.in: Narrow down the drivers to filter from the list,
    because otherwise radeonhd would not be selectable. (LP: #174311)

 -- Timo Aaltonen <tepsipakki@ubuntu.com>  Mon, 10 Dec 2007 23:43:37 +0200

xorg (1:7.3+7ubuntu2) hardy; urgency=low

  * dexconf: purge unneeded cruft. Restricted-manager no longer needs
    extra_options.

 -- Timo Aaltonen <tepsipakki@ubuntu.com>  Thu, 29 Nov 2007 17:30:06 +0200

xorg (1:7.3+7ubuntu1) hardy; urgency=low

  * Merge with Debian unstable, remaining changes:
    - apport/xorg-server.py, debian/x11-common.install:
      + apport hook for xorg-server crashes
    - local/Failsafe/*, x11-common.install:
      + Bulletproof-X.
    - control:
      + Change maintainer address.
      + xserver-xorg: Recommends displayconfig-gtk
      + Move xorg-docs Recommends to Suggests, because xorg-docs is in
        universe.
    - control, rules:
      + Add a dependency to x11-common for each binary built to save
        disk/livecd space.
      + Symlink the doc directories to x11-common, explicitly remove the
        doc directories on upgrade for the now symlinked doc directories.
    - control, rules, vars.sparc:
      + Make xorg Architecture: any and use an extra variable to not
        Depends on type-handling.
      + Drop dependency on "sparc-utils | not+sparc"
    - local/xserver-wrapper.c:
      + Stop handling -config specifically in the wrapper, as Xorg now
        handles this itself.
    - local/dexconf, control:
      + Added support for vmmouse_detect (if present) to override mouse
        driver with vmware. Depends on mdetect.
    - local/dexconf:
      + Add extra bits for ps3fb xorg.conf.
    - local/dexconf, xserver-xorg.templates:
      + 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.
    - scripts/vars.{amd64,i386}:
      + Install both xserver-xorg-video-intel AND xserver-xorg-video-i810,
        instead of OR.
    - scripts/vars.i386:
      + Add xserver-xorg-video-amd and xserver-xorg-video-psb.
    - scripts/vars.lpia:
      + Copied from vars.i386.
    - 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).
    - xserver-xorg.postinst.in:
      + 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.

 -- Timo Aaltonen <tepsipakki@ubuntu.com>  Tue, 27 Nov 2007 11:53:49 +0200

xorg (1:7.3+7) unstable; urgency=low

  * Don't set driver-specific depths in xserver postinst
    + For newport, vga, savage, suncg6, and tdfx. These should all be handled
      in the drivers themselves
  * Get rid of old server symlink stuff that was left behind
    + Make sure we replace symlinks pointing to /bin/true in the postinst.
      This situation was created if you had installed the previous package
      from scratch. Closes: #452897

 -- David Nusinow <dnusinow@debian.org>  Mon, 26 Nov 2007 23:07:19 -0500

xorg (1:7.3+6ubuntu1) hardy; urgency=low

  * Merge with Debian unstable, remaining changes:
    - apport/xorg-server.py, debian/x11-common.install:
      + apport hook for xorg-server crashes
    - local/Failsafe/*, x11-common.install:
      + Bulletproof-X.
    - control:
      + Change maintainer address.
      + xserver-xorg: Recommends displayconfig-gtk
      + Move xorg-docs Recommends to Suggests, because xorg-docs is in
        universe.
    - control, rules:
      + Add a dependency to x11-common for each binary built to save
        disk/livecd space.
      + Symlink the doc directories to x11-common, explicitly remove the
        doc directories on upgrade for the now symlinked doc directories.
    - control, rules, vars.sparc:
      + Make xorg Architecture: any and use an extra variable to not
        Depends on type-handling.
      + Drop dependency on "sparc-utils | not+sparc"
    - local/xserver-wrapper.c:
      + Stop handling -config specifically in the wrapper, as Xorg now
        handles this itself.
    - local/dexconf, control:
      + Added support for vmmouse_detect (if present) to override mouse
        driver with vmware. Depends on mdetect.
    - local/dexconf:
      + Add extra bits for ps3fb xorg.conf.
    - local/dexconf, xserver-xorg.templates:
      + 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.
    - scripts/vars.{amd64,i386}:
      + Install both xserver-xorg-video-intel AND xserver-xorg-video-i810,
        instead of OR.
    - scripts/vars.i386:
      + Add xserver-xorg-video-amd and xserver-xorg-video-psb.
    - scripts/vars.lpia:
      + Copied from vars.i386.
    - 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).
    - xserver-xorg.postinst.in:
      + 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.
  * Bring back old changelog entries.

 -- Timo Aaltonen <tepsipakki@ubuntu.com>  Mon, 19 Nov 2007 18:05:43 +0200

xorg (1:7.3+6) unstable; urgency=low

  * Only cleaning out old junk on upgrade and after version compare
    This currently includes deregistering old debconf questions and removing
    server symlink cruft. Closes: #451426, #451425, #451439

 -- David Nusinow <dnusinow@debian.org>  Thu, 15 Nov 2007 20:38:44 -0500

xorg (1:7.3+5) unstable; urgency=low

  [ David Nusinow ]
  * Change xlibs-static-dev transitional package from the libs to oldlibs
    section
  * Don't have dexconf write "CoreKeyboard" any more. With input-hotplug this
    is meaningless
  * Unregister various old questions from the debconf database because we
    don't use them any more.

  [ Brice Goglin ]
  * Replace xorg dependency on xbase-clients and xutils with the corresponding
    new x11-*utils packages (without xutils-dev), closes: #445471.
  * Replace xserver-xorg dependency on xbase-clients with x11-xkb-utils
    (for xkbcomp).

  [ Julien Cristau ]
  * Reupload, because 1:7.3+4 seems to have been lost in the ftp-master crash.
  * Drop code related to shared/default-x-server from xserver-xorg.prerm.

 -- David Nusinow <dnusinow@debian.org>  Wed, 14 Nov 2007 21:29:31 -0500

xorg (1:7.3+4ubuntu1) hardy; urgency=low

  * apport/xorg-server.py, debian/x11-common.install:
    - apport hook for xorg-server crashes
  * local/Failsafe/*, x11-common.install:
    - Bulletproof-X.
  * debian/control:
    - Change maintainer address.
    - xserver-xorg: Recommends displayconfig-gtk
    - Move xorg-docs Recommends to Suggests, because xorg-docs is in
      universe.
  * control, rules:
    - Add a dependency to x11-common for each binary built to save
      disk/livecd space.
    - Symlink the doc directories to x11-common, explicitly remove the
      doc directories on upgrade for the now symlinked doc directories.
  * control, rules, vars.sparc:
    - Make xorg Architecture: any and use an extra variable to not
      Depends on type-handling.
    - Drop dependency on "sparc-utils | not+sparc"
  * local/xserver-wrapper.c:
    - Stop handling -config specifically in the wrapper, as Xorg now
      handles this itself.
  * local/dexconf, control:
    - Added support for vmmouse_detect (if present) to override mouse
      driver with vmware. Depends on mdetect.
  * local/dexconf:
    - Add extra bits for ps3fb xorg.conf.
  * local/dexconf, xserver-xorg.templates:
    - 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.
  * scripts/vars.{amd64,i386}:
    - Install both xserver-xorg-video-intel AND xserver-xorg-video-i810,
      instead of OR.
  * scripts/vars.i386:
    - Add xserver-xorg-video-amd and xserver-xorg-video-psb.
  * scripts/vars.lpia:
    - Copied from vars.i386.
  * 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).
  * xserver-xorg.postinst.in:
    - 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.

 -- Timo Aaltonen <tepsipakki@ubuntu.com>  Thu, 08 Nov 2007 08:12:20 +0200

xorg (1:7.3+4) unstable; urgency=low

  * Don't try and reset monitor identifier question, it doesn't exist now
  * Don't bother at all with default-x-server question. 
    Closes: #448863, #374578
    + Remove it from the xserver-xorg postinst. Now instead of a complicated
      md5sum, only create the symlink if nothing exists there.
    + Make sure we delete the old md5sum and xserver roster files for this
      stuff. We don't need it now.

 -- David Nusinow <dnusinow@debian.org>  Sun, 04 Nov 2007 11:41:04 -0500

xorg (1:7.3+3) unstable; urgency=low

  [ David Nusinow ]
  * dexconf: Don't write the server layout. The server no longer requires one
    by default as of 1.4.
  * Don't ask or write about video ram. This is a useless "feature"
  * dexconf: Set SERVER to xorg
  * Don't ask for the monitor identifier, just use a generic name
  * Delete the obsolete template question for autodetect mouse
  * Don't ask for the mouse port or protocol any more
    + Will be set to /dev/input/mice by default.
    + Add udev to xserver-xorg recommends to make sure this device file is
      present on normal systems
    + Will be set to "auto" protocol by default. This will let the driver
      choose the correct protocol automatically. The kernel driver multiplexes
      different protocols through the same /dev/input/mice device file,
      allowing this. Only in pathological cases will you need to work around
      it.
  * Don't specify the device section to use in the screen section
    + xserver-xorg-core 2:1.4-3 and above will use the first device section
      listed when none is specified. We only write one device with this script
      anyway.
    + Have xserver-xorg depend on -core >= 2:1.4-3
  * Delete unused templates for no_known_ and multible_possible_ x-servers
  * Delete hidden fontserver template and dexconf ability to use it
    + This wasn't configurable and most people should be fine without listing
      a font server in xorg.conf
  * Don't ask about writing the files section any more. Delete the question

  [ Christian Perrier ]
  * Hebrew. Closes: #447308

  [ Timo Aaltonen ]
  * xserver-xorg.postinst.in:
    - Add lt to the list of non-Latin keymaps.
    - 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.
    - Map et console keymap to ee.
    - Set default keyboard variant for French to oss.
    - Map mk console keymap to mk.
    - Map nl console keymap to nl.
    - Map ru console keymap to ru.
    - Map slovene console keymap to si.
    - 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.
    - Map uk console keymap to gb, not gb(intl).
    - Fix sanity-checking logic for French Canadian vs. US-layout keyboards.
    - Try autodetecting South Korean keyboards. They have to be detected
      from LANG since they use US keymaps on the console.
    - 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.
    - Detect keyboard layout configuration using /etc/default/console-setup
      if available.
  * dexconf: Fix problem preventing touchpad scrolling from being able to be
    enabled by switching HorizEdgeDelta for HorizEdgeScroll.

  [ Julien Cristau ]
  * dexconf: don't use the shared/default-x-server template (closes: #443004).
  * debian/control: xserver-xorg depends on x11-common >= 1:7.3+3 for the
    above change.
  * debian/xserver-xorg.templates: drop the default-x-server question.
  * dexconf: don't generate two mouse sections.  Touchpads will be handled
    through input-hotplug.

 -- David Nusinow <dnusinow@debian.org>  Wed, 31 Oct 2007 22:39:46 -0400

xorg (1:7.3+2) unstable; urgency=low

  * Upload to unstable

 -- David Nusinow <dnusinow@debian.org>  Sun, 16 Sep 2007 16:23:45 -0400

xorg (1:7.3+1) experimental; urgency=low

  [ Brice Goglin ]
  * Use laptop-detect in our postinst code instead of requiring xsfbs
    to call it in all maintainer scripts of many packages.

  [ Julien Cristau ]
  * Bump video and input ABIs to 2 for xserver 1.4.

 -- Julien Cristau <jcristau@debian.org>  Mon, 10 Sep 2007 16:45:38 +0200

xorg (1:7.3~rc1) experimental; urgency=low

  * Bump driver ABI for xserver 1.3.99.0.
  * xserver-xorg doesn't recommend the drivers anymore, the Depends should be
    enough.

 -- Julien Cristau <jcristau@debian.org>  Sat, 18 Aug 2007 20:08:31 +0200

xorg (1:7.2.ds3-1) experimental; urgency=low

  * Add xutils and xbase-clients transitional packages
    + xbase-clients is now split (closes: #151613).
    + ditto xutils (closes: #330751).
  * Bump version number to 1:7.2.ds3 to be higher than xbase-client's current
    version.
  * Remove unused code from debian/rules.
  * xserver-xorg.postinst: drop code to detect the X server; we haven't had
    more than one since XFree86 4.0.

 -- Julien Cristau <jcristau@debian.org>  Thu, 26 Jul 2007 19:16:00 +0200

xorg (1:7.2-6) UNRELEASED; urgency=low

  [ Brice Goglin ]
  * Remove the reference to the unexisting example file
    /usr/share/doc/x11-common/examples/xsession in Xsession.5.
    Thanks Braun Gabor (closes: #393233).
  * xserver-wrapper.c: drop privileges on alternate config file given
    with -xf86config as we do for -config, closes: #323107.
  * Update xsfbs to fix displaying of patches applied by quilt,
    closes: #428090.
  * Remove mdetect from xserver-xorg Recommends since it does not use
    it anymore, thanks Joey Hess (closes: #435588).
  * Move xorg-docs from xorg Depends to Recommends, closes: #427172.

  [ Julien Cristau ]
  * xserver-xorg-video-all: don't depend on the intel driver on alpha, arm,
    armeb, armel, m32r, m68k, mips and mipsel; drop alternative dependency on
    the obsolete -modesetting drivers on other architectures, and prefer
    -intel to -i810.
  * Drop the xserver-xfree86, xlibmesa-dri, x-window-system and
    x-window-system-core transitional packages.

  [ David Nusinow ]
  * Remove the code to migrate old XFree86 templates over to Xorg. You'll have
    to install etch now if you're migrating from sarge for your settings to
    transition over.
  * Add libgl1-mesa-dri to the xserver-xorg recommends.
    Previously, this recommends was in the xorg package, but many people don't
    have the xorg package installed (even though they should). Moving it here
    makes it far more likely that people will actually have a working DRI.
    Thanks Frans Pop. Closes: #433035

 -- Brice Goglin <bgoglin@debian.org>  Sat, 11 Aug 2007 19:06:20 +0200

xorg (1:7.2-5ubuntu13) gutsy; urgency=low

  * debian/local/Failsafe/failsafeXServer:
    + Change next to continue (closes LP: #149304)
  * debian/local/Failsafe/failsafeXinit:
    + Fix typo s/XORGCONF/XORGCONFIG/

 -- Bryce Harrington <bryce@ubuntu.com>  Sun, 07 Oct 2007 09:56:15 -0700

xorg (1:7.2-5ubuntu12) gutsy; urgency=low

  * Add a dependency to x11-common for each binary built.
  * Symlink the doc directories to x11-common, explicitely remove the doc
    directories on upgrade for the now symlinked doc directories.

 -- Matthias Klose <doko@ubuntu.com>  Fri, 05 Oct 2007 20:28:33 +0200

xorg (1:7.2-5ubuntu11) gutsy; urgency=low

  * debian/local/Failsafe/failsafeXinit: Switch to use of new
    'xfailsafedialog' script instead of displayconfig-gtk
    (closes LP: #146186)
  * debian/local/Failsafe/failsafeXServer:
    + Use :10 instead of :0 to avoid overwriting the (failed)
      Xorg.0.log.  (Temporary but regression-safe fix for 148122)
    + Add failure logging, so we can track past failures and avoid
      re-running Bulletproof-X if it's already proven unable to fix the
      issue.  In this (rare but possible) case, we'll just get out of
      the way and let gdm handle it. (closes LP: #146603)
  * Drop debian/local/Failsafe/failsafeInstall as it is no longer used
  * debian/local/dexconf:  Fix problem preventing touchpad scrolling
    from being able to be enabled by switching HorizEdgeDelta for
    HorizEdgeScroll, as suggested by Matthew Garrett).
    (closes LP: #147249, and probably many more.)

 -- Bryce Harrington <bryce@ubuntu.com>  Thu, 04 Oct 2007 03:30:32 -0700

xorg (1:7.2-5ubuntu10) gutsy; urgency=low

  * debian/local/dexconf:  Removing static wacom entries [Closes: LP# 83860]

 -- Bryce Harrington <bryce@ubuntu.com>  Mon, 17 Sep 2007 10:33:51 -0700

xorg (1:7.2-5ubuntu9) gutsy; urgency=low

  * debian/control:  Add Recommends for displayconfig-gtk
  * debian/local/Failsafe/:
    - Fix issue where debconf smooshes together stdout and stderr
      which resulted in issue where if any warning msgs are generated,
      they end up in the xorg.conf.failsafe.
    - Fix issue discovered in testing that it is difficult to override
      defaults in failsafeXserver, by making several parameters
      configurable as environment variables.
    - Fix issue when running failsafeXserver directly, not through gdm,
      where SIGSTOP was emitted to the parent process.  Now only do this
      if the parent process is gdm.
    - Fix issue on hardware that can't do DRI.  We had been unable to
      forcibly "Disable" DRI and other modules because guidance would
      crash on presence of this parameter in xorg.conf's.  Now that
      guidance is patched with this, we can safely use it to solve this
      issue.
    - Add warning dialog if displayconfig-gtk is not installed.

 -- Bryce Harrington <bryce@ubuntu.com>  Fri,  7 Sep 2007 15:00:41 -0700

xorg (1:7.2-5ubuntu8) gutsy; urgency=low

  * debian/local/Failsafe/failsafeXServer:  Fix bug where gdm would
    attempt to manage the display while in failsafe mode, interrupting
    the user.  Now we shutdown gdm while in failsafe mode, and restart
    after we're finished.

 -- Bryce Harrington <bryce@ubuntu.com>  Tue,  4 Sep 2007 19:10:53 -0700

xorg (1:7.2-5ubuntu7) gutsy; urgency=low

  * debian/scripts/vars.i386:  Enabling xserver-xorg-video-amd as
    depends, as MIR has cleared and it's now in main. (LP: #130717)
  * debian/local/Failsafe/*:
    - Remove failsafe xorg.conf statements that guidance doesn't
      understand yet (e.g. Module>Disable)
    - Omit BUSID when debconf fails to discover it
    - Correct quotes for DISPLAY_MODES in failsafe xorg.conf
    - Add some error detection/reporting for failsafe xorg.conf generation
    - Add gksu for running displayconfig-gtk

 -- Bryce Harrington <bryce@ubuntu.com>  Fri, 24 Aug 2007 16:34:45 -0700

xorg (1:7.2-5ubuntu6) gutsy; urgency=low

  * debian/scripts:  Dropping xserver-xorg-video-amd as depends until MIR
    clears.

 -- Bryce Harrington <bryce@ubuntu.com>  Thu, 16 Aug 2007 14:47:05 -0700

xorg (1:7.2-5ubuntu5) gutsy; urgency=low

  * debian/scripts:  Add xserver-xorg-video-amd and
    xserver-xorg-video-psb to xserver-xorg-video-all.  (LP: #130717)
  * debian/local/Failsafe/failsafeDexconf: script (based on dexconf) to
    generate a failsafe xorg.conf with hardcoded values for driver
    ("vesa"), refresh rates, and so forth.  Disables several modules
    that can sometimes cause problems (dri, glx, etc.)  Still uses
    debconf for keyboard, mouse, etc.
  * debian/local/Failsafe/failsafeXServer: using a static
    /etc/X11/xorg.conf.failsafe rather than a tmp file, so that
    displayconfig-gtk can reuse the file if user wishes.
  * debian/local/Failsafe/failsafeHelpmesg: dropped; this is now
    available in python through displayconfig-gtk in a much less hacky
    manner.
  * debian/control: Drop xserver-xorg-video-all and
    xserver-xorg-input-all as Recommends, since these are already
    listed as the first default for Depends.

 -- Bryce Harrington <bryce@ubuntu.com>  Thu, 16 Aug 2007 12:26:39 -0700

xorg (1:7.2-5ubuntu4) gutsy; urgency=low

  * Stop handling -config specifically in the wrapper, as Xorg now handles
    this itself.

 -- Tollef Fog Heen <tfheen@ubuntu.com>  Fri, 10 Aug 2007 09:12:13 +0200

xorg (1:7.2-5ubuntu3) gutsy; urgency=low

  * debian/local/dexconf: fix the Display-subsection generation
    (LP: 130094).

 -- Timo Aaltonen <tepsipakki@ubuntu.com>  Fri,  3 Aug 2007 15:20:41 +0300

xorg (1:7.2-5ubuntu2) gutsy; urgency=low

  * debian/scripts/vars.lpia: Copied from vars.i386.

 -- Matthias Klose <doko@ubuntu.com>  Thu, 02 Aug 2007 08:57:30 +0000

xorg (1:7.2-5ubuntu1) 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.
      + Drop dependency on "sparc-utils | not+sparc"
      + Move xorg-docs Depends to Suggests, because xorg-docs is in
        universe.
    - 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:
      + Unconditionally 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 work 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.
        (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. (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. (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/apport/xorg-server.py, debian/x11-common.install: apport
      hook for xorg-server crashes. 
    - debian/scripts/vars.{i386,amd64}:
      Install both xserver-xorg-video-intel AND xserver-xorg-video-i810,
      instead of OR.
  * debian/local/dexconf
    - Added support for vmmouse_detect (if present) to override mouse
      driver with vmware (see lp bug #71167; also requires new mdetect).
  * debian/local/Failsafe/*, debian/x11-common.install:
    - Added first release of Bulletproof-X for testing.  Changes to
      displayconfig-gtk and gdm are required before this can be made
      default.  See debian/local/Failsafe/README for details.

 -- Bryce Harrington <bryce@ubuntu.com>  Wed,  1 Aug 2007 13:08:11 -0700

xorg (1:7.2-5) unstable; urgency=low

  * Don't use the dexconf function fetch to get the modes. This will fail when
    the value is empty by design. Just use db_get instead.

 -- David Nusinow <dnusinow@debian.org>  Tue, 12 Jun 2007 20:54:56 -0400

xorg (1:7.2-4) unstable; urgency=low

  [ Julien Cristau ]
  * Add ${shlibs:Depends} to x11-common's Depends field, because the X server
    wrapper is an ELF object... oops.
  * Allow libgl1 as alternative to libgl1-mesa-glx in xorg's dependencies.

  [ Brice Goglin ]
  * Add armel support, thanks to Riku Voipio (closes: #408817).
  * Make xephem conflict versioned as <= 3.4-5 (closes: #419533).
  * Replace references to xserver-common with x11-common in Xwrapper.config(5)
    manpage. Thanks Mikhail Gusarov (closes: #405739).
  * Replace references to .Xsession with .xsession in Xsession(5) and
    Xsession.options(5) manpages. Thanks Reuben Thomas (closes: #365430).
  * Add documentation for use-session-dbus in Xsession.options(5), based on
    75dbus_dbus-launch header in the dbus package, closes: #322284.
  * Minor fixes in Xsession(5), thanks Lajos Parkatti, closes: #372519.
  * Add DebianRed to rgb.txt, closes: #243288.
  * Fix possible buffer overflows in xserver-wrapper.c.
    Thanks Jochen Voss (closes: #396958).
  * Add conflict for x11-common against vide (<= 1.21-3).
    Thanks Pierre Machard, closes: #370167.

  [ Timo Aaltonen ]
  * Xsession.d/*: change 'which' -> '/usr/bin/which', since the zsh builtin
    command can in some circumstances make the login fail.

  [ Christian Perrier ]
  * Debconf translations:
    - Vietnamese. Closes: #426978, #427180

  [ David Nusinow ]
  * Get rid of all the explicit modes by default. They just bloated the
    default config for no reason.
    + The /config/display/modes now has no default (blank). As a result of
      this, under normal conditions, this multi-select field will be empty.
      The debconfage and dexconf will not fill in this section at all. The
      server will then choose the highest resolution that it can probe with
      DDC. This should work for most people, who are probably choosing their
      best resolution anyway. If xresprobe is available and used, the
      resolutions it finds will be selected. Until there is a good way for the
      server to store this information by itself, we should leave this as it
      is. Most people can get by without this section, but it'll help some of
      those with broken hardware.
    + If the user does select a mode or modes for this question, dexconf no
      longer iterates through a set of depths and puts the mode list in for
      each. Instead, if dexconf does find a set of specified modes, it will
      write a single "Display" subsection for the screen, and it will contain
      the modes. This is functionally equivalent to what we were doing anyway,
      and it cuts down the number of lines in our xorg.conf considerably.

 -- David Nusinow <dnusinow@debian.org>  Mon, 11 Jun 2007 22:58:03 -0400

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

  * Add debian/apport/xorg-server.py: Bryce's apport hook for xorg-server
    crashes.
  * debian/x11-common.install: Install debian/apport/* into the apport package
    hooks directory.

 -- Martin Pitt <martin.pitt@ubuntu.com>  Tue, 03 Jul 2007 10:09:31 +0200

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

  [Bryce Harrington]
  * Move xorg-docs Depends to Suggests, because xorg-docs is in universe.

 -- Timo Aaltonen <tepsipakki@ubuntu.com>  Mon,  4 Jun 2007 20:53:22 +0300

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

  * debian/xserver-xorg.postinst.in:
    - Fix an elif-sentence which was mistakenly appended to the previous
      line, hence broke the upgrade.
  * This change got dropped from the changelog, so here it is:
    - debian/scripts/var.{i386,amd64}:
      Install both xserver-xorg-video-intel AND xserver-xorg-video-i810,
      instead of OR.

 -- Timo Aaltonen <tepsipakki@ubuntu.com>  Mon,  4 Jun 2007 17:01:13 +0300

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.
        (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. (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. (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 <tepsipakki@ubuntu.com>  Mon,  4 Jun 2007 11:20:17 +0300

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

  [ Christian Perrier ]
  * Debconf templates proofread by the debian-l10n-english team
    Closes: #418007
  * Debconf translations:
    - Arabic. Closes: #418026
    - Thai. Closes: #418049
    - Lituanian. Closes: #418042
    - Nepali.
    - Bulgarian. Closes: #418027
    - Slovak. Closes: #418024
    - Tamil. Closes: #418022
    - Korean. Closes: #418075
    - Portuguese.
    - Galician. Closes: #418187
    - Basque. Closes: #418191
    - Brazilian Portuguese. Closes: #418223
    - Dutch
    - Albanian. Closes: #418504
    - Swedish. Closes: #418537
    - Russian. Closes: #418589
    - Czech. Closes: #418769
    - Malayalam. Closes: #419522
    - Japanese. Closes: #419707
    - Traditional Chinese. Closes: #420047
    - Hungarian. Closes: #420116
    - German
    - Italian. Closes: #421013

  [ David Nusinow ]
  * Don't write the DRI section to xorg.conf. We now ship a default mode in
    libdrm as of libdrm 2.3.0-3, so we don't need to do this. Users can still
    override the default mode in their xorg.conf's if they choose
  * Don't write the files section of xorg.conf by default. If the user does
    want to write the files section, don't write out any font paths, only
    write out the font server bit if they specify that.
    + This will depend on having xserver-xorg-core version 2:1.3.0.0.dfsg-3
      which includes a patch to always look in the default font paths by
      default. Bump the xserver-xorg dependency on xserver-xorg-core to this
      version.

  [ Julien Cristau ]
  * xorg recommends libgl1-mesa-dri instead of depending on it.

  [ Timo Aaltonen ]
  * xserver-xorg-video-all: Replaces/Conflicts xserver-xorg-driver-all
  * x11-common.init: Only source /etc/default/rcS if it exists,
    allowing x11-common to be installed by debootstrap.
  * x11common.{dirs,links}: Don't ship or link to
    /usr/X11R6/lib/X11/fonts
  * debian/scripts/vars.*: Remove xserver-xorg-video-vmware from non-x86
    archs.
  * debian/{control,rules,scripts/vars.*}: Set XSERVER_XORG_DETECT_DEPENDS
    on amd64, hppa, i386, ia64.
  * debian/scripts/vars: Add xserver-xorg-input-elographics to
    XSERVER_XORG_INPUT_DEPENDS.
  * debian/xserver-xorg.postinst.in: ATI vendor string was changed in
    discover-data_2.2006.08.15, so edit them to reflect the change.

 -- David Nusinow <dnusinow@debian.org>  Sun, 29 Apr 2007 21:33:00 -0400

xorg (1:7.2-2) experimental; urgency=low

  [ Julien Cristau ]
  * Add support for kfreebsd-{amd64,i386} (closes: #363910).  Thanks,
    Robert Millan and Daniel Stone!
  * In xserver-xorg's postinst, delete old FontPaths pointing to CID fonts,
    are these aren't supported anymore.

  [ Colin Watson ]
  * debian/xserver-xorg.config.in: Improve expr return code handling in
    validate_nice_value; don't use run function when we need to check
    db_input's return value (LP: #68267).

  [ Julien Cristau ]
  * Drop references to obsolete modules in the debconf templates.
  * dexconf: don't add fontpaths in /usr/X11R6.
  * dexconf: point to the xorg.conf manpage, not /etc/X11/xorg.conf
    (closes: #408114).
  * Add patch from Guillem Jover <guillem@debian.org> to add console detection
    support for GNU/kFreeBSD to the X server wrapper (closes: #413454).
  * Add xserver-xorg-video-vmware to xserver-xorg-video-all's dependencies on
    amd64 (closes: #413492).

  [ David Nusinow ]
  * Add xserver-xorg-input-evtouch to the dependency list for
    xserver-xorg-input-all
  * Remove code from dexconf, xserver-xorg.templates, and
    xserver-xorg.postinst to process the module list. The server will now have
    a default set of modules to be loaded and those can be added to or
    disabled in xorg.conf. This will require xserver-xorg-core 2:1.2.99.905-3
    so bump the versioned dependency to it.

 -- David Nusinow <dnusinow@debian.org>  Sun, 15 Apr 2007 11:44:28 -0400

xorg (1:7.2-0ubuntu11) feisty; urgency=low

  * debian/local/dexconf: 
    - Change the wacom device path /dev/wacom -> /dev/input/wacom so
      USB devices have a chance to work out-of-the-box. Serial devices
      use the initscript from wacom driver as before.

 -- Timo Aaltonen <tepsipakki@ubuntu.com>  Mon,  2 Apr 2007 17:17:58 +0300

xorg (1:7.2-0ubuntu10) feisty; urgency=low

  * debian/xserver-xorg.postinst.in:
    - Move the special case of elographics after xresprobing, so we can
      check if PROBE_DUMP is empty, and only then use the special case.
      (LP: #89590)
  * debian/scripts/vars.*
    - add the intel and -modesetting drivers as a substitute for -i810.
      Taken from Debian. (LP: #80417)

 -- Timo Aaltonen <tepsipakki@ubuntu.com>  Fri, 30 Mar 2007 18:04:08 +0300

xorg (1:7.2-0ubuntu9) feisty; urgency=low

  [ Colin Watson ]
  * debian/xserver-xorg.config.in: Improve expr return code handling in
    validate_nice_value (the right way this time); don't use run function
    when we need to check db_input's return value (LP: #68267).

  [ Timo Aaltonen ]
  * debian/xserver-xorg.postinst.in: Intel Mobile 945GM needs sync ranges
    (LP: #62002)

 -- Timo Aaltonen <tepsipakki@ubuntu.com>  Tue, 27 Mar 2007 00:44:01 +0300

xorg (1:7.2-0ubuntu8) feisty; urgency=low

  * debian/local/dexconf:
    - Revert enabling horizontal scrolling for synaptics, since it is broken
    for some hardware. Better to be on the safe side.
    - Fix the reference to xorg.conf manpage (LP: #52032)

 -- Timo Aaltonen <tepsipakki@ubuntu.com>  Fri, 16 Mar 2007 10:49:18 +0200

xorg (1:7.2-0ubuntu7) feisty; urgency=low

  * debian/local/dexconf: 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)

 -- Martin Pitt <martin.pitt@ubuntu.com>  Fri,  9 Mar 2007 10:52:42 +0100

xorg (1:7.2-0ubuntu6) feisty; urgency=low

  * 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/local/dexconf: Read above debconf 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)

 -- Martin Pitt <martin.pitt@ubuntu.com>  Thu,  8 Mar 2007 11:40:50 +0100

xorg (1:7.2-0ubuntu5) feisty; urgency=low

  * revert the "fix" to validate_nice_value, which in fact broke it
    completely.

 -- Timo Aaltonen <tepsipakki@ubuntu.com>  Wed,  7 Mar 2007 12:19:27 +0200

xorg (1:7.2-0ubuntu4) feisty; urgency=low

  * debian/x11-common.config.in:
    - fix validate_nice_value() not to fail when using adept
      (Closes: LP #68267)
  * debian/local/dexconf:
    - don't set HorizScrollDelta for synaptics so that horizontal scrolling
      works. (Closes: LP #40021)

 -- Timo Aaltonen <tepsipakki@ubuntu.com>  Wed,  7 Mar 2007 07:59:58 +0200

xorg (1:7.2-0ubuntu3) feisty; urgency=low

  * Set default keyboard variant for French to oss (LP: #89835).

 -- Colin Watson <cjwatson@ubuntu.com>  Tue,  6 Mar 2007 11:20:23 +0000

xorg (1:7.2-0ubuntu2) feisty; urgency=low

  * Add xserver-xorg-video-1.0 alternative to the Depends for
    xserver-xorg. 

 -- Kyle McMartin <kyle@ubuntu.com>  Sun,  4 Mar 2007 15:48:54 +0000

xorg (1:7.2-0ubuntu1) feisty; urgency=low

  * debian/control:
    - don't require a xserver-xorg-core non available yet, the versionned
      Depends is only for reportbug
  * debian/control, debian/scripts/vars.sparc, debian/rules:
    - makes xorg arch any and use an extra variable 
      to not Depends on type-handling

  [ Timo Aaltonen ]
  * Merge with Debian, remaining changes:
    - debian/control:
      + 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:
        Depends: xserver-xorg-video-1.0 -> xserver-xorg-video.
        Put ${F:XServer-Xorg-Detect-Depends} in Recommends:, like the rest
        of the tools.
      + Added Replaces: xserver-xorg-driver-all to xserver-xorg-video-all
      + Added Conflicts: xserver-xorg-driver-all to xserver-xorg-video-all
      + Keep meta-packages for xlibs-dev, xbase-clients, xutils
    - debian/local/Xsession:
      + Set temporary umask when creating $ERRFILE
      + 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)
    - debian/local/dexconf:
      + don't put /usr/X11R6/* in font paths.
      + Uncoditionally re-enable ZAxisMapping in dexconf.
        (Closes: LP #31827)
      + Add InputDevice entries for wacom.
      + Add extra bits for ps3fb xorg.conf
      + 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.
        (Closes: LP #27442)
      + Enable elographics driver when matching known machines.
    - debian/rules:
      + set XSERVER_XORG_DETECT_DEPENDS, but with an empty list since the old
        packages are already in Recommends:.
      + move the dh_gencontrol trick to binary-indep:, so it actually is set
        for xserver-xorg.
    - debian/scripts/vars*
      + Add xserver-xorg-input-elographics to XSERVER_XORG_INPUT_DEPENDS.
      + Set XSERVER_XORG_DETECT_DEPENDS on amd64, hppa, i386, ia64.
      + Add xserver-xorg-video-vmware on amd64, remove from non-x86* archs.
    - debian/x11-common.{dirs,links}: don't ship usr/X11R6/lib/X11/fonts
    - debian/x11-common.init: Only source /etc/default/rcS if it exists,
      allowing x11-common to be installed by debootstrap.
    - debian/xserver-xorg.postinst.in:
      + Skip video card autodetection if xforcevesa is set
        (Closes: LP #27020, #59618).
      + Detect keyboard layout configuration using /etc/default/console-setup
        if available.
      + Translate debian-installer/keymap=uk to gb, not gb(intl)
        (Closes: LP #58016)
      + 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.
      + Clean up duplicate keymaps in xserver-xorg.config.in and make sure
        they're all neatly alphabetised.
      + Map cf console keymap to ca(fr), and fix sanity-checking logic for
        French Canadian vs. US-layout keyboards. (Closes: LP #34627)
      + Map et console keymap to ee. (Closes: LP #42800)
      + Map nl console keymap to nl. (Closes: LP #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.
      + Handle trfu/trqu console keymaps the same way as trf/trq.
        (Closes: LP #37867)
      + Map croat console keymap to hr. (Closes: LP #43598)
      + Try autodetecting South Korean keyboards.  They have to be detected
        from LANG since they use US keymaps on the console.
      + 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.
        (Closes at least: LP #30489)
      + Some ati cards require a kick (sync ranges) when using DVI output.
        (Closes: LP #39570)
      + Make sure to write sync values for Intel Corporation 82852/855GM
        Integrated Graphics Device when monitor is LCV/LDVS.
        (Closes: LP #13846)
      + 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/local/dexconf:
    - change font paths /usr/share/X11/fonts -> /usr/share/fonts/X11.
  * debian/rules:
    - change SERVERABIBUMP to 7.2
  * debian/xserver-xorg.links:
    - ship a symlink "usr/share/X11/fonts -> usr/share/fonts/X11".
  * debian/control:
    - change the Maintainer-fields.

  [ Colin Watson ]
  * Add lt to list of non-Latin keymaps (LP: #38931).

 -- Sebastien Bacher <seb128@canonical.com>  Fri, 23 Feb 2007 14:05:18 +0100

xorg (1:7.1.0-18) unstable; urgency=high

  * Add more conflicts to x11-common:
    + communicator-smotif-477
    + epan
    + navigator-smotif-477
    + stella (<< 2.2-1)
    + xfractint (<< 20.3.01-1)
    + xgobi
    + xpostitplus
    + xisp

 -- Julien Cristau <jcristau@debian.org>  Fri, 06 Apr 2007 02:54:22 +0200

xorg (1:7.1.0-17) unstable; urgency=high

  * x11-common Conflicts with netscape-base-4 (from woody/contrib).  Reported
    by Lennart Sorensen.

 -- Julien Cristau <jcristau@debian.org>  Fri, 06 Apr 2007 01:45:17 +0200

xorg (1:7.1.0-16) unstable; urgency=high

  [ Christian Perrier ]
  * Debconf translations:
    - Norwegian Nynorsk added (sent privately)
    - Marathi added. Closes: #416799
  * Configure Romanian keymap when the system is installed in
    Romanian. Closes: #416544

  [ Julien Cristau ]
  * Add x11-common conflict with ucbmpeg-play << 2.3p-13 (closes: #417564).
  * Urgency high to get this into etch.

 -- Julien Cristau <jcristau@debian.org>  Tue, 03 Apr 2007 14:06:17 +0200

xorg (1:7.2-1) experimental; urgency=low

  * New upstream release
  * Have the metapackages support xserver-xorg-video-intel,
    xserver-xorg-video-i810-modesetting, and xserver-xorg-intel-modesetting
    packages as valid options in addition to i810
  * Add xorg-docs to the xorg package dependencies. There's some very useful
    manpages in there, among other things.

 -- David Nusinow <dnusinow@debian.org>  Sun,  4 Mar 2007 15:38:57 -0500

xorg (1:7.1.0-15) unstable; urgency=low

  * Reupload without the .git/ dir.

 -- Julien Cristau <jcristau@debian.org>  Tue,  6 Mar 2007 18:48:00 +0100

xorg (1:7.1.0-14) unstable; urgency=high

  [ Julien Cristau ]
  * Add conflict on old versions of hamsoft, phototk and tkworld in x11-common
    (closes: #413281, #413339).  Thanks, Bill Allombert!

 -- David Nusinow <dnusinow@debian.org>  Sun,  4 Mar 2007 18:39:11 -0500

xorg (1:7.1.0-13) unstable; urgency=high

  * debian/local/Xsession: set temporary umask when creating $ERRFILE.  Thanks
    Timo Aaltonen.  This fixes CVE-2006-5214.
  * Change versioned conflict on opera to << 9.00-20060616, per Edward
    Welbourne <eddy@opera.com>.
  * Don't source debconf stuff in xserver-xorg.preinst, thanks lintian.

 -- Julien Cristau <jcristau@debian.org>  Wed, 28 Feb 2007 13:41:12 +0100

xorg (1:7.1.0-12) unstable; urgency=high

  [ Christian Perrier ]
  * Map French Canadian console keymap to "ca" X keymap in the postinst
    Closes: #408482

  [ Julien Cristau ]
  * High urgency upload for RC bugfix.
  * x11-common Conflicts with opera (<< 9.10-20061214.6), to provide an
    upgrade path for users with this third-party package installed.  Thanks to
    Steve Langasek (closes: #410740).
  * Change my email address in debian/control.
  * Use dh_strip to strip /usr/bin/X in x11-common.
  * Don't call update-rc.d twice in x11-common's postrm.

 -- Julien Cristau <jcristau@debian.org>  Tue, 13 Feb 2007 11:12:46 +0100

xorg (1:7.1.0-11) unstable; urgency=medium

  [ Julien Cristau ]
  * Added Tamil debconf translation (closes: #406306).

  [ David Nusinow ]
  * Permit pre-seeding for font server in dexconf. This adds a new hidden
    template that does not need to be translated. Thanks Petter Reinholdtsen
    for the original report and patch, and Damyan Ivanov for noticing the
    regression. Closes: #323262

 -- Julien Cristau <julien.cristau@ens-lyon.org>  Mon, 15 Jan 2007 00:15:33 +0100

xorg (1:7.1.0-10) unstable; urgency=low

  * Change the Depends of xserver-xorg back to xserver-xorg-video-all |
    xserver-xorg-video-1.0, xserver-xorg-input-all | xserver-xorg-input, and
    remove alternative recommends, because we'd like the -all packages to be
    pulled in on initial install and on upgrade from pre-modular versions
    (closes: #405639, #406058).
  * Add xserver-xorg-input-void to xserver-xorg-input-all's dependencies on
    s390.
  * Fix dexconf to work when $TMPDIR is NFS-mounted, by closing the redirected
    file descriptor before trying to rm $DEXCONFTMPDIR (closes: #405782).
    Thanks to Boris Dores for the report, and to Brice Goglin for the patch.
  * Add myself to Uploaders, and remove Fabio with his permission.

 -- Julien Cristau <julien.cristau@ens-lyon.org>  Tue,  9 Jan 2007 02:34:33 +0100

xorg (1:7.1.0-9) unstable; urgency=high

  [ Christian Perrier ]
  * xserver-xorg: set Depends on ${misc:Depends} mostly to have
    "debconf|debconf-2.0" listed in Depends to allow for the cdebconf
    transition. Closes: #402570

  [ Julien Cristau ]
  * Bump x11-common's conflict on xtel to <= 3.3.0-5.4, as that version
    installs fonts in /usr/lib/X11/fonts, which x11-common includes as a
    symlink.

  [ David Nusinow ]
  * Move the depends on xserver-xorg-(input/video)-all to a recommends. Just
    depend on the pseudopackages. The recommends also | -vesa for video, and
    -kbd and -mouse for -input. We duplicate the recommendation for
    xserver-xorg-input-all to handle the two different input packages we need.
    This is to deal with issues in which aptitude can't install the -all
    packages, so it just picks something random. This gives it some hints,
    hopefully at least guaranteeing that -vesa, -kbd, and -mouse are
    installed. Unfortunately, because we can't reproduce this bug, we can't
    fully guarnatee that this is fixed. It doesn't appear to break upgrades
    though. Thanks Steinar Gunderson. Closes: #403818
  [ Debconf translations updated ]
  * Italian typos fixed. Closes: #403196
  * Mistake in explanation about lspci in french translation fixed.
    Closes: #403297

 -- David Nusinow <dnusinow@debian.org>  Tue, 19 Dec 2006 22:19:00 -0500

xorg (1:7.1.0-8) unstable; urgency=medium

  [ Debconf translations updated ]
  * Portuguese. Closes: #399240

  [ Debconf translations added ]
  * Lithuanian. Closes: #400396
  * Malayalam. Closes: #402308

  [ Christian Perrier ]
  * Configure the German Swiss keymap when the D-I chosen keyboard is
    mac-usb-de_CH
    Closes: #396125

  [ Jurij Smakov ]
  * Add detection of PGX32 framebuffers on sparc.
  * Correct the setting of default depth for cgsix framebuffer, so
    that it actually triggers.

  [ Julien Cristau ]
  * Run invoke-rc.d and update-rc.d only once in postinst (instead of 3
    times), and let debhelper handle it.
  * Add a link to xserver-xorg-core's reportbug script, so bug reports against
    xserver-xorg contain the submitter's config and log files.  This means
    xserver-xorg needs to depend on xserver-xorg-core >= 2:1.1.1-11.

 -- David Nusinow <dnusinow@debian.org>  Sun, 10 Dec 2006 19:59:50 -0500

xorg (1:7.1.0-7) unstable; urgency=high

  [ Debconf translations added ]
  * Albanian. Closes: #397442
  * Bulgarian. Closes: #397473
  * Korean. Closes: #397218

  [ Debconf translations updated ]
  * Arabic (from Arabeyes CVS)

  [ Christian Perrier ]
  * Configure the Greek keymap when the D-I chosen keyboard is Greek
    Closes: #398290

  [ Julien Cristau ]
  * Install /etc/X11/Xsession with mode 0755, since that's what we did in the
    monolith, and some display managers rely on it being executable
    (closes: #390526).
  * Add line breaks to x11-common's Conflicts field in debian/control.
  * Add x11-common conflict with xephem (only in woody/non-free).

 -- David Nusinow <dnusinow@debian.org>  Sat, 18 Nov 2006 19:56:52 -0500

xorg (1:7.1.0-6) unstable; urgency=low

  [ Debconf translations added ]
  * Arabic (though still incomplete).
  * Bosnian. Closes: #396484
  * Chinese (Traditional).
  * Croatian.
  * Greek.
  * Thai. Closes: #396827
  * Turkish.

  [ Debconf translations updated ]
  * Nepali
  * Russian. Closes: #391602

  [ Julien Cristau ]
  * Readd /etc/X11/Xresources/x11-common which was lost in the transition from
    the monolith.  This enables the -color customization, and closes: #365358.
  * Delete stampdir in debian/rules clean.
  * Don't load the obsolete Type 1 font backend in the server, as suggested by
    Juliusz Chroboczek (closes: #364965).
  * Bump x11-common's conflict on xlbiff to "<< 4.1-4". Thanks to Bill
    Allombert and Steve Langasek (closes: #396279).

 -- David Nusinow <dnusinow@debian.org>  Sun,  5 Nov 2006 20:09:29 -0500

xorg (1:7.1.0-5) unstable; urgency=low

  [ Debconf translation added ]
  * Wolof. Closes: #393815

  [ Debconf translation updates ]
  * Vietnamese. Closes: #393640

  [ David Nusinow ]
  * Fix server symlink md5sum for upgrades from sarge. It now takes links to
    the XFree86 server and /bin/true in case of botched old symlink
    transition in to account.
  * Remove server symlink md5sum recreation in preinst. This gets taken care
    of in the postinst, and having it the preinst can cause upgrade problems

 -- David Nusinow <dnusinow@debian.org>  Thu, 19 Oct 2006 23:13:17 -0400

xorg (1:7.1.0-4) unstable; urgency=low

  [ Debconf translation updates ]
    - Catalan. Closes: #372262
    - German. Closes: #392456
    - Italian. Closes: #391497
    - Norwegian Bokmål. Closes: #391683
    - Russian. Closes: #391563

  [ David Nusinow ]
  * Add grace6's sarge version to the long list of conflicted packages. Thanks
    Bill Allombert. Closes: #390943

  [ Jurij Smakov ]
  * Add the dependency for xorg on sparc-utils (for sparc only), as we rely on
    prtconf from this package for videocard detection.

 -- David Nusinow <dnusinow@debian.org>  Mon, 16 Oct 2006 21:48:29 -0400

xorg (1:7.1.0-3) unstable; urgency=low

  [ Debconf translation updates ]
    - Dutch. Closes: #391187
    - Simplified Chinese. Closes: #390956

  [ David Nusinow ]
  * Make /dev/input/mice the default mouse port in the xserver-xorg.templates 
    file.  Also provide the devices in this file rather than as a variable in
    the config script. Closes: #385078
  * Have dexconf actually use the mouse protocol and port selected during
    debconf config. Thanks Ilguiz Latypov. Closes: #376055

 -- David Nusinow <dnusinow@debian.org>  Thu,  5 Oct 2006 22:28:36 -0400

xorg (1:7.1.0-2) unstable; urgency=low

  [ Debconf translations updates ]
    - Romanian. Closes: #388441
    - Vietnamese. Closes: #388565
    - Finnish. Closes: #389699
    - Basque. Closes: #389721
    - Portuguese. Closes: #390750
    - Hungarian. Closes: #390755
    - Swedish. Closes: #390782
    - Slovak. Closes: #390795
    - Japanese. Closes: #390806
    - Czech. Closes: #390900
    - Khmer. Closes: #375063
    - Czech. Closes: #390900

  [ Steve Langasek ]
  * Add Conflicts: with xserver-xfree86-dbg for the /usr/X11R6/bin
    transition.  Thanks to Bill Allombert for testing.  Closes: #388633.

  [ Denis Barbier ]
  * Fix handling of "Generic Video Card" and "Generic Monitor" strings
    in xserver-xorg.{config,postinst}, previous changes were buggy.
    Closes: #389506  Thanks Joshua Kwan.
  * Fix xserver-xorg.postinst, it could hang.
    Closes: #388568  Thanks Bas Wijnen.
  * In xserver-xorg.config, map sg-latin1 console keymap to 'ch(de)'.
    Closes: #386191  Thanks Tormod Volden.

  [ David Nusinow ]
  * Incorporate the entire old xserver-xorg.config script in to the
    postinst script. This is hideously dirty, but it should allow the script
    to properly expect discover and xresprobe to be installed without having
    gross hacks in tasksel just for this task. We'll junk all this for etch+1.
    Thanks to Joey Hess for the solution.
  * Bump server abi version to 7.1.0, not that we're doing anything with it
    yet
  * Lower the upgrade_issues warning call to priority medium. We already have
    the xserver-xfree86 dummy package that depends on xserver-xorg, so apt and
    aptitude should do the correct thing in most cases in theory. Cross your
    fingers folks. Thanks to the d-i team and Steve Langasek. Closes: #372077

 -- David Nusinow <dnusinow@debian.org>  Tue,  3 Oct 2006 23:30:01 -0400

xorg (1:7.1.0-1) unstable; urgency=low

  [ Christian Perrier ]
  * Fix lspci command line recommendation in templates
    Fix translations accordingly. Closes: #387563

  [ Denis Barbier ]
  * Translations of "Generic Video Card" were hardcoded into
    xserver-xorg.config, move them into debian/po/*.po files.
    Same for "Generic Monitor" translations which were
    hardcoded into xserver-xorg.postinst.  Closes: #387698
  * Modify debian/x11-common.dirs and debian/x11-common.install
    so that this package can be compiled from an SVN checkout
    without .svn files being shipped in /etc/X11/Xsession.d.
  * Add m32r support.  Thanks Kazuhiro Inaoka (closes: #376060)
  * Add ppc64 support.  Thanks Andreas Jochens (closes: #362085)
  * Fix list of display resolution in maintainer scripts, the
    patch sent to #330304 had been broken when updated to 7.0.
  * Add support for Catalan keyboard. Thanks Robert Millan
    (closes: #346269)
  * Fix Japanese keyboard configuration in xserver-xorg.config.
    Thanks Kenshi Muto (closes: #385392)

  [ Debconf translations updates ]
    - Dzongkha (Tenzin Dendup). Closes: #382959, #383111, #388013
    - Khmer (Khoem Sokhem). Closes: #375063
    - Vietnamese (Clytie Siddall). Closes: #383127
    - Basque (Piarres Beobide). Closes: #374032
    - Romanian (Eddy Petrisor). Closes: #383539
    - Brazilian Portuguese (Felipe Augusto van de Wiel). Closes: #373880, #365531
    - Portuguese (Miguel Figueiredo). Closes: #386343
    - Czech (Miroslav Kure). Closes: #384764
    - Slovak (Peter Mann). Closes: #386827
    - Swedish (Daniel Nylander). Closes: #386511
    - Galicien (Jacobo Tarrio). Closes: #387969
    - Added Finnish (Tapio Lehtonen). Closes: #387391

  [ David Nusinow ]
  * Update xsfbs with patch from ubuntu to support ARCHITECTURE, LAPTOP,
    RECONFIGURE, FIRSTINST, and UPGRADE variables for use in the xserver-xorg
    config scripting
  * Remove test for upgrade from xserver-xorg.postinst
  * Pull patch from Ubuntu to xserver-xorg postinst to correctly update the
    config file on upgrades (closes: #375689)
  * Steal patch from Ubuntu to update non-latin keymaps by Colin Watson
  * Steal patch from Ubuntu for xserver-xorg.config to help with the Mac mini
    by Fabio.
  * Steal patch from Ubuntu to recreate missing server symlink checksum that
    was lost on some upgrades. This patch by Fabio.
  * Don't force people to select resolution modes. Previously, if none were
    selected, a loop would be entered until some were. This turned out to be
    buggy, but it should not be in place anyway. I've removed the loop, so
    that if the user selects no modes, dexconf won't write the section to
    xorg.conf and the server will be left to its own nefarious devices. Thanks
    Robert Millan. (closes: #384285)

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

  [ Drew Parsons ]
  * Sync experimental version to unstable for X11R7.1 transition.
  * Use dh_installman to install man pages. Closes: #368316, #375391, #376764.

  [ Branden Robinson ]
  * In the config script, munge the source package version into the upstream
    version so we can tell Discover what to look for.  Discover's data is
    based on the upstream version number, not the Debian package's, so strip
    the Debian revision and the (ugh!) epoch.  The introduction of the epoch
    caused the config script to start passing Discover a data version that
    wouldn't match anything, because the epoch is not part of the upstream
    version number.  Thanks to Thomas Lange for diagnosing this bug!

 -- David Nusinow <dnusinow@debian.org>  Tue, 19 Sep 2006 22:05:50 -0400

xorg (1:7.1.0~1) experimental; urgency=low

  [ Drew Parsons ]
  * Tighten dependencies between X11R7.1 server and video drivers.
    xserver-xorg Depends: xserver-xorg-video-all | xserver-xorg-video-1.0.

 -- Drew Parsons <dparsons@debian.org>  Fri, 25 Aug 2006 20:23:25 +1000

xorg (1:7.0.23) unstable; urgency=low

  [ Denis Barbier ]
  * Run debconf-updatepo in the clean target to make sure that debian/po/*.po
    files are up-to-date.  Thanks Thomas Huriaux (closes: #372904)
  * Fix XKB paths in debconf templates.  Thanks Vincent Ho (closes: #373175)
  * Replace _Choices by __Choices in debconf templates, because several
    translations had wrong number of items.

  [ Christian Perrier ]
  * Debconf translations updates
    - French (Christian Perrier)
    - Brazilian (André Luis Lopes). Closes: #373880
    - Galician (Jacobo Tarrio). Closes: #373894
    - Basque (Piarres Beobide). Closes: #374032
    - Romanian (Eddy Petrisor). Closes: #374082
    - Vietnamese (Clytie Siddall). Closes: #375087
    - Swedish (Daniel Nylander). Closes: #375970
    - Russian (Yuri Kozlov). Closes: #376343
    - Danish (Claus Hindsgaul). Closes: #376705
    - Simplified Chinese (Carlos Z.F. Liu). Closes: #382496
  * New debconf translations:
    - Nepali (Mahesh subedi). Closes: #374803
    - Khmer (auk piseth). Closes: #375063
    - Dzongkha (Jurmey Rabgay).

  [ Michel Dänzer ]
  * Add debian/scripts/vars.armeb, thanks Lennert Buytenhek. Closes: #367188

  [ Jurij Smakov ]
  * Remove xserver-xorg-video-{newport,tga} from XSERVER_XORG_VIDEO_DEPENDS
    on sparc, since these drivers do not built on sparc (sparc is not in
    the arch list). Thanks to Julien Cristau for pointing it out.
  * Fix the currently broken sparc hardware detection in config and
    postinst scripts:
    - introduce a new discover_sparc_video() function which uses prtconf
      rather than discover to do the hardware detection. discover does not
      support detection of devices attached to UPA and SBUS buses, common
      on sparc, so it's pretty useless there.
    - use this function on sparc by introducing the DISCOVER_PROG and
      DISCOVER_FUNC variables, preserving the old behavior for all other
      arches. Adjust the debugging messages appropriately.
    - set the default sparc driver to 'sunffb'.
    - set default keyboard rules for sparc to 'xorg' instead of obsolete
      'sun'. The keyboard layer in 2.6 kernels have been unified across
      all arches, so 'xorg' is the correct setting now.
    - add 'cfb' and 'cfb32' to the list of modules loaded by default on
      sparc, since the symbols provided by them are required by sunffb
      driver. Closes: #352869, #377809
    - set the default color depth to 8 for the 'cgsix' driver, as it's the
      maximum depth supported by it.

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

 -- Denis Barbier <barbier@debian.org>  Sat, 12 Aug 2006 18:11:07 +0200

xorg (1:7.1.1ubuntu8) feisty; urgency=low

  * dexconf: Add extra bits for ps3fb xorg.conf

 -- Ben Collins <bcollins@ubuntu.com>  Fri, 16 Feb 2007 16:38:16 -0500

xorg (1:7.1.1ubuntu7) feisty; urgency=low

  [ robepisc ]
  * Skip video card autodetection if xforcevesa is set (LP: #59618).

 -- Colin Watson <cjwatson@ubuntu.com>  Wed, 31 Jan 2007 10:38:30 +0000

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

Old Changelog:

  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

