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

xorg: Changes to 'debian-unstable'



New branch 'debian-unstable' available with the following commits:
commit 604536a5e9f7fbe2baf9a4a09e23b6faead270c9
Author: Julien Cristau <julien.cristau@ens-lyon.org>
Date:   Mon Jan 15 00:44:56 2007 +0000

    Make dexconf cope with a nonexistent shared/fontpath/fontserver template.
    
    If x11-common is installed with an older xserver-xorg, the new fontserver
    template will not exist, and db_get will fail.  Since dexconf is set -e,
    we need to add a test around db_get to deal with this case.

commit b0d1cb4db0e1acf36c0d56defeb714ac3808e6ff
Author: Julien Cristau <julien.cristau@ens-lyon.org>
Date:   Mon Jan 15 00:17:14 2007 +0000

    Fix formatting.

commit f2283d26a65eb88d459c701057a52b762ecd1612
Author: Julien Cristau <julien.cristau@ens-lyon.org>
Date:   Sun Jan 14 23:48:39 2007 +0000

    Make the new font server template shared, so it can be used by other X servers.

commit c010b451ebefcf56c5c181b2f358ad21383522cb
Author: Julien Cristau <julien.cristau@ens-lyon.org>
Date:   Sun Jan 14 23:16:24 2007 +0000

    Prepare changelog for upload.

commit 5360cc2e91a8a938f31749969ed85b5df9117c6a
Author: David Nusinow <dnusinow@debian.org>
Date:   Sun Jan 14 22:49:42 2007 +0000

    * 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

commit 1f7cfb94604a1736df472d7487f5f3dcba354185
Author: Julien Cristau <julien.cristau@ens-lyon.org>
Date:   Wed Jan 10 12:20:45 2007 +0000

    * Added Tamil debconf translation (closes: #406306).

commit 3db7af83d9497907413e09a437249f3f5e3925e7
Author: Julien Cristau <julien.cristau@ens-lyon.org>
Date:   Tue Jan 9 01:39:26 2007 +0000

    * Add bug closers for #406058 and #405639.
    * Add myself to Uploaders, and remove Fabio with his permission.
    * Prepare changelog for upload.

commit b6a23cd326680829552199eca3c0f32c8d4feb54
Author: Julien Cristau <julien.cristau@ens-lyon.org>
Date:   Sat Jan 6 18:28:11 2007 +0000

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

commit 88ccd47ce9d1fe405a8196b577d73a1a76abdfee
Author: Julien Cristau <julien.cristau@ens-lyon.org>
Date:   Mon Jan 1 18:56:41 2007 +0000

    * 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.
    * Add xserver-xorg-input-void to xserver-xorg-input-all's dependencies on
      s390.

commit e53fa613e2a333b3bfd133e68732c4683131da8c
Author: Julien Cristau <julien.cristau@ens-lyon.org>
Date:   Wed Dec 20 03:27:58 2006 +0000

    Fix Steinar's name in changelog

commit 00e84cae04b6ef765cfdc19bfc2a3442e091e826
Author: David Nusinow <dnusinow@debian.org>
Date:   Wed Dec 20 03:23:06 2006 +0000

    Prepare changelog for upload

commit 6929f466e1de053de5c6db43c8753857f69088b2
Author: David Nusinow <dnusinow@debian.org>
Date:   Wed Dec 20 03:18:48 2006 +0000

    * 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.
    * 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 Gunerson. Closes: #403818

commit ac4e64502eb4ddf39e7d4f7be9b0e6d508dae367
Author: Julien Cristau <julien.cristau@ens-lyon.org>
Date:   Wed Dec 20 02:15:06 2006 +0000

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

commit a22a8b8328c2124a435a3f1fe1c8006baafbe660
Author: Julien Cristau <julien.cristau@ens-lyon.org>
Date:   Sat Dec 16 00:48:37 2006 +0000

    * Mistake in explanation about lspci in french translation fixed.
      Closes: #403297

commit b3babaf916f783f5ab0c0dd5544c9e62046fc581
Author: Christian Perrier <bubulle@debian.org>
Date:   Fri Dec 15 18:31:46 2006 +0000

    Fix typos in Italian

commit 734c63bc3f6f918d2d418a328db22fd6db26b72d
Author: David Nusinow <dnusinow@debian.org>
Date:   Tue Dec 12 23:59:39 2006 +0000

    Reflow changelog entry

commit 0594ea5cccb408c49a90608691d1f956c578909e
Author: Christian Perrier <bubulle@debian.org>
Date:   Mon Dec 11 12:25:39 2006 +0000

    xserver-xorg Depends on ${misc:Depends}. See #402570

commit d8fb44a3bde06ee5b711dafcc5946f0d84a406c6
Author: David Nusinow <dnusinow@debian.org>
Date:   Mon Dec 11 01:04:16 2006 +0000

    Prepare changelog for upload

commit a1b71f9378a5ecdceaf2b9ad4371088ff2031018
Author: Christian Perrier <bubulle@debian.org>
Date:   Sat Dec 9 15:53:04 2006 +0000

    Added Malayalam translation

commit 36d5ede2e649fd0c8fdd5af1e3b4eb28bd230318
Author: Jurij Smakov <jurij@wooyd.org>
Date:   Fri Dec 1 05:32:09 2006 +0000

    Correct the setting of default depth for cgsix
    framebuffer so that it actually triggers.

commit 4a1404dc3c29d4cacfe43ae485686470504cf345
Author: Christian Perrier <bubulle@debian.org>
Date:   Tue Nov 28 19:56:15 2006 +0000

    Remove non ASCII chars in headers (this breaks Pootle)

commit 16018c3ebcdfd5dfdb8885e15495d795366d4626
Author: Christian Perrier <bubulle@debian.org>
Date:   Sun Nov 26 06:21:42 2006 +0000

    Move the line about Lituanian translation being added to a separate entry
    just like we did before

commit 0b7f2b248d1bc4d83df6d5aa4a8e8be7f400a8a0
Author: Julien Cristau <julien.cristau@ens-lyon.org>
Date:   Sat Nov 25 23:01:14 2006 +0000

    * Add Lithuanian debconf translation (closes: #400396).

commit 3ed744bb0774a04e09165dd7c58935cd1de164ba
Author: Julien Cristau <julien.cristau@ens-lyon.org>
Date:   Sat Nov 25 18:02:04 2006 +0000

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

commit b0b0d000c977c16385864fb45ae39ced929dba12
Author: Julien Cristau <julien.cristau@ens-lyon.org>
Date:   Sat Nov 25 15:44:40 2006 +0000

    * Run invoke-rc.d and update-rc.d only once in postinst (instead of 3
      times), and let debhelper handle it.

commit 8ce0c857562ee2272905674af08f70750f3ef077
Author: Jurij Smakov <jurij@wooyd.org>
Date:   Thu Nov 23 23:24:40 2006 +0000

    Add detection of PGX32 framebuffers on sparc
    (device id TSI,gfxp).

commit 14548811d6ef37968f5e66ebc2f0379c9535f2b8
Author: Christian Perrier <bubulle@debian.org>
Date:   Wed Nov 22 20:16:21 2006 +0000

    Select German Swiss keymap for powerpc German Swiss keyboards

commit d19f4da7a88076b0f6efa7ea6da18077b164eea6
Author: Christian Perrier <bubulle@debian.org>
Date:   Sun Nov 19 07:09:17 2006 +0000

    Portuguese translation fixed

commit a578a6f15de59ee7c25f079bd9a84718755eb166
Author: David Nusinow <dnusinow@debian.org>
Date:   Sun Nov 19 00:57:21 2006 +0000

    Prepare changelog for upload. Bump urgency to high.

commit 9e7eacd76233789a600be3126b9a5b1d9fba3c18
Author: Julien Cristau <julien.cristau@ens-lyon.org>
Date:   Wed Nov 15 00:26:18 2006 +0000

    * Add x11-common conflict with xephem (only in woody/non-free).

commit 3b73912d78f973b2fd0ad7291d0e0e5f46ab40a0
Author: Christian Perrier <bubulle@debian.org>
Date:   Tue Nov 14 18:54:00 2006 +0000

    Albanian translation completed

commit 3aa812b98dccd3c2f59ec2552bfb00835f9893a5
Author: Christian Perrier <bubulle@debian.org>
Date:   Tue Nov 14 07:52:27 2006 +0000

    Configure the greek keymap

commit 296f8c0c033b61ffa0c5ab87ee94ae731857a7d6
Author: Julien Cristau <julien.cristau@ens-lyon.org>
Date:   Sun Nov 12 12:56:31 2006 +0000

    * Add line breaks to x11-common's Conflicts field in debian/control.

commit d541f2cdd2c86fb04e4f201ac27201bd97ed61b8
Author: Christian Perrier <bubulle@debian.org>
Date:   Tue Nov 7 19:19:54 2006 +0000

    Bulgarian translation added

commit 4576acbc5d9e1d9aeb68df542f16d5296790b754
Author: Christian Perrier <bubulle@debian.org>
Date:   Tue Nov 7 19:04:20 2006 +0000

    Albanian translation added

commit 400ca3e590caef056b64c6194fe340dd7971facd
Author: Julien Cristau <julien.cristau@ens-lyon.org>
Date:   Tue Nov 7 15:43:00 2006 +0000

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

commit 2f25d93b9231348644f0498eac6e6fa9d9902e28
Author: Christian Perrier <bubulle@debian.org>
Date:   Mon Nov 6 07:13:58 2006 +0000

    Added Korean translation

commit d0ceec00a56f23fe6f6d8c7ea840356bf4468288
Author: Christian Perrier <bubulle@debian.org>
Date:   Mon Nov 6 07:12:25 2006 +0000

    Arabic translation completed

commit 504da20e06e9b33967de535baecb425b2bab833c
Author: David Nusinow <dnusinow@debian.org>
Date:   Mon Nov 6 01:10:31 2006 +0000

    * Update xserver-xorg.postinst.in commentary to be more accurate
    * Prepare changelog for upload

commit bf16a6f208e4da0395caf4e2db2e894ff218ffec
Author: Julien Cristau <julien.cristau@ens-lyon.org>
Date:   Sun Nov 5 13:38:26 2006 +0000

    Revert change to debconf templates, because I'm afraid of bubulle's wrath.

commit 5a7d298ca3c9370c5f8244a2287a3e115f1709ae
Author: Julien Cristau <julien.cristau@ens-lyon.org>
Date:   Sat Nov 4 05:31:47 2006 +0000

    * Bump x11-common's conflict on xlbiff to "<< 4.1-4". Thanks to Bill
      Allombert and Steve Langasek (closes: #396279).

commit c693ed43f466e9ef2185a32a8f446b0f42a9bdba
Author: Christian Perrier <bubulle@debian.org>
Date:   Fri Nov 3 19:05:29 2006 +0000

    Added Thai translation of templates

commit da4c59259c1d19ccaffcb971eec0ba476ff46304
Author: Christian Perrier <bubulle@debian.org>
Date:   Wed Nov 1 08:25:34 2006 +0000

    Mention the Russian translation fx

commit 7b3062f4d27a75bb2fa9242768f82dabd5caba6f
Author: Christian Perrier <bubulle@debian.org>
Date:   Wed Nov 1 08:22:23 2006 +0000

    Added Bosnian translation

commit 010e3c064c89cf71b785fcc46d32ad51e61a9b8c
Author: Christian Perrier <bubulle@debian.org>
Date:   Thu Oct 26 17:41:46 2006 +0000

    Nepali translation updated

commit 2dddfc45b0aac340a967aa69926fba4101a1d737
Author: Christian Perrier <bubulle@debian.org>
Date:   Wed Oct 25 18:10:45 2006 +0000

    Greek translation updated

commit 17000c2ee8a8dab694061d1df1aa484df172281e
Author: Christian Perrier <bubulle@debian.org>
Date:   Wed Oct 25 06:26:39 2006 +0000

    Croatian translation added

commit 96d45ac4e8ca9a1cb6161e73b774cd358f20cb14
Author: Julien Cristau <julien.cristau@ens-lyon.org>
Date:   Tue Oct 24 02:27:09 2006 +0000

    * Don't load the obsolete Type 1 font backend in the server, as suggested by
      Juliusz Chroboczek (closes: #364965).

commit 4a68935f1f38479af0a0a40eb09959e265223e58
Author: Julien Cristau <julien.cristau@ens-lyon.org>
Date:   Mon Oct 23 23:11:50 2006 +0000

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

commit f766b4edaec69c93080127d3c7bd0d07951eb2ed
Author: Christian Perrier <bubulle@debian.org>
Date:   Sat Oct 21 17:44:53 2006 +0000

    Re-order strings in the PO files. Update Turkish

commit 887adad38919f261cbeb302b2a49e263434059f4
Author: Christian Perrier <bubulle@debian.org>
Date:   Sat Oct 21 07:16:00 2006 +0000

    Arabic partial translation added

commit d157f734de5be0fadc097d2b9a28e07424b7eb5d
Author: Christian Perrier <bubulle@debian.org>
Date:   Fri Oct 20 17:20:43 2006 +0000

    Traditional Chinese added

commit 575ec2e07ab19b2db22633ea3243af8851a37f09
Author: David Nusinow <dnusinow@debian.org>
Date:   Fri Oct 20 03:13:26 2006 +0000

    Prepare changelog for upload

commit 556c10e7418c05352a00749619f85fefea29a58f
Author: David Nusinow <dnusinow@debian.org>
Date:   Fri Oct 20 03:13:04 2006 +0000

    Update comments to match reality

commit 43cad5f6621ebfb9d3a66663ccb55a006666c271
Author: David Nusinow <dnusinow@debian.org>
Date:   Fri Oct 20 02:43:02 2006 +0000

    * 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

commit 3c59d46c812565438dbc7f72c9edcfd4d326e988
Author: Christian Perrier <bubulle@debian.org>
Date:   Wed Oct 18 06:30:18 2006 +0000

    Wolof translation added

commit ed862e45cdef3e55c8297025679bcb9988a71e78
Author: Christian Perrier <bubulle@debian.org>
Date:   Tue Oct 17 18:04:24 2006 +0000

    Vietnamese translation update

commit af1e7c90ed46d0f4ec45b25e1bffb7ca0786b8ab
Author: David Nusinow <dnusinow@debian.org>
Date:   Tue Oct 17 01:56:57 2006 +0000

    Prepare changelog for upload

commit 2226e15a7cb72a901a8ed8fa784c622968a15fbb
Author: Jurij Smakov <jurij@wooyd.org>
Date:   Sun Oct 15 06:17:06 2006 +0000

    Correct the changelog.

commit e0d36e6a70c90782f73f8d415ae2c53562565067
Author: Jurij Smakov <jurij@wooyd.org>
Date:   Sun Oct 15 06:16:10 2006 +0000

    Add the xorg dependency on sparc-utils as 'sparc-utils | not+sparc'.
    That works because either we are on sparc and sparc-utils will satisfy
    it, or we are not, then not+sparc (a virtual package provided by
    type-handling on non-sparc architectures only) will do the trick.

commit 041871754a6ea16a3d0d8a0e0d777e297776586b
Author: Christian Perrier <bubulle@debian.org>
Date:   Thu Oct 12 06:31:52 2006 +0000

    German translation update (and sort things in changelog)

commit 58ad05ee432ba6b9e01e648100138f950526b006
Author: Christian Perrier <bubulle@debian.org>
Date:   Tue Oct 10 06:14:09 2006 +0000

    Catalan translation update

commit a8797ba3d63ab08b134c12b8728c319cf7227ffc
Author: Christian Perrier <bubulle@debian.org>
Date:   Sun Oct 8 11:56:28 2006 +0000

    Norwegian Bokmål translation update

commit 43db9c17566021dc440015ba525a665f394ac5b8
Author: David Nusinow <dnusinow@debian.org>
Date:   Sun Oct 8 04:08:32 2006 +0000

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

commit b6e3a446db15cec806672e72114d28633bd315fd
Author: Christian Perrier <bubulle@debian.org>
Date:   Sat Oct 7 19:59:27 2006 +0000

    Catalan translation update

commit 7e3ab6e475cc0984365cb2b27614f47180649664
Author: Christian Perrier <bubulle@debian.org>
Date:   Sat Oct 7 17:12:14 2006 +0000

    Russian translation updated

commit 14384d9b26480e40bdb6c79e59f94a5a2e320af0
Author: Christian Perrier <bubulle@debian.org>
Date:   Sat Oct 7 06:38:42 2006 +0000

    Italian translation update

commit 7c04800287d998eff9251f3cf97f7d1f2f6fa4d0
Author: David Nusinow <dnusinow@debian.org>
Date:   Fri Oct 6 02:45:35 2006 +0000

    Fix changelog message and prepare for upload.

commit a2b6287a9d1cfe2bfb1d0d2d8d3d599056486503
Author: David Nusinow <dnusinow@debian.org>
Date:   Fri Oct 6 02:26:55 2006 +0000

    Fix default. Thanks Frans Pop for catching this in the nick of time

commit 70d212c5c5ed9c97f980219353c03f8a5a644b7d
Author: David Nusinow <dnusinow@debian.org>
Date:   Fri Oct 6 02:22:01 2006 +0000

    Prepare changelog for upload

commit b86c11d71f56b7abcf19f26a75eb23ad12725354
Author: David Nusinow <dnusinow@debian.org>
Date:   Fri Oct 6 02:06:20 2006 +0000

    * Have dexconf actually use the mouse protocol and port selected during
      debconf config. Thanks Ilguiz Latypov. Closes: #376055

commit 46ec4963b3dcbf1c64a97d6fb840f6b3fc0e9d8f
Author: David Nusinow <dnusinow@debian.org>
Date:   Fri Oct 6 01:59:53 2006 +0000

    * Make ImPS/2 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

commit f56342855e12730052e5edc5e3ad5e488ca0b499
Author: David Nusinow <dnusinow@debian.org>
Date:   Fri Oct 6 00:21:59 2006 +0000

    Re-merge changes with changelog intact

commit bfd802eb64ab231a7d928bc875c2588d7cf63ae7
Author: David Nusinow <dnusinow@debian.org>
Date:   Fri Oct 6 00:19:32 2006 +0000

    Revert last two changes because the package was already uploaded. I'll reapply in a moment.

commit f399b66853aea6b39dfc649403bbdb0b722795ad
Author: Christian Perrier <bubulle@debian.org>
Date:   Thu Oct 5 18:03:23 2006 +0000

    Dutch translation update

commit 7f385e95bef68d1861dfe91132c9809779afb199
Author: Christian Perrier <bubulle@debian.org>
Date:   Wed Oct 4 06:19:34 2006 +0000

    Updated Simplified Chinese translation

commit f25520173ed8a92b2f6ccba31cdf095a8ee97d5a
Author: David Nusinow <dnusinow@debian.org>
Date:   Wed Oct 4 03:30:16 2006 +0000

    Prepare changelog for release

commit b791f377324a2ae52391a723e2c8d55fa4a9651b
Author: David Nusinow <dnusinow@debian.org>
Date:   Wed Oct 4 03:28:03 2006 +0000

    * 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

commit c47fb7a920825e3824c9f719346a026cda995919
Author: David Nusinow <dnusinow@debian.org>
Date:   Wed Oct 4 03:16:03 2006 +0000

    * 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

commit 4feae4a3370b91f00305acdba84a9b6a91a0b471
Author: Christian Perrier <bubulle@debian.org>
Date:   Tue Oct 3 20:42:27 2006 +0000

    Updated Khmer and Czech

commit 568c86bbac2d14cb39ff850da267ae36b08680a7
Author: Christian Perrier <bubulle@debian.org>
Date:   Tue Oct 3 19:09:07 2006 +0000

    Update a few translations

commit 9c2ed83d95c19aa471e6ad972d2afe7add7cffce
Author: Christian Perrier <bubulle@debian.org>
Date:   Tue Oct 3 06:21:22 2006 +0000

    Swedish translation update

commit 8be999089a661fe8643bc11de13c48d009f1890c
Author: Christian Perrier <bubulle@debian.org>
Date:   Tue Oct 3 04:07:55 2006 +0000

    Portuguese and Hungarian translation updates

commit db90aa5d371f384fb862fc3970500b3c0aad8fd3
Author: Denis Barbier <barbier@debian.org>
Date:   Wed Sep 27 19:13:48 2006 +0000

    In xserver-xorg.config, map sg-latin1 console keymap to 'ch(de)'.
    Closes: #386191  Thanks Tormod Volden.

commit 5c0c3b8d0c00a4fdcfb5732d89cc38a7585ea66d
Author: Denis Barbier <barbier@debian.org>
Date:   Wed Sep 27 19:01:36 2006 +0000

    Fix xserver-xorg.postinst, it could hang.
    Closes: #388568  Thanks Bas Wijnen.

commit dd0fd29bf639f33633ad777a1c51a7468ca0d180
Author: Christian Perrier <bubulle@debian.org>
Date:   Wed Sep 27 17:45:10 2006 +0000

    Updated basque and Finnish translations

commit 3ca2806e5a4c4bcae13240ecae0164f34692b6d4
Author: Denis Barbier <barbier@debian.org>
Date:   Tue Sep 26 21:27:00 2006 +0000

    Fix handling of "Generic Video Card" and "Generic Monitor" strings
    in xserver-xorg.{config,postinst}, previous changes were buggy and
    these scripts could enter an endless loop.
    Closes: #389506  Thanks Joshua Kwan.

commit 46f9c872a6def96e7f460abdb8a3acb79680ae1a
Author: Steve Langasek <vorlon@debian.org>
Date:   Thu Sep 21 22:06:12 2006 +0000

    Add xserver-xfree86-dbg to the conflicts

commit a88dd7418be275bad14357d7066df6a233e8ca3f
Author: Christian Perrier <bubulle@debian.org>
Date:   Thu Sep 21 18:43:29 2006 +0000

    Vietnamese translation update

commit 91bbb74bcb197e29937e75b6732fa75a70028668
Author: Christian Perrier <bubulle@debian.org>
Date:   Wed Sep 20 18:06:20 2006 +0000

    Romanian translation update

commit d9733a5dd6984b723300b7bd9233ed64c42bc455
Author: David Nusinow <dnusinow@debian.org>
Date:   Wed Sep 20 02:06:05 2006 +0000

    Prepare changelog for upload to unstable

commit f7bfa366db07143492872caed60d4d1f45d7a66b
Author: David Nusinow <dnusinow@debian.org>
Date:   Wed Sep 20 01:55:01 2006 +0000

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

commit 0b3265b89d085bf2a95aeac9c195d3bc2c81faad
Author: David Nusinow <dnusinow@debian.org>
Date:   Wed Sep 20 00:33:54 2006 +0000

    * Revert ZAxisMapping patch stolen from ubuntu. The server should default
      to a more extensive mapping now anyway, so scroll thingies will work by
      default without this.

commit f1070f1da10cf829006f16d5d5cf150b00fba9f0
Author: Branden Robinson <branden@debian.org>
Date:   Tue Sep 19 16:08:55 2006 +0000

    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!

commit 3a8d6991bd7bbae515bb765dcf56f6b7686f3511
Author: Christian Perrier <bubulle@debian.org>
Date:   Mon Sep 18 18:13:05 2006 +0000

    Dzongkha translation update

commit f50fd667078e66bacc00c3d74d551e73506d4cf1
Author: Drew Parsons <dparsons@debian.org>
Date:   Mon Sep 18 12:10:30 2006 +0000

    * Sync experimental version to unstable for X11R7.1 transition.

commit ef3e43fe5510a8a020845ba538beb212b3ff068d
Author: Christian Perrier <bubulle@debian.org>
Date:   Mon Sep 18 06:39:20 2006 +0000

    Updated Galician translation

commit 6ac063a234849cd95ca7bc471a3bc5723239e8b5
Author: Christian Perrier <bubulle@debian.org>
Date:   Sun Sep 17 07:15:10 2006 +0000

    Finally recommend using "lspci" instead of "lspci -n", after discussion in
    the BTS and on IRC with Matthew Wilcox

commit 75b0938ff43c76dfa58f8bc8880592177f939224
Author: Denis Barbier <barbier@debian.org>
Date:   Sat Sep 16 09:27:28 2006 +0000

    Move translations of "Generic Monitor" from xserver-xorg.postinst
    into debian/po/*.po files.  Closes: #387698

commit 097779db489a4714266015358cce7978733bd0c9
Author: Christian Perrier <bubulle@debian.org>
Date:   Sat Sep 16 07:08:29 2006 +0000

    Regenerate stuff with debconf-updatepo from etch to avoid having an untranslatable string in the POT file

commit d591f66bca26c73e7032785bccf0addfa00da05d
Author: Christian Perrier <bubulle@debian.org>
Date:   Fri Sep 15 06:23:00 2006 +0000

    Fix my fix's spelling

commit e625d6715ab791ee8c2bb9bc26ce424de6efa816
Author: Christian Perrier <bubulle@debian.org>
Date:   Fri Sep 15 06:18:55 2006 +0000

    Fix lspci command line in templates and translations

commit 680f04a551cedca3640e450febeeac617e4f9cda
Author: Christian Perrier <bubulle@debian.org>
Date:   Thu Sep 14 07:58:58 2006 +0000

    Finnish translation added

commit ec8ce59302a9b421cb8bb57038a94814a6665d04
Author: Christian Perrier <bubulle@debian.org>
Date:   Sun Sep 10 16:32:46 2006 +0000

    The Brazilian update will close two bugs, not one.

commit 593b113ba9f6d1b7d0338e8d26dd3b44f3f7a223
Author: Christian Perrier <bubulle@debian.org>
Date:   Sun Sep 10 15:57:11 2006 +0000

    Slovak translation update

commit ab98cdfa28023273de935da274004a4783679be5
Author: David Martínez <ender@debian.org>
Date:   Sat Sep 9 23:22:11 2006 +0000

    Update Spanish debconf translation.

commit c9e20eaeedc0b0eb5e42ebe943380a3992a66bc4
Author: Christian Perrier <bubulle@debian.org>
Date:   Fri Sep 8 22:09:57 2006 +0000

    Swedish translation update

commit f5b090c6c1aeae65ce83985408afb093cc16051c
Author: Christian Perrier <bubulle@debian.org>
Date:   Thu Sep 7 06:25:18 2006 +0000

    Portuguese translation update

commit ee03a3280b9076366f5bbe0ea8564510d5f10450
Author: Denis Barbier <barbier@debian.org>
Date:   Mon Sep 4 21:29:06 2006 +0000

      * Fix Japanese keyboard configuration in xserver-xorg.config.
        Thanks Kenshi Muto (closes: #385392)

commit b2b5a546c18ea74d8cf75311015a587f010b0438
Author: Christian Perrier <bubulle@debian.org>
Date:   Sun Aug 27 07:50:42 2006 +0000

    Czech translation completed

commit b2c655058bd284e106fd630dad5d8c8dd3eb8926
Author: Christian Perrier <bubulle@debian.org>
Date:   Sun Aug 27 07:18:27 2006 +0000

    Czech translation update

commit d11d9e95799aeae822b597ea56c3d95ed8eb19d2
Author: Christian Perrier <bubulle@debian.org>
Date:   Wed Aug 23 09:55:27 2006 +0000

    Final update for this BR (373880)

commit 6a0a3a2fb478b5c3aeeafb7d4f050ce75e637e6a
Author: Christian Perrier <bubulle@debian.org>
Date:   Tue Aug 22 12:30:34 2006 +0000

    Brazilian Portuguese translation update

commit 07a714fbf4a4e9cd440e1af6e69702898f9877c5
Author: David Nusinow <dnusinow@debian.org>
Date:   Tue Aug 22 03:44:14 2006 +0000

      * Remove test for upgrade from xserver-xorg.postinst

commit af12bb7749e2c0ede5c28d0deb083901a93551cc
Author: David Nusinow <dnusinow@debian.org>
Date:   Tue Aug 22 03:41:43 2006 +0000

    * Steal patch from Ubuntu to recreate missing server symlink checksum that
      was lost on some upgrades. This patch by Fabio.

commit d1feb0795185e33e3f0b27db8b0144d87ccbda17
Author: David Nusinow <dnusinow@debian.org>
Date:   Tue Aug 22 03:25:04 2006 +0000

    Add closer

commit 261368d5324076a516162a303d67c21167e4683c
Author: David Nusinow <dnusinow@debian.org>
Date:   Tue Aug 22 03:22:59 2006 +0000

    * Steal patch from Ubuntu for xserver-xorg.config to help with the Mac mini
      by Fabio.

commit c87cefab15f652a1531f7eb6f68979d96b717a59
Author: David Nusinow <dnusinow@debian.org>
Date:   Tue Aug 22 03:17:12 2006 +0000

    * Steal patch from Ubuntu to update non-latin keymaps by Colin Watson

commit 451de0de1130364a40ea971f6776748160680c50
Author: David Nusinow <dnusinow@debian.org>
Date:   Tue Aug 22 03:14:36 2006 +0000

    * Pull patch from Ubuntu to xserver-xorg postins to correctly update the
      config file on upgrades

commit 801217db387a6a3ce668d879e5999a805be3c81a
Author: David Nusinow <dnusinow@debian.org>
Date:   Tue Aug 22 03:10:59 2006 +0000

    * Steal patch from Ubuntu by Fabio to unconditionally enable ZAxisMapping in
      dexconf
    * Update xsfbs with patch from ubuntu to support ARCHITECTURE, LAPTOP,
      RECONFIGURE, FIRSTINST, and UPGRADE variables for use in the xserver-xorg
      config scripting

commit 2354bbbdfc74d292b4aed6eed5b64428d4854735
Author: Christian Perrier <bubulle@debian.org>
Date:   Sun Aug 20 23:05:59 2006 +0000

    Romanian translation update

commit 3d9d1a3f83efbb8954070e20d977fc2d915c1a01
Author: Christian Perrier <bubulle@debian.org>
Date:   Wed Aug 16 02:31:45 2006 +0000

    Basque translation update

commit 44fc903a0006817e1c10238ba5a9cd347976153a
Author: Christian Perrier <bubulle@debian.org>
Date:   Tue Aug 15 13:37:49 2006 +0000

    Dzongkha translation completed

commit fc8139ed982230db0b3ac2d9ac701ff381018f4f
Author: Christian Perrier <bubulle@debian.org>
Date:   Tue Aug 15 13:35:42 2006 +0000

    Vietnamese translation completed

commit f9b2e38513638fb29d1cd24bc7f9a8e172318547
Author: Christian Perrier <bubulle@debian.org>
Date:   Tue Aug 15 13:34:58 2006 +0000

    Vietnamese translation completed

commit dfb22005ada7e1311d999a5c7de1845b5b134516
Author: Christian Perrier <bubulle@debian.org>
Date:   Tue Aug 15 13:32:40 2006 +0000

    Khmer translation compelted

commit 775d7861ab887ed2baddfec2e6ae8cf442993f83
Author: Christian Perrier <bubulle@debian.org>
Date:   Mon Aug 14 14:15:06 2006 +0000

    Khmer translation update

commit cb1cdeba724d556e8246844601526fc208fe06d4
Author: Denis Barbier <barbier@debian.org>
Date:   Mon Aug 14 13:59:43 2006 +0000

    Add support for Catalan keyboard. Thanks Robert Millan
    (closes: #346269)

commit 93846f45df536790f11364009b33f45335facc4f
Author: Denis Barbier <barbier@debian.org>
Date:   Mon Aug 14 13:04:45 2006 +0000

    Fix list of display resolution in maintainer scripts, the
    patch sent to #330304 had been broken when updated to 7.0.

commit dce149f2a5dc504328956cdfa8fd4e0850a7c2b3
Author: Denis Barbier <barbier@debian.org>
Date:   Mon Aug 14 12:27:47 2006 +0000

    Add ppc64 support.  Thanks Andreas Jochens (closes: #362085)

commit bd1249975a3c42fb7f435596c054c8a330c3d6e0
Author: Denis Barbier <barbier@debian.org>
Date:   Mon Aug 14 11:59:23 2006 +0000

    Add m32r support.  Thanks Kazuhiro Inaoka (closes: #376060)

commit dbfe224faa3ae5feb2234898f9db65e26b9317e8
Author: Denis Barbier <barbier@debian.org>
Date:   Mon Aug 14 11:53:37 2006 +0000

    Update Dzongkha debconf translation (Tenzin Dendup). Closes: #382959

commit fb70755c0676c96ae682dacbd480473ec8ec86a2
Author: Denis Barbier <barbier@debian.org>
Date:   Mon Aug 14 09:50:17 2006 +0000

    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.

commit da74882c7c295bacdc3a9c67f973bcbf8b62751b
Author: Denis Barbier <barbier@debian.org>
Date:   Mon Aug 14 09:18:28 2006 +0000

    Translations of "Generic Video Card" were hardcoded into
    xserver-xorg.config, move them into debian/po/*.po files.

commit 5be70df70fb34d18e55da2f6b113748aac8a4314
Author: Denis Barbier <barbier@debian.org>
Date:   Sat Aug 12 20:53:49 2006 +0000

    Upload xorg 1:7.0.23 into unstable

commit aa5eb05bef9783fad0055048d1c573caa17091af
Author: Denis Barbier <barbier@debian.org>
Date:   Sat Aug 12 20:28:07 2006 +0000

    Replace _Choices by __Choices in debconf templates, because several
    translations had wrong number of items.

commit 793408989331c58b6066b7a59e21be7af558775f
Author: Denis Barbier <barbier@debian.org>
Date:   Sat Aug 12 16:02:29 2006 +0000

    Run debconf-updatepo

commit f808db649f9d0b4e3fd3744244fff0a55b48d86f
Author: Christian Perrier <bubulle@debian.org>
Date:   Sat Aug 12 00:33:44 2006 +0000

    Simplified Chinese translation update

commit 7e56fce5f75dbeeaf8789aaa3950cb09005d7dfd
Author: Ishikawa Mutsumi <ishikawa@debian.org>
Date:   Fri Jul 28 05:12:38 2006 +0000

    Update Japanese translation

commit 1baf8592d2a16a33dbf15de3076849ecf4e352f9
Author: Christian Perrier <bubulle@debian.org>
Date:   Sun Jul 23 21:00:28 2006 +0000

    Yet another update from Florentin

commit 18f95a1cae555331c796af0d60516eefd26a4585
Author: Christian Perrier <bubulle@debian.org>
Date:   Sun Jul 23 17:26:57 2006 +0000

    French translation update, thanks to Florentin Duneau for the missing space
    and pointing the nasty "multiécrans".

commit 43a07accfc249b6545d05824348b95d431a97adc
Author: Jurij Smakov <jurij@wooyd.org>
Date:   Wed Jul 19 05:16:26 2006 +0000

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

commit 1d032d9416f7ffe32b0233192559e134898afae0
Author: Jurij Smakov <jurij@wooyd.org>
Date:   Sun Jul 16 20:10:18 2006 +0000

    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.

commit 3b5283df4c5017058afb3dac0788f3ed021c2f0b
Author: Christian Perrier <bubulle@debian.org>
Date:   Wed Jul 5 06:29:14 2006 +0000

    Updated Danish translation

commit 65fab72da4141ef2c33eef649100121a83e324f9
Author: Christian Perrier <bubulle@debian.org>
Date:   Sun Jul 2 17:26:50 2006 +0000

    Russian translation update

commit 3ee1645e8ecb1d4a82f39407d67fab77e295655b
Author: Christian Perrier <bubulle@debian.org>
Date:   Sun Jul 2 06:08:15 2006 +0000

    Really add Dzongkha translation

commit ea397d96f744aa1d36ce8f22beb0218fcebd6e8e
Author: Christian Perrier <bubulle@debian.org>
Date:   Sat Jul 1 06:37:40 2006 +0000

    Added Dzongkha debconf translations

commit 1f4b60787fd4e1336f640c74c31ca412cb94eb00
Author: Christian Perrier <bubulle@debian.org>
Date:   Fri Jun 30 05:04:00 2006 +0000

    Swedish translation update

commit 51898cb50e2ad4ac1fda7961ad84fdeb02c617fb
Author: Michel Dänzer <daenzer@debian.org>
Date:   Sun Jun 25 11:33:17 2006 +0000

    Add support for armeb architecture. Some of the drivers don't make sense, but
    it's just a copy of the arm file...

commit 98c82bb1a79495afa7ebefff9cfa72a093f64788
Author: Christian Perrier <bubulle@debian.org>
Date:   Sat Jun 24 08:09:00 2006 +0000

    Khmer translation update

commit 92a3b364ef751273bae35a97fa583f94a08ec2f9
Author: Christian Perrier <bubulle@debian.org>
Date:   Fri Jun 23 11:26:05 2006 +0000

    Vietnamese translation update

commit bb4b1bb75bb08d1de31459f3423269d59cbc7e4e
Author: Christian Perrier <bubulle@debian.org>
Date:   Fri Jun 23 05:39:50 2006 +0000

    Khmer translation added

commit 513a3505b72b3e997093450a945f03efe898672f
Author: Christian Perrier <bubulle@debian.org>
Date:   Thu Jun 22 05:27:48 2006 +0000

    Nepali translation added

commit 93647c626282df896c50f4022f207a298d21b209
Author: Christian Perrier <bubulle@debian.org>
Date:   Sat Jun 17 18:23:20 2006 +0000

    Romanian translation update

commit 7f2a7b868d894174ff24b3d9c7d1210bd21f429a
Author: Christian Perrier <bubulle@debian.org>
Date:   Sat Jun 17 06:04:50 2006 +0000

    Basque translation update

commit 2aefe59ed8509c1b3dc3b67ea76948d26a1809ef
Author: Christian Perrier <bubulle@debian.org>
Date:   Fri Jun 16 17:51:19 2006 +0000

    Galician translation updated

commit c3636741e1286f4d3143223fee9ff3e2b4543f01
Author: Christian Perrier <bubulle@debian.org>
Date:   Fri Jun 16 05:57:14 2006 +0000

    Brazilian translation update

commit 557b7abbccaa91ac6e6181296d896a9246dfea10
Author: Christian Perrier <bubulle@debian.org>
Date:   Thu Jun 15 04:10:19 2006 +0000

    French translation update (to be proofread)

commit 0b6e8e4b9ce692eed30fa60f76045389760b4cc8
Author: Denis Barbier <barbier@debian.org>
Date:   Wed Jun 14 19:51:12 2006 +0000

    Fix XKB paths in debconf templates.  Thanks Vincent Ho (closes: #373175)

commit 4ff8535000a0a971f5af1292c6d176171def3be8
Author: Denis Barbier <barbier@debian.org>
Date:   Wed Jun 14 19:48:25 2006 +0000

    Run debconf-updatepo in the clean target to make sure that debian/po/*.po
    files are up-to-date.  Thanks Thomas Huriaux (closes: #372904)

commit 4440852290c97023e96d80b21094e437c6330887
Author: David Nusinow <dnusinow@debian.org>
Date:   Mon Jun 12 03:52:02 2006 +0000

    Prepare changelog for upload to unstable

commit df54eb4781a45e4256d77fd33846a750e3088295
Author: David Nusinow <dnusinow@debian.org>
Date:   Mon Jun 12 03:38:56 2006 +0000

    Add more thank you's

commit 7c15d98c76f838f2377990a3c4f587ca084d686c
Author: David Nusinow <dnusinow@debian.org>
Date:   Mon Jun 12 03:38:10 2006 +0000

    Fix closer and thank the appropriate parties

commit 662d887f07090dcd9e8299198b7cef9d1f59809a
Author: David Nusinow <dnusinow@debian.org>
Date:   Mon Jun 12 03:35:55 2006 +0000

    * Correct the sections on the transitional packages (closes: #371874)

commit 3dac772a7be0c748ca73416f4ae6cf3656d53fcb
Author: David Nusinow <dnusinow@debian.org>
Date:   Fri Jun 9 04:24:21 2006 +0000

    * During x11-common preinst, handle /usr/X11R6/bin before anything else to
      try and prevent serious problems during error unwind

commit 0cc4fd4069b3489a72e9e196b802d59278a884c4
Author: David Nusinow <dnusinow@debian.org>
Date:   Fri Jun 9 02:44:49 2006 +0000

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

commit 6e6245a9dd7d961de725d649d53b6991685ff227
Author: David Nusinow <dnusinow@debian.org>
Date:   Thu Jun 8 04:28:51 2006 +0000

    * Correct the sections on the transitional packages

commit 54745dea6996a94faa224ad4c75a909820e0903e
Author: David Nusinow <dnusinow@debian.org>
Date:   Thu Jun 8 04:00:36 2006 +0000

    Prepare changelog for release

commit 192b3ba45880742670f6f95af3693bc32a426e99
Author: David Nusinow <dnusinow@debian.org>
Date:   Thu Jun 8 03:45:33 2006 +0000

    * Move test to create Xwrapper.config to do it on either install or upgrade,
      not in the migration code

commit bc3451feb32c508fee00343e9fa2b53766767c00
Author: David Nusinow <dnusinow@debian.org>
Date:   Thu Jun 8 03:10:41 2006 +0000

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

commit 57886dd305c986a9513e57b9acbe334cdfe85c4a
Author: Steve Langasek <vorlon@debian.org>
Date:   Wed Jun 7 01:07:12 2006 +0000

    Fix bad shell in the x11-common.preinst.  true || false && exit 1 is not
    the same thing as true || (false && exit 1) !

commit ff757ad7c85daa34af44c8128eba599fb164308f
Author: Josh Triplett <josh@freedesktop.org>
Date:   Mon Jun 5 01:21:17 2006 +0000

    * Remove duplicated dependency on libx11-dev from xorg-dev.

commit fe54b67df7810a29528a02d86017c81807a92365
Author: Josh Triplett <josh@freedesktop.org>
Date:   Sun Jun 4 22:36:54 2006 +0000

    * Add conflicts on the old non-free package xv, no longer in Debian,
      which broke upgrading on at least one system.

commit d375eb2013cc40ce649bb8af0379890f014a0624
Author: David Nusinow <dnusinow@debian.org>
Date:   Sun Jun 4 19:21:55 2006 +0000

    * Add conflicts on some old woody stuff, including xftp, xext, xpaste, and
      ghostview. Thanks Carl Miller and Roger Leigh. (closes: #362915, #370088)

commit ef3cc2e8595af8c382e655833705063e5fb34306
Author: Steve Langasek <vorlon@debian.org>
Date:   Sun Jun 4 08:32:18 2006 +0000

    Bump conflict with xorg 6.9 packages to (<< 7.0), thanks to amd64
    binNMUs. :/  Closes: #370215.

commit 394f814a4b1e26f25a863db8b4425bb2b37d2bdb
Author: Steve Langasek <vorlon@debian.org>
Date:   Sun Jun 4 08:27:18 2006 +0000

    Conflict with guitar, which also ships an empty /usr/X11R6/bin.

commit fa946ee9c4ffed8d770aa921c8c3e5a5c54d3d55
Author: Christian Perrier <bubulle@debian.org>
Date:   Fri Jun 2 03:28:40 2006 +0000

    Basque translation updateBasque transltion update

commit 9f8e27160e66c5e8537cbc5b4902c983012567da
Author: Christian Perrier <bubulle@debian.org>
Date:   Wed May 31 22:24:02 2006 +0000

    ReMove eXtra cApitaLiZation

commit 1570a5ceee50a4018041fe6b7ee489b154237708
Author: Christian Perrier <bubulle@debian.org>
Date:   Tue May 30 18:54:48 2006 +0000

    Updated Galician and added Norwegian translations

commit c2189738064859baba8df957d39a449951667479
Author: Steve Langasek <vorlon@debian.org>
Date:   Sun May 28 22:37:51 2006 +0000

    Add x11-common conflict with ppxp

commit 4c4e1fd68ca983d944763428af75d7583ae190aa
Author: Christian Perrier <bubulle@debian.org>
Date:   Sun May 28 16:26:21 2006 +0000

    Commit the file which is currently in final review by the French Team,
    mostly to avoid mistakes

commit b9d4b7304b0506feb7b59d5a5cfac91a949922ff
Author: Christian Perrier <bubulle@debian.org>
Date:   Thu May 25 06:40:02 2006 +0000

    I messed up: multiécrans, prérempli and autodétection are not composed

commit 3ec52dabf7370338f178bbb76d6b58feb799cffd
Author: Christian Perrier <bubulle@debian.org>
Date:   Wed May 24 09:18:45 2006 +0000

    So is prerempli...

commit 48dfb36716366b052c8f530f1c7e54d635d3d238
Author: Christian Perrier <bubulle@debian.org>
Date:   Wed May 24 09:12:46 2006 +0000

    Multiecrans is also composed

commit 8f2e1db7e6cacb6439530eacb5ec101cac03a1b9
Author: Christian Perrier <bubulle@debian.org>
Date:   Wed May 24 09:11:31 2006 +0000

    auto-détection is a composed word

commit 0a99317eb194036c86236e1287526bc4be169a7c
Author: Christian Perrier <bubulle@debian.org>
Date:   Tue May 23 17:17:15 2006 +0000

    Danish, Czech translation updates
    Small correction to French (IIRC)

commit 373ff219cc6f0bd091a53e730dbdc3340e4f1523
Author: David Nusinow <dnusinow@debian.org>
Date:   Sun May 21 20:01:34 2006 +0000

    Prepare changelog for upload

commit eb6a7700c05a512933e5263d7ab8db0173a3691e
Author: David Nusinow <dnusinow@debian.org>
Date:   Sun May 21 18:58:59 2006 +0000

    * Add x11-common conflict with ivtools-dev. Thanks Julien Danjou.
    * Re-add accidentally removed (wtf happened?) xlibmesa-gl-dev transitional
      package. Thanks Steve Langasek.

commit 87f3dfae1e7e45079cd0d7360caa6580c1152e3f
Author: David Nusinow <dnusinow@debian.org>
Date:   Sun May 21 18:54:00 2006 +0000

    * Add x11-common conflict with ivtools-dev. Thanks Julien Danjou.
      (closes: #368298)

commit 597e0c7f805a5694145aac5e0f2d796489aea6d2
Author: Christian Perrier <bubulle@debian.org>
Date:   Sun May 21 04:47:21 2006 +0000

    Brazilian translation update

commit 3f4fb0858776c44f12343757d90a977a2f766797
Author: Christian Perrier <bubulle@debian.org>
Date:   Sat May 20 13:44:59 2006 +0000

    Russian translation update

commit dbcc1eb88c63e75842e0fb2b6ba4fb639c548c51
Author: Christian Perrier <bubulle@debian.org>
Date:   Fri May 19 12:45:42 2006 +0000

    Vietnamese translation update

commit b7101a92b88d846be4cdfdaf784da0202755ca5d
Author: David Nusinow <dnusinow@debian.org>
Date:   Fri May 19 03:44:06 2006 +0000

    Prepare changelog for release

commit 51f4b8c001b4309a21c69e363f4855092ff13d5c
Author: David Nusinow <dnusinow@debian.org>
Date:   Fri May 19 02:44:53 2006 +0000

    Fix formatting gaff

commit f2a3b76c5b21b66eb0fae5237227fddc267e55e5
Author: David Nusinow <dnusinow@debian.org>
Date:   Fri May 19 02:36:20 2006 +0000

    * Increment version with xdm conflict to the current version in testing and
      unstable. (closes: #363462)

commit 33702dbb8ec11c21e3fc9e77e8fd518176e10d69
Author: David Nusinow <dnusinow@debian.org>
Date:   Fri May 19 01:43:59 2006 +0000

    Fix several bugs in the new debconfage

commit 0f66003291b9829a1fa995f90d074b1d27bb24e1
Author: Christian Perrier <bubulle@debian.org>
Date:   Thu May 18 13:20:55 2006 +0000

    Hungarian translation update

commit 373dab5e5b1b04b25b1e93b4306a96c2de55a21b
Author: Christian Perrier <bubulle@debian.org>
Date:   Thu May 18 02:20:31 2006 +0000

    Galician translation update

commit 36d4b7c3f6dd4efd4e0754ad9ce5b9b2e900698e
Author: Christian Perrier <bubulle@debian.org>
Date:   Wed May 17 12:14:34 2006 +0000

    French translation updated (and first review)

commit b22bc1a2de3e9c59783ab90b2f1bb95436722f99
Author: Christian Perrier <bubulle@debian.org>
Date:   Wed May 17 12:10:51 2006 +0000

    Unfuzzy Japanese translation

commit a49ab030e610258ff1f3ec8b3df5dad858371cea
Author: Christian Perrier <bubulle@debian.org>
Date:   Wed May 17 12:09:54 2006 +0000

    Fix quotes for consistency
    Update Japanese translation

commit 35aa441c82d523e9b4bd92c3e029c7f1e5d3ae48
Author: David Nusinow <dnusinow@debian.org>
Date:   Wed May 17 04:05:25 2006 +0000

    Fix stupid mistake in my template

commit 6ac0362f9da346001c26fc221b41df08d6b3d36e
Author: David Nusinow <dnusinow@debian.org>
Date:   Wed May 17 03:57:35 2006 +0000

    * Re-add call to update-rc.d and invoke-rc.d in x11-common postinst
    * Bump standards version to 3.7.2.0

commit 5b6a801700979d13e5e97c3142c91760e6322863
Author: David Nusinow <dnusinow@debian.org>
Date:   Wed May 17 03:35:05 2006 +0000

    * Add missing quotes in 20x11-common_process-args. Thanks Greg Kochanski.
      (closes: #347481)

commit 0558e1ff99a05bb27911b7417fba6c01ababa694
Author: David Nusinow <dnusinow@debian.org>
Date:   Wed May 17 03:00:28 2006 +0000

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

commit 5aec063f0515f32079d7eab2d0dfa14b007d7a57
Author: David Nusinow <dnusinow@debian.org>
Date:   Wed May 17 02:36:29 2006 +0000

    use alternate patch for ICE and socket VERBOSE bug

commit d69e7585629805e67f7a5536b85beac5a503cfd3
Author: David Nusinow <dnusinow@debian.org>
Date:   Wed May 17 02:34:47 2006 +0000

    Add closer and credit for missed bug

commit d04ef523122d40f810625e86084311546e9bb6e6
Author: David Nusinow <dnusinow@debian.org>
Date:   Wed May 17 02:32:50 2006 +0000

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

commit d5c3d44f356a2c5a0fe01343620f8abbeb99b259
Author: David Nusinow <dnusinow@debian.org>
Date:   Wed May 17 02:27:09 2006 +0000

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

commit bea8f62ef07787542fc1daff217fa7d1eeb40555
Author: David Nusinow <dnusinow@debian.org>
Date:   Wed May 17 02:11:28 2006 +0000

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

commit 733c132050a77e81831725468462fd18b38efbf1
Author: David Nusinow <dnusinow@debian.org>
Date:   Wed May 17 02:06:35 2006 +0000

      and Frank Mehnert for the reports and the patches.
    * Implement a status call in x11-common's init script for LSB compliance

commit 64bc8572aa2904c17eab4340a6e2aaad79c1c08c
Author: David Nusinow <dnusinow@debian.org>
Date:   Wed May 17 01:31:33 2006 +0000

    * Allow ICE socket to be set up in non-verbose mode. Thanks Gilmar Santos Jr
      and Frank Mehnert for the reports and the patches.
      (closes: #367556, #363427)

commit 1f1aca8ffa14d5bb06562365f2d69762a32b0c49
Author: Christian Perrier <bubulle@debian.org>
Date:   Tue May 16 21:51:52 2006 +0000

    And yet another error spotted..:-(

commit b66a078a9a993c612400732442298c36ca189fc9
Author: Christian Perrier <bubulle@debian.org>
Date:   Tue May 16 19:01:29 2006 +0000

    Remove a few errors in templates and re-generate PO files
    Translators have been notified

commit 3c620e1c589702ff3e89772547e8b309f00ac4cd
Author: Christian Perrier <bubulle@debian.org>
Date:   Tue May 16 12:39:33 2006 +0000

    Correct error in my use of the new po-debconf features

commit 79f2329a08f6e9660c822b55eeb2736e287c6858
Author: David Nusinow <dnusinow@debian.org>
Date:   Mon May 15 03:34:53 2006 +0000

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

commit 88da46c37ee641b34418e60abf308b3c191b0a44
Author: David Nusinow <dnusinow@debian.org>
Date:   Mon May 15 02:53:24 2006 +0000

    Minor cleanup from Christian's template rewrite

commit c70b0c8d23c662ee09bf87fcca9acd3d5d9d3ede
Author: Christian Perrier <bubulle@debian.org>
Date:   Sat May 13 05:47:39 2006 +0000

    Rewrite templates for DevRef #6.5 compliance

commit 8128f425343a8287178083e8daab326dd7be8004
Author: David Nusinow <dnusinow@debian.org>
Date:   Tue May 9 05:01:30 2006 +0000

    Remove strange duplicate of xlibmesa-gl

commit 55b8761a7991fadb153c8ed9e01ee3fcbee86c65
Author: David Nusinow <dnusinow@debian.org>
Date:   Mon May 8 04:39:46 2006 +0000

    * Add xlibmesa-glu transitional package

commit 9ba93eb8109ab6f05806cdebe26315ae91adc498
Author: Steve Langasek <vorlon@debian.org>
Date:   Sat May 6 04:29:48 2006 +0000

    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.

commit 8d16a4a5dfc6d08ae8c2979fa01be4d494c18653
Author: David Martínez <ender@debian.org>
Date:   Fri May 5 16:41:41 2006 +0000

    Fixed changelog line for Frank Küster (missing umlaute in the surname).

commit f3a1746a15ee1eec990670d2fe4f173bfba20b9c
Author: David Nusinow <dnusinow@debian.org>
Date:   Fri May 5 04:11:13 2006 +0000

    Document the previous fix

commit ef6d30d287f1ee710812c95a3a408d5b891a373d
Author: David Nusinow <dnusinow@debian.org>
Date:   Fri May 5 03:47:59 2006 +0000

    Oh yeah... and fix that bug I uncovered a few hours ago

commit 2157dd195cfc69078ffbce526fd57d7bd31c4caf
Author: David Nusinow <dnusinow@debian.org>
Date:   Fri May 5 03:18:41 2006 +0000

    Fuck you whitespace.

commit e426714115c74dbef8d03f54abb16c709b583be0
Author: David Nusinow <dnusinow@debian.org>
Date:   Fri May 5 02:55:36 2006 +0000

    * Tell the configuration scripts that we're upgrading properly. The variable
      that was being used to test this was never set for some reason.

commit bc8d9dfbd999d2f7017600fd368e3b220865cc5b
Author: David Nusinow <dnusinow@debian.org>
Date:   Fri May 5 02:16:37 2006 +0000

    Better fix from Steve Langasek

commit 3cfe1142c29133166de1a503177bdbda6633f9ac
Author: David Nusinow <dnusinow@debian.org>
Date:   Fri May 5 02:14:03 2006 +0000

    Fix up my test so that it... er... works

commit c98ba1ce995a3f2481de33588f4d61bb3c3046c8
Author: David Nusinow <dnusinow@debian.org>
Date:   Fri May 5 00:27:38 2006 +0000

    * 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

commit 0aae8438730c097d1277215e94d14df40e7732c5
Author: David Martínez <ender@debian.org>
Date:   Thu May 4 23:16:22 2006 +0000

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

commit a24d895ea025bac4e2100d6697c81bfacd8bbaf7
Author: David Martínez <ender@debian.org>
Date:   Thu May 4 16:53:24 2006 +0000

    debian/control: Fixed several short descriptions.

commit 9802b535d45fcdd63f5f85e7c321f86779ad351c
Author: Steve Langasek <vorlon@debian.org>
Date:   Thu May 4 09:51:28 2006 +0000

    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.

commit 1adea05d28bc9910518f0362baa2e220f0d2fa07
Author: David Nusinow <dnusinow@debian.org>
Date:   Wed May 3 04:36:14 2006 +0000

    Prepare changelog for upload to unstable

commit 552394a69bf43d0696e38a728044ecacabdb1251
Author: David Nusinow <dnusinow@debian.org>
Date:   Wed May 3 02:13:41 2006 +0000

    * Have the xserver-xorg-video-all metapackages depend on
      xserver-xorg-video-v4l now that it's in the archive

commit b4c97378e4a917ef35a5b7096666dbcc2fc52c82
Author: David Nusinow <dnusinow@debian.org>
Date:   Wed May 3 02:02:10 2006 +0000

      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.

commit 55dabe81f463cc7f5130aec8965abb8d9fd46255
Author: David Nusinow <dnusinow@debian.org>
Date:   Tue May 2 03:14:46 2006 +0000

    * Add x11-common conflict with xpmumon. Thanks Jack Bates.

commit 57dbed0f64e9baa8066f7b1f06207f2e0285cfd5
Author: Christian Perrier <bubulle@debian.org>
Date:   Mon May 1 06:34:52 2006 +0000

    Brazilian translation update

commit d94c8ed3c3141f8fb36d1190ac6c30ce1966923d
Author: David Nusinow <dnusinow@debian.org>
Date:   Sat Apr 29 22:06:16 2006 +0000

      Rodney Gordon II, Adam Borowski. Thanks to Steven Brown for a fix.
    * Add xfree86-common transitional package. This package is meant to remove
      files that were moved to x11-common, like Xsession. Thanks Frank Kuster.
      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)

commit aa86fb16e95de5f0846bbf68f2e000d9108f4cb0
Author: David Nusinow <dnusinow@debian.org>
Date:   Sat Apr 29 19:48:09 2006 +0000

    * Prevent the xserver-xorg config from failing during migration of
      zaxismapping and emulate3buttons questions when they don't exist. Thanks
      Rodney Gordon II, Adam Borowski. Thanks to Steven Brown for a fix.
      (closes: #365282)

commit af2591c147a847fccb386ec28f045def1d214d4f
Author: David Nusinow <dnusinow@debian.org>
Date:   Sat Apr 29 17:33:27 2006 +0000

    * Define the backup config file name before we tell people where we're
      backing up :-) Thanks Frans Pop and Flavio Stanchin. (closes: 365278)

commit e03419312e0be07e23a4ad2c6fbfacb9e657abf3
Author: David Nusinow <dnusinow@debian.org>
Date:   Fri Apr 28 04:30:18 2006 +0000

    Prepare changelog for release

commit c234a5b018b41f979f245a644d066acf5c723c79
Author: David Nusinow <dnusinow@debian.org>
Date:   Fri Apr 28 04:18:07 2006 +0000

    Document corner case. Thanks Steve Langasek.

commit 6d7bfa488830f5b7da6f12ca250710d9b49b1dbc
Author: David Nusinow <dnusinow@debian.org>
Date:   Fri Apr 28 04:09:20 2006 +0000

    Copy missing line to allow backing up file to work

commit 231659121c39c0090286628506f517e94814aabb
Author: Steve Langasek <vorlon@debian.org>
Date:   Wed Apr 26 07:51:03 2006 +0000

    fix encoding problem in debian/changelog

commit f20b1ff51c535875f0973171266362d94f1e9a44
Author: David Martínez <ender@debian.org>
Date:   Tue Apr 25 11:51:34 2006 +0000

    Updated Spanish translation.

commit 7b5a318a009550eeccf3fb3b26142b6e21159374
Author: Steve Langasek <vorlon@debian.org>
Date:   Tue Apr 25 05:22:22 2006 +0000

    do delete speedo font paths, speedo is dead

commit 244bca950fe89bd8ec7bc2eb129a3e3d5a39c39a
Author: David Nusinow <dnusinow@debian.org>
Date:   Tue Apr 25 05:16:07 2006 +0000

      Thanks Steve Langasek for re-working my primitive sed.

commit acbb5178876e731b5e205359b95b55995d55fd86
Author: David Nusinow <dnusinow@debian.org>
Date:   Tue Apr 25 04:16:08 2006 +0000

    Add closers galore

commit 07647681eeb0457254bb55ad43f427fe36bf8d0a
Author: David Nusinow <dnusinow@debian.org>
Date:   Tue Apr 25 03:58:20 2006 +0000

    Re-use already used variables

commit d2aef2062d55ed58647a89d99c98c96ab719f622
Author: David Nusinow <dnusinow@debian.org>
Date:   Tue Apr 25 03:55:31 2006 +0000

    * 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
    * Document the above in NEWS.Debian

commit ee7bb40ee1e3f4d5c10589c359e621ef9dcb8e83
Author: David Nusinow <dnusinow@debian.org>
Date:   Tue Apr 25 00:46:38 2006 +0000

    * Re-add XF86Config-4 -> xorg.conf code in xserver-xorg.config. Thanks to
      Steve Langasek for catching this. (closes: #362728)

commit 476aaff08297ce80766e575d976e84bf34434b09
Author: David Nusinow <dnusinow@debian.org>
Date:   Tue Apr 25 00:17:43 2006 +0000

    * Add x11-common conflicts with beaver, lsb-core, and yank. Thanks Aaron M.
      Ucko. (closes: #364113)

commit 39087c96a33acae6f4181eac082b32e11b45fcbe
Author: Christian Perrier <bubulle@debian.org>
Date:   Mon Apr 24 22:54:01 2006 +0000

    Fix typo in templates and unfuzzy translations

commit 6e0d14d7d281f7b963fe2123704791400236ad58
Author: Christian Perrier <bubulle@debian.org>
Date:   Mon Apr 24 22:50:10 2006 +0000

    Russian translation update

commit 3393a803092684e116c4e1cdf6d05233b2f188a5
Author: Christian Perrier <bubulle@debian.org>
Date:   Mon Apr 24 12:48:05 2006 +0000

    Basque translation update

commit c4d117a0921d486c42156cbef2dd11b35913a93d
Author: Christian Perrier <bubulle@debian.org>
Date:   Mon Apr 24 12:30:00 2006 +0000

    Vietnamese translation update

commit 7705537d04e0e1f8b480fec23600b38415d27cec
Author: David Nusinow <dnusinow@debian.org>
Date:   Sun Apr 23 22:37:22 2006 +0000

    * Allow the xorg metapackage to be satisfied by any terminal emulator.
      Thanks Ren?? van Bevern. (closes: #364475)

commit be88ef041ea55419f670b7c5e0a9d5f4b60864e1
Author: David Nusinow <dnusinow@debian.org>
Date:   Sat Apr 22 14:13:56 2006 +0000

      (closes: #364210), xterm (<< 208-1), and xmh (<= 6.8.2.dfsg.1-4);
    * Add vars.hurd-i386 to allow this package to build on that arch. Thanks
      Samuel Thibault and Michael Banck. (closes: #358692)

commit a6aedbc527892c92d09f5be3649283ea77871390
Author: Steve Langasek <vorlon@debian.org>
Date:   Sat Apr 22 05:16:14 2006 +0000

    document additional bug closure

commit a2d7b0b1a0d564667740ce7ab73c59ba2f52b487
Author: Ishikawa Mutsumi <ishikawa@debian.org>
Date:   Fri Apr 21 11:17:33 2006 +0000

    update Debconf Japanese translation (Kenshi Muto)

commit 7bac1ba71222cf24f9479bde2f9cc43f17507a52
Author: Steve Langasek <vorlon@debian.org>
Date:   Fri Apr 21 09:47:24 2006 +0000

    Additional conflicts for xfs-xtt, xnest, xterm, and xmh.

commit b747c6dd8eb4f6f4cf455fe6f206a657f975bb92
Author: Steve Langasek <vorlon@debian.org>
Date:   Thu Apr 20 22:56:48 2006 +0000

    Add pmud-utils (<= 0.10-9) to the conflicts list for x11-common, and
    update conflicts with wmnet to 1.0.5-12.  Closes: #364007.

commit 555b3eb247919ab6262e8153d537e24b729c60bf
Author: Christian Perrier <bubulle@debian.org>
Date:   Thu Apr 20 19:31:50 2006 +0000

    Romanian translation completed

commit d22225e90bc140b30f1452e807898acc483b4e90
Author: Christian Perrier <bubulle@debian.org>
Date:   Thu Apr 20 17:27:52 2006 +0000

    Give back to Caesar what belongs to Caesar

commit 7072060f796b92cca39bf82b94f12c46a2d657cf
Author: Christian Perrier <bubulle@debian.org>
Date:   Thu Apr 20 12:42:54 2006 +0000

    Updated Galician translation. Closes: #362821

commit 1513597b0826fee95ab1e3686275b0d678de47ae
Author: Christian Perrier <bubulle@debian.org>
Date:   Thu Apr 20 12:41:32 2006 +0000

    Updated Danish translation. Closes: #362570

commit 5d79bb3b5ded3f11f8d14998d01d03c35bec18eb
Author: Christian Perrier <bubulle@debian.org>
Date:   Thu Apr 20 12:40:08 2006 +0000

    Update Czech translation
    Closes: #362495

commit cbffff7a292eb0f38e9fc4ee7bad671ce11ac1a0
Author: Christian Perrier <bubulle@debian.org>
Date:   Thu Apr 20 12:38:40 2006 +0000

    Polish translation grabbed from the BTS and merged in
    Closes: #359746

commit 624faac5c8bcac0c029382b8f15293e66b112319
Author: Christian Perrier <bubulle@debian.org>
Date:   Thu Apr 20 12:30:45 2006 +0000

    Mark #363051 as pending. I bringed translations back

commit 9f6000f448ee41e3d8e62bfbff798f5d74eff33e
Author: Christian Perrier <bubulle@debian.org>
Date:   Thu Apr 20 12:27:25 2006 +0000

    Update German translation. Closes: #341003

commit 89124ffe029552c4ae1ffc2520e081810dfb7440
Author: Christian Perrier <bubulle@debian.org>
Date:   Thu Apr 20 12:09:58 2006 +0000

    Dutch and Catalan translations updated from the xorg-x11 bug log
    Closes: #350765, #358171

commit 900a6b3546950e312e0eea0df0c2173c5104b047
Author: Christian Perrier <bubulle@debian.org>
Date:   Thu Apr 20 12:05:14 2006 +0000

    Add Hungarian translation from xorg-x11. Closes: #352471

commit 536b0d138d3eb29e8fdaa77f633f305a2c152ca1
Author: Christian Perrier <bubulle@debian.org>
Date:   Thu Apr 20 12:00:53 2006 +0000

    Merge translations from the 6.9 branch, including those that we didn't
    support yet.

commit 0433cc14248777ce622941cfd8f389a1e4bc0c69
Author: David Nusinow <dnusinow@debian.org>
Date:   Mon Apr 17 16:30:57 2006 +0000

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

commit 002f13da4fad2c36fb170bd4f658940f2c677506
Author: David Nusinow <dnusinow@debian.org>
Date:   Mon Apr 17 16:00:59 2006 +0000

    * Make x11-common not depend on laptop-detect. This is now only recommended
      by xserver-xorg. Thanks Marc Wilson. (closes: #363081)

commit 3b52105eebd6cbb4865564b47c3e72ae796ccc2b
Author: David Nusinow <dnusinow@debian.org>
Date:   Mon Apr 17 14:13:30 2006 +0000

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

commit 1f0bdce5a9cf72289da0f6ff73adb97f60880331
Author: David Nusinow <dnusinow@debian.org>
Date:   Mon Apr 17 14:10:08 2006 +0000

    Add closer

commit db8086a94cae2812f60c58f9512c09ecd649e0d2
Author: David Nusinow <dnusinow@debian.org>
Date:   Mon Apr 17 06:43:19 2006 +0000

    * Make x11-common pre-depend on debconf | debconf-2.0. Thanks Steve
      Langasek. (closes: #362992)

commit bf228de32d470c5c6fdcb53e46f66e21b5a356bd
Author: David Nusinow <dnusinow@debian.org>
Date:   Mon Apr 17 06:40:35 2006 +0000

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

commit b3d53950db9ba931c52445b60fcc7f693cb44596
Author: David Nusinow <dnusinow@debian.org>
Date:   Mon Apr 17 04:13:56 2006 +0000

    * Add more versioned conflicts (libmotif-dev, motif-clients, xslideshow,
      xtrkcad). Thanks Steve Langasek.

commit ba6b5c4c8eed142829354896c7da3cc4476adecb
Author: Steve Langasek <vorlon@debian.org>
Date:   Mon Apr 17 03:42:17 2006 +0000

    retroactively document the transition bug fixed by 7.0.13.

commit 8e37ab612ccb352a3d0f2fb9fb9e6724ca03623f
Author: David Nusinow <dnusinow@debian.org>
Date:   Sun Apr 16 22:15:41 2006 +0000

    Fix brain fart and make xearth conflict <= not >=. Thanks Sven-Haegar Koch

commit 275ae57510b1a80983a7bdf387bf15aab2cc6f74
Author: David Nusinow <dnusinow@debian.org>
Date:   Sun Apr 16 21:47:24 2006 +0000

    * Add x11-common conflict on xearth. Thanks Steve M. Robbins.
      (closes: #362524)

commit e3d2a6b0f9216b2b0b0ac50e8128eb3569f2f975
Author: David Nusinow <dnusinow@debian.org>
Date:   Sun Apr 16 21:43:48 2006 +0000

      transition. This prevents the test from succeeding incorrectly.
    * Fix case on xfs-xtt conflict for x11-common. Thanks Mike Furr.
      (closes: #362955)

commit f993a43b162a5b721553180d04149c6fc233d1a1
Author: David Nusinow <dnusinow@debian.org>
Date:   Sun Apr 16 00:01:23 2006 +0000

    * Fix shell snippet that provides the /usr/X11R6/bin dir->symlink
      transition. This prevents the test from succeeding incorrectly.
      Thanks Steve Langasek.

commit 8de723bf37989bc3504a224b44cfc195a8d50e63
Author: David Nusinow <dnusinow@debian.org>
Date:   Sat Apr 15 16:41:53 2006 +0000

    Add closer

commit 8694b9a669b0d82a0c3491a8b0a741b53d5d530b
Author: David Nusinow <dnusinow@debian.org>
Date:   Sat Apr 15 16:29:21 2006 +0000

      and Christian Hammers. Thanks to Steve Langasek for the fix.
    * Have safer and better logic for replacing the /usr/X11R6/bin dir with a
      symlink. Handle new installs. Thanks Bart Vanhaute. (closes: #362780)

commit dcea8b2aec1b7c3915268c714985bc8fe6537147
Author: David Nusinow <dnusinow@debian.org>
Date:   Sat Apr 15 16:22:53 2006 +0000

      and Christian Hammers. Thanks to Steve Langasek for the fix.
      (closes: #362713, #362672)

commit 13e7a0eceab20fca529e9779adc6980f00f0f795
Author: David Nusinow <dnusinow@debian.org>
Date:   Sat Apr 15 16:22:12 2006 +0000

    * Add pgaccess to the list of packages to conflict with. Thanks Bas
      Couwenberg. (closes: #362685)

commit 5b86a31ddd282ef323690aa69a5181f80c1070d6
Author: David Nusinow <dnusinow@debian.org>
Date:   Sat Apr 15 16:15:38 2006 +0000

      build properly. Thanks Eugene Konev for the fix. Thanks Paul Wise and LIU
    * 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 Steve Langasek. (closes: #362713)

commit bec4b12b1497d6a769dba12d0d9f2872dd8a5c30
Author: David Nusinow <dnusinow@debian.org>
Date:   Sat Apr 15 16:08:39 2006 +0000

    Add closers and thanks

commit 3e5c9a2c90e2ad224d434c60031f785fe875b259
Author: David Nusinow <dnusinow@debian.org>
Date:   Sat Apr 15 16:04:24 2006 +0000

    * Make xserver-xorg-(input|video)-all arch: any rather than all, to let them
      build properly. Thanks Eugene Konev.

commit 1cf368b6af375bfdf8e240931a468b1681e6b519
Author: David Nusinow <dnusinow@debian.org>
Date:   Sat Apr 15 15:57:38 2006 +0000

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

commit 75483dceebd2809c3a617a5c0e35918bc26ecc73
Author: David Nusinow <dnusinow@debian.org>
Date:   Sat Apr 15 15:55:09 2006 +0000

    * Update list of x11-common conflicts. Thanks Steve Langasek.
      (closes: #362711)

commit 2eb59d54b70961ddc0ebf2d73f8344aed8b74838
Author: David Nusinow <dnusinow@debian.org>
Date:   Sat Apr 15 15:38:05 2006 +0000

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

commit 9a4524a0836eaf6204eb804929018e4d81985adc
Author: David Nusinow <dnusinow@debian.org>
Date:   Fri Apr 14 05:47:27 2006 +0000

    Drop version number in script to match current reality rather than the reality of my testing machine

commit e035f9cea0dd6ec9737c369ac16046f88519061c
Author: David Nusinow <dnusinow@debian.org>
Date:   Fri Apr 14 05:39:31 2006 +0000

      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.

commit ea657d98931712efe9f274ba555b4fac1c5f586e
Author: David Nusinow <dnusinow@debian.org>
Date:   Fri Apr 14 03:51:14 2006 +0000

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

commit c81c8607f4c1a95ef47ffbe962036c44d273a449
Author: David Nusinow <dnusinow@debian.org>
Date:   Fri Apr 14 03:03:01 2006 +0000

    * Have xserver-xorg depend on xbase-clients

commit 65675ba7fb3e30ce20cce0b1ac1477a7adb93ba3
Author: David Nusinow <dnusinow@debian.org>
Date:   Fri Apr 14 03:00:17 2006 +0000

    * Document the metapackage name change in x11-common's NEWS.Debian.

commit ba764db5eb5ee2b92c7c074919ee92809cd85f3e
Author: David Nusinow <dnusinow@debian.org>
Date:   Fri Apr 14 02:36:52 2006 +0000

    * Have x11-common conflict with libxft-dev <= 2.1.8.2-5. Thanks Margarita
      Manterola. (closes: #362255)

commit fdb39eb35c4c0c88707de869005092548b1863f6
Author: David Nusinow <dnusinow@debian.org>
Date:   Fri Apr 14 02:29:40 2006 +0000

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

commit f3da6baa3e00f404ef02e19d2b95c21ec4169974
Author: David Nusinow <dnusinow@debian.org>
Date:   Fri Apr 14 01:41:47 2006 +0000

    Add conflict with old xserver-xfree86. Thanks Eugene Konev.

commit c8f44497691e7d2e6612bb54905e8f7151c31913
Author: David Nusinow <dnusinow@debian.org>
Date:   Fri Apr 14 01:15:51 2006 +0000

    Add closer

commit f30abe7b52f60c03e3b6be1dedd65b9a82872d72
Author: David Nusinow <dnusinow@debian.org>
Date:   Fri Apr 14 01:07:59 2006 +0000

    Update x11-common conflict versions against modular X packages

commit 3d329b3c3472d742e5939b2836c2c1a44525db8b
Author: David Nusinow <dnusinow@debian.org>
Date:   Fri Apr 14 00:29:18 2006 +0000

    Bump x11-common conflict with xserver-xorg to current version. Thanks Steve Langasek

commit acb579a491dbabdf19e9275113e7bcabc7d67b98
Author: David Nusinow <dnusinow@debian.org>
Date:   Fri Apr 14 00:18:48 2006 +0000

    * Symlink /usr/X11R6/bin to /usr/bin in x11-common.postinst. Thanks Steve
      Langasek.

commit e27ba53bea026699839008705d53082759b77c37
Author: David Nusinow <dnusinow@debian.org>
Date:   Fri Apr 14 00:08:43 2006 +0000

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

commit 47c6c262662575a108c94fbaa22e9bdb5e0204ba
Author: David Nusinow <dnusinow@debian.org>
Date:   Thu Apr 13 23:58:26 2006 +0000

    Add closer

commit 7aae732082b4b46e5be645625879103d6f2e5290
Author: David Nusinow <dnusinow@debian.org>
Date:   Thu Apr 13 23:55:38 2006 +0000

      Provides only the dummy video driver currently.
    * 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.

commit 8554eac4fa153e73b254e5953f164b71272c093f
Author: David Nusinow <dnusinow@debian.org>
Date:   Thu Apr 13 23:34:14 2006 +0000

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

commit 17068556030c4a70062c03c73b197f31a5a34a01
Author: David Nusinow <dnusinow@debian.org>
Date:   Thu Apr 13 00:27:47 2006 +0000

    * Have xserver-xorg depend on xkb-data | xkb-data-legacy. Not a recommends
      any more. Thanks to a lot of people. (closes: #362112, #362105)

commit add6447ce1818a5a8a62861822291d38797bd24e
Author: David Nusinow <dnusinow@debian.org>
Date:   Sat Apr 8 17:34:03 2006 +0000

    * 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

commit 776f76b1fc26b4fb754788285f19bfdc190e69e4
Author: David Nusinow <dnusinow@debian.org>
Date:   Fri Apr 7 04:34:12 2006 +0000

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

commit 4253f9f6ea681e25b0ca793efdbddffc7438a71e
Author: David Nusinow <dnusinow@debian.org>
Date:   Wed Apr 5 03:07:34 2006 +0000

    Fix changelog. Bump the version number.

commit 481835bae9bf58f7427ffecd7d7515bb0ad8bf57
Author: David Nusinow <dnusinow@debian.org>
Date:   Wed Apr 5 03:04:39 2006 +0000

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

commit baee2990a997bb2bb3bdfae8e526d864a4a6076d
Author: David Nusinow <dnusinow@debian.org>
Date:   Mon Mar 27 00:18:36 2006 +0000

    * Add xlibs-static-dev transitional metapackage

commit 4cac1f994212d0a48eee5b87dab656ccfebd17c7
Author: David Nusinow <dnusinow@debian.org>
Date:   Mon Mar 27 00:10:49 2006 +0000

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

commit 2f35ba1e66ed6cafc88daf96063ccc4c8bf590c7
Author: David Nusinow <dnusinow@debian.org>
Date:   Wed Mar 22 04:38:39 2006 +0000

    Fix symlink goof

commit 8dc68958028bd7997cb53af5375d08cc932c20b1
Author: David Nusinow <dnusinow@debian.org>
Date:   Wed Mar 22 04:34:14 2006 +0000

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

commit 74e6b30ef88feb9523b1c3a5c8d7d26d38db5387
Author: David Nusinow <dnusinow@debian.org>
Date:   Tue Mar 21 02:28:29 2006 +0000

    * 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

commit c60f6e88944b451c1e531ed311a141b712290b48
Author: David Nusinow <dnusinow@debian.org>
Date:   Mon Mar 20 04:57:39 2006 +0000

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

commit 33fcdb06d0143f4a9dbe3bfb885dc904e8a637c1
Author: David Nusinow <dnusinow@debian.org>
Date:   Sun Mar 12 17:59:06 2006 +0000

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

commit 5fe6c0441b7c2cbeb42a38f079c82bf9a8d9c131
Author: David Nusinow <dnusinow@debian.org>
Date:   Sun Mar 12 00:05:47 2006 +0000

    * Update dexconf for new font location. Thanks Svante Signell.
      (closes: #356181)

commit 9ff22179c79d6766f82992b1dc355f5807c5d080
Author: David Nusinow <dnusinow@debian.org>
Date:   Sun Mar 12 00:03:24 2006 +0000

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

commit 04bcde55edf262110bc098d6d648c547ffd42e6e
Author: David Nusinow <dnusinow@debian.org>
Date:   Fri Feb 24 06:13:53 2006 +0000

    * Provide versioned dependencies for all the stuff xorg depends on.

commit 1c775aa6d52741229d21b6b28f542b6833310602
Author: David Nusinow <dnusinow@debian.org>
Date:   Fri Feb 24 05:41:22 2006 +0000

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

commit 713b00199634afe99e168f359d4701d27b1c139d
Author: David Nusinow <dnusinow@debian.org>
Date:   Fri Feb 24 05:31:29 2006 +0000

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

commit 40345fc9e847f0d8bde77b254b81d059a93c175d
Author: David Nusinow <dnusinow@debian.org>
Date:   Tue Feb 21 04:51:57 2006 +0000

    Have xorg metapackage depend on xkb-data rather than xkeyboard-config (same thing, different package name)

commit 3aaa239fb2b66b651bd2d681ec54f9b5e0c3d653
Author: David Nusinow <dnusinow@debian.org>
Date:   Tue Feb 21 03:12:00 2006 +0000

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

commit 15e374a04f695aa2fb6a680db137c97adfe4d1e2
Author: David Nusinow <dnusinow@debian.org>
Date:   Tue Feb 21 00:51:40 2006 +0000

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

commit bee432cc34f713a8753d79e6338cd6a44823a1b8
Author: David Nusinow <dnusinow@debian.org>
Date:   Mon Feb 20 05:05:35 2006 +0000

    Pull in xfonts-base instead of xfonts-misc

commit 8ea327899b979012a7e82fe4b41c5993aab62dcf
Author: David Nusinow <dnusinow@debian.org>
Date:   Sun Feb 19 01:08:37 2006 +0000

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

commit db00ce3032fba13e15b1f8cbad101fd948a52446
Author: David Nusinow <dnusinow@debian.org>
Date:   Sun Feb 19 00:52:55 2006 +0000

    * Provide xlibs and xlibs-data transitional packages. These are empty
      packages that depend on the packages that replace them.

commit ad9009453691b0a17e009cc9c1d0e25d8c8a006e
Author: David Nusinow <dnusinow@debian.org>
Date:   Sat Feb 18 21:26:55 2006 +0000

    * Put setuid fix in xorg source package where it belongs rather than
      xorg-server
    * TODO update while I'm at it

commit 00aaaef00e6226f2319a171a506efef7ff18f3d7
Author: David Nusinow <dnusinow@debian.org>
Date:   Fri Feb 17 03:02:36 2006 +0000

    * This is a Debian-native package so version it accordingly
    * Fix variable goof in rules file that prevented the xserver-xorg-video-all
      package from properly depending on the video drivers

commit 541e3325a8600e29cefdfc4b168f2c97f0a6e9e7
Author: David Nusinow <dnusinow@debian.org>
Date:   Mon Feb 13 00:22:03 2006 +0000

    * Fix various lintian errors
      + Remove extra depends on x11-common from xserver-xorg
      + Add debconf dependency for xserver-xorg

commit af12d1a20fc0dff7da006ad3fc480a0441b2a255
Author: David Nusinow <dnusinow@debian.org>
Date:   Fri Feb 10 03:20:53 2006 +0000

    * Add an epoch due to idiocy while working on aborted experimental packages

commit 408a8c61defffb81e2801f4f307f6d14e222d1b5
Author: David Nusinow <dnusinow@debian.org>
Date:   Fri Feb 10 03:10:41 2006 +0000

    * After consultation with Daniels, since we're going to have multiple X
      servers in the repo soon enough, we need to differentiate the drivers for
      them. As such, the drivers will be named
      xserver-<servername>-<drivertype>. So we'll have xserver-xorg-video and
      xserver-xorg-input, with the metapackages being xserver-xorg-video-all
      and xserver-xorg-input-all. Ideally we'd have -driver- in there too, but
      it's way too long. This change implements this in the xorg package.

commit d018c3b026ef1017b9578eebddd83d8da5b859f3
Author: David Nusinow <dnusinow@debian.org>
Date:   Thu Feb 9 02:19:18 2006 +0000

    * Change driver metapackage naming to match individual packages:
      + xserver-xorg-driver -> xorg-video-driver
      + xserver-xorg-input -> xorg-input-driver
      + Update the packaging variables that define arch-specific drivers to
        include in the metapackage as well to match these names

commit 3d7b5cb3f9fa1f8d6415560860fc1ba374353f00
Author: David Nusinow <dnusinow@debian.org>
Date:   Thu Feb 9 02:09:24 2006 +0000

    * Convert to xsfbs
      + shell-lib.sh deleted in favor of xsfbs/xsfbs.sh
      + use targets for script generation and such from xsfbs/xsfbs.mk

commit 176f0a952f5ebf14783f0fb42c8ab7e85fa2021b
Author: David Nusinow <dnusinow@debian.org>
Date:   Thu Feb 9 02:02:19 2006 +0000

    Pull in xsfbs

commit d5ef28b13335dccc0c8b795d030f950a772b0414
Author: David Nusinow <dnusinow@debian.org>
Date:   Thu Feb 9 02:00:07 2006 +0000

    Remove gratuitous ubuntu references in package descriptions

commit 1d2b6d0c46b476b606c52e7a2db255252c6d470c
Author: David Nusinow <dnusinow@debian.org>
Date:   Thu Feb 9 01:56:08 2006 +0000

    * Remove xbase-clients and xutils metapackages. We're just bundling the apps
      in to one big source package right now

commit 959ca81e3739baac1cb7a2ab0241952c800f057b
Author: David Nusinow <dnusinow@debian.org>
Date:   Thu Feb 9 01:35:11 2006 +0000

    Add xorg package that is essentially all the metapackages and such



Reply to: