Bump to latest mesa in Debian

8 files changed, 500 insertions, 92 deletions

diff --git a/debian/README.build b/debian/README.build
index 53299308baf..b44a4c42ef2 100644
--- a/debian/README.build
+++ b/debian/README.build
@@ -20,7 +20,7 @@ debian/libdir.map, the format is:
 
 The architecture optimized libraries should go under
 /usr/lib/<something>, where <something> matches the optimizations used,
-e.g. "mmx" or "v9".
+e.g. "cmov" or "v9".
 
 Only packages listed in the control file *and* libdir.map are actually
 built.  That means that even if debian/libdir.map lists
@@ -29,6 +29,14 @@ debian/control it *won't* be built.  The other way around, if
 libgl1-random-stuff is listed in debian/control but there's no entry for
 it in debian/libdir.map it *won't* be built.
 
+Again...
+
+If the libdir.map file doesn't mention your (lib)-(config), e.g.
+gl-debian_i386, THE TARGET WON'T BE BUILT.
+
+If the package listed in libdir.map is not listed in debian/control, THE
+TARGET WON'T BE BUILT.
+
 For architectures where glide3 is available an extra package is built
 (iff this is the mesa-legacy source package).  The list of supported
 architectures in found in the control file.
diff --git a/debian/changelog b/debian/changelog
index e00814211a0..044a30c2c22 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,19 +1,118 @@
-mesa (6.5-0.1) experimental; urgency=low
+mesa (6.5.0.cvs.20060524-1.1) unstable; urgency=medium
 
-  * NMU
-  * New upstream development release
-  * Increment libdrm-dev build-dep to 2.0.1
-  * Re-Add s390 and m68k to the USE_IEEE test in src/mesa/main/imports.h.
-    I need to submit this upstream.
-  * Remove set_buffer function from idirectfbgl_mesa.c in directfb driver.
-    Also remove the line that sets SetBuffer to it. Fixes FTBFS.
-  * Don't build now non-existant i830 driver in debian dri configs. Fixes
-    FTBFS.
-  * Update source package install file
-  * Install the glx sources with the rest in the sources package. This will
-    allow building of Xgl
-
- -- David Nusinow <dnusinow@debian.org>  Sat,  8 Apr 2006 14:28:20 -0400
+  * Non-maintainer upload.
+  * Upload mesa 6.5 cvs to unstable, because we need it for Xorg 7.1.
+  * Upload with medium urgency instead of high, since this is a new
+    upstream that should get some testing in unstable in spite of the
+    multiple RC bugfixes.
+  * Update debian/copyright with the full text of the SGI Free B and SGI
+    MIT-style licenses in use in the package, and take a stab at
+    cleaning up the list of paths and licenses.
+    Closes: #368562.
+  * Make mesa-common-dev Replaces: xlibosmesa-dev from sarge.
+    Closes: #384057.
+  * Fix libgl1-mesa-glx to not Provides: libgl1-mesa-dri, since it
+    definitely doesn't provide DRI support and this Provides: breaks
+    upgrades from sarge.  Closes: #384282.
+  * debian/libgl1-mesa-swx11.shlibs: create a static shlibs file,
+    because libOSMesa.so.6 is not provided by all implementations of
+    libGL and so needs a separate shlibs declaration.  Also make
+    libgl1-mesa-glx the default alternative instead of libgl1-mesa-swx11
+    for consistency even when building against libgl1-mesa-swx11,
+    because to the extent these are interchangeable (i.e., 99%...),
+    there should be no reason to prefer one over the other -- and to the
+    extent that they aren't interchangeable, it's wrong to list libgl1
+    as an alternative dependency at all.  Closes: #386185.
+  * Don't provide shlibs at all for libgl1-mesa-swx11-dbg; this is an
+    unnecessary duplication of the existing libgl1-mesa-swx11 shlibs
+    since packages should not really be linking against /usr/lib/debug/
+    separately.
+  * src/mesa/tnl/t_vb_render.c: Drop a pointless printf() in the
+    RENDER_LINE macro, getting rid of copious debug output on console.
+    Closes: #369895.
+  * libgl1-mesa-swx11 has no reason to depend on libglu, anything that
+    wants libglu will have its own dependency on it; drop this
+    hard-coded dependency from debian/control.
+  * Have libglu1-mesa-dev Provides: xlibmesa-glu-dev, since it's the
+    successor to that package and xlibmesa-glu-dev is still referenced
+    in a number of places and this makes for more reliable builds than
+    depending on alternatives without requiring another dummy -dev
+    package from xorg.
+  * Replace references to Source-Version in debian/control with either 
+    binary:Version or source:Version, depending on whether the
+    relationship references an arch: any or arch: all package, making
+    mesa binNMU-safe; add build-depends on dpkg-dev (>= 1.13.19) to
+    ensure these substvars are available.
+
+ -- Steve Langasek <vorlon@debian.org>  Fri, 15 Sep 2006 15:51:16 -0700
+
+mesa (6.5.0.cvs.20060524-1) experimental; urgency=low
+
+  * The "-O666 -fwater-c00ling -DBE_F4ST" release
+  * New pull from CVS
+  * Merge back and forth with 6.4.2-1
+  * configs/debian*_i386: disabled, optimized build fuxxored.
+
+ -- Marcelo E. Magallon <mmagallo@debian.org>  Wed, 24 May 2006 14:12:13 -0600
+
+mesa (6.5.0.cvs.20060512-0.0.1) experimental; urgency=low
+
+  * New upstream release (6.5.0)
+  * Pulled CVS as of 2006-05-12
+  * debian/control: remove DirectFB packages
+
+ -- Marcelo E. Magallon <mmagallo@debian.org>  Fri, 12 May 2006 15:23:49 -0600
+
+mesa (6.4.2-1) unstable; urgency=low
+
+  * The "please, please, please don't hate me" release.
+  * New upstream release.
+  * Ack NMUs
+  * debian/control: mesa-common-dev Replaces xlibmesa-gl-dev (<< 1:7)
+    AGAINST MY BETTER JUDGEMENT.  The problem here is gratuitous package
+    renames within a system that does not support them.  (closes:
+    bug#362063)
+  * debian/control: hurd-i386 doesn't have drm.  Doesn't fix #358065,
+    yet.
+  * bin/mklib: fix from Robert Millan to support hurd-i386 and
+    GNU/kFreeBSD.  Thanks Robert.  (closes: bug#358066)
+  * src/glx/x11/indirect_vertex_array.c, src/mesa/main/glheader.h,
+    src/mesa/drivers/dri/common/glcontextmodes.c: fix broken indirect
+    rendering on 64-bit platforms.  Thanks Aaron M. Ucko.  (closes:
+    bug#364228)
+  * debian/control: b-d on x11proto-gl-dev.  Please don't hate me!
+  * debian/control: Standards-Version: 3.7.2
+  * debian/rules: export DEB_HOST_ARCH
+  * configs/debian-dri: use DEB_HOST_ARCH to decide if certain DRI drivers
+    should be built or not.
+        + Built only for i386: i810 i830 sis.
+          Rationale: integrated chipsets available only for i386 processors.
+        + Built only for i386: ffb.
+          Rationale: Michel Dänzer said so, no idea why.
+        + Built only for i386, amd64: i915.
+          Rationale: Apparently this is available in the 64-bit Intel chipset.
+    Please file a bug report stating which drivers should be included/excluded
+    for which architectures.  Positive lists are preferred.  If possible state
+    why.
+  * debian/mesa-swx11-source.install: nuke this abomination.  Dinamically
+    generate the list at build time.
+  * debian/drivers.map: add gl-debian-dri_i386
+  * debian/README.build: updated, add big friendly letters in short sentences.
+    Perhaps I can read it myself this way...
+  * debian/rules, configs/debian, configs/debian-dri, configs/debian_i386,
+    configs/debian-dri_i386, debian/libdir.map, debian/drivers.map: hack in
+    support for variable driver's dir.  If you want this for your pet
+    architecture please provide BOTH configs/debian_arch and
+    configs/debian-dri_arch.  If you just want to include/exclude DRI drivers
+    on your architecture look in configs/debian-dri.
+  * configs/debian*_i386: disabled, optimized build fuxxored.
+  * debian/rules: remove misguided Perl construct, replace by something
+    simpler in shell.  I actually meant to do something else with the Perl
+    thing, but got distracted and forgot about it.  Thanks Aaron M. Ucko!
+  * debian/rules: make it work like debian/README.build says it works wrt to
+    building optimized targets.
+
+ -- Marcelo E. Magallon <mmagallo@debian.org>  Tue, 16 May 2006 18:07:53 -0600
 
 mesa (6.4.1-0.4) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index b444adf3ec7..fd91268235b 100644
--- a/debian/control
+++ b/debian/control
@@ -3,13 +3,13 @@ Section: graphics
 Priority: optional
 Maintainer: Mesa package maintainers <pkg-mesa-devel@lists.alioth.debian.org>
 Uploaders: Marcelo E. Magallon <mmagallo@debian.org>
-Standards-Version: 3.6.1
-Build-Depends: lesstif2-dev, grep-dctrl, debhelper (>> 4), build-essential (>= 11), libdrm-dev (>> 2.0.1), libdirectfb-dev, xutils, libexpat-dev, libxxf86vm-dev, libx11-dev, libxext-dev, pkg-config, 
+Standards-Version: 3.7.2
+Build-Depends: lesstif2-dev, grep-dctrl, debhelper (>> 4), build-essential (>= 11), libdrm-dev (>> 2) [!hurd-i386], libdirectfb-dev, xutils, libexpat-dev, libxxf86vm-dev, libx11-dev, libxext-dev, pkg-config, x11proto-gl-dev, dpkg-dev (>= 1.13.19)
 
 Package: libgl1-mesa-swx11
 Section: libs
 Architecture: any
-Depends: ${shlibs:Depends}, libglu1-mesa | libglu1
+Depends: ${shlibs:Depends}
 Conflicts: mesag3-glide, mesag3-glide2, mesag3+ggi, libgl1, nvidia-glx, mesag3, libgl1-mesa-swrast
 Provides: libgl1, mesag3, libgl1-mesa-swrast
 Replaces: libgl1, mesag3, libgl1-mesa-swrast
@@ -30,7 +30,7 @@ Description: A free implementation of the OpenGL API -- runtime
 Package: libgl1-mesa-swx11-dev
 Section: libdevel
 Architecture: any
-Depends: libgl1-mesa-swx11 (= ${Source-Version}), libc6-dev, libx11-dev | xlibs-dev (>> 4.1.0), libxext6 | xlibs (>> 4.1.0), mesa-common-dev (= ${Source-Version}), lesstif2-dev
+Depends: libgl1-mesa-swx11 (= ${binary:Version}), libc6-dev, libx11-dev | xlibs-dev (>> 4.1.0), libxext6 | xlibs (>> 4.1.0), mesa-common-dev (= ${source:Version}), lesstif2-dev
 Provides: libgl-dev, mesag3-widgets, mesag-widgets-dev, libglw-dev, mesag-dev, libgl1-mesa-swrast-dev
 Conflicts: mesa-dev, libgl-dev, mesag3 (<< 3.1-1), nvidia-glx-dev, mesag-dev, libgl1-mesa-swrast-dev
 Replaces: libgl-dev, mesag-dev, libgl1-mesa-swrast-dev
@@ -51,7 +51,7 @@ Description: A free implementation of the OpenGL API -- development support file
 Package: libgl1-mesa-swx11-dbg
 Section: libs
 Architecture: any
-Depends: ${shlibs:Depends}, libglu1-mesa | libglu1
+Depends: ${shlibs:Depends}
 Conflicts: libgl1-mesa-swrast-dbg
 Replaces: libgl1-mesa-swrast-dbg
 Provides: libgl1-mesa-swrast-dbg
@@ -67,7 +67,7 @@ Architecture: any
 Depends: ${shlibs:Depends}
 Conflicts: libgl1, libgl1-mesa-dri (<< 6.4.0)
 Replaces: libgl1, libgl1-mesa-dri (<< 6.4.0)
-Provides: libgl1, libgl1-mesa-dri
+Provides: libgl1
 Description: A free implementation of the OpenGL API -- GLX runtime
  This version of Mesa provides GLX and DRI capabilities: it is capable of
  both direct and indirect rendering.  For direct rendering, it can use DRI
@@ -82,7 +82,7 @@ Description: A free implementation of the OpenGL API -- GLX runtime
 Package: libgl1-mesa-dri
 Section: libs
 Architecture: any
-Depends: ${shlibs-Depends}, libgl1-mesa-glx (= ${Source-Version})
+Depends: ${shlibs:Depends}, libgl1-mesa-glx (= ${binary:Version})
 Conflicts: xlibmesa-dri (<< 1:7.0.0)
 Replaces: xlibmesa-dri (<< 1:7.0.0)
 Description: A free implementation of the OpenGL API -- DRI modules
@@ -99,7 +99,7 @@ Description: A free implementation of the OpenGL API -- DRI modules
 Package: libgl1-mesa-dev
 Section: libs
 Architecture: any
-Depends: ${shlibs:Depends}, libc6-dev, mesa-common-dev (= ${Source-Version}), libgl1-mesa-glx (=${Source-Version}), libgl1-mesa-dri (= ${Source-Version})
+Depends: ${shlibs:Depends}, libc6-dev, mesa-common-dev (= ${source:Version}), libgl1-mesa-glx (=${binary:Version}), libgl1-mesa-dri (= ${binary:Version})
 Conflicts: libgl-dev, libgl1-mesa-dri-dev
 Replaces: libgl-dev, libgl1-mesa-dri-dev
 Provides: libgl-dev, libgl1-mesa-dri-dev
@@ -114,40 +114,10 @@ Description: A free implementation of the OpenGL API -- GLX development support
  For a complete description of Mesa, please look at the libgl1-mesa-swx11
  package.
 
-Package: libgl1-mesa-directfb
-Section: libs
-Architecture: any
-Depends: ${shlibs:Depends}, libglu1-mesa | libglu1
-Conflicts: libgl1
-Replaces: libgl1
-Provides: libgl1
-Description: A free implementation of the OpenGL API -- DirectFB runtime
- This version of Mesa provides hardware accelerated rendering
- capabilities via the DirectFB infraestructure.
- .
- For a complete description of Mesa, please look at the libgl1-mesa-swx11
- package.
-
-Package: libgl1-mesa-directfb-dev
-Section: libs
-Architecture: any
-Depends: ${shlibs:Depends}, libc6-dev, mesa-common-dev (= ${Source-Version}), libgl1-mesa-directfb (=${Source-Version})
-Conflicts: libgl-dev
-Replaces: libgl-dev
-Provides: libgl-dev
-Description: A free implementation of the OpenGL API -- DirectFB development support files
- This version of Mesa provides hardware accelerated rendering
- capabilities via the DirectFB infraestructure.
- .
- This package includes headers and static libraries for compiling
- programs with Mesa.
- .
- For a complete description of Mesa, please look at the libgl1-mesa-swx11
- package.
-
 Package: mesa-common-dev
 Section: devel
 Architecture: all
+Replaces: xlibmesa-gl-dev (<< 1:7), xlibosmesa-dev
 Description: Developer documentation for Mesa
  This package includes the specifications for the Mesa-specific OpenGL
  extensions, the complete set of release release notes and the
@@ -168,7 +138,7 @@ Description: Mesa Off-screen rendering extension
 Package: libosmesa6-dev
 Section: devel
 Architecture: any
-Depends: libosmesa6 (= ${Source-Version}), libgl1-mesa-swx11-dev (= ${Source-Version})
+Depends: libosmesa6 (= ${binary:Version}), libgl1-mesa-swx11-dev (= ${binary:Version})
 Conflicts: xlibosmesa-dev, libosmesa4-dev, libosmesa-dev
 Replaces: xlibosmesa-dev, libosmesa-dev
 Provides: xlibosmesa-dev, libosmesa-dev
@@ -202,8 +172,8 @@ Description: The OpenGL utility library (GLU)
 Package: libglu1-mesa-dev
 Section: libdevel
 Architecture: any
-Depends: ${shlibs:Depends}, libglu1-mesa (= ${Source-Version}), libgl1-mesa-dev | libgl-dev
-Provides: libglu-dev
+Depends: ${shlibs:Depends}, libglu1-mesa (= ${binary:Version}), libgl1-mesa-dev | libgl-dev
+Provides: libglu-dev, xlibmesa-glu-dev
 Conflicts: mesag-dev (<< 5.0.0-1), mesa-glide2-dev (<< 5.0.0-1), mesag3+ggi-dev (<< 5.0.0-1), xlibmesa-dev
 Replaces: libglu-dev
 Description: The OpenGL utility library -- development support files
diff --git a/debian/copyright b/debian/copyright
index 2cc225284e0..8a0af603099 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -58,6 +58,327 @@ License:
    will become a part of the body of work which is copyrighted by
    Brian Paul and licensed by the above terms.
 
+----------------------------------------------------------------------
+
+Some files, as listed below, are made available under the SGI Free B 
+license.  This license is as follows:
+
+           SGI FREE SOFTWARE LICENSE B (Version 1.1 [02/22/2000])
+
+1.  Definitions.
+
+1.1. "Additional Notice Provisions" means such additional provisions as
+     appear in the Notice in Original Code under the heading "Additional
+     Notice Provisions."
+
+1.2. "Covered Code" means the Original Code or Modifications, or any
+     combination thereof.
+
+1.3. "Hardware" means any physical device that accepts input, processes
+     input, stores the results of processing, and/or provides output.
+
+1.4. "Larger Work" means a work that combines Covered Code or portions
+     thereof with code not governed by the terms of this License.
+
+1.5. "Licensable" means having the right to grant, to the maximum extent
+     possible, whether at the time of the initial grant or subsequently
+     acquired, any and all of the rights conveyed herein.
+
+1.6. "License" means this document.
+
+1.7. "Licensed Patents" means patent claims Licensable by SGI that are
+     infringed by the use or sale of Original Code or any Modifications
+     provided by SGI, or any combination thereof.
+
+1.8. "Modifications" means any addition to or deletion from the
+     substance or structure of the Original Code or any previous
+     Modifications. When Covered Code is released as a series of files,
+     a Modification is: 
+
+     A. Any addition to the contents of a file containing Original Code
+        and/or addition to or deletion from the contents of a file
+        containing previous Modifications.
+
+     B. Any new file that contains any part of the Original Code or
+        previous Modifications.
+
+1.9. "Notice" means any notice in Original Code or Covered Code, as
+     required by and in compliance with this License.
+
+1.10. "Original Code" means source code of computer software code that
+      is described in the source code Notice required by Exhibit A as
+      Original Code, and updates and error corrections specifically 
+      thereto.
+
+1.11. "Recipient" means an individual or a legal entity exercising
+      rights under, and complying with all of the terms of, this License
+      or a future version of this License issued under Section 8. For
+      legal entities, "Recipient" includes any entity that controls, is
+      controlled by, or is under common control with Recipient. For
+      purposes of this definition, "control" of an entity means (a) the
+      power, direct or indirect, to direct or manage such entity, or (b)
+      ownership of fifty percent (50%) or more of the outstanding shares
+      or beneficial ownership of such entity.
+
+1.12. "Recipient Patents" means patent claims Licensable by a Recipient
+      that are infringed by the use or sale of Original Code or any
+      Modifications provided by SGI, or any combination thereof.
+
+1.13. "SGI" means Silicon Graphics, Inc.
+
+1.14. "SGI Patents" means patent claims Licensable by SGI other than the
+      Licensed Patents.
+
+2.  License Grant and Restrictions.
+
+2.1. SGI License Grant. Subject to the terms of this License and any
+     third party intellectual property claims, for the duration of
+     intellectual property protections inherent in the Original Code,
+     SGI hereby grants Recipient a worldwide, royalty-free,
+     non-exclusive license, to do the following: (i) under copyrights
+     Licensable by SGI, to reproduce, distribute, create derivative
+     works from, and, to the extent applicable, display and perform the
+     Original Code and/or any Modifications provided by SGI alone and/or
+     as part of a Larger Work; and (ii) under any Licensable Patents, to
+     make, have made, use, sell, offer for sale, import and/or otherwise
+     transfer the Original Code and/or any Modifications provided by
+     SGI. Recipient accepts the terms and conditions of this License by
+     undertaking any of the aforementioned actions. The patent license
+     shall apply to the Covered Code if, at the time any related
+     Modification is added, such addition of the Modification causes
+     such combination to be covered by the Licensed Patents. The patent
+     license in Section 2.1(ii) shall not apply to any other
+     combinations that include the Modification. No patent license is
+     provided under SGI Patents for infringements of SGI Patents by
+     Modifications not provided by SGI or combinations of Original Code
+     and Modifications not provided by SGI.
+
+2.2. Recipient License Grant. Subject to the terms of this License and
+     any third party intellectual property claims, Recipient hereby
+     grants SGI and any other Recipients a worldwide, royalty-free,
+     non-exclusive license, under any Recipient Patents, to make, have
+     made, use, sell, offer for sale, import and/or otherwise transfer
+     the Original Code and/or any Modifications provided by SGI.
+
+2.3. No License For Hardware Implementations. The licenses granted in
+     Section 2.1 and 2.2 are not applicable to implementation in
+     Hardware of the algorithms embodied in the Original Code or any
+     Modifications provided by SGI .
+
+3.  Redistributions. 
+
+3.1. Retention of Notice/Copy of License. The Notice set forth in
+     Exhibit A, below, must be conspicuously retained or included in any
+     and all redistributions of Covered Code. For distributions of the
+     Covered Code in source code form, the Notice must appear in every
+     file that can include a text comments field; in executable form,
+     the Notice and a copy of this License must appear in related
+     documentation or collateral where the Recipient’s rights relating
+     to Covered Code are described. Any Additional Notice Provisions
+     which actually appears in the Original Code must also be retained
+     or included in any and all redistributions of Covered Code.
+
+3.2. Alternative License. Provided that Recipient is in compliance with
+     the terms of this License, Recipient may, so long as without
+     derogation of any of SGI’s rights in and to the Original Code,
+     distribute the source code and/or executable version(s) of Covered
+     Code under (1) this License; (2) a license identical to this
+     License but for only such changes as are necessary in order to
+     clarify Recipient’s role as licensor of Modifications; and/or (3) a
+     license of Recipient’s choosing, containing terms different from
+     this License, provided that the license terms include this Section
+     3 and Sections 4, 6, 7, 10, 12, and 13, which terms may not be
+     modified or superseded by any other terms of such license. If
+     Recipient elects to use any license other than this License,
+     Recipient must make it absolutely clear that any of its terms which
+     differ from this License are offered by Recipient alone, and not by
+     SGI. It is emphasized that this License is a limited license, and,
+     regardless of the license form employed by Recipient in accordance
+     with this Section 3.2, Recipient may relicense only such rights, in
+     Original Code and Modifications by SGI, as it has actually been
+     granted by SGI in this License.
+
+3.3. Indemnity. Recipient hereby agrees to indemnify SGI for any
+     liability incurred by SGI as a result of any such alternative
+     license terms Recipient offers.
+
+4.  Termination. This License and the rights granted hereunder will
+    terminate automatically if Recipient breaches any term herein and
+    fails to cure such breach within 30 days thereof. Any sublicense to 
+    the Covered Code that is properly granted shall survive any
+    termination of this License, absent termination by the terms of such
+    sublicense. Provisions that, by their nature, must remain in effect
+    beyond the termination of this License, shall survive.
+
+5.  No Trademark Or Other Rights. This License does not grant any rights
+    to: (i) any software apart from the Covered Code, nor shall any
+    other rights or licenses not expressly granted hereunder arise by
+    implication, estoppel or otherwise with respect to the Covered Code;
+    (ii) any trade name, trademark or service mark whatsoever, including
+    without limitation any related right for purposes of endorsement or
+    promotion of products derived from the Covered Code, without prior
+    written permission of SGI; or (iii) any title to or ownership of the
+    Original Code, which shall at all times remains with SGI. All rights
+    in the Original Code not expressly granted under this License are
+    reserved.
+
+6.  Compliance with Laws; Non-Infringement. There are various worldwide
+    laws, regulations, and executive orders applicable to dispositions
+    of Covered Code, including without limitation export, re-export, and
+    import control laws, regulations, and executive orders, of the U.S.
+    government and other countries, and Recipient is reminded it is
+    obliged to obey such laws, regulations, and executive orders.
+    Recipient may not distribute Covered Code that (i) in any way
+    infringes (directly or contributorily) any intellectual property
+    rights of any kind of any other person or entity or (ii) breaches
+    any representation or warranty, express, implied or statutory, to
+    which, under any applicable law, it might be deemed to have been
+    subject.
+
+7.  Claims of Infringement. If Recipient learns of any third party claim
+    that any disposition of Covered Code and/or functionality wholly or
+    partially infringes the third party's intellectual property rights,
+    Recipient will promptly notify SGI of such claim.
+
+8.  Versions of the License. SGI may publish revised and/or new versions
+    of the License from time to time, each with a distinguishing version
+    number. Once Covered Code has been published under a particular
+    version of the License, Recipient may, for the duration of the
+    license, continue to use it under the terms of that version, or
+    choose to use such Covered Code under the terms of any subsequent
+    version published by SGI. Subject to the provisions of Sections 3
+    and 4 of this License, only SGI may modify the terms applicable to
+    Covered Code created under this License.
+
+9.  DISCLAIMER OF WARRANTY. COVERED CODE IS PROVIDED "AS IS." ALL
+    EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS ARE DISCLAIMED,
+    INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND CONDITIONS
+    OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A PARTICULAR
+    PURPOSE, AND NON-INFRINGEMENT. SGI ASSUMES NO RISK AS TO THE QUALITY
+    AND PERFORMANCE OF THE SOFTWARE. SHOULD THE SOFTWARE PROVE DEFECTIVE
+    IN ANY RESPECT, SGI ASSUMES NO COST OR LIABILITY FOR SERVICING,
+    REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY IS AN ESSENTIAL
+    PART OF THIS LICENSE. NO USE OF ANY COVERED CODE IS AUTHORIZED
+    HEREUNDER EXCEPT SUBJECT TO THIS DISCLAIMER.
+
+10.  LIMITATION OF LIABILITY. UNDER NO CIRCUMSTANCES NOR LEGAL THEORY,
+     WHETHER TORT (INCLUDING, WITHOUT LIMITATION, NEGLIGENCE OR STRICT
+     LIABILITY), CONTRACT, OR OTHERWISE, SHALL SGI OR ANY SGI LICENSOR
+     BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR
+     CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT
+     LIMITATION, DAMAGES FOR LOSS OF GOODWILL, WORK STOPPAGE, LOSS OF
+     DATA, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER
+     COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN
+     INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF
+     LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY
+     RESULTING FROM SGI's NEGLIGENCE TO THE EXTENT APPLICABLE LAW
+     PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE
+     EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO
+     THAT EXCLUSION AND LIMITATION MAY NOT APPLY TO RECIPIENT.
+
+11.  Indemnity. Recipient shall be solely responsible for damages
+     arising, directly or indirectly, out of its utilization of rights
+     under this License. Recipient will defend, indemnify and hold
+     harmless Silicon Graphics, Inc. from and against any loss,
+     liability, damages, costs or expenses (including the payment of
+     reasonable attorneys fees) arising out of Recipient's use,
+     modification, reproduction and distribution of the Covered Code or
+     out of any representation or warranty made by Recipient.
+
+12.  U.S. Government End Users. The Covered Code is a "commercial item"
+     consisting of "commercial computer software" as such terms are
+     defined in title 48 of the Code of Federal Regulations and all U.S.
+     Government End Users acquire only the rights set forth in this
+     License and are subject to the terms of this License.
+
+13.  Miscellaneous. This License represents the complete agreement
+     concerning the its subject matter. If any provision of this License
+     is held to be unenforceable, such provision shall be reformed so as
+     to achieve as nearly as possible the same legal and economic effect
+     as the original provision and the remainder of this License will
+     remain in effect. This License shall be governed by and construed
+     in accordance with the laws of the United States and the State of
+     California as applied to agreements entered into and to be
+     performed entirely within California between California residents.
+     Any litigation relating to this License shall be subject to the
+     exclusive jurisdiction of the Federal Courts of the Northern
+     District of California (or, absent subject matter jurisdiction in
+     such courts, the courts of the State of California), with venue
+     lying exclusively in Santa Clara County, California, with the
+     losing party responsible for costs, including without limitation,
+     court costs and reasonable attorneys fees and expenses. The
+     application of the United Nations Convention on Contracts for the
+     International Sale of Goods is expressly excluded. Any law or
+     regulation that provides that the language of a contract shall be
+     construed against the drafter shall not apply to this License.
+
+Exhibit A
+
+License Applicability. Except to the extent portions of this file are
+made subject to an alternative license as permitted in the SGI Free
+Software License B, Version 1.1 (the "License"), the contents of this
+file are subject only to the provisions of the License. You may not use
+this file except in compliance with the License. You may obtain a copy
+of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
+Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
+
+http://oss.sgi.com/projects/FreeB
+
+Note that, as provided in the License, the Software is distributed on an
+"AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
+DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
+CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
+PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+
+Original Code. The Original Code is: [name of software, version number,
+and release date], developed by Silicon Graphics, Inc. The Original Code
+is Copyright (c) [dates of first publication, as appearing in the Notice
+in the Original Code] Silicon Graphics, Inc. Copyright in any portions
+created by third parties is as indicated elsewhere herein. All Rights
+Reserved.
+
+Additional Notice Provisions: [such additional provisions, if any, as 
+appear in the Notice in the Original Code under the heading "Additional 
+Notice Provisions"]
+
+--------------------------------------------------------------------------
+
+Some other files listed below are made available from Silicon Graphics,
+Inc. under a more liberal, MIT-style license, as follows:
+
+   Permission to use, copy, modify, and distribute this software for
+   any purpose and without fee is hereby granted, provided that the above
+   copyright notice appear in all copies and that both the copyright notice
+   and this permission notice appear in supporting documentation, and that
+   the name of Silicon Graphics, Inc. not be used in advertising
+   or publicity pertaining to distribution of the software without specific,
+   written prior permission.
+
+   THE MATERIAL EMBODIED ON THIS SOFTWARE IS PROVIDED TO YOU "AS-IS"
+   AND WITHOUT WARRANTY OF ANY KIND, EXPRESS, IMPLIED OR OTHERWISE
+   INCLUDING WITHOUT LIMITATION, ANY WARRANTY OF MERCHANTABILITY OR
+   FITNESS FOR A PARTICULAR PURPOSE.  IN NO EVENT SHALL SILICON
+   GRAPHICS, INC.  BE LIABLE TO YOU OR ANYONE ELSE FOR ANY DIRECT,
+   SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY
+   KIND, OR ANY DAMAGES WHATSOEVER, INCLUDING WITHOUT LIMITATION,
+   LOSS OF PROFIT, LOSS OF USE, SAVINGS OR REVENUE, OR THE CLAIMS OF
+   THIRD PARTIES, WHETHER OR NOT SILICON GRAPHICS, INC.  HAS BEEN
+   ADVISED OF THE POSSIBILITY OF SUCH LOSS, HOWEVER CAUSED AND ON
+   ANY THEORY OF LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE
+   POSSESSION, USE OR PERFORMANCE OF THIS SOFTWARE.
+   
+   US Government Users Restricted Rights
+   Use, duplication, or disclosure by the Government is subject to
+   restrictions set forth in FAR 52.227.19(c)(2) or subparagraph
+   (c)(1)(ii) of the Rights in Technical Data and Computer Software
+   clause at DFARS 252.227-7013 and/or in similar or successor
+   clauses in the FAR or the DOD or NASA FAR Supplement.
+   Unpublished-- rights reserved under the copyright laws of the
+   United States.  Contractor/manufacturer is Silicon Graphics,
+   Inc., 2011 N.  Shoreline Blvd., Mountain View, CA 94039-7311.
+
+--------------------------------------------------------------------------
+
  Mesa Component Licenses:
 
  Component       Files                 Primary Author      License
@@ -75,43 +396,40 @@ License:
  3Dfx driver     src/FX/*              David Bucciarelli   Mesa
                  include/GL/fxmesa.h
 
- BeOS R4 driver  src/BeOS/*            Brian Paul          Mesa
+ BeOS R4 driver  mesa/drivers/beos/    Brian Paul          Mesa
 
- MGL driver      src/MGL/*             SciTech, Inc        SciTech copyright
-                 include/GL/mglmesa.h
+ MGL driver      include/GL/mglmesa.h  SciTech, Inc        GNU LGPL
 
- Windows driver  src/Windows/*         Li Wei              copyright by Li Wei
+ Windows driver  mesa/drivers/windows/ Li Wei              GNU LGPL
                  include/GL/wmesa.h
 
- SVGA driver     src/SVGA/*            Brian Paul          GNU-LGPL
+ SVGA driver     mesa/drivers/svga/    Brian Paul          GNU LGPL
                  include/GL/svgamesa.h
 
- DOS driver      src/DOS/*             Charlie Wallace     GNU-LGPL
+ DOS driver      mesa/drivers/dos/     Charlie Wallace     GNU LGPL
                  include/GL/dosmesa.h
 
- GGI driver      src/GGI/*             Uwe Maurer          GNU-LGPL
+ GGI driver      mesa/drivers/ggi/     Uwe Maurer          GNU LGPL
                  include/GL/ggimesa.h
 
- S3 driver       src/S3/*              S3, Inc.            S3 copyright
-
- GLUT            src-glut/*            Mark Kilgard        Mark's copyright
+ GLUT            src/glut/*            Mark Kilgard        Mark's copyright
                  include/GL/*glut*.h
 
- GLU library     src-glu/*             Brian Paul          GNU-LGPL
+ GLU library     src/glu/*             Brian Paul          GNU LGPL
 
- SI GLU library  si-glu/*              SGI                 SGI Free B
+ SGI GLU library src/glu/sgi/*         SGI                 SGI Free B
                  include/GL/glu.h
 
  Ext registry    include/GL/glext.h    SGI                 SGI Free B
                  include/GL/glxext.h
 
- demo programs   demos/*               various             see source files
+ demo programs   progs/demos/*         various             see source files
 
- X demos         xdemos/*              Brian Paul          see source files
+ X demos         progs/xdemos/*        Brian Paul          see source files
 
- SGI demos       samples/*             SGI                 SGI copyright
+ SGI demos       progs/samples/*       SGI                 SGI MIT-style
 
- RedBook demos   book/*                SGI                 SGI copyright
+ RedBook demos   progs/redbook/*       SGI                 SGI MIT-style
 
 
     On Debian systems the full text of the GNU LGPL license is found in
diff --git a/debian/drivers.map b/debian/drivers.map
index 05056cf6501..8920eaf6294 100644
--- a/debian/drivers.map
+++ b/debian/drivers.map
@@ -1,2 +1,3 @@
 gl-debian-dri lib/*_dri.so usr/lib/dri libgl1-mesa-dri
+gl-debian-dri_i386 lib/*_dri.so usr/lib/i686/cmov/dri libgl1-mesa-dri
 gl-debian-directfb src/mesa/drivers/directfb/libidirectfbgl_mesa.so usr/lib/directfb-0.9.22/interfaces/IDirectFBGL libgl1-mesa-directfb
diff --git a/debian/libdir.map b/debian/libdir.map
index f1f62492858..17728419e92 100644
--- a/debian/libdir.map
+++ b/debian/libdir.map
@@ -1,10 +1,11 @@
 gl-debian usr/lib libgl1-mesa-swx11 libgl1-mesa-swx11-dev
 gl-debian-static usr/lib libgl1-mesa-swx11 libgl1-mesa-swx11-dev
 gl-debian-debug usr/lib/debug libgl1-mesa-swx11-dbg libgl1-mesa-swx11-dbg
-gl-debian_i386 usr/lib/i686/mmx/cmov libgl1-mesa-swx11 libgl1-mesa-swx11-dev
-gl-debian-static_i386 usr/lib/i686/mmx/cmov libgl1-mesa-swx11 libgl1-mesa-swx11-dev
-gl-debian-debug_i386 usr/lib/debug/i686/mmx/cmov libgl1-mesa-swx11-dbg libgl1-mesa-swx11-dbg
+gl-debian_i386 usr/lib/i686/cmov libgl1-mesa-swx11 libgl1-mesa-swx11-dev
+gl-debian-static_i386 usr/lib/i686/cmov libgl1-mesa-swx11 libgl1-mesa-swx11-dev
+gl-debian-debug_i386 usr/lib/debug/i686/cmov libgl1-mesa-swx11-dbg libgl1-mesa-swx11-dbg
 gl-debian-dri usr/lib libgl1-mesa-glx libgl1-mesa-dev
+gl-debian-dri_i386 usr/lib/i686/cmov libgl1-mesa-glx libgl1-mesa-dev
 gl-debian-directfb usr/lib libgl1-mesa-directfb libgl1-mesa-directfb-dev
 gl-debian-osmesa16 usr/lib libosmesa6 libosmesa6-dev
 gl-debian-osmesa16-static usr/lib libosmesa6 libosmesa6-dev
diff --git a/debian/libgl1-mesa-swx11.shlibs b/debian/libgl1-mesa-swx11.shlibs
new file mode 100644
index 00000000000..f4b6356179c
--- /dev/null
+++ b/debian/libgl1-mesa-swx11.shlibs
@@ -0,0 +1,2 @@
+libGL 1 libgl1-mesa-glx | libgl1
+libOSMesa 6 libgl1-mesa-swx11 | libgl1-mesa-glide3
diff --git a/debian/rules b/debian/rules
index 6365329261a..97beb4f9f9d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,7 @@
 #!/usr/bin/make -f
 
 export DH_OPTIONS
+export DEB_HOST_ARCH
 
 CFLAGS = -Wall -g
 
@@ -18,19 +19,19 @@ DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH)
 STAMPDIR := debian/stamp
 
 select_target_any = $(shell dh_listpackages -s | grep -v '^$$' | while read p ; do cut -d ' ' -f 1,3 debian/libdir.map | grep -w $$p ; done | grep -v _ | cut -d ' ' -f 1 | sort -u | grep ^$(1)- | cut -d - -f 2-)
-select_target_arch = $(filter $(foreach t,$(BUILD_$(1)_TARGETS_any),$(t)_%), $(patsubst configs/%, %, $(wildcard configs/*_$(DEB_HOST_ARCH))))
+select_target_arch = $(filter $(shell dh_listpackages -s | grep -v '^$$' | while read p ; do cut -d ' ' -f 1,3 debian/libdir.map | grep -w $$p ; done | grep _ | cut -d ' ' -f 1 | sort -u | grep ^$(1)- | cut -d - -f 2-), $(patsubst configs/%, %, $(wildcard configs/*_$(DEB_HOST_ARCH))))
 select_target = $(sort $(BUILD_$(1)_TARGETS_any) $(BUILD_$(1)_TARGETS_arch))
 
 BUILD_GL_TARGETS_any := $(call select_target_any,gl)
-BUILD_GL_TARGETS_arch := $(call select_target_arch,GL)
+BUILD_GL_TARGETS_arch := $(call select_target_arch,gl)
 BUILD_GL_TARGETS := $(call select_target,GL)
 
 BUILD_GLU_TARGETS_any := $(call select_target_any,glu)
-#BUILD_GLU_TARGETS_arch := $(call select_target_arch,GLU)
+#BUILD_GLU_TARGETS_arch := $(call select_target_arch,glu)
 BUILD_GLU_TARGETS := $(call select_target,GLU)
 
 BUILD_GLW_TARGETS_any := $(call select_target_any,glw)
-#BUILD_GLW_TARGETS_arch := $(call select_target_arch,GLW)
+#BUILD_GLW_TARGETS_arch := $(call select_target_arch,glw)
 BUILD_GLW_TARGETS := $(call select_target,GLW)
 
 BUILD_TARGETS := \
@@ -42,8 +43,6 @@ ifneq ($(strip $(shell grep-dctrl -n -s Package -PX libgl1-mesa-directfb debian/
 DFB_MODULE_DIR := $(shell pkg-config --variable=moduledir directfb-internal)
 endif
 
-DRI_MODULE_DIR := /usr/lib/dri
-
 build: $(STAMPDIR)/build
 $(STAMPDIR)/build: $(BUILD_TARGETS)
 	dh_testdir
@@ -54,6 +53,9 @@ $(STAMPDIR)/build: $(BUILD_TARGETS)
 #     2: target (debian, debian-i386, ...)
 #     3: subdir to build (mesa, glw, glu/sgi)
 
+driver_map = $(word $(2),$(shell grep '^$(1) ' debian/drivers.map))
+libdir_map = $(word $(2),$(shell grep '^$(1) ' debian/libdir.map))
+
 define build_target_actions
 	dh_testdir
 	chmod +x debian/shadowtree
@@ -64,7 +66,7 @@ define build_target_actions
 		mkdir -p build/$(1)-$(2)/lib/ ; \
 		ln -sf ../../gl-$(2)/lib/libGL.so build/$(1)-$(2)/lib/ ; \
 	fi
-	make -C build/$(1)-$(2)/src SRC_DIRS=$(3)
+	make -C build/$(1)-$(2)/src SRC_DIRS=$(3) DEBIAN_DRIVERS_DIR=$(if $(call driver_map,$(1)-$(2),1),/$(call driver_map,$(1)-$(2),3))
 	if test $(1) != gl ; then \
 		rm build/$(1)-$(2)/lib/libGL.so ; \
 	fi
@@ -94,7 +96,6 @@ define install_target_lib_actions
 	dh_install -p$(4) build/$(1)/lib/lib*.a $(2)
 endef
 
-libdir_map = $(word $(2),$(shell grep '^$(1) ' debian/libdir.map))
 install_target_libs = $(call install_target_lib_actions,$(1),$(call libdir_map,$(1),2),$(call libdir_map,$(1),3),$(call libdir_map,$(1),4))
 
 # Parameters:
@@ -108,7 +109,6 @@ define install_target_driver_actions
 	dh_install -p$(4) build/$(1)/$(2) $(3)
 endef
 
-driver_map = $(word $(2),$(shell grep '^$(1) ' debian/drivers.map))
 install_target_drivers = $(if $(call driver_map,$(1),1),$(call install_target_driver_actions,$(1),$(call driver_map,$(1),2),$(call driver_map,$(1),3),$(call driver_map,$(1),4)))
 
 # Parameters:
@@ -144,14 +144,14 @@ clean:
 	dh_testroot
 	$(RM) -rf debian/stamp
 	$(RM) -rf build
-	dh_clean
+	dh_clean debian/mesa-swx11-source.install
 
 install: build install-all
 	@echo Target $@.
 	@echo Target $@: done.
 
 binary-indep: DH_OPTIONS := -i
-binary-indep: build
+binary-indep: debian/mesa-swx11-source.install build
 	@echo Target $@
 	dh_testdir
 	dh_testroot
@@ -186,7 +186,6 @@ binary-arch: build install
 	dh_compress -s
 	dh_fixperms -s
 #	dh_makeshlibs -s -Nlibglu1-mesa -Nmesag3
-	dh_makeshlibs -plibgl1-mesa-swx11-dbg -V 'libgl1-mesa-swx11 | libgl1'
 ifneq ($(strip $(shell dh_listpackages -s | grep -w libgl1-mesa-glide3)),)
 	dh_makeshlibs -plibgl1-mesa-glide3 -V 'libgl1-mesa-glide3'
 endif
@@ -197,7 +196,7 @@ ifneq ($(strip $(shell dh_listpackages -s | grep -w libosmesa6)),)
 	dh_makeshlibs -plibosmesa6
 endif
 ifneq ($(strip $(shell dh_listpackages -s | grep -w libgl1-mesa-swx11)),)
-	dh_makeshlibs -plibgl1-mesa-swx11 -V 'libgl1-mesa-swx11 | libgl1'
+	dh_makeshlibs -plibgl1-mesa-swx11
 endif
 ifneq ($(strip $(shell dh_listpackages -s | grep -w libgl1-mesa-glx)),)
 	dh_makeshlibs -plibgl1-mesa-glx -V 'libgl1-mesa-glx | libgl1'
@@ -208,7 +207,7 @@ endif
 # Make sure nothing has been left behind.
 	find debian -mindepth 2 -name shlibs | cut -d / -f 2 | sort -u > \
 		debian/shlibs.actual
-	find debian -mindepth 2 -name lib\*.so.\* | cut -d / -f 2 | sort -u > \
+	find debian -mindepth 2 -name lib\*.so.\* | grep -v dbg | cut -d / -f 2 | sort -u > \
 		debian/shlibs.should
 	cmp debian/shlibs.actual debian/shlibs.should
 	rm debian/shlibs.actual debian/shlibs.should
@@ -219,5 +218,15 @@ endif
 	dh_builddeb -s
 	@echo Target $@: done.
 
+list-targets:
+	@for t in $(BUILD_GL_TARGETS_arch) ; do echo $$t ; done
+
+debian/mesa-swx11-source.install:
+	( find src/mesa src/glx/x11 include/GL/internal -name '*.[ch]' ; \
+	  find include/GL -name 'xmesa*' ) | \
+	egrep -v 'drivers/(dri/(fb|ffb|gamma|i[a-z0-9]+|mach64|mga|r[0-9]+|radeon|s3v|savage|sis|tdfx|trident|unichrome)|directfb|dos|fbdev|ggi|glide|osmesa|svga|windows)/' | \
+	while read x; do echo $$x usr/share/mesa-source/`dirname $$x`; done \
+	> $@
+
 binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
+.PHONY: build clean binary-indep binary-arch binary install configure debian/mesa-swx11-source.install