Commit Mesa 6.4 sources and packaging

19 files changed, 1738 insertions, 0 deletions

diff --git a/debian/README.build b/debian/README.build
new file mode 100644
index 00000000000..53299308baf
--- /dev/null
+++ b/debian/README.build
@@ -0,0 +1,37 @@
+I have added a few new configuration files to the configs directory:
+
+    There's a base configuration, debian, which sets things up for
+    building in a debian environment.
+
+    There's also a debian-static configuration, which is for static
+    building.
+
+All the others are derived from one of these two configurations.
+
+The platform-specific optimizations go into a debian-foo_ARCH file, like
+debian_i386 or debian_sparc.  You can name this files whatever you want,
+but the last token must be a debian arch name.  Note the "_"!  These
+will be picked up automatically by the debian/rules.
+
+In order to actually install the new files, you need to edit
+debian/libdir.map, the format is:
+
+    target-name libdir package package-dev
+
+The architecture optimized libraries should go under
+/usr/lib/<something>, where <something> matches the optimizations used,
+e.g. "mmx" or "v9".
+
+Only packages listed in the control file *and* libdir.map are actually
+built.  That means that even if debian/libdir.map lists
+libgl1-random-stuff, if libgl1-random-stuff is *not* listed in
+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.
+
+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.
+
+There's an alioth project for this package:
+http://alioth.debian.org/projects/pkg-mesa/
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 00000000000..bfded473c44
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,655 @@
+mesa (6.4.0-1) unstable; urgency=low
+
+  [ Marcelo E. Magallon <mmagallo@debian.org> ]
+  * debian/control: build-depend on xutils (closes: #326466)
+  * include/GL/glx{int,proto,md,tokens}.h: missing upstream (closes: bug#326466)
+  * debian/libgl1-mesa-dri-dev.install: install GLX include files here, too.
+  * debian/rules: GLU and GLW don't have arch-specific targets.
+
+  [ Daniel Stone <daniels@debian.org> ]
+  * New upstream version, incorporating changes from Ubuntu 6.3 packaging.
+  * Rename packages:
+    - mesag3 -> libgl1-mesa-swrast
+    - mesag-dev -> libgl1-mesa-swrast-dev
+    - libgl1-mesa-dri -> libgl1-mesa
+    - libgl1-mesa-dri-dev -> libgl1-mesa-dev
+    - libgl1-mesa-dri still exists, but now contains the DRI modules only.
+  * Drop dependency *from* mesa-common-dev on libgl1-mesa-dev and
+    libglu1-mesa-dev; it should be the other way around.
+  * Add Build-Depends on pkg-config to get flags from libdrm, and libexpat-dev
+    for DRI configuration.  Break out xlibs-dev Build-Depends to the
+    individual libraries required.
+  * Bump libdrm-dev Build-Depends to >> 1.0.5, in order to get new
+    via_drm.h to build the unichrome DRI driver.
+  * Configs: pare DRI drivers down to a sensible set for each architecture.
+  * Remove completely broken Glide target, which caused FTBFS.
+  * Add mesa-swrast-source package, providing the source for the software
+    rasteriser for libGLcore in the X server.
+  * Drop tight libosmesa6 -> libgl1-mesa-swrast Depends, replace with
+    shlibs:Depends.
+
+ -- Daniel Stone <daniels@debian.org>  Wed, 26 Oct 2005 12:30:46 +1000
+
+mesa (6.3.2-2) unstable; urgency=low
+
+  * debian/rules: build only whatever needs to be build according to
+    debian/control.
+  * debian/libdir.map: it's usr/lib/debug not usr/lib/dbg
+  * debian/rules: select optimized targets for the current host architecture
+    only (thanks Michel!)
+  * debian/README.build: reword some of the directions, add more info.
+  * debian/control: forgot to add CPR relationships in the new packages
+    (thanks Michel!)
+  * debian/control: Set maintainer to pkg-mesa-devel, add myself as uploader
+
+ -- Marcelo E. Magallon <mmagallo@debian.org>  Sun, 28 Aug 2005 14:41:15 -0600
+
+mesa (6.3.2-1) unstable; urgency=low
+
+  * New upstream
+  * configs/debian-dri: new target
+  * debian/control: add build-depends on libdrm-dev
+  * debian/rules: pass SRC_DIRS instead of SUBDIRS on the command line.
+    This allows for configurations to override the command line in a
+    sane way.
+  * configs/debian-dri: override SRC_DIRS
+  * configs/debian: add -D_GNU_SOURCE (required by dri drivers)
+  * debian/control, debian/rules: drop glide out of this package, it
+    will be moved to the mesa-legacy package, forked from 6.2.1-7.
+  * debian/drivers.map, debian/rules: take into account that some
+    drivers have external components.
+        + To be fixed: debian/drivers.map hardcodes locations
+  * debian/control: libgl1-mesa-dri, libgl1-mesa-directfb: new drivers
+  * dh_makeshlibs for libgl1-mesa-dri and libgl1-mesa-directfb
+  * debian/control: priority is optional... again...
+
+ -- Marcelo E. Magallon <mmagallo@debian.org>  Sun, 21 Aug 2005 17:13:19 -0600
+
+mesa (6.2.1-7) unstable; urgency=low
+
+  * Previous upload got lost somewhere
+      + bin/mklib: add GNU/kFreeBSD, patch from Aurelien Jarno (closes:
+        bug#307154)
+      + recompile with newer g++
+
+ -- Marcelo E. Magallon <mmagallo@debian.org>  Tue, 02 Aug 2005 06:47:20 -0600
+
+mesa (6.2.1-6) unstable; urgency=low
+
+  * bin/mklib: add GNU/kFreeBSD, patch from Aurelien Jarno (closes:
+    bug#307154)
+  * recompile with newer g++
+
+ -- Marcelo E. Magallon <mmagallo@debian.org>  Sun, 24 Jul 2005 11:47:16 -0600
+
+mesa (6.2.1-5) unstable; urgency=low
+
+  * debian/rules: big mess up, files are not being moved to their proper
+    places.  I naively assumed that command-line options to debhelper
+    commands would override DH_OPTIONS, that is, that having
+    DH_OPTIONS=-i (as suggested in the documentation) would mean
+    something like "use -i unless -p is passed on the command line".  It
+    actually means "use -i in addition to -p passed on the command
+    line", which does not make any sense, but is consistent with the
+    wording in the documentation. (closes: bug#306499, bug#306918,
+    bug#307095)
+
+ -- Marcelo E. Magallon <mmagallo@debian.org>  Sun, 01 May 2005 09:45:12 -0600
+
+mesa (6.2.1-4) unstable; urgency=low
+
+  * debian/control: fix description to reflect the exact content and
+    purpose of package (libosmesa-dev, mesag-dev).
+  * debian/rules: DH_OPTIONS=-s added to binary-arch target.  (closes:
+    bug#306091)
+
+ -- Marcelo E. Magallon <mmagallo@debian.org>  Sat, 26 Mar 2005 08:03:44 -0600
+
+mesa (6.2.1-3) unstable; urgency=low
+
+  * debian/control: try to match the override file.  If mesa is "extra"
+    (for whatever reason), all the packages should be extra.
+  * debian/rules: quick workaround for left-over libGL.so in GLU -dev
+    package.
+
+ -- Marcelo E. Magallon <mmagallo@debian.org>  Thu, 24 Mar 2005 19:35:34 -0600
+
+mesa (6.2.1-2) unstable; urgency=low
+
+  * The "thank you so much, I'm still voting against you" release.
+  * debian/rules: correct artifact of me not having had a proper
+    pbuilder environment to build stuff on and the repackaging from the
+    previous release.  The -glu- and -glw- targets now explicitly depend
+    on the matching -gl- target, and symlinks are placed in the build
+    directories in order to actually have a libGL.so to make ld happy
+    when creating the libraries.
+  * debian/rules: uncomment dh_install :-\  There was a reason why I had
+    commented that out...
+  * First change closes: bug#298922
+  * Second change closes: bug#300302, bug#300284, bug#300430
+  * debian/control: "An X", whatever, I've been corrected multiple times
+    in both ways (translators beware).  (closes: bug#300012)
+
+ -- Marcelo E. Magallon <mmagallo@debian.org>  Sun, 20 Mar 2005 22:03:29 -0600
+
+mesa (6.2.1-1) unstable; urgency=low
+
+  * The "autobuilders, please please please don't hate me" release.
+  * New upstream.
+  * Repackage:
+        + Fall prey to debhelper
+        + Entries below this one preserved for historical reasons or
+          sentimental value, pick as many as you want.  They bear NO
+          relation to the actual packages!
+  * configs/debian, configs/debian-debug, configs/debian-debug-i386,
+    configs/debian-glide, configs/debian-glide-i386, configs/debian-i386,
+    configs/debian-osmesa16, configs/debian-osmesa16-static,
+    configs/debian-osmesa32, configs/debian-osmesa32-static,
+    configs/debian-static, configs/debian-static-i386: new files.
+  * configs/debian-sparc: Dave Miller confirmed that the sparc assembly
+    files do work on Linux.  I don't know where to install the optimized
+    libraries, so the file doesn't actually exist.  Please read
+    debian/README.build if you want to have a sparc-optimized library.
+  * debian/control: GGI and glide2 are gone.  glide is glide3.
+  * debian/rules: modify shlibs file for the glide3 target to require glide3
+    and only glide3 because that library exports functions not available in
+    other libGLs.  Rationale: if someone is compiling a Debian package and
+    uses the glide target either he doesn't know what he is doing or he knows
+    exactly what he is doing.  In the first case the package should not be
+    installable and in the second case the package requires this particular
+    version.
+  * debian/control: libgl1-mesa-glide3-dev does NOT provide a proper OpenGL
+    development environment (see above).
+  * PCR is bound to be wrong... *sigh*
+
+ -- Marcelo E. Magallon <mmagallo@debian.org>  Sat, 25 Dec 2004 14:50:02 -0600
+
+mesa (6.0.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * debian/rules: redid a bunch of stuff in order to support new build system
+    without autoconf and automake stuff.  The next version is going to change
+    this _again_.
+
+ -- Marcelo E. Magallon <mmagallo@debian.org>  Sun, 11 Apr 2004 07:00:19 -0600
+
+mesa (5.0.0-5.1) unstable; urgency=low
+
+  * Non-Maintainer Upload.
+  * Rename "GGIMesa"-references in src/GGI/default/Makefile.am to
+    "MesaGGI", which makes the package build again with newer libtool.
+    (Closes: #213836)
+
+ -- Steinar H. Gunderson <sesse@debian.org>  Sun, 15 Feb 2004 17:37:08 +0100
+
+mesa (5.0.0-5) unstable; urgency=low
+
+  * debian/control: yank and put error?  Remove hard-coded
+    nvidia-glx-dev from mesag-glide2-dev dependencies.
+
+ -- Marcelo E. Magallon <mmagallo@debian.org>  Sun, 09 Feb 2003 10:31:51 +0100
+
+mesa (5.0.0-4) unstable; urgency=low
+
+  * debian/rules: fix typo in definition of GLIDE_ARCHS.  (closes: bug#179622)
+
+ -- Marcelo E. Magallon <mmagallo@debian.org>  Mon, 03 Feb 2003 20:19:12 +0100
+
+mesa (5.0.0-3) unstable; urgency=low
+
+  * The "it's amazing how people pick severities" release
+  * debian/control: mesa-common-dev conflicts with xlibmesa-dev.  Actually put
+    dependency of mesa-common-dev on the mesa-*-dev packages to avoid having
+    to track other libgl-dev packages popping up.  IMO this is less error
+    prone.  You can't install mesa-common-dev without installing mesa-*-dev,
+    and those packages conflict with other libgl-dev packages.  (closes:
+    bug#177996)
+  * Rename libglu1c102 to libglu1-mesa; the libglu1c102 is incorrent since
+    this library does not export C++ functions.  Sorry about the mess.
+  * Rename libglu1-dev to libglu1-mesa-dev to be consistent
+  * debian/rules: use grep-dctrl to extract architectures from debian/control
+  * debian/control: add grep-dctrl to build-depends
+  * debian/shlibs.libglu: libglu1-mesa | libglu1
+  * debian/rules: install include/GL/xmesa.h in /usr/include/GL/xmesa.h; I'm
+    not 100% sure this is the right thing to do, but it's a niche so I don't
+    think it will actually make trouble (closes: bug#148866)
+  * debian/rules: install include/GL/glx*.h in the common package.  (closes:
+    bug#178562)
+  * debian/rules: nasty hack to work arround libtool's idea of how libraries
+    should be linked (closes: bug#178514)
+  * debian/rules: even nastier hack.  Getting environment variables to
+    percolate thru all the make calls isn't getting anywhere.
+  * si-glu/Makefile.am: export only glu.* symbols
+  * si-glu/Makefile.am: add -lm to link line
+  * src/Makefile.am: god damm it.  If you use libm link to it!
+  * debian/control: mesa-common-dev depends on libglu1-mesa-dev to satisfy
+    libgl-dev's requirements
+
+ -- Marcelo E. Magallon <mmagallo@debian.org>  Mon, 27 Jan 2003 17:15:25 +0100
+
+mesa (5.0.0-2) unstable; urgency=low
+
+  * debian/control: Not funny, I'm sure I put lesstif and xlibs-dev in the
+    build-depends.  CVS says I didn't.  (closes: bug#176730)
+  * debian/control, debian/rules: regenerate auto-stuff (closes: bug#176729)
+  * debian/control, debian/rules: GCC C++ 3.2 transition (libglu1c102 -- ugly!)
+  * remove Makefile.in from CVS control
+  * si-glu/libnurbs/interface/Makefile.am: fix INCLUDES macro
+
+ -- Marcelo E. Magallon <mmagallo@debian.org>  Sun, 19 Jan 2003 00:48:32 +0100
+
+mesa (5.0.0-1) unstable; urgency=low
+
+  * New upstream release, it looks like glide and GGI are in working
+    condition again.
+  * FX patches from previous releases gone.  They'll be back later.
+  * debian/rules: some clean ups.
+  * debian/control: add libglu1 packages
+  * debian/control: Standards-Version: 3.5.8
+  * debian/rules: Build Xt widgets (if you need this stuff, you need to depend
+    on mesag-dev, libgl-dev is not enough)
+  * debian/control, debian/rules: add mesa-common-dev package
+  * debian/control, debian/rules: add osmesa packages.
+
+ -- Marcelo E. Magallon <mmagallo@debian.org>  Sun, 15 Dec 2002 12:28:49 +0100
+
+mesa (4.0.3-1) unstable; urgency=low
+
+  * New (and long delayed) upstream version
+  * Redid a bunch of FX patches, probably broke.
+
+ -- Marcelo E. Magallon <mmagallo@debian.org>  Thu, 03 Oct 2002 11:27:29 +0200
+
+mesa (3.5-1) unstable; urgency=low
+
+  * New upstream version.
+  * Redid patches.
+  * Disabled building GGI target.  Someone with a good understanding of GGI
+    needs to write a driver for mesa.  The old version doesn't cut it
+    anymore.
+  * Most makefiles won't work.  Copied them out of CVS.
+  * src/Makefile.am: add -lm to library list.  (closes: bug#102717)
+  * configure.in: adjust GLU's version info to match previous release.
+
+ -- Marcelo E. Magallon <mmagallo@debian.org>  Mon, 25 Jun 2001 22:13:40 +0200
+
+mesa3 (3.4.2.1-4) unstable; urgency=low
+
+  * So, here's the deal: the 3Dfx backend is going nowhere in 4.x and 5.x is
+    just arround the corner.  Same thing for the GGI stuff.  In order to leave
+    the people who need this stuff with _something_ to work with, I'll compile
+    those targets out of the mesa3 source package and the mesa package will
+    stuck to plain old X.
+  * debian/control, debian/rules: strip out all the parts concerning to mesa3g
+    and mesa3g-dev
+  * debian/control: update GGI architectures, let's see what happens
+  * debian/rules: special case alpha for stripping options.  Chris, did you
+    ever figure out what the problem actually is? (closes: bug#99284)
+  * debian/rules: hereby I decree that everything in etc is a conffile.  Die
+    future bugs, die!.
+  * configure: fix ggi_libdir, ggi_confdir (closes: bug#139598)
+
+ -- Marcelo E. Magallon <mmagallo@debian.org>  Sun, 29 Sep 2002 11:21:00 +0200
+ 
+mesa (3.4.2.1-3) unstable; urgency=low
+
+  * Actually install widgets on the mesag-dev package (closes: bug#98988)
+
+ -- Marcelo E. Magallon <mmagallo@debian.org>  Sat,  9 Jun 2001 16:39:36 +0200
+
+mesa (3.4.2.1-2) unstable; urgency=low
+
+  * src/X/xmesa1.c: I knew it, I knew it.  This was bound to break.  Stupid
+    typo.  Restored MESA_GLX_FX (got renamed to GLX_FX accidentally, if you
+    have to know) (closes: bug#94114)
+
+ -- Marcelo E. Magallon <mmagallo@debian.org>  Mon, 21 May 2001 08:52:07 +0200
+
+mesa (3.4.2.1-1) unstable; urgency=low
+
+  * Upstream released 3.4.2.
+  * Hmmm... thought about it on my way home.  The code to parse 3dfx.conf
+    is wrong.  Redid.  Still not tested.  (closes: bug#94114)
+  * debian/README.Debian: document 3dfx.conf
+
+ -- Marcelo E. Magallon <mmagallo@debian.org>  Sat, 19 May 2001 11:57:33 +0200
+
+mesa (3.4.2-1) unstable; urgency=low
+
+  * New upstream version.
+  * debian/config.guess, debian/config.sub: newest versions from
+    http://subversions.gnu.org/cgi-bin/cvsweb/config (closes: bug#95338)
+  * GAAAAAAARGGH! src/X/xmesa1.c: horrible hack to use /etc/mesa/3dfx.conf
+    if there's no MESA_GLX_FX environment variable defined.  I.  Hate.
+    This.  I'll make a deal with you: you find another of these things,
+    and you send me a nice tested patch.  I don't have a 3DFX card and I
+    *HATE* uploading stuff I can't fully test. (closes: bug#94114)
+  * debian/rules: use the new files
+  * debian/rules: s/TMPDIR/DTEMPDIR/g
+  * gl3DfxSetDitherModeEXT from Zephaniah (closes: bug#65860)
+  * Disable GL_EXT_shared_texture_palette per default.  Patch looks funny,
+    but I'll blindly trust Zephaniah.
+  * Hmmm... I hope Zephaniah tested this, because it broke in a rather silly
+    way at compile time.
+  * Fancy what people regard as "pretty important".
+
+ -- Marcelo E. Magallon <mmagallo@debian.org>  Fri, 18 May 2001 09:23:49 +0200
+
+mesa (3.4.1-3) unstable; urgency=low
+
+  * PLEASE SUBMIT NMUs TO THE BTS, DAMN IT!
+  * debian/control: exclude m68k from libggi2-dev build-dependency.
+ 
+ -- Marcelo E. Magallon <mmagallo@debian.org>  Sat, 17 Mar 2001 19:45:09 +0100
+
+mesa (3.4.1-2) unstable; urgency=low
+
+  * debian/control: add missing dependency on xlibs-dev and corrected the
+    one for libglide2-dev
+ 
+ -- Marcelo E. Magallon <mmagallo@debian.org>  Wed, 14 Mar 2001 00:21:42 +0100
+
+mesa (3.4.1-1) unstable; urgency=low
+
+  * New upstream version.
+  * New maintainer. (closes: bug#81139)
+  * Some fixes to get it to compile.
+  * debian/rules: some reorganization happened to allow me test different
+    builds better.
+  * debian/control: nuked widgets package, if you miss it, you are doing
+    something wrong.
+  * debian/rules: -dev packages will be missing some garbage they used to
+    install.  If you miss any of those files, I'm fairly confident you
+    are doing something wrong.
+  * configure, ltmain.sh, aclocal.m4, acinclude.m4, ...: vicious hacks to
+    allow the GGI version to compile.
+  * TODO: add the widgets to the packages
+  * TODO: make OSmesa packages
+
+ -- Marcelo E. Magallon <mmagallo@debian.org>  Sat, 10 Feb 2001 18:34:13 +0100
+
+mesa (3.2.1-1) unstable; urgency=low
+
+  * New upstream version.
+
+ -- James A. Treacy <treacy@debian.org>  Mon, 31 Jul 2000 15:13:34 -0400
+
+mesa (3.2-2) frozen unstable; urgency=low
+
+  * add MMX and 3Dnow opts for x86.
+
+ -- James A. Treacy <treacy@debian.org>  Fri,  7 Jul 2000 16:06:43 -0400
+
+mesa (3.2-1) frozen unstable; urgency=low
+
+  * New upstream version.
+  * Made minor changes to README.3DFX. Closes bug#56827
+  * Added symlinks for mesa widget libraries. Closes bug#63115
+
+ -- James A. Treacy <treacy@debian.org>  Wed, 28 Jun 2000 11:21:09 -0400
+
+mesa (3.1-17) frozen unstable; urgency=low
+
+  * Fixed Makefile for demos in mesag-widgets-dev. Closes bug#62674
+
+ -- James A. Treacy <treacy@debian.org>  Fri, 19 May 2000 13:23:00 -0400
+
+mesa (3.1-16) frozen unstable; urgency=low
+
+  * Add --prefix=/usr to ggi build. Closes bug#61705, #61486
+
+ -- James A. Treacy <treacy@debian.org>  Wed, 12 Apr 2000 15:12:48 -0400
+
+mesa (3.1-15) frozen unstable; urgency=low
+
+  * Remove ggi from the build on m68k. Closes bug#59273
+
+ -- James A. Treacy <treacy@debian.org>  Mon,  6 Mar 2000 13:20:29 -0500
+
+mesa (3.1-14) frozen unstable; urgency=low
+
+  * Fixed hard-coded location of config file in library. This is release
+    critical, even though no bug was filed (relates to bug#58267).
+
+ -- James A. Treacy <treacy@debian.org>  Mon, 28 Feb 2000 10:58:34 -0500
+
+mesa (3.1-13) frozen unstable; urgency=low
+
+  * Add missing ggi libraries. Closes bug#58267, #57760
+
+ -- James A. Treacy <treacy@debian.org>  Thu, 24 Feb 2000 00:59:30 -0500
+
+mesa (3.1-12) frozen unstable; urgency=low
+
+  * Dependencies are now computed in a more intelligent way. Closes: bug#55861
+
+ -- James A. Treacy <treacy@debian.org>  Fri, 21 Jan 2000 16:26:40 -0500
+
+mesa (3.1-11) frozen unstable; urgency=low
+
+  * Remove svgalib support from the software only package of mesa
+
+ -- James A. Treacy <treacy@debian.org>  Sat, 22 Jan 2000 05:33:13 +0000
+
+mesa (3.1-10) frozen unstable; urgency=low
+
+  * Fix the mesag3-glide2 postinst. Closes bug#55462
+
+ -- James A. Treacy <treacy@debian.org>  Sat, 22 Jan 2000 02:06:27 +0000
+
+mesa (3.1-9) frozen unstable; urgency=low
+
+  * The ggi based packages are now built with the other versions of mesa. Closes: bug#49218, #55221
+
+ -- James A. Treacy <treacy@debian.org>  Sat, 15 Jan 2000 22:24:13 -0500
+
+mesa (3.1-8) unstable; urgency=low
+
+  * fixed the postinst and prerm for the glide packages
+  * added Provides: mesag-dev to the mesag-glide2-dev package to maintain
+    backwards compatability
+
+ -- James A. Treacy <treacy@debian.org>  Sat, 15 Jan 2000 01:01:58 -0500
+
+mesa (3.1-7) unstable; urgency=low
+
+  * Fix version number for soname in the shlib file. Closes: bug#54926
+
+ -- James A. Treacy <treacy@debian.org>  Thu, 13 Jan 2000 01:37:03 -0500
+
+mesa (3.1-6) unstable; urgency=low
+
+  * Include docs/README.3DFX in mesag3-glide2 package. Closes: bug#54625
+  * Remove Provides: libgl1 from mesag3-widgets. Closes: bug#54774
+  * conflicts with older versions of mesa. Closes: bug#54831
+
+ -- James A. Treacy <treacy@debian.org>  Mon, 10 Jan 2000 11:50:49 -0500
+
+mesa (3.1-5) unstable; urgency=low
+
+  * now Conflicts: libgl1
+  * remove extra '.' in library name
+
+ -- James A. Treacy <treacy@debian.org>  Sun,  9 Jan 2000 20:47:31 -0500
+
+mesa (3.1-4) unstable; urgency=low
+
+  * Added links libGL.so.1 <- libMesaGL.so.3 so existing progs don't break
+  * Copyright changed for version 3.1
+
+ -- James A. Treacy <treacy@debian.org>  Thu,  6 Jan 2000 17:11:11 -0500
+
+mesa (3.1-3) unstable; urgency=low
+
+  * copyright file now refers to /usr/share/common-license/LGPL.
+
+ -- James A. Treacy <treacy@debian.org>  Tue,  4 Jan 2000 11:50:45 -0500
+
+mesa (3.1-2) unstable; urgency=low
+
+  * Second try. Fixed shlibs file.
+
+ -- James A. Treacy <treacy@debian.org>  Tue,  4 Jan 2000 00:00:29 -0500
+
+mesa (3.1-1) unstable; urgency=low
+
+  * New upstream version.
+  * glide version of packages added, since glide is now under the GPL.
+  * mesa widget libraries are now in a separate package
+  * library names are changed to lib{GL,GLU}.*
+
+ -- James A. Treacy <treacy@debian.org>  Tue, 14 Dec 1999 10:06:14 -0500
+
+mesa (3.0-2) unstable; urgency=low
+
+  * added symlinks from libMesaGL* -> libGL*. Fixes bug #37160
+  * added lines (commented out) for building a glide version of mesa. Fixes bug #39758
+
+ -- James A. Treacy <treacy@debian.org>  Thu, 13 May 1999 01:02:42 -0400
+
+mesa (3.0-1) unstable; urgency=low
+
+  * mesa libs moved to /usr/lib. Fixes bug #26874
+  * motif widget library libMesaGLwM added (compiled using headers from lesstif). Fixes bug #25380
+
+ -- James A. Treacy <treacy@debian.org>  Thu,  6 Aug 1998 13:49:37 -0400
+
+mesa (2.6-4) unstable; urgency=low
+
+  * call to ldconfig in postinst put back in. Fixes bug #20552
+  * changelog.Debian file created for the mesa-doc package.
+  * deleted miscellaneous files. Fixes bug #21481
+
+ -- James A. Treacy <treacy@debian.org>  Sat, 23 May 1998 23:41:34 -0400
+
+mesa (2.6-3) frozen unstable; urgency=low
+
+  * No changes. Just trying (again) to get this back in the distribution
+
+ -- James A. Treacy <treacy@debian.org>  Tue, 24 Mar 1998 00:53:09 -0500
+
+mesa (2.6-2) unstable frozen; urgency=low
+
+  * point copyright to LPGL in /usr/doc/copyright. Fixes bug #19633
+
+ -- James A. Treacy <treacy@debian.org>  Sun, 15 Mar 1998 14:00:33 -0500
+
+mesa (2.6-1) unstable; urgency=low
+
+  * New upstream Release
+  * strip static lib with --strip-debug and shared with strip--unneeded: Fixes bug#17301
+  * create doc package in build-indep: Fixes bug#16090
+  * added widgets-mesa library to package: Fixes bug#15729
+  * created mesa-glide* packages
+
+ -- James A. Treacy <treacy@debian.org>  Mon, 19 Jan 1998 23:45:50 -0500
+
+mesa (2.5-2) unstable; urgency=low
+
+  * Corrected i386 specific debian/rules file: Fixes bug#15640
+
+ -- James A. Treacy <treacy@debian.org>  Fri,  5 Nov 1997 11:46:13 -0500
+
+mesa (2.5-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- James A. Treacy <treacy@debian.org>  Sun, 23 Nov 1997 20:46:13 -0500
+
+mesa (2.4-1) unstable; urgency=low
+
+  * New upstream release.
+  * New maintainer.
+  * libc6 release.
+
+ -- James A. Treacy <treacy@debian.org>  Mon,  3 Nov 1997 01:11:34 -0500
+
+mesa (2.2-2) unstable; urgency=low
+
+  * debian/control: mesa-doc no longer depends on mesa (bug #8840).
+
+ -- Karl Sackett <krs@debian.org>  Wed, 30 Apr 1997 10:25:25 -0500
+
+mesa (2.2-1) unstable; urgency=low
+
+  * New upstream release.
+  * Make-config: linux-elf libraries compiled with -D_REENTRANT.
+
+ -- Karl Sackett <krs@debian.org>  Wed, 19 Mar 1997 09:10:22 -0600
+
+mesa (2.1-4) unstable; urgency=low
+
+  * debian/control: lib packages moved from 'graphics' to 'libs'.
+  * debian/rules: headers moved from /usr/include/mesa to /usr/include
+    (no more -I/usr/include/mesa).
+
+ -- Karl Sackett <krs@debian.org>  Tue, 25 Feb 1997 09:30:23 -0600
+
+mesa (2.1-3) unstable; urgency=low
+
+  * debian/control: mesa2 provides mesa and conflicts with mesa
+    (bug #7394).
+
+ -- Karl Sackett <krs@debian.org>  Mon, 17 Feb 1997 09:25:42 -0600
+
+mesa (2.1-2) unstable; urgency=low
+
+  * debian/rules: install gmesa.h, osmesa.h, FooMesa.h in mesa-dev
+    (bug #6864).
+
+ -- Karl Sackett <krs@debian.org>  Tue, 28 Jan 1997 09:37:41 -0600
+
+mesa (2.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * Added soname to mesa and mesa-widgets.
+  * Moved static libraries to mesa2-dbg.
+  * debian/postinst, postinst-widgets: call ldconfig without explicit
+    pathname (bugs #6176, 6180).
+
+ -- Karl Sackett <krs@debian.org>  Mon, 6 Jan 1997 09:30:10 -0600
+
+mesa (2.0-2) unstable; urgency=low
+
+  * Created mesa-widgets and mesa-widgets-dev (Bug #5029).
+
+ -- Karl Sackett <krs@debian.org>  Wed, 30 Oct 1996 08:44:19 -0600
+
+mesa (2.0-1) unstable; urgency=low
+
+  * src/draw.c: replaced with upstream patch.
+  * Make-config: linux-elf target builds libMesaGLw.so library, looks
+    for XLIBS in /usr/X11R6/lib, removed -mieee-mp from CFLAGS.
+  * widgets-sgi/Makefile: builds libMesaGlw.a library
+  * New upstream release.
+  * Converted to new package standard.
+  * Maintainer address changed.
+
+ -- Karl Sackett <krs@debian.org>  Mon, 14 Oct 1996 15:37:19 -0500
+
+1.2.8-3
+  * Package split into runtime, development, and documentation
+    packages.
+  * widgets now made as a sharable library.
+  * GLUT removed.  This will be released as a separate package.
+
+1.2.8-2
+  * Support files now architecture-independent
+
+1.2.8-1
+  * Upgrade to latest release
+  * Brought support files up to latest packaging requirements
+  * mondello/Makefile: fixed error in realclean target
+
+1.2.7-2
+  * debian.rules: clean all Makefiles out of widgets directory
+  * debian.postrm: remove /usr/lib/mesa entry from /etc/ld.so.config
+    (bug #2817)
+
+1.2.7-1
+  * Added Debian support files
+  * Included the GLUT OpenGL Utility Toolkit
+  * Makefile - disable building programs in demos, samples, and book
+    directories
+  * mklib.linux - disabled building *.a libraries
+  * widgets/Makefile.in - disabled building demo programs
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 00000000000..b8626c4cff2
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+4
diff --git a/debian/control b/debian/control
new file mode 100644
index 00000000000..e19fe96ce0f
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,221 @@
+Source: mesa
+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 (>> 1.0.5), libdirectfb-dev, makedepend | xutils, libexpat-dev, libxxf86vm-dev, libx11-dev, libxext-dev, pkg-config, 
+
+Package: libgl1-mesa-swrast
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}, libglu1-mesa | libglu1
+Conflicts: mesag3-glide, mesag3-glide2, mesag3+ggi, libgl1, nvidia-glx, mesag3
+Provides: libgl1, mesag3
+Replaces: libgl1, mesag3
+Description: A free implementation of the OpenGL API -- runtime
+ Mesa is a 3-D graphics library with an API which is very similar to
+ that of OpenGL.  To the extent that Mesa utilizes the OpenGL command
+ syntax or state machine, it is being used with authorization from
+ Silicon Graphics, Inc.  However, the author makes no claim that Mesa
+ is in any way a compatible replacement for OpenGL or associated with
+ Silicon Graphics, Inc.
+ .
+ This library provides a pure software rasteriser; it does not provide
+ a direct rendering-capable library, or one which uses GLX.  For that,
+ please see libgl1-mesa.
+ .
+ On Linux, this library is also known as libGL or libGL.so.1.
+
+Package: libgl1-mesa-swrast-dev
+Section: libdevel
+Architecture: any
+Depends: libgl1-mesa-swrast (= ${Source-Version}), libc6-dev, libx11-6-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
+Conflicts: mesa-dev, libgl-dev, mesag3 (<< 3.1-1), nvidia-glx-dev, mesag-dev
+Replaces: libgl-dev, mesag-dev
+Description: A free implementation of the OpenGL API -- development support files
+ This package provides the development environment required for
+ compiling programs with Mesa.  For a complete description of Mesa,
+ please look at the libgl1-mesa package.
+ .
+ This package also provides a simple widgets library, libGLw, which
+ allows Motif-based applications to embed an OpenGL drawing context.
+ The headers and static libraries for compiling programs that use this
+ library are included.
+ .
+ This library provides a pure software rasteriser; it does not provide
+ a direct rendering-capable library, or one which uses GLX.  For that,
+ please see libgl1-mesa-dev.
+
+Package: libgl1-mesa-swrast-dbg
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}, libglu1-mesa | libglu1
+Description: A free implementation of the OpenGL API -- debugging package
+ This package provides a debug-enabled version of the Mesa libraries.
+ .
+ For a complete description of Mesa, please look at the libgl1-mesa-swrast
+ package.
+
+Package: libgl1-mesa
+Section: libs
+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
+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
+ modules from the libgl1-mesa-dri package to accelerate drawing.
+ .
+ This package does not include the modules themselves: these can be found
+ in the libgl1-mesa-dri package.
+ .
+ For a complete description of Mesa, please look at the
+ libgl1-mesa-swrast package.
+
+Package: libgl1-mesa-dri
+Section: libs
+Architecture: any
+Depends: ${shlibs-Depends}, libgl1-mesa (= ${Source-Version})
+Conflicts: xlibmesa-dri
+Replaces: xlibmesa-dri
+Description: A free implementation of the OpenGL API -- DRI modules
+ 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
+ modules from the libgl1-mesa-dri package to accelerate drawing.
+ .
+ This package does not include the OpenGL library itself, only the DRI
+ modules for accelerating direct rendering.
+ .
+ For a complete description of Mesa, please look at the
+ libgl1-mesa-swrast package.
+
+Package: libgl1-mesa-dev
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}, libc6-dev, mesa-common-dev (= ${Source-Version}), libgl1-mesa (=${Source-Version})
+Conflicts: libgl-dev, libgl1-mesa-dri-dev
+Replaces: libgl-dev, libgl1-mesa-dri-dev
+Provides: libgl-dev, libgl1-mesa-dri-dev
+Description: A free implementation of the OpenGL API -- GLX development support files
+ 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
+ modules from the libgl1-mesa-dri package to accelerate drawing.
+ .
+ This package includes headers and static libraries for compiling
+ programs with Mesa.
+ .
+ For a complete description of Mesa, please look at the libgl1-mesa
+ 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
+ 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
+ package.
+
+Package: mesa-common-dev
+Section: devel
+Architecture: all
+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
+ development header files common to all Mesa packages.
+
+Package: libosmesa6
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: Mesa Off-screen rendering extension
+ OSmesa is a Mesa extension that allows programs to render to an
+ off-screen buffer using the OpenGL API without having to create a
+ rendering context on an X Server.  It uses a pure software renderer.
+ .
+ This package provides both 16-bit and 32-bit versions of the off-screen
+ renderer which do not require external libraries to work.
+
+Package: libosmesa6-dev
+Section: devel
+Architecture: any
+Depends: libosmesa6 (= ${Source-Version}), libgl1-mesa-swrast-dev (= ${Source-Version})
+Conflicts: xlibosmesa-dev, libosmesa4-dev, libosmesa-dev
+Replaces: xlibosmesa-dev, libosmesa-dev
+Provides: xlibosmesa-dev, libosmesa-dev
+Description: Mesa Off-screen rendering extension -- development support files
+ This package provides the required environment for developing programs
+ that use the off-screen rendering extension of Mesa.
+ .
+ For more information on OSmesa see the libosmesa6 package.
+
+Package: libglu1-mesa
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}, libgl1-mesa | libgl1
+Provides: libglu1
+Conflicts: mesag3 (<< 5.0.0-1), xlibmesa3, libglu1
+Replaces: libglu1
+Description: The OpenGL utility library (GLU)
+ GLU offers simple interfaces for building mipmaps; checking for the
+ presence of extensions in the OpenGL (or other libraries which follow
+ the same conventions for advertising extensions); drawing
+ piecewise-linear curves, NURBS, quadrics and other primitives
+ (including, but not limited to, teapots); tesselating surfaces; setting
+ up projection matrices and unprojecting screen coordinates to world
+ coordinates.
+ .
+ On Linux, this library is also known as libGLU or libGLU.so.1.
+ .
+ This package provides the SGI implementation of GLU shipped with the
+ Mesa package (ergo the "-mesa" suffix).
+
+Package: libglu1-mesa-dev
+Section: libdevel
+Architecture: any
+Depends: ${shlibs:Depends}, libglu1-mesa (= ${Source-Version}), libgl1-mesa-dev | libgl-dev
+Provides: libglu-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
+ Includes headers and static libraries for compiling programs with GLU.
+ .
+ For a complete description of GLU, please look at the libglu1-mesa
+ package.
+
+Package: mesa-swrast-source
+Section: libdevel
+Architecture: all
+Description: Mesa software rasteriser source -- development support files
+ This package contains the source to the Mesa software rasteriser, which
+ implements all of Mesa's GL support in software.  It powers the X11 and
+ X server backends (assuming unaccelerated indirect).  This package is
+ provided mainly for modular X servers which support GL, and need the
+ software rasteriser source to build the GLcore module for unaccelerated
+ indirect rendering.
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 00000000000..2cc225284e0
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,118 @@
+This package was debianized by James A. Treacy treacy@debian.org on Thu,
+6 Jan 2000 01:11:34 -0500.  It was newly debianized by Marcelo E.
+Magallon <mmagallo@debian.org> on Sat, 25 Dec 2004 14:50:02 -0600.
+
+It was downloaded from http://www.mesa3d.org/download.html
+
+For more information see:
+
+  http://www.mesa3d.org/
+
+Copyright:
+
+Upstream Author: Brian Paul <brian.paul@tungstengraphics.com>
+
+License:
+
+                    License / Copyright Information
+
+   The Mesa distribution consists of several components. Different
+   copyrights and licenses apply to different components. For
+   example, GLUT is copyrighted by Mark Kilgard, some demo programs
+   are copyrighted by SGI, some of the Mesa device drivers are
+   copyrighted by their authors. See below for a list of Mesa's
+   components and the copyright/license for each.
+
+   The core Mesa library is licensed according to the terms of the
+   XFree86 copyright (an MIT-style license). This allows integration
+   with the XFree86/DRI project. Unless otherwise stated, the Mesa
+   source code and documentation is licensed as follows:
+
+ Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
+
+ Permission is hereby granted, free of charge, to any person obtaining a
+ copy of this software and associated documentation files (the "Software"),
+ to deal in the Software without restriction, including without limitation
+ the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ and/or sell copies of the Software, and to permit persons to whom the
+ Software is furnished to do so, subject to the following conditions:
+
+ The above copyright notice and this permission notice shall be included
+ in all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+                        Attention, Contributors
+
+   When contributing to the Mesa project you must agree to relinquish
+   your work to the holder of the copyright for the particular
+   component you're contributing to. That is, you can't put your own
+   copyright on the code, unless it's a modular piece that can be
+   omitted from Mesa (like a new device driver). If for example, you
+   contribute a bug fix to Mesa's texture mapping code, your code
+   will become a part of the body of work which is copyrighted by
+   Brian Paul and licensed by the above terms.
+
+ Mesa Component Licenses:
+
+ Component       Files                 Primary Author      License
+ ----------------------------------------------------------------------------
+ core Mesa code  src/*.[ch]            Brian Paul          Mesa
+                 include/GL/gl.h
+
+ GLX driver      src/X/*               Brian Paul          Mesa
+                 include/GL/glx.h
+                 include/GL/xmesa.h
+
+ OS/Mesa driver  src/OSmesa/*          Brian Paul          Mesa
+                 include/GL/osmesa.h
+
+ 3Dfx driver     src/FX/*              David Bucciarelli   Mesa
+                 include/GL/fxmesa.h
+
+ BeOS R4 driver  src/BeOS/*            Brian Paul          Mesa
+
+ MGL driver      src/MGL/*             SciTech, Inc        SciTech copyright
+                 include/GL/mglmesa.h
+
+ Windows driver  src/Windows/*         Li Wei              copyright by Li Wei
+                 include/GL/wmesa.h
+
+ SVGA driver     src/SVGA/*            Brian Paul          GNU-LGPL
+                 include/GL/svgamesa.h
+
+ DOS driver      src/DOS/*             Charlie Wallace     GNU-LGPL
+                 include/GL/dosmesa.h
+
+ GGI driver      src/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
+                 include/GL/*glut*.h
+
+ GLU library     src-glu/*             Brian Paul          GNU-LGPL
+
+ SI GLU library  si-glu/*              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
+
+ X demos         xdemos/*              Brian Paul          see source files
+
+ SGI demos       samples/*             SGI                 SGI copyright
+
+ RedBook demos   book/*                SGI                 SGI copyright
+
+
+    On Debian systems the full text of the GNU LGPL license is found in
+    /usr/share/common-licenses/LGPL.
diff --git a/debian/drivers.map b/debian/drivers.map
new file mode 100644
index 00000000000..05056cf6501
--- /dev/null
+++ b/debian/drivers.map
@@ -0,0 +1,2 @@
+gl-debian-dri lib/*_dri.so usr/lib/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
new file mode 100644
index 00000000000..f863feb764e
--- /dev/null
+++ b/debian/libdir.map
@@ -0,0 +1,15 @@
+gl-debian usr/lib libgl1-mesa-swrast libgl1-mesa-swrast-dev
+gl-debian-static usr/lib libgl1-mesa-swrast libgl1-mesa-swrast-dev
+gl-debian-debug usr/lib/debug libgl1-mesa-swrast-dbg libgl1-mesa-swrast-dbg
+gl-debian_i386 usr/lib/i686/mmx/cmov libgl1-mesa-swrast libgl1-mesa-swrast-dev
+gl-debian-static_i386 usr/lib/i686/mmx/cmov libgl1-mesa-swrast libgl1-mesa-swrast-dev
+gl-debian-debug_i386 usr/lib/debug/i686/mmx/cmov libgl1-mesa-swrast-dbg libgl1-mesa-swrast-dbg
+gl-debian-dri usr/lib libgl1-mesa 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
+gl-debian-osmesa32 usr/lib libosmesa6 libosmesa6-dev
+gl-debian-osmesa32-static usr/lib libosmesa6 libosmesa6-dev
+glu-debian usr/lib libglu1-mesa libglu1-mesa-dev
+glu-debian-static usr/lib libglu1-mesa libglu1-mesa-dev
+glw-debian-static usr/lib libgl1-mesa-swrast libgl1-mesa-swrast-dev
diff --git a/debian/libgl1-mesa-dev.install b/debian/libgl1-mesa-dev.install
new file mode 100644
index 00000000000..add5bef54d6
--- /dev/null
+++ b/debian/libgl1-mesa-dev.install
@@ -0,0 +1,3 @@
+include/GL/glx.h                        usr/include/GL
+include/GL/glxext.h                     usr/include/GL
+include/GL/glx_mangle.h                 usr/include/GL
diff --git a/debian/libgl1-mesa-glide3-dev.install b/debian/libgl1-mesa-glide3-dev.install
new file mode 100644
index 00000000000..ff19d29a1a6
--- /dev/null
+++ b/debian/libgl1-mesa-glide3-dev.install
@@ -0,0 +1 @@
+include/GL/fxmesa.h                     usr/include/GL
diff --git a/debian/libgl1-mesa-glide3.docs b/debian/libgl1-mesa-glide3.docs
new file mode 100644
index 00000000000..51210741920
--- /dev/null
+++ b/debian/libgl1-mesa-glide3.docs
@@ -0,0 +1 @@
+docs/README.3DFX
diff --git a/debian/libgl1-mesa-swrast-dev.install b/debian/libgl1-mesa-swrast-dev.install
new file mode 100644
index 00000000000..da4b3b1a6ca
--- /dev/null
+++ b/debian/libgl1-mesa-swrast-dev.install
@@ -0,0 +1,5 @@
+include/GL/glx.h                        usr/include/GL
+include/GL/glxext.h                     usr/include/GL
+include/GL/glx_mangle.h                 usr/include/GL
+src/glw/GLwDrawA.h                      usr/include/GL
+src/glw/GLwMDrawA.h                     usr/include/GL
diff --git a/debian/libglu1-mesa-dev.install b/debian/libglu1-mesa-dev.install
new file mode 100644
index 00000000000..a707e392ad0
--- /dev/null
+++ b/debian/libglu1-mesa-dev.install
@@ -0,0 +1,2 @@
+include/GL/glu.h                        usr/include/GL
+include/GL/glu_mangle.h                 usr/include/GL
diff --git a/debian/mesa-common-dev.docs b/debian/mesa-common-dev.docs
new file mode 100644
index 00000000000..457acbf84c4
--- /dev/null
+++ b/debian/mesa-common-dev.docs
@@ -0,0 +1,7 @@
+docs/bugs.html
+docs/debugging.html
+docs/envvars.html
+docs/faq.html
+docs/osmesa.html
+docs/RELNOTES-*
+docs/*.spec
diff --git a/debian/mesa-common-dev.install b/debian/mesa-common-dev.install
new file mode 100644
index 00000000000..48ab3d4859b
--- /dev/null
+++ b/debian/mesa-common-dev.install
@@ -0,0 +1,4 @@
+include/GL/gl.h                         usr/include/GL
+include/GL/glext.h                      usr/include/GL
+include/GL/gl_mangle.h                  usr/include/GL
+include/GL/osmesa.h                     usr/include/GL
diff --git a/debian/mesa-swrast-source.dirs b/debian/mesa-swrast-source.dirs
new file mode 100644
index 00000000000..8256e60ad87
--- /dev/null
+++ b/debian/mesa-swrast-source.dirs
@@ -0,0 +1,4 @@
+usr/share/mesa-source/src/mesa/ppc
+usr/share/mesa-source/src/mesa/sparc
+usr/share/mesa-source/src/mesa/x86
+usr/share/mesa-source/src/mesa/x86-64
diff --git a/debian/mesa-swrast-source.install b/debian/mesa-swrast-source.install
new file mode 100644
index 00000000000..432bb2b1d98
--- /dev/null
+++ b/debian/mesa-swrast-source.install
@@ -0,0 +1,347 @@
+src/mesa/main/accum.c usr/share/mesa-source/src/mesa/main
+src/mesa/main/accum.h usr/share/mesa-source/src/mesa/main
+src/mesa/main/api_arrayelt.c usr/share/mesa-source/src/mesa/main
+src/mesa/main/api_arrayelt.h usr/share/mesa-source/src/mesa/main
+src/mesa/main/api_eval.h usr/share/mesa-source/src/mesa/main
+src/mesa/main/api_loopback.c usr/share/mesa-source/src/mesa/main
+src/mesa/main/api_loopback.h usr/share/mesa-source/src/mesa/main
+src/mesa/main/api_noop.c usr/share/mesa-source/src/mesa/main
+src/mesa/main/api_noop.h usr/share/mesa-source/src/mesa/main
+src/mesa/main/api_validate.c usr/share/mesa-source/src/mesa/main
+src/mesa/main/api_validate.h usr/share/mesa-source/src/mesa/main
+src/mesa/main/attrib.c usr/share/mesa-source/src/mesa/main
+src/mesa/main/attrib.h usr/share/mesa-source/src/mesa/main
+src/mesa/main/blend.c usr/share/mesa-source/src/mesa/main
+src/mesa/main/blend.h usr/share/mesa-source/src/mesa/main
+src/mesa/main/bufferobj.c usr/share/mesa-source/src/mesa/main
+src/mesa/main/bufferobj.h usr/share/mesa-source/src/mesa/main
+src/mesa/main/buffers.c usr/share/mesa-source/src/mesa/main
+src/mesa/main/buffers.h usr/share/mesa-source/src/mesa/main
+src/mesa/main/clip.c usr/share/mesa-source/src/mesa/main
+src/mesa/main/clip.h usr/share/mesa-source/src/mesa/main
+src/mesa/main/colormac.h usr/share/mesa-source/src/mesa/main
+src/mesa/main/colortab.c usr/share/mesa-source/src/mesa/main
+src/mesa/main/colortab.h usr/share/mesa-source/src/mesa/main
+src/mesa/main/config.h usr/share/mesa-source/src/mesa/main
+src/mesa/main/context.c usr/share/mesa-source/src/mesa/main
+src/mesa/main/context.h usr/share/mesa-source/src/mesa/main
+src/mesa/main/convolve.c usr/share/mesa-source/src/mesa/main
+src/mesa/main/convolve.h usr/share/mesa-source/src/mesa/main
+src/mesa/main/dd.h usr/share/mesa-source/src/mesa/main
+src/mesa/main/debug.c usr/share/mesa-source/src/mesa/main
+src/mesa/main/debug.h usr/share/mesa-source/src/mesa/main
+src/mesa/main/depth.c usr/share/mesa-source/src/mesa/main
+src/mesa/main/depth.h usr/share/mesa-source/src/mesa/main
+src/mesa/main/dispatch.c usr/share/mesa-source/src/mesa/main
+src/mesa/main/dlist.c usr/share/mesa-source/src/mesa/main
+src/mesa/main/dlist.h usr/share/mesa-source/src/mesa/main
+src/mesa/main/drawpix.c usr/share/mesa-source/src/mesa/main
+src/mesa/main/drawpix.h usr/share/mesa-source/src/mesa/main
+src/mesa/main/enable.c usr/share/mesa-source/src/mesa/main
+src/mesa/main/enable.h usr/share/mesa-source/src/mesa/main
+src/mesa/main/enums.c usr/share/mesa-source/src/mesa/main
+src/mesa/main/enums.h usr/share/mesa-source/src/mesa/main
+src/mesa/main/eval.c usr/share/mesa-source/src/mesa/main
+src/mesa/main/eval.h usr/share/mesa-source/src/mesa/main
+src/mesa/main/extensions.c usr/share/mesa-source/src/mesa/main
+src/mesa/main/extensions.h usr/share/mesa-source/src/mesa/main
+src/mesa/main/fbobject.c usr/share/mesa-source/src/mesa/main
+src/mesa/main/fbobject.h usr/share/mesa-source/src/mesa/main
+src/mesa/main/feedback.c usr/share/mesa-source/src/mesa/main
+src/mesa/main/feedback.h usr/share/mesa-source/src/mesa/main
+src/mesa/main/fog.c usr/share/mesa-source/src/mesa/main
+src/mesa/main/fog.h usr/share/mesa-source/src/mesa/main
+src/mesa/main/framebuffer.c usr/share/mesa-source/src/mesa/main
+src/mesa/main/framebuffer.h usr/share/mesa-source/src/mesa/main
+src/mesa/main/get.c usr/share/mesa-source/src/mesa/main
+src/mesa/main/get.h usr/share/mesa-source/src/mesa/main
+src/mesa/main/getstring.c usr/share/mesa-source/src/mesa/main
+src/mesa/main/glheader.h usr/share/mesa-source/src/mesa/main
+src/mesa/main/hash.c usr/share/mesa-source/src/mesa/main
+src/mesa/main/hash.h usr/share/mesa-source/src/mesa/main
+src/mesa/main/hint.c usr/share/mesa-source/src/mesa/main
+src/mesa/main/hint.h usr/share/mesa-source/src/mesa/main
+src/mesa/main/histogram.c usr/share/mesa-source/src/mesa/main
+src/mesa/main/histogram.h usr/share/mesa-source/src/mesa/main
+src/mesa/main/image.c usr/share/mesa-source/src/mesa/main
+src/mesa/main/image.h usr/share/mesa-source/src/mesa/main
+src/mesa/main/imports.c usr/share/mesa-source/src/mesa/main
+src/mesa/main/imports.h usr/share/mesa-source/src/mesa/main
+src/mesa/main/light.c usr/share/mesa-source/src/mesa/main
+src/mesa/main/light.h usr/share/mesa-source/src/mesa/main
+src/mesa/main/lines.c usr/share/mesa-source/src/mesa/main
+src/mesa/main/lines.h usr/share/mesa-source/src/mesa/main
+src/mesa/main/macros.h usr/share/mesa-source/src/mesa/main
+src/mesa/main/matrix.c usr/share/mesa-source/src/mesa/main
+src/mesa/main/matrix.h usr/share/mesa-source/src/mesa/main
+src/mesa/main/mtypes.h usr/share/mesa-source/src/mesa/main
+src/mesa/main/occlude.c usr/share/mesa-source/src/mesa/main
+src/mesa/main/occlude.h usr/share/mesa-source/src/mesa/main
+src/mesa/main/pixel.c usr/share/mesa-source/src/mesa/main
+src/mesa/main/pixel.h usr/share/mesa-source/src/mesa/main
+src/mesa/main/points.c usr/share/mesa-source/src/mesa/main
+src/mesa/main/points.h usr/share/mesa-source/src/mesa/main
+src/mesa/main/polygon.c usr/share/mesa-source/src/mesa/main
+src/mesa/main/polygon.h usr/share/mesa-source/src/mesa/main
+src/mesa/main/rastpos.c usr/share/mesa-source/src/mesa/main
+src/mesa/main/rastpos.h usr/share/mesa-source/src/mesa/main
+src/mesa/main/renderbuffer.c usr/share/mesa-source/src/mesa/main
+src/mesa/main/renderbuffer.h usr/share/mesa-source/src/mesa/main
+src/mesa/main/simple_list.h usr/share/mesa-source/src/mesa/main
+src/mesa/main/state.c usr/share/mesa-source/src/mesa/main
+src/mesa/main/state.h usr/share/mesa-source/src/mesa/main
+src/mesa/main/stencil.c usr/share/mesa-source/src/mesa/main
+src/mesa/main/stencil.h usr/share/mesa-source/src/mesa/main
+src/mesa/main/texcompress.c usr/share/mesa-source/src/mesa/main
+src/mesa/main/texcompress.h usr/share/mesa-source/src/mesa/main
+src/mesa/main/texcompress_fxt1.c usr/share/mesa-source/src/mesa/main
+src/mesa/main/texcompress_s3tc.c usr/share/mesa-source/src/mesa/main
+src/mesa/main/texenvprogram.c usr/share/mesa-source/src/mesa/main
+src/mesa/main/texenvprogram.h usr/share/mesa-source/src/mesa/main
+src/mesa/main/texformat.c usr/share/mesa-source/src/mesa/main
+src/mesa/main/texformat.h usr/share/mesa-source/src/mesa/main
+src/mesa/main/texformat_tmp.h usr/share/mesa-source/src/mesa/main
+src/mesa/main/teximage.c usr/share/mesa-source/src/mesa/main
+src/mesa/main/teximage.h usr/share/mesa-source/src/mesa/main
+src/mesa/main/texobj.c usr/share/mesa-source/src/mesa/main
+src/mesa/main/texobj.h usr/share/mesa-source/src/mesa/main
+src/mesa/main/texrender.c usr/share/mesa-source/src/mesa/main
+src/mesa/main/texrender.h usr/share/mesa-source/src/mesa/main
+src/mesa/main/texstate.c usr/share/mesa-source/src/mesa/main
+src/mesa/main/texstate.h usr/share/mesa-source/src/mesa/main
+src/mesa/main/texstore.c usr/share/mesa-source/src/mesa/main
+src/mesa/main/texstore.h usr/share/mesa-source/src/mesa/main
+src/mesa/main/varray.c usr/share/mesa-source/src/mesa/main
+src/mesa/main/varray.h usr/share/mesa-source/src/mesa/main
+src/mesa/main/version.h usr/share/mesa-source/src/mesa/main
+src/mesa/main/vsnprintf.c usr/share/mesa-source/src/mesa/main
+src/mesa/main/vtxfmt.c usr/share/mesa-source/src/mesa/main
+src/mesa/main/vtxfmt.h usr/share/mesa-source/src/mesa/main
+src/mesa/main/vtxfmt_tmp.h usr/share/mesa-source/src/mesa/main
+src/mesa/math/m_clip_tmp.h usr/share/mesa-source/src/mesa/math
+src/mesa/math/m_copy_tmp.h usr/share/mesa-source/src/mesa/math
+src/mesa/math/m_debug.h usr/share/mesa-source/src/mesa/math
+src/mesa/math/m_debug_clip.c usr/share/mesa-source/src/mesa/math
+src/mesa/math/m_debug_norm.c usr/share/mesa-source/src/mesa/math
+src/mesa/math/m_debug_util.h usr/share/mesa-source/src/mesa/math
+src/mesa/math/m_debug_xform.c usr/share/mesa-source/src/mesa/math
+src/mesa/math/m_dotprod_tmp.h usr/share/mesa-source/src/mesa/math
+src/mesa/math/m_eval.c usr/share/mesa-source/src/mesa/math
+src/mesa/math/m_eval.h usr/share/mesa-source/src/mesa/math
+src/mesa/math/m_matrix.c usr/share/mesa-source/src/mesa/math
+src/mesa/math/m_matrix.h usr/share/mesa-source/src/mesa/math
+src/mesa/math/m_norm_tmp.h usr/share/mesa-source/src/mesa/math
+src/mesa/math/m_trans_tmp.h usr/share/mesa-source/src/mesa/math
+src/mesa/math/m_translate.c usr/share/mesa-source/src/mesa/math
+src/mesa/math/m_translate.h usr/share/mesa-source/src/mesa/math
+src/mesa/math/m_vector.c usr/share/mesa-source/src/mesa/math
+src/mesa/math/m_vector.h usr/share/mesa-source/src/mesa/math
+src/mesa/math/m_xform.c usr/share/mesa-source/src/mesa/math
+src/mesa/math/m_xform.h usr/share/mesa-source/src/mesa/math
+src/mesa/math/m_xform_tmp.h usr/share/mesa-source/src/mesa/math
+src/mesa/math/mathmod.h usr/share/mesa-source/src/mesa/math
+src/mesa/array_cache/ac_context.c usr/share/mesa-source/src/mesa/array_cache
+src/mesa/array_cache/ac_context.h usr/share/mesa-source/src/mesa/array_cache
+src/mesa/array_cache/ac_import.c usr/share/mesa-source/src/mesa/array_cache
+src/mesa/array_cache/acache.h usr/share/mesa-source/src/mesa/array_cache
+src/mesa/swrast/s_aaline.c usr/share/mesa-source/src/mesa/swrast
+src/mesa/swrast/s_aaline.h usr/share/mesa-source/src/mesa/swrast
+src/mesa/swrast/s_aalinetemp.h usr/share/mesa-source/src/mesa/swrast
+src/mesa/swrast/s_aatriangle.c usr/share/mesa-source/src/mesa/swrast
+src/mesa/swrast/s_aatriangle.h usr/share/mesa-source/src/mesa/swrast
+src/mesa/swrast/s_aatritemp.h usr/share/mesa-source/src/mesa/swrast
+src/mesa/swrast/s_accum.c usr/share/mesa-source/src/mesa/swrast
+src/mesa/swrast/s_accum.h usr/share/mesa-source/src/mesa/swrast
+src/mesa/swrast/s_alpha.c usr/share/mesa-source/src/mesa/swrast
+src/mesa/swrast/s_alpha.h usr/share/mesa-source/src/mesa/swrast
+src/mesa/swrast/s_atifragshader.c usr/share/mesa-source/src/mesa/swrast
+src/mesa/swrast/s_atifragshader.h usr/share/mesa-source/src/mesa/swrast
+src/mesa/swrast/s_bitmap.c usr/share/mesa-source/src/mesa/swrast
+src/mesa/swrast/s_blend.c usr/share/mesa-source/src/mesa/swrast
+src/mesa/swrast/s_blend.h usr/share/mesa-source/src/mesa/swrast
+src/mesa/swrast/s_buffers.c usr/share/mesa-source/src/mesa/swrast
+src/mesa/swrast/s_context.c usr/share/mesa-source/src/mesa/swrast
+src/mesa/swrast/s_context.h usr/share/mesa-source/src/mesa/swrast
+src/mesa/swrast/s_copypix.c usr/share/mesa-source/src/mesa/swrast
+src/mesa/swrast/s_depth.c usr/share/mesa-source/src/mesa/swrast
+src/mesa/swrast/s_depth.h usr/share/mesa-source/src/mesa/swrast
+src/mesa/swrast/s_drawpix.c usr/share/mesa-source/src/mesa/swrast
+src/mesa/swrast/s_drawpix.h usr/share/mesa-source/src/mesa/swrast
+src/mesa/swrast/s_feedback.c usr/share/mesa-source/src/mesa/swrast
+src/mesa/swrast/s_feedback.h usr/share/mesa-source/src/mesa/swrast
+src/mesa/swrast/s_fog.c usr/share/mesa-source/src/mesa/swrast
+src/mesa/swrast/s_fog.h usr/share/mesa-source/src/mesa/swrast
+src/mesa/swrast/s_fragprog_to_c.c usr/share/mesa-source/src/mesa/swrast
+src/mesa/swrast/s_imaging.c usr/share/mesa-source/src/mesa/swrast
+src/mesa/swrast/s_lines.c usr/share/mesa-source/src/mesa/swrast
+src/mesa/swrast/s_lines.h usr/share/mesa-source/src/mesa/swrast
+src/mesa/swrast/s_linetemp.h usr/share/mesa-source/src/mesa/swrast
+src/mesa/swrast/s_logic.c usr/share/mesa-source/src/mesa/swrast
+src/mesa/swrast/s_logic.h usr/share/mesa-source/src/mesa/swrast
+src/mesa/swrast/s_masking.c usr/share/mesa-source/src/mesa/swrast
+src/mesa/swrast/s_masking.h usr/share/mesa-source/src/mesa/swrast
+src/mesa/swrast/s_nvfragprog.c usr/share/mesa-source/src/mesa/swrast
+src/mesa/swrast/s_nvfragprog.h usr/share/mesa-source/src/mesa/swrast
+src/mesa/swrast/s_pixeltex.c usr/share/mesa-source/src/mesa/swrast
+src/mesa/swrast/s_pixeltex.h usr/share/mesa-source/src/mesa/swrast
+src/mesa/swrast/s_points.c usr/share/mesa-source/src/mesa/swrast
+src/mesa/swrast/s_points.h usr/share/mesa-source/src/mesa/swrast
+src/mesa/swrast/s_pointtemp.h usr/share/mesa-source/src/mesa/swrast
+src/mesa/swrast/s_readpix.c usr/share/mesa-source/src/mesa/swrast
+src/mesa/swrast/s_span.c usr/share/mesa-source/src/mesa/swrast
+src/mesa/swrast/s_span.h usr/share/mesa-source/src/mesa/swrast
+src/mesa/swrast/s_spantemp.h usr/share/mesa-source/src/mesa/swrast
+src/mesa/swrast/s_stencil.c usr/share/mesa-source/src/mesa/swrast
+src/mesa/swrast/s_stencil.h usr/share/mesa-source/src/mesa/swrast
+src/mesa/swrast/s_tcc.c usr/share/mesa-source/src/mesa/swrast
+src/mesa/swrast/s_texstore.c usr/share/mesa-source/src/mesa/swrast
+src/mesa/swrast/s_texture.c usr/share/mesa-source/src/mesa/swrast
+src/mesa/swrast/s_texture.h usr/share/mesa-source/src/mesa/swrast
+src/mesa/swrast/s_triangle.c usr/share/mesa-source/src/mesa/swrast
+src/mesa/swrast/s_triangle.h usr/share/mesa-source/src/mesa/swrast
+src/mesa/swrast/s_trispan.h usr/share/mesa-source/src/mesa/swrast
+src/mesa/swrast/s_tritemp.h usr/share/mesa-source/src/mesa/swrast
+src/mesa/swrast/s_zoom.c usr/share/mesa-source/src/mesa/swrast
+src/mesa/swrast/s_zoom.h usr/share/mesa-source/src/mesa/swrast
+src/mesa/swrast/swrast.h usr/share/mesa-source/src/mesa/swrast
+src/mesa/swrast_setup/ss_context.c usr/share/mesa-source/src/mesa/swrast_setup
+src/mesa/swrast_setup/ss_context.h usr/share/mesa-source/src/mesa/swrast_setup
+src/mesa/swrast_setup/ss_triangle.c usr/share/mesa-source/src/mesa/swrast_setup
+src/mesa/swrast_setup/ss_triangle.h usr/share/mesa-source/src/mesa/swrast_setup
+src/mesa/swrast_setup/ss_tritmp.h usr/share/mesa-source/src/mesa/swrast_setup
+src/mesa/swrast_setup/ss_vb.h usr/share/mesa-source/src/mesa/swrast_setup
+src/mesa/swrast_setup/swrast_setup.h usr/share/mesa-source/src/mesa/swrast_setup
+src/mesa/tnl/t_array_api.c usr/share/mesa-source/src/mesa/tnl
+src/mesa/tnl/t_array_api.h usr/share/mesa-source/src/mesa/tnl
+src/mesa/tnl/t_array_import.c usr/share/mesa-source/src/mesa/tnl
+src/mesa/tnl/t_array_import.h usr/share/mesa-source/src/mesa/tnl
+src/mesa/tnl/t_context.c usr/share/mesa-source/src/mesa/tnl
+src/mesa/tnl/t_context.h usr/share/mesa-source/src/mesa/tnl
+src/mesa/tnl/t_pipeline.c usr/share/mesa-source/src/mesa/tnl
+src/mesa/tnl/t_pipeline.h usr/share/mesa-source/src/mesa/tnl
+src/mesa/tnl/t_save_api.c usr/share/mesa-source/src/mesa/tnl
+src/mesa/tnl/t_save_api.h usr/share/mesa-source/src/mesa/tnl
+src/mesa/tnl/t_save_loopback.c usr/share/mesa-source/src/mesa/tnl
+src/mesa/tnl/t_save_playback.c usr/share/mesa-source/src/mesa/tnl
+src/mesa/tnl/t_vb_arbprogram.c usr/share/mesa-source/src/mesa/tnl
+src/mesa/tnl/t_vb_arbprogram.h usr/share/mesa-source/src/mesa/tnl
+src/mesa/tnl/t_vb_arbprogram_sse.c usr/share/mesa-source/src/mesa/tnl
+src/mesa/tnl/t_vb_cliptmp.h usr/share/mesa-source/src/mesa/tnl
+src/mesa/tnl/t_vb_cull.c usr/share/mesa-source/src/mesa/tnl
+src/mesa/tnl/t_vb_fog.c usr/share/mesa-source/src/mesa/tnl
+src/mesa/tnl/t_vb_light.c usr/share/mesa-source/src/mesa/tnl
+src/mesa/tnl/t_vb_lighttmp.h usr/share/mesa-source/src/mesa/tnl
+src/mesa/tnl/t_vb_normals.c usr/share/mesa-source/src/mesa/tnl
+src/mesa/tnl/t_vb_points.c usr/share/mesa-source/src/mesa/tnl
+src/mesa/tnl/t_vb_program.c usr/share/mesa-source/src/mesa/tnl
+src/mesa/tnl/t_vb_render.c usr/share/mesa-source/src/mesa/tnl
+src/mesa/tnl/t_vb_rendertmp.h usr/share/mesa-source/src/mesa/tnl
+src/mesa/tnl/t_vb_texgen.c usr/share/mesa-source/src/mesa/tnl
+src/mesa/tnl/t_vb_texmat.c usr/share/mesa-source/src/mesa/tnl
+src/mesa/tnl/t_vb_vertex.c usr/share/mesa-source/src/mesa/tnl
+src/mesa/tnl/t_vertex.c usr/share/mesa-source/src/mesa/tnl
+src/mesa/tnl/t_vertex.h usr/share/mesa-source/src/mesa/tnl
+src/mesa/tnl/t_vertex_generic.c usr/share/mesa-source/src/mesa/tnl
+src/mesa/tnl/t_vertex_sse.c usr/share/mesa-source/src/mesa/tnl
+src/mesa/tnl/t_vp_build.c usr/share/mesa-source/src/mesa/tnl
+src/mesa/tnl/t_vp_build.h usr/share/mesa-source/src/mesa/tnl
+src/mesa/tnl/t_vtx_api.c usr/share/mesa-source/src/mesa/tnl
+src/mesa/tnl/t_vtx_api.h usr/share/mesa-source/src/mesa/tnl
+src/mesa/tnl/t_vtx_eval.c usr/share/mesa-source/src/mesa/tnl
+src/mesa/tnl/t_vtx_exec.c usr/share/mesa-source/src/mesa/tnl
+src/mesa/tnl/t_vtx_generic.c usr/share/mesa-source/src/mesa/tnl
+src/mesa/tnl/t_vtx_x86.c usr/share/mesa-source/src/mesa/tnl
+src/mesa/tnl/tnl.h usr/share/mesa-source/src/mesa/tnl
+src/mesa/shader/arbfragparse.c usr/share/mesa-source/src/mesa/shader
+src/mesa/shader/arbfragparse.h usr/share/mesa-source/src/mesa/shader
+src/mesa/shader/arbprogparse.c usr/share/mesa-source/src/mesa/shader
+src/mesa/shader/arbprogparse.h usr/share/mesa-source/src/mesa/shader
+src/mesa/shader/arbprogram.c usr/share/mesa-source/src/mesa/shader
+src/mesa/shader/arbprogram.h usr/share/mesa-source/src/mesa/shader
+src/mesa/shader/arbprogram_syn.h usr/share/mesa-source/src/mesa/shader
+src/mesa/shader/arbvertparse.c usr/share/mesa-source/src/mesa/shader
+src/mesa/shader/arbvertparse.h usr/share/mesa-source/src/mesa/shader
+src/mesa/shader/atifragshader.c usr/share/mesa-source/src/mesa/shader
+src/mesa/shader/atifragshader.h usr/share/mesa-source/src/mesa/shader
+src/mesa/shader/nvfragparse.c usr/share/mesa-source/src/mesa/shader
+src/mesa/shader/nvfragparse.h usr/share/mesa-source/src/mesa/shader
+src/mesa/shader/nvfragprog.h usr/share/mesa-source/src/mesa/shader
+src/mesa/shader/nvprogram.c usr/share/mesa-source/src/mesa/shader
+src/mesa/shader/nvprogram.h usr/share/mesa-source/src/mesa/shader
+src/mesa/shader/nvvertexec.c usr/share/mesa-source/src/mesa/shader
+src/mesa/shader/nvvertexec.h usr/share/mesa-source/src/mesa/shader
+src/mesa/shader/nvvertparse.c usr/share/mesa-source/src/mesa/shader
+src/mesa/shader/nvvertparse.h usr/share/mesa-source/src/mesa/shader
+src/mesa/shader/nvvertprog.h usr/share/mesa-source/src/mesa/shader
+src/mesa/shader/program.c usr/share/mesa-source/src/mesa/shader
+src/mesa/shader/program.h usr/share/mesa-source/src/mesa/shader
+src/mesa/shader/shaderobjects.c usr/share/mesa-source/src/mesa/shader
+src/mesa/shader/shaderobjects.h usr/share/mesa-source/src/mesa/shader
+src/mesa/shader/shaderobjects_3dlabs.c usr/share/mesa-source/src/mesa/shader
+src/mesa/shader/shaderobjects_3dlabs.h usr/share/mesa-source/src/mesa/shader
+src/mesa/shader/grammar/grammar.c usr/share/mesa-source/src/mesa/shader/grammar
+src/mesa/shader/grammar/grammar.h usr/share/mesa-source/src/mesa/shader/grammar
+src/mesa/shader/grammar/grammar_syn.h usr/share/mesa-source/src/mesa/shader/grammar
+src/mesa/shader/grammar/grammar_mesa.c usr/share/mesa-source/src/mesa/shader/grammar
+src/mesa/shader/grammar/grammar_mesa.h usr/share/mesa-source/src/mesa/shader/grammar
+src/mesa/shader/slang/slang_assemble_assignment.c usr/share/mesa-source/src/mesa/shader/slang
+src/mesa/shader/slang/slang_assemble_assignment.h usr/share/mesa-source/src/mesa/shader/slang
+src/mesa/shader/slang/slang_assemble.c usr/share/mesa-source/src/mesa/shader/slang
+src/mesa/shader/slang/slang_assemble_conditional.c usr/share/mesa-source/src/mesa/shader/slang
+src/mesa/shader/slang/slang_assemble_conditional.h usr/share/mesa-source/src/mesa/shader/slang
+src/mesa/shader/slang/slang_assemble_constructor.c usr/share/mesa-source/src/mesa/shader/slang
+src/mesa/shader/slang/slang_assemble_constructor.h usr/share/mesa-source/src/mesa/shader/slang
+src/mesa/shader/slang/slang_assemble.h usr/share/mesa-source/src/mesa/shader/slang
+src/mesa/shader/slang/slang_assemble_typeinfo.c usr/share/mesa-source/src/mesa/shader/slang
+src/mesa/shader/slang/slang_assemble_typeinfo.h usr/share/mesa-source/src/mesa/shader/slang
+src/mesa/shader/slang/slang_compile.c usr/share/mesa-source/src/mesa/shader/slang
+src/mesa/shader/slang/slang_compile.h usr/share/mesa-source/src/mesa/shader/slang
+src/mesa/shader/slang/slang_execute.c usr/share/mesa-source/src/mesa/shader/slang
+src/mesa/shader/slang/slang_execute.h usr/share/mesa-source/src/mesa/shader/slang
+src/mesa/shader/slang/slang_mesa.h usr/share/mesa-source/src/mesa/shader/slang
+src/mesa/shader/slang/slang_preprocess.c usr/share/mesa-source/src/mesa/shader/slang
+src/mesa/shader/slang/slang_preprocess.h usr/share/mesa-source/src/mesa/shader/slang
+src/mesa/shader/slang/slang_storage.c usr/share/mesa-source/src/mesa/shader/slang
+src/mesa/shader/slang/slang_storage.h usr/share/mesa-source/src/mesa/shader/slang
+src/mesa/shader/slang/slang_utility.c usr/share/mesa-source/src/mesa/shader/slang
+src/mesa/shader/slang/slang_utility.h usr/share/mesa-source/src/mesa/shader/slang
+src/mesa/shader/slang/traverse_wrap.h usr/share/mesa-source/src/mesa/shader/slang
+src/mesa/shader/slang/library/slang_common_builtin_gc_bin.h usr/share/mesa-source/src/mesa/shader/slang/library
+src/mesa/shader/slang/library/slang_common_builtin_gc.h usr/share/mesa-source/src/mesa/shader/slang/library
+src/mesa/shader/slang/library/slang_core_gc_bin.h usr/share/mesa-source/src/mesa/shader/slang/library
+src/mesa/shader/slang/library/slang_core_gc.h usr/share/mesa-source/src/mesa/shader/slang/library
+src/mesa/shader/slang/library/slang_fragment_builtin_gc_bin.h usr/share/mesa-source/src/mesa/shader/slang/library
+src/mesa/shader/slang/library/slang_fragment_builtin_gc.h usr/share/mesa-source/src/mesa/shader/slang/library
+src/mesa/shader/slang/library/slang_shader_syn.h usr/share/mesa-source/src/mesa/shader/slang/library
+src/mesa/shader/slang/library/slang_version_syn.h usr/share/mesa-source/src/mesa/shader/slang/library
+src/mesa/shader/slang/library/slang_vertex_builtin_gc_bin.h usr/share/mesa-source/src/mesa/shader/slang/library
+src/mesa/shader/slang/library/slang_vertex_builtin_gc.h usr/share/mesa-source/src/mesa/shader/slang/library
+src/mesa/drivers/x11/glxheader.h usr/share/mesa-source/src/mesa/drivers/x11
+src/mesa/drivers/x11/xm_api.c usr/share/mesa-source/src/mesa/drivers/x11
+src/mesa/drivers/x11/xm_buffer.c usr/share/mesa-source/src/mesa/drivers/x11
+src/mesa/drivers/x11/xm_dd.c usr/share/mesa-source/src/mesa/drivers/x11
+src/mesa/drivers/x11/xm_line.c usr/share/mesa-source/src/mesa/drivers/x11
+src/mesa/drivers/x11/xm_span.c usr/share/mesa-source/src/mesa/drivers/x11
+src/mesa/drivers/x11/xm_tri.c usr/share/mesa-source/src/mesa/drivers/x11
+src/mesa/drivers/x11/xmesaP.h usr/share/mesa-source/src/mesa/drivers/x11
+src/mesa/drivers/common/driverfuncs.c usr/share/mesa-source/src/mesa/drivers/common
+src/mesa/drivers/common/driverfuncs.h usr/share/mesa-source/src/mesa/drivers/common
+src/mesa/glapi/dispatch.h usr/share/mesa-source/src/mesa/glapi
+src/mesa/glapi/glapi.c usr/share/mesa-source/src/mesa/glapi
+src/mesa/glapi/glapi.h usr/share/mesa-source/src/mesa/glapi
+src/mesa/glapi/glapioffsets.h usr/share/mesa-source/src/mesa/glapi
+src/mesa/glapi/glapitable.h usr/share/mesa-source/src/mesa/glapi
+src/mesa/glapi/glapitemp.h usr/share/mesa-source/src/mesa/glapi
+src/mesa/glapi/glprocs.h usr/share/mesa-source/src/mesa/glapi
+src/mesa/glapi/glthread.c usr/share/mesa-source/src/mesa/glapi
+src/mesa/glapi/glthread.h usr/share/mesa-source/src/mesa/glapi
+src/glx/x11/indirect_size.c usr/share/mesa-source/src/glx/x11
+src/glx/x11/indirect_size.h usr/share/mesa-source/src/glx/x11
+include/GL/internal/dri_interface.h usr/share/mesa-source/include/GL/internal
+include/GL/internal/glcore.h usr/share/mesa-source/include/GL/internal
+include/GL/internal/sarea.h usr/share/mesa-source/include/GL/internal
+src/mesa/main/glheader.h usr/share/mesa-source/src/mesa/main
+src/mesa/glapi/glthread.h usr/share/mesa-source/src/mesa/glapi
+src/mesa/glapi/glapitable.h usr/share/mesa-source/src/mesa/glapi
+include/GL/xmesa.h usr/share/mesa-source/include/GL
+include/GL/xmesa_xf86.h usr/share/mesa-source/include/GL
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 00000000000..1e1369b5edf
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,222 @@
+#!/usr/bin/make -f
+
+export DH_OPTIONS
+
+CFLAGS = -Wall -g
+
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+	CFLAGS += -O0
+else
+	CFLAGS += -O2
+endif
+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+	INSTALL_PROGRAM += -s
+endif
+
+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 = $(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 := $(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 := $(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 := $(call select_target,GLW)
+
+BUILD_TARGETS := \
+	$(foreach t, $(BUILD_GL_TARGETS), $(STAMPDIR)/target-gl-$(t)) \
+	$(foreach t, $(BUILD_GLU_TARGETS), $(STAMPDIR)/target-glu-$(t)) \
+	$(foreach t, $(BUILD_GLW_TARGETS), $(STAMPDIR)/target-glw-$(t))
+
+ifneq ($(strip $(shell grep-dctrl -n -s Package -PX libgl1-mesa-directfb debian/control)),)
+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
+	mkdir -p $(dir $@) && touch $@
+
+# Parameters:
+#     1: library (gl, glu, glw)
+#     2: target (debian, debian-i386, ...)
+#     3: subdir to build (mesa, glw, glu/sgi)
+
+define build_target_actions
+	dh_testdir
+	chmod +x debian/shadowtree
+	$(RM) -rf build/$(1)-$(2)
+	debian/shadowtree build/$(1)-$(2)
+	ln -sf $(2) build/$(1)-$(2)/configs/current
+	if test $(1) != gl ; then \
+		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)
+	if test $(1) != gl ; then \
+		rm build/$(1)-$(2)/lib/libGL.so ; \
+	fi
+	mkdir -p $(dir $@) && touch $@
+endef
+
+$(STAMPDIR)/target-gl-%:
+	$(call build_target_actions,gl,$*,mesa)
+
+$(STAMPDIR)/target-glu-%: $(STAMPDIR)/target-gl-%
+	$(call build_target_actions,glu,$*,glu/sgi)
+
+$(STAMPDIR)/target-glw-%: $(STAMPDIR)/target-gl-%
+	$(call build_target_actions,glw,$*,glw)
+
+# Parameters:
+#     1: target (gl-debian, gl-debian-i386, ...)
+#     2: installation directory (usr/lib, usr/lib/dbg, ...)
+#     3: library package name
+#     4: development package name
+
+define install_target_lib_actions
+	dh_installdirs -p$(3) $(2)
+	dh_installdirs -p$(4) $(2)
+	dh_install -p$(3) build/$(1)/lib/lib*.so.* $(2)
+	dh_install -p$(4) build/$(1)/lib/lib*.so $(2)
+	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:
+#     1: target (gl-debian, gl-debian-i386, ...)
+#     2: source directory (usr/lib, usr/lib/dbg, ...)
+#     3: installation directory (usr/lib, usr/lib/dbg, ...)
+#     4: package name
+
+define install_target_driver_actions
+	dh_installdirs -p$(4) $(3)
+	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:
+#     1: target (gl-debian, gl-debian-i386, ...)
+
+define install_target
+	$(call install_target_libs,$(1))
+	$(call install_target_drivers,$(1))
+endef
+
+install-target-%: $(STAMPDIR)/target-%
+	@echo Target $@.
+	$(call install_target,$*)
+	@echo Target $@: done.
+
+install-pre:
+	@echo Target $@.
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
+	@echo Target $@: done.
+
+install-all: install-pre \
+	$(addprefix install-target-gl-,$(BUILD_GL_TARGETS)) \
+	$(addprefix install-target-glu-,$(BUILD_GLU_TARGETS)) \
+	$(addprefix install-target-glw-,$(BUILD_GLW_TARGETS))
+	@echo Target $@.
+	@echo Target $@: done.
+
+clean:
+	dh_testdir
+	dh_testroot
+	$(RM) -rf debian/stamp
+	$(RM) -rf build
+	dh_clean
+
+install: build install-all
+	@echo Target $@.
+	@echo Target $@: done.
+
+binary-indep: DH_OPTIONS := -i
+binary-indep: build
+	@echo Target $@
+	dh_testdir
+	dh_testroot
+	dh_installchangelogs docs/VERSIONS
+	dh_installdocs
+#	dh_installexamples
+	dh_install
+#	dh_installman
+#	dh_link
+	dh_strip
+	dh_compress
+	dh_fixperms
+	dh_installdeb
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+	@echo Target $@: done.
+
+# binary-arch: DH_OPTIONS := -s
+binary-arch: build install
+	@echo Target $@
+	dh_testdir -s
+	dh_testroot -s
+	dh_installchangelogs -s docs/VERSIONS
+	dh_installdocs -s
+#	dh_installexamples -s
+	dh_install -s
+#	dh_installman -s
+#	dh_link -s
+	dh_strip -s
+	dh_compress -s
+	dh_fixperms -s
+#	dh_makeshlibs -s -Nlibglu1-mesa -Nmesag3
+	dh_makeshlibs -plibgl1-mesa-swrast-dbg -V 'libgl1-mesa-swrast | libgl1'
+ifneq ($(strip $(shell dh_listpackages -s | grep -w libgl1-mesa-glide3)),)
+	dh_makeshlibs -plibgl1-mesa-glide3 -V 'libgl1-mesa-glide3'
+endif
+ifneq ($(strip $(shell dh_listpackages -s | grep -w libglu1-mesa)),)
+	dh_makeshlibs -plibglu1-mesa -V 'libglu1-mesa | libglu1'
+endif
+ifneq ($(strip $(shell dh_listpackages -s | grep -w libosmesa6)),)
+	dh_makeshlibs -plibosmesa6
+endif
+ifneq ($(strip $(shell dh_listpackages -s | grep -w libgl1-mesa-swrast)),)
+	dh_makeshlibs -plibgl1-mesa-swrast -V 'libgl1-mesa-swrast | libgl1'
+endif
+ifneq ($(strip $(shell dh_listpackages -s | grep -w libgl1-mesa)),)
+	dh_makeshlibs -plibgl1-mesa -V 'libgl1-mesa | libgl1'
+endif
+ifneq ($(strip $(shell dh_listpackages -s | grep -w libgl1-mesa-directfb)),)
+	dh_makeshlibs -plibgl1-mesa-directfb -V 'libgl1-mesa-directfb | libgl1'
+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 > \
+		debian/shlibs.should
+	cmp debian/shlibs.actual debian/shlibs.should
+	rm debian/shlibs.actual debian/shlibs.should
+	dh_installdeb -s
+	dh_shlibdeps -s
+	dh_gencontrol -s
+	dh_md5sums -s
+	dh_builddeb -s
+	@echo Target $@: done.
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install configure
diff --git a/debian/shadowtree b/debian/shadowtree
new file mode 100644
index 00000000000..3e2a89afdfc
--- /dev/null
+++ b/debian/shadowtree
@@ -0,0 +1,91 @@
+#!/usr/bin/perl
+
+use strict;
+use warnings;
+use File::Find;
+use File::Spec;
+use Cwd;
+
+sub usage()
+{
+    my $name = (File::Spec->splitpath($0))[2];
+    print <<EOT
+Usage:
+
+    $name destination
+EOT
+    ;
+    exit 0;
+}
+
+sub get_first_subdir($$)
+{
+    my @path = File::Spec->splitdir(File::Spec->rel2abs(shift));
+    my @base = File::Spec->splitdir(File::Spec->rel2abs(shift));
+
+    while (@path and @base and $path[0] eq $base[0])
+    {
+        shift @path;
+        shift @base;
+    }
+
+    @base ? '' : $path[0];
+}
+
+my $dst = shift;
+
+if (not defined $dst or $dst eq '')
+{
+    usage();
+}
+
+my $src = File::Spec->rel2abs(cwd());
+
+$dst = File::Spec->rel2abs($dst);
+
+if (! -d $dst)
+{
+    my $path = '';
+    foreach my $d (File::Spec->splitdir($dst))
+    {
+        $path = File::Spec->catdir($path, $d);
+        if (! -d $path)
+        {
+            mkdir $path or die "Can't create directory $path: $!";
+        }
+    }
+}
+
+my $subdir = File::Spec->rel2abs(get_first_subdir($dst, $src), $src);
+my @path = File::Spec->splitdir($dst);
+my $curdir = File::Spec->catdir(@path);
+
+find {
+    wanted => sub {
+        if ($File::Find::name eq $subdir or /^(CVS(?:\.adm)?|RCS|SCCS)$/)
+        {
+            $File::Find::prune = 1;
+            return;
+        }
+        elsif ($_ eq File::Spec->curdir)
+        {
+            return;
+        }
+        elsif (-d)
+        {
+            push @path, $_;
+            $curdir = File::Spec->catdir(@path);
+            mkdir $curdir unless -d $curdir;
+        }
+        else
+        {
+            my $basename = (File::Spec->splitpath($File::Find::name))[2];
+            my $filename = File::Spec->catfile($curdir, $basename);
+            unlink $filename;
+            symlink File::Spec->abs2rel($File::Find::name, $curdir), $filename;
+        }
+    },
+    postprocess => sub {
+        pop @path;
+    }
+}, $src;
diff --git a/debian/shlibs.local b/debian/shlibs.local
new file mode 100644
index 00000000000..a29cea0ef71
--- /dev/null
+++ b/debian/shlibs.local
@@ -0,0 +1,2 @@
+libGL   1
+libGLU  1 libglu1-mesa | libglu1