--- mesa-7.6.0~git20090817.7c422387.orig/debian/watch
+++ mesa-7.6.0~git20090817.7c422387/debian/watch
@@ -0,0 +1,3 @@
+version=3
+opts="uversionmangle=s/-rc/~rc/" \
+http://sf.net/mesa3d/MesaLib-(.*)\.tar\.gz
--- mesa-7.6.0~git20090817.7c422387.orig/debian/changelog
+++ mesa-7.6.0~git20090817.7c422387/debian/changelog
@@ -0,0 +1,2001 @@
+mesa (7.6.0~git20090817.7c422387-0ubuntu0sarvatt~jaunty) jaunty; urgency=low
+
+  * Checkout from git 20090817 (master branch) up to commit
+    7c4223876b4f8a78335687c7fcd7448b5a83ad10
+  * Only added debian/ tree from origin/ubuntu
+  * hook: Drop 107_glxgears_is_not_a_benchmark.patch (testing)
+  * hook: Drop 108_bo_assertion.patch (applied upstream)
+  * Enable r600 driver. Note that it requires seperate drm modules
+    not provided in this PPA or in ubuntu, and also does not work with
+    KMS.
+
+ -- Robert Hooker <sarvatt@ubuntu.com>  Mon, 17 Aug 2009 10:31:10 -0400
+
+mesa (7.5~rc4-1ubuntu3) karmic; urgency=low
+
+  * Add 108_bo_assertion.patch: Fix assertion failure on remapping a 
+    non-BO-backed VBO with intel video. (LP: #396667)
+
+ -- Robert Hooker (Sarvatt) <sarvatt@gmail.com>  Tue, 07 Jul 2009 14:35:54 -0400
+
+mesa (7.5~rc4-1ubuntu2) karmic; urgency=low
+
+  * rules: Add a missing semicolon (FTBFS).
+
+ -- Timo Aaltonen <tjaalton@ubuntu.com>  Tue, 30 Jun 2009 19:49:17 +0300
+
+mesa (7.5~rc4-1ubuntu1) karmic; urgency=low
+
+  * Merge from Debian experimental, remaining changes:
+    - debian/control
+      + Change maintainer address to Ubuntu.
+      + Drop lesstif-dev from Build-Depends.
+      + Comment out GLw libs since it depends on lesstif-dev.
+    - debian/rules
+      + Unexport LDFLAGS (amd64 FTBFS).
+      + Use --disable-glw for swx11 targets too.
+      + Don't enable motif for swx11 targets.
+      + Build .debs with lzma compression.  
+    - debian/patches
+      + 101_ubuntu_hidden_glname.patch refreshed.
+      + 102_dont_vblank.patch refreshed.
+    - debian/mesa-common-dev.install
+      + Install dri.pc
+  * Dropped patches, applied upstream:
+    104_fix_dri2_ext_tfp.diff
+    105_glXWaitX_segfaults.patch
+    108_destroy_intel_fb.patch
+    109_release_direct_rendering_resources.patch
+    110_null_ptr_during_screen_tear_down.patch
+  * rules: Serialize install phase as suggested by Julien Cristau,
+    fixes amd64 FTBFS.
+
+ -- Timo Aaltonen <tjaalton@ubuntu.com>  Tue, 30 Jun 2009 17:52:14 +0300
+
+mesa (7.5~rc4-1) experimental; urgency=low
+
+  [ Timo Aaltonen ]
+  * New upstream release candidate.
+    + xdriinfo now works with DRI2 (closes: #527132)
+  * rules: Disable EGL.
+  * mesa-common-dev.install: Don't install glxew.h, conflicts with libglew.
+
+  [ Julien Cristau ]
+  * Update patches:
+    + 02_use-ieee-fp-on-s390-and-m68k.patch moved from imports.h to compiler.h
+    + 03_optional-progs-and-install.patch refreshed
+    + 05_hurd-ftbfs.diff partly applied upstream
+    + 06_kfreebsd-ftbfs.diff refreshed
+  * Install dri.pc, which will be needed to build xorg-server 1.7.
+  * Don't build gallium for now.
+
+ -- Julien Cristau <jcristau@debian.org>  Sun, 28 Jun 2009 20:21:37 +0200
+
+mesa (7.4.4-1) unstable; urgency=low
+
+  [ Julien Cristau ]
+  * New upstream release.
+    + fixes a crash in swrast glXWaitX (closes: #528708)
+  * Don't build hardware dri drivers on s390.
+  * Update 04_osmesa_version.diff, refresh 06_kfreebsd-ftbfs.diff.
+
+  [ Brice Goglin ]
+  * Enable motif in GLw, closes: #527483.
+
+ -- Julien Cristau <jcristau@debian.org>  Sun, 28 Jun 2009 18:58:27 +0200
+
+mesa (7.4.1-1ubuntu6) karmic; urgency=low
+  
+  * Install dri.pc in libgl1-mesa-dev as well
+    (LP: #379797)
+
+ -- Robert Hooker <sarvatt@gmail.com>  Wed, 24 Jun 2009 17:47:08 -0400
+
+mesa (7.4.1-1ubuntu5) karmic; urgency=low
+
+  * Drop 111_fix_mesa_ref_fb_call_syntax.patch: Testing showed that 110
+    alone is sufficient to fix the issue.
+
+ -- Bryce Harrington <bryce@ubuntu.com>  Wed, 24 Jun 2009 17:07:33 -0700
+
+mesa (7.4.1-1ubuntu4) karmic; urgency=low
+
+  * Add 110_null_ptr_during_screen_tear_down.patch and
+    111_fix_mesa_ref_fb_call_syntax.patch to fix crashes caused by errors
+    in the previous memory leak fixes in -1u3.
+    (LP: #391808)
+
+ -- Bryce Harrington <bryce@ubuntu.com>  Wed, 24 Jun 2009 15:32:54 -0700
+
+mesa (7.4.1-1ubuntu3) karmic; urgency=low
+
+  * Add 108_destroy_intel_fb.patch: Release fb backing regions in
+    intelDestroyBuffer(). Cherrypicked patch.  Fixes memory leak when
+    destroying framebuffers.
+    (LP: #360319)
+  * Add 109_release_direct_rendering_resources.patch: Cherrypicked patch.
+    Also release direct rendering resources in glXDestroyGLXPixmap.
+    Fixes leak running compiz with direct rendering.
+    (LP: #376092)
+
+ -- Bryce Harrington <bryce@ubuntu.com>  Tue, 23 Jun 2009 13:44:02 -0700
+
+mesa (7.4.1-1ubuntu2) karmic; urgency=low
+
+  * Add 107_glxgears_is_not_a_benchmark.patch:  glxgears makes
+    troubleshooting performance issues difficult because bug reporters
+    see it provides fps output, and end up not looking for a better
+    benchmark.
+
+ -- Bryce Harrington <bryce@ubuntu.com>  Mon, 04 May 2009 12:49:12 -0700
+
+mesa (7.4.1-1ubuntu1) karmic; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - debian/control
+      + Change maintainer address to Ubuntu.
+      + Drop lesstif-dev from Build-Depends.
+      + Comment out GLw libs since it depends on lesstif-dev.
+    - debian/rules
+      + Unexport LDFLAGS (amd64 FTBFS).
+      + use --disable-glw for swx11 targets too.
+      + Build .debs with lzma compression.
+    - debian/patches
+      + 101_ubuntu_hidden_glname.patch.
+      + 102_dont_vblank.patch:
+      + 104_fix_dri2_ext_tfp.diff
+      + 105_glXWaitX_segfaults.patch
+
+ -- Timo Aaltonen <tjaalton@ubuntu.com>  Fri, 15 May 2009 14:50:57 +0300
+
+mesa (7.4.1-1) unstable; urgency=low
+
+  [ Julien Cristau ]
+  * Make libgl1-mesa-dev and mesa-common-dev 'Architecture: any'.  This gets
+    rid of uninstallability when a new upstream version isn't built on all
+    architectures, and allows us to ship potentially arch-specific .pc files.
+  * Install pkgconfig files for libGLU, libOSMesa and libGLw.
+  * Make libgl1-mesa-dri{,-dbg} 'Architecture: any', as swrast_dri.so should
+    get built everywhere.
+  * Drop the dependency on libgl1-mesa-glx from -dri, and make -glx recommend
+    -dri instead.  The dri drivers are also loaded by the X server, which
+    doesn't need libGL.  On the other hand, libGL needs one of the dri drivers
+    for direct rendering (either software or hardware).  Mark libgl1-mesa-dri
+    as breaking old xserver-xorg-core and libgl1-mesa-glx, to avoid
+    incompatibilities.
+  * Add patch by Samuel Thibault to fix FTBFS on hurd-i386.
+  * Pull from mesa_7_4_branch as of May 3rd (commit 63375254).
+  * Move -dbg packages to new 'debug' section.
+
+  [ Brice Goglin ]
+  * Add patch by Aurelien Jarno to fix FTBFS on kfreebsd-i386, closes: #524690.
+
+ -- Julien Cristau <jcristau@debian.org>  Sun, 03 May 2009 16:05:09 +0200
+
+mesa (7.4-2) unstable; urgency=low
+
+  * Upload to unstable.
+
+ -- Julien Cristau <jcristau@debian.org>  Wed, 08 Apr 2009 23:53:47 +0100
+
+mesa (7.4-1) experimental; urgency=low
+
+  [ Timo Aaltonen ]
+  * New upstream release.
+
+ -- Julien Cristau <jcristau@debian.org>  Wed, 01 Apr 2009 20:25:00 +0200
+
+mesa (7.4-0ubuntu4) karmic; urgency=low
+
+  * debian/patches/106_compiz_ring_switcher_xorg_segv_on_radeon.diff:
+    fix xserver segv triggered by compiz ring switcher plugin for users
+    with r300/r400 radeon chipsets and -ati driver. Patch previously
+    commited to mesa master as c28707b50701b1cf8727be29d61e2d939c6ee58f
+    and also to mesa_7_4_branch as a1ce4efefbb7f796a0a24544a1e893a56848f0c1.
+    Note: it was commited to the 7.4 branch after mesa 7.4.0 release.
+    (LP: #368049)
+
+ -- Martin Olsson <martin@minimum.se>  Mon, 04 May 2009 12:25:29 +0200
+
+mesa (7.4-0ubuntu3) jaunty; urgency=low
+
+  * Disable 103_bump_965_texture_limit.diff.  This is suspected to cause X
+    freeze issues.
+    (LP: 359392, Reopen: 146298)
+
+ -- Bryce Harrington <bryce@ubuntu.com>  Fri, 17 Apr 2009 11:48:50 -0700
+
+mesa (7.4-0ubuntu2) jaunty; urgency=low
+
+  * Add 105_glXWaitX_segfaults.patch. Resolves segfaults from unitialized
+    variables when using swrast based drivers. (LP: #355242)
+
+ -- Mario Limonciello <superm1@ubuntu.com>  Wed, 15 Apr 2009 01:03:30 -0500
+
+mesa (7.4-0ubuntu1) jaunty; urgency=low
+
+  * New upstream release, merge from debian-experimental
+    (LP: #330476, #347171, #349127)
+  * Drop 103_rs600_support.patch, included in this version.
+  * Drop 104_swrast_fbconfigs.patch, included in this version.
+  * Add 103_bump_965_texture_limit.diff. (LP: #146298)
+  * Add 104_fix_dri2_ext_tfp.diff. (LP: #324854)
+
+ -- Timo Aaltonen <tjaalton@ubuntu.com>  Fri, 03 Apr 2009 12:42:06 +0300
+
+mesa (7.4~rc1-1) experimental; urgency=low
+
+  * New upstream release candidate.
+  * Fix watch file to make uscan not consider release candidates as newer than
+    actual releases.
+  * debian/control: add lpia to the Architecture field for
+    libgl1-mesa-dri{,-dbg} to match Ubuntu.
+  * debian/rules: on lpia, only build the i915 and i965 dri drivers (based on
+    Ubuntu changes).
+  * Build-depend on linux-libc-dev >= 2.6.29 on linux archs.
+
+ -- Julien Cristau <jcristau@debian.org>  Wed, 25 Mar 2009 11:34:42 +0100
+
+mesa (7.3-1ubuntu4) jaunty; urgency=low
+
+  * Backport 104_swrast_fbconfigs.patch from mesa git.
+    - Properly assigns an fbconfig for the root visual.  This fixes
+      issues with MythTV not being able to show fonts when using a software
+      rasterizer. (LP: #341898)
+
+ -- Mario Limonciello <superm1@ubuntu.com>  Fri, 27 Mar 2009 02:50:13 -0500
+
+mesa (7.3-1ubuntu3) jaunty; urgency=low
+
+  * Add 103_rs600_support.patch: Adds support for the RS600 chip and sets
+    the number of gb pipes properly for r3xx/r5xx cards.
+
+ -- Bryce Harrington <bryce@ubuntu.com>  Tue, 03 Mar 2009 00:26:59 -0800
+
+mesa (7.3-1ubuntu2) jaunty; urgency=low
+
+  [ Julien Cristau ]
+  * Drop CFLAGS mangling for lpia and armel from debian/rules, the issue has
+    been fixed upstream.
+
+  [ Timo Aaltonen ]
+  * 102_dont_vblank.patch: Disable vblank again for intel, and revisit it
+    again during the next cycle.
+
+ -- Timo Aaltonen <tjaalton@ubuntu.com>  Mon, 23 Feb 2009 16:48:56 +0200
+
+mesa (7.3-1ubuntu1) jaunty; urgency=low
+
+  * Merge with Debian experimental.
+  * Drop 102_remove_flip.diff, included in 7.3..
+
+ -- Timo Aaltonen <tjaalton@ubuntu.com>  Sat, 31 Jan 2009 12:38:44 +0200
+
+mesa (7.3-1) experimental; urgency=low
+
+  [ Timo Aaltonen ]
+  * New upstream release.
+
+  [ Julien Cristau ]
+  * Try to make the diff a bit smaller by removing directories that are in
+    upstream git but not in tarballs.
+
+ -- Julien Cristau <jcristau@debian.org>  Fri, 30 Jan 2009 20:00:34 +0100
+
+mesa (7.3~rc3-1ubuntu2) jaunty; urgency=low
+
+  * 102_remove_flip.diff: Add a patch from upstream which removes the
+    remaining bits of pageflipping support. (LP: #320690)
+
+ -- Timo Aaltonen <tjaalton@ubuntu.com>  Sun, 25 Jan 2009 00:00:04 +0200
+
+mesa (7.3~rc3-1ubuntu1) jaunty; urgency=low
+
+  * Merge with Debian experimental.
+  * Drop 102_dont_vblank.patch, since the new drm code in the kernel
+    fixes the bugs that it worked around.
+  * Bump the build-dependency of libdrm to 2.4.4. It's the first version
+    with necessary changes to build this.
+
+ -- Timo Aaltonen <tjaalton@ubuntu.com>  Fri, 23 Jan 2009 10:20:24 +0200
+
+mesa (7.3~rc3-1) experimental; urgency=low
+
+  [ Timo Aaltonen ]
+  * New upstream release candidate.
+
+  [ Julien Cristau ]
+  * Refresh patches 03 and 04.
+
+ -- Julien Cristau <jcristau@debian.org>  Wed, 21 Jan 2009 19:01:21 +0100
+
+mesa (7.3~rc1-1) experimental; urgency=low
+
+  * New upstream release candidate.
+    + provides DRI2 (closes: #411141).
+    + i915: fallback for cube map texture.  Fixes GPU hang with scorched3d
+      (closes: #484049).
+
+  [ Timo Aaltonen ]
+  * Remove debian/patches/01_disable-intel-classic-warn.diff, the
+    warning is gone now.
+  * debian/control:
+    - Build-depend on x11proto-dri2-dev (>= 1.99.3)
+
+  [ Julien Cristau ]
+  * Require libdrm-dev 2.4.3.
+  * Merge packaging changes from unstable, from 7.0.3-5 to 7.0.3-7.
+  * Delete unused configs/debian-*, and install-source.sh script.  We've
+    switched to using autoconf, and mesa-swx11-source is gone.
+  * Delete some now unused code from debian/rules.
+
+ -- Julien Cristau <jcristau@debian.org>  Sat, 10 Jan 2009 22:14:55 +0100
+
+mesa (7.2+git20081209.a0d5c3cf-0ubuntu4) jaunty; urgency=low
+
+  * debian/rules: Add -D_GNU_SOURCE for lpia & armel (FTBFS).
+
+ -- Timo Aaltonen <tjaalton@ubuntu.com>  Fri, 12 Dec 2008 02:15:40 +0200
+
+mesa (7.2+git20081209.a0d5c3cf-0ubuntu3) jaunty; urgency=low
+
+  * debian/rules (CFLAGS): Avoid recursive reference.
+
+ -- Matthias Klose <doko@ubuntu.com>  Thu, 11 Dec 2008 22:34:43 +0100
+
+mesa (7.2+git20081209.a0d5c3cf-0ubuntu2) jaunty; urgency=low
+
+  * debian/rules: Add -D_BSD_SOURCE to CFLAGS for lpia & armel (FTBFS).
+  * Drop the Xsession.d hook, not needed anymore.
+
+ -- Timo Aaltonen <tjaalton@ubuntu.com>  Thu, 11 Dec 2008 23:20:47 +0200
+
+mesa (7.2+git20081209.a0d5c3cf-0ubuntu1) jaunty; urgency=low
+
+  * Merge from debian-experimental git branch.
+  * 103_fix-crash-in-i830_emit_state.dpatch: deleted, included
+    upstream.
+
+ -- Timo Aaltonen <tjaalton@ubuntu.com>  Tue, 09 Dec 2008 21:54:28 +0200
+
+mesa (7.2-1ubuntu2) intrepid; urgency=low
+
+  * debian/patches/103_fix-crash-in-i830_emit_state.dpatch:
+    - Apply upstream commit to fix a crash in i830_emit_state
+      (LP: #277709)
+
+ -- Chris Coulson <chrisccoulson@googlemail.com>  Tue, 21 Oct 2008 17:55:10 +0100
+
+mesa (7.2-1ubuntu1) intrepid; urgency=low
+
+  * Merge from Debian experimental.
+
+ -- Timo Aaltonen <tepsipakki@ubuntu.com>  Wed, 24 Sep 2008 21:00:38 +0300
+
+mesa (7.2-1) experimental; urgency=low
+
+  [ Brice Goglin ]
+  * Fix grammar and punctuation in glxinfo(1), thanks Sam Hocevar,
+    closes: #498595.
+
+  [ Timo Aaltonen ]
+  * New upstream release.
+  * Refresh patch 04_osmesa_version.diff
+
+  [ Julien Cristau ]
+  * Remove the build-dep on dri2proto, DRI2 support has been removed.
+  * intel: don't warn about TTM init failure.
+
+ -- Julien Cristau <jcristau@debian.org>  Wed, 24 Sep 2008 14:28:21 +0200
+
+mesa (7.1-1ubuntu3) intrepid; urgency=low
+
+  * debian/rules: Build i915 and i965 DRI drivers on lpia. (LP: #270106)
+
+ -- Timo Aaltonen <tepsipakki@ubuntu.com>  Tue, 16 Sep 2008 13:07:02 +0300
+
+mesa (7.1-1ubuntu2) intrepid; urgency=low
+
+  * 102_dont_vblank.patch
+    - Revert the commit which defaults to vblank on intel. It breaks
+      DPMS with compiz, resulting in a hang. (LP: 262605)
+
+ -- Timo Aaltonen <tepsipakki@ubuntu.com>  Fri, 12 Sep 2008 11:25:01 +0300
+
+mesa (7.1-1ubuntu1) intrepid; urgency=low
+
+  * Merge from debian experimental, remaining changes:
+    - debian/control
+      + Change maintainer address to Ubuntu.
+      + Drop lesstif-dev from Build-Depends since it's a universe component
+        that Ubuntu doesn't want in main due to security concerns about it
+        (it's a large codebase without active development - last release >2
+        yrs ago).
+      + Comment out GLw libs since it depends on lesstif-dev.
+      + Add lpia to -dri and -dri-dbg package in.
+      + Add Pre-Depends: dpkg (>= 1.14.12ubuntu3) to ensure dpkg
+        support for lzma.
+    - debian/rules
+      + Unexport LDFLAGS (amd64 FTBFS).
+      + Add Xsession hook to disable ASM optimizations when running on
+        64-but processors that don't support them
+        (LP: 87661, Deb: 484180, fdo: 8724)
+      + use --disable-glw for swx11 targets too.
+      + Build .debs with lzma compression.
+    - debian/patches
+      + Add 101_ubuntu_hidden_glname.patch.
+
+ -- Timo Aaltonen <tepsipakki@ubuntu.com>  Thu, 28 Aug 2008 01:18:35 +0300
+
+mesa (7.1-1) experimental; urgency=low
+
+  * Add parallel build support.
+  * New upstream development release
+    + libGLU now only exports its public interface (closes: #319388)
+  * Some more parallel build updates.
+
+ -- Julien Cristau <jcristau@debian.org>  Wed, 27 Aug 2008 19:52:24 +0200
+
+mesa (7.1~rc3-1ubuntu4) intrepid; urgency=low
+
+  * debian/control: Add Pre-Depends: dpkg (>= 1.14.12ubuntu3) to ensure dpkg
+    support for lzma.
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Sun, 11 May 2008 10:42:54 +0200
+
+mesa (7.1~rc3-1ubuntu3) intrepid; urgency=low
+
+  * Build .debs with lzma compression to reduce libgl1-mesa-dri from 13.2 to
+    2.8 MB.
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Tue, 12 Aug 2008 09:31:01 +0200
+
+mesa (7.1~rc3-1ubuntu2) intrepid; urgency=low
+
+  * 102_fix-fdo-14441.diff: fix tfp on i965. (LP: #245888)
+
+ -- Timo Aaltonen <tepsipakki@ubuntu.com>  Fri, 01 Aug 2008 16:08:01 +0300
+
+mesa (7.1~rc3-1ubuntu1) intrepid; urgency=low
+
+  * merged with debian-experimental
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 15 Jul 2008 15:07:41 +0100
+
+mesa (7.1~rc3-1) experimental; urgency=low
+
+  [ Julien Cristau ]
+  * New upstream release candidate (updated to git commit 4fab47b1).
+  * Build against libdrm >= 2.3.1.
+  * 04_osmesa_version.diff: fix libOSMesa versioning, to revert accidental
+    SONAME bump.
+
+  [ Timo Aaltonen ]
+  * Refresh patches, and drop obsolete 00_create-libdir.patch and
+    01_fix-makefile.patch.
+  * Build-depend on x11proto-dri2-dev.
+  * Drop mesa-swx11-source.
+  * Add dri_interface.h to mesa-common-dev.
+  * Add gl.pc to libgl1-mesa-dev
+  * rules: Replace the old build system with the new autotools-based 
+    system.
+  * Run autoreconf before building the various flavours..
+  * Add automake & autoconf to build-deps.
+  * Use --enable-glx-tls for dri.
+
+ -- Julien Cristau <jcristau@debian.org>  Sun, 13 Jul 2008 19:41:42 +0200
+
+mesa (7.1~rc1-0ubuntu2) intrepid; urgency=low
+
+  * Merge with debian git, fixes FTBFS on sparc/hppa/ia64.
+
+ -- Timo Aaltonen <tepsipakki@ubuntu.com>  Mon, 07 Jul 2008 11:12:26 +0300
+
+mesa (7.1~rc1-0ubuntu1) intrepid; urgency=low
+
+  [ Bryce Harrington ]
+  * Merge from git.debian.org, remaining changes:
+    - Change maintainer address to Ubuntu.
+    - Drop lesstif-dev from Build-Depends since it's a universe component
+      that Ubuntu doesn't want in main due to security concerns about it
+      (it's a large codebase without active development - last release >2
+      yrs ago).
+    - Comment out GLw libs from control since it depends on lesstif-dev.
+    - Add lpia to -dri and -dri-dbg package in debian/control.
+    - Add Xsession hook to disable ASM optimizations when running on
+      64-but processors that don't support them
+      (LP: 87661, Deb: 484180, fdo: 8724)
+    - Add 101_ubuntu_hidden_glname.patch.
+
+  [ Timo Aaltonen ]
+  * Dropped patches
+    102_ubuntu_no_glw.patch:
+    - the new build system handles this better
+    103_dlopen_in_driveropen.diff and 104_fix_driveropen.diff:
+    - upstream
+  * debian/rules: use --disable-glw for swx11 targets too.
+  * Unexport LDFLAGS (amd64 FTBFS).
+
+ -- Timo Aaltonen <tepsipakki@ubuntu.com>  Fri, 04 Jul 2008 13:19:57 +0300
+
+mesa (7.0.3-7) unstable; urgency=low
+
+  * Cherry-pick patch from upstream:
+    Use 3Dnow! x86-64 routines only on processors that support 3Dnow!
+    (closes: #484180).
+  * Also build the x86-specific dri drivers on kfreebsd (closes: #492894).
+
+ -- Julien Cristau <jcristau@debian.org>  Sun, 14 Dec 2008 07:34:58 +0530
+
+mesa (7.0.3-6) unstable; urgency=high
+
+  * Update debian/copyright to the SGI Free Software License B, version 2.0.
+    It now mirrors the free X11 license used by X.Org (closes: #368560).
+    http://www.sgi.com/company_info/newsroom/press_releases/2008/september/opengl.html
+
+ -- Julien Cristau <jcristau@debian.org>  Sat, 20 Sep 2008 16:30:44 +0200
+
+mesa (7.0.3-5) unstable; urgency=low
+
+  * Disable the i915tex driver, it doesn't build against libdrm 2.3.1.
+  * Pull from mesa_7_0_branch (27425708).
+
+ -- Julien Cristau <jcristau@debian.org>  Sat, 12 Jul 2008 18:56:19 +0200
+
+mesa (7.0.3-4) unstable; urgency=low
+
+  * Pull from mesa_7_0_branch (2ac4919d).
+  * Put back our configs/ changes into the .diff.gz since choose-configs
+    needs them before quilt is invoked. Put 04_cleanup-osmesa-configs.patch
+    there as well for #485161.
+
+ -- Brice Goglin <bgoglin@debian.org>  Wed, 18 Jun 2008 20:59:14 +0200
+
+mesa (7.0.3-3ubuntu1) intrepid; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+     - Change maintainer address to Ubuntu.
+       - Drop lesstif-dev from Build-Depends since it's a universe component
+         that Ubuntu doesn't want in main due to security concerns about it
+         (it's a large codebase without active development - last release >2
+         yrs ago).
+       - Comment out GLw libs from control since it depends on lesstif-dev.
+       - Add lpia to -dri and -dri-dbg package in debian/control.
+       - Add lpia to ARCH_X86 in configs/debian-dri-default.
+       - Add 101_ubuntu_hidden_glname.patch
+       - Add 102_ubuntu_no_glw.patch to remove lesstif build depends since
+         its a universe component.
+       - Add 103_dlopen_in_driveropen.diff and 104_fix_driveropen.diff from
+         upstream; "Always call dlopen in DriverOpen".
+         (LP: 189580, fdo: 13541)
+       - Add Xsession hook to disable ASM optimizations when running on
+         64-but processors that don't support them
+         (LP: 87661, Deb: 484180, fdo: 8724)
+
+ -- Bryce Harrington <bryce@ubuntu.com>  Tue, 17 Jun 2008 16:47:35 -0700
+
+mesa (7.0.3-3) unstable; urgency=low
+
+  * Pull from mesa_7_0_branch (718724de).
+    + Fix intel_batchbuffer_space on i965, closes: #455817.
+    + Fix busy error in i915_wait_irq for real now, closes: #467319.
+  * Move our configs/ changes from the .diff.gz into our quilt patches,
+    with 04_cleanup-osmesa-configs.patch renamed into 04_debian-configs.patch,
+    closes: #485161.
+
+ -- Brice Goglin <bgoglin@debian.org>  Tue, 17 Jun 2008 20:00:51 +0200
+
+mesa (7.0.3-2) unstable; urgency=low
+
+  * Pull from mesa_7_0_branch (03447de3).
+  * Set right cliprects for the current draw region on Intel, closes: #467319.
+  * Use BRW_TEXCOORDMODE_CLAMP instead of BRW_TEXCOORDMODE_CLAMP_BORDER
+    to implement GL_CLAMP on i965, closes: #478880.
+  * Fix segment fault with BASE_LEVEL set to 5 for MipMap on i915,
+    closes: #451339.
+  * Disable low impact fallback on r300 by default, closes: #440868.
+
+ -- Brice Goglin <bgoglin@debian.org>  Fri, 13 Jun 2008 06:53:29 +0200
+
+mesa (7.0.3-1ubuntu2) intrepid; urgency=low
+
+  * Add Xsession hook to disable ASM optimizations when running on 
+    64-but processors that don't support them (LP: #87661)
+
+ -- Tormod Volden <debian.tormod@gmail.com>  Thu, 05 Jun 2008 12:41:25 +0200
+
+mesa (7.0.3-1ubuntu1) intrepid; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - Change maintainer address.
+    - Drop lesstif-dev from Build-Depends.
+    - Comment out GLw libs from control.
+    - Add lpia to -dri and -dri-dbg package in debian/control.
+    - Add lpia to ARCH_X86 in configs/debian-dri-default.
+    - Add 101_ubuntu_hidden_glname.patch
+    - Add 102_ubuntu_no_glw.patch
+    - Add 103_dlopen_in_driveropen.diff and 104_fix_driveropen.diff from
+      upstream; "Always call dlopen in DriverOpen". (LP: #189580)
+
+ -- Timo Aaltonen <tepsipakki@ubuntu.com>  Wed, 04 Jun 2008 18:38:43 +0300
+
+mesa (7.0.3-1) unstable; urgency=low
+
+  * New upstream release.
+  * Only call ProgramStringNotify if program parsing succeeded,
+    closes: #473551.
+
+ -- Brice Goglin <bgoglin@debian.org>  Fri, 11 Apr 2008 08:42:37 +0200
+
+mesa (7.0.3~rc2-2) unstable; urgency=low
+
+  * Pull from mesa_7_0_branch (1e83d70b).
+  * Fixes regression in the i965 dri driver (closes: #470984, #470084)
+  * Update 02_use-ieee-fp-on-s390-and-m68k.patch.
+  * Change libgl1-mesa-swx11-i686's pre-dependency on libgl1-mesa-swx11 to a
+    regular versioned dependency, and add ${shlibs:Depends}.
+
+ -- Julien Cristau <jcristau@debian.org>  Mon, 31 Mar 2008 16:47:31 +0200
+
+mesa (7.0.3~rc2-1ubuntu3) hardy; urgency=low
+
+  * debian/patches/107_fix_-ve_rhw_regression.patch: Fixes regression
+    introduced upstream where a -ve rhw workaround is being applied only
+    for IGD systems, when it should be applied only for *non*-IGD systems.
+    This resulted in rendering issues in 3D games and drawing programs.
+    (LP: #199823, #206287)
+
+ -- Bryce Harrington <bryce@ubuntu.com>  Fri, 04 Apr 2008 19:46:40 -0700
+
+mesa (7.0.3~rc2-1ubuntu2) hardy; urgency=low
+
+  [ Laurent Bigonville ]
+  * debian/patches/105_vblank_fix.patch: Fix "drmWaitVBlank returned -1" error
+    (LP: #186764)
+
+  [ Timo Aaltonen ]
+  * Add 106_i965_wine_fix.diff from upstream, "Only call
+    ProgramStringNotify if program parsing succeeded". (LP: #178292)
+
+ -- Timo Aaltonen <tepsipakki@ubuntu.com>  Wed, 12 Mar 2008 12:33:41 +0200
+
+mesa (7.0.3~rc2-1ubuntu1) hardy; urgency=low
+
+  * Merge from debian unstable (LP: #189167), remaining changes:
+    - Change maintainer address.
+    - Drop lesstif-dev from Build-Depends.
+    - Comment out GLw libs from control.
+    - Add lpia to -dri and -dri-dbg package in debian/control.
+    - Add lpia to ARCH_X86 in configs/debian-dri-default.
+    - Add 101_ubuntu_hidden_glname.patch
+    - Add 102_ubuntu_no_glw.patch
+  * Drop patch 103_fix_rv410se.diff, applied upstream.
+  * Add 103_dlopen_in_driveropen.diff and 104_fix_driveropen.diff from
+    upstream; "Always call dlopen in DriverOpen". (LP: #189580)
+ 
+ -- Timo Aaltonen <tepsipakki@ubuntu.com>  Tue, 26 Feb 2008 13:07:45 +0200
+
+mesa (7.0.3~rc2-1) unstable; urgency=low
+
+  * New upstream release candidate.
+    + enable user-defined clip planes for R300 (closes: #408679)
+    + 03_optional-progs-and-install.patch: partly applied upstream, fixed up
+  * Stop building with -O0 on hppa. Bug #451047 should be fixed in recent gcc
+    versions.
+
+ -- Julien Cristau <jcristau@debian.org>  Sun, 24 Feb 2008 10:22:54 +0100
+
+mesa (7.0.2-4ubuntu2) hardy; urgency=low
+
+  * 103_fix_rv410se.diff:
+    - patch from upstream; "Fix rendering on x700 SE chips."
+      (LP: #151974)
+
+ -- Timo Aaltonen <tepsipakki@ubuntu.com>  Wed, 30 Jan 2008 13:18:23 +0200
+
+mesa (7.0.2-4ubuntu1) hardy; urgency=low
+
+  * Merge from debian unstable (LP: #151974), remaining changes:
+    - Change maintainer address.
+    - Drop lesstif-dev from Build-Depends.
+    - Comment out GLw libs from control.
+    - Add lpia to -dri and -dri-dbg package in debian/control.
+    - Add lpia to ARCH_X86 in configs/debian-dri-default.
+    - Add 101_ubuntu_hidden_glname.patch
+    - Add 102_ubuntu_no_glw.patch
+
+ -- Timo Aaltonen <tepsipakki@ubuntu.com>  Tue, 29 Jan 2008 12:09:30 +0200
+
+mesa (7.0.2-4) unstable; urgency=low
+
+  * Update to mesa_7_0_branch head (commit 48ae5cf0).
+  * Add Vcs-Git, Vcs-Browser and Homepage fields in debian/control.
+
+ -- Julien Cristau <jcristau@debian.org>  Thu, 17 Jan 2008 22:23:06 +0100
+
+mesa (7.0.2-3ubuntu1) hardy; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - Change maintainer address.
+    - Drop lesstif-dev from Build-Depends.
+    - Comment out GLw libs from control.
+    - Add lpia to -dri and -dri-dbg package in debian/control.
+    - Add lpia to ARCH_X86 in configs/debian-dri-default.
+    - Add 101_ubuntu_hidden_glname.patch
+    - Add 102_ubuntu_no_glw.patch
+  * debian/control: Do not build-depend on gcc-3.4 anymore.
+  * Drop 110_ubuntu_use_gcc-3.4_for_i965.patch
+
+ -- Timo Aaltonen <tepsipakki@ubuntu.com>  Sat, 05 Jan 2008 00:45:31 +0200
+
+mesa (7.0.2-3) unstable; urgency=low
+
+  * Update to mesa_7_0_branch head (commit 0107acde).
+  * Bump Standards-Version to 3.7.3.
+  * Move libgl1-mesa-swx11-dbg, mesa-common-dev and libosmesa6-dev to section
+    libdevel.
+  * libgl1-mesa-swx11 conflicts with libgl1-mesa-glx.  Move it and
+    libgl1-mesa-swx11-dev to priority extra.
+  * Fix typo in mesa-common-dev's long description.
+
+ -- Julien Cristau <jcristau@debian.org>  Tue, 18 Dec 2007 19:13:18 +0100
+
+mesa (7.0.2-2ubuntu1) hardy; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - Change maintainer address.
+    - Add gcc-3.4 as a build dependency for amd64, i386 and lpia.
+    - Drop lesstif-dev from Build-Depends.
+    - Comment out GLw libs from control.
+    - Add lpia to -dri and -dri-dbg package in debian/control.
+    - Add lpia to ARCH_X86 in configs/debian-dri-default.
+    - Add 101_ubuntu_hidden_glname.patch
+    - Add 102_ubuntu_no_glw.patch
+    - Add 110_ubuntu_use_gcc-3.4_for_i965.patch
+  
+ -- Timo Aaltonen <tepsipakki@ubuntu.com>  Fri, 16 Nov 2007 09:00:24 +0200
+
+mesa (7.0.2-2) unstable; urgency=low
+
+  [ Julien Cristau ]
+  * Don't set -fno-strict-aliasing in configs/debian-default.  It is set
+    upstream now.
+  * Workaround gcc ICE on hppa: build libOSMesa with -O0 (see bug#451047).
+  * Add build-dep on libxext-dev.  Thanks, Timo Aaltonen!
+
+ -- Brice Goglin <bgoglin@debian.org>  Tue, 13 Nov 2007 21:43:40 +0100
+
+mesa (7.0.2-1ubuntu2) hardy; urgency=low
+
+  * Add libxext-dev to Build-Depends.
+
+ -- Timo Aaltonen <tepsipakki@ubuntu.com>  Mon, 12 Nov 2007 14:50:38 +0200
+
+mesa (7.0.2-1ubuntu1) hardy; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - Change maintainer address.
+    - Add gcc-3.4 as a build dependency for amd64, i386 and lpia.
+    - Drop lesstif-dev from Build-Depends.
+    - Comment out GLw libs from control.
+    - Add lpia to -dri and -dri-dbg package in debian/control.
+    - Add lpia to ARCH_X86 in configs/debian-dri-default.
+    - Add 101_ubuntu_hidden_glname.patch
+    - Add 102_ubuntu_no_glw.patch
+    - Add 110_ubuntu_use_gcc-3.4_for_i965.patch
+  
+ -- Timo Aaltonen <tepsipakki@ubuntu.com>  Mon, 12 Nov 2007 12:55:33 +0200
+
+mesa (7.0.2-1) unstable; urgency=low
+
+  * New upstream release.
+    + Fix Blender crash in triangle_twoside(), closes: #439668, #446315.
+    + Fix crash in _generic_read_RGBA_span_RGB565_MMX(), closes: #445313.
+    + Fix the new __gluInvertMatrix() function, closes: #440137 ,#441071.
+    + Refresh 03_optional-progs-and-install.patch since libGLU is not
+      built when building progs/xdemos.
+    + Refresh 04_cleanup-osmesa-configs.patch.
+    + Drop 05_static-nonpic.patch,, applied upstream.
+    + Remove DESTDIR from INSTALL_DIR in configs/debian-default since
+      the upstream Makefiles now support DESTDIR.
+  * Add myself to Uploaders.
+
+ -- Brice Goglin <bgoglin@debian.org>  Sun, 11 Nov 2007 11:53:26 +0100
+
+mesa (7.0.1-2) unstable; urgency=low
+
+  * Update to latest git (from mesa_7_0_branch)
+    + adds support for some new intel chipsets (i915 and i915_tex dri drivers)
+      (closes: #437333)
+    + broken inline asm in dri drivers fixed (closes: #423739)
+
+ -- Julien Cristau <jcristau@debian.org>  Tue, 28 Aug 2007 12:11:30 +0200
+
+mesa (7.0.1-1ubuntu3) gutsy; urgency=low
+
+  * Add lpia to -dri and -dri-dbg package in debian/control.
+  * Add lpa top ARCH_X86 in configs/debian-dri-default.
+
+ -- Tollef Fog Heen <tfheen@ubuntu.com>  Fri, 12 Oct 2007 14:12:21 +0200
+
+mesa (7.0.1-1ubuntu2) gutsy; urgency=low
+
+  * Add fix-965-vblank.patch, pulled from upstream
+    b3fc9a1585f390274fa26b3e3f80bc6d16f4388a which fixes missed vbl
+    interrupts on Intel i965 hardware.
+
+ -- Kyle McMartin <kyle@ubuntu.com>  Wed,  3 Oct 2007 11:11:22 -0400
+
+mesa (7.0.1-1ubuntu1) gutsy; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - Change maintainer to Ubuntu
+    - Add gcc-3.4 as a build dependency for lpia.
+    - Add support for Intel 945GME, G33, Q33, Q35
+      + 200_945gme.patch, upstream a74eec5af5397b612d60dd4b0d81666027f19bb0,
+        ad6351a994fd14af9d07da4f06837a7f9b9d0de4
+      + 201_g33.patch, upstream 8331d9d7aa7cde7126d38d4e1eb5fe8a168077f3
+    - Comment out GLw libs from control file
+    - Dropped Ubuntu addition of conflicts of libgl1-mesa-glx against
+      libgl1-mesa-swx11, since Debian has hadded a shlibs file for
+      libgl1-mesa-swx11-i686
+
+ -- Bryce Harrington <bryce@ubuntu.com>  Wed, 15 Aug 2007 15:08:32 -0700
+
+mesa (7.0.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * Upload to unstable.
+
+ -- Julien Cristau <jcristau@debian.org>  Thu, 09 Aug 2007 11:56:16 +0200
+
+mesa (7.0.1~rc2-1) experimental; urgency=low
+
+  [ David Nusinow ]
+  * New upstream release candidate
+  * Bite the bullet and add myself to uploaders
+
+  [ Julien Cristau ]
+  * Modify the short descriptions of various packages so they fit in .changes
+    files without being cut off.  Thanks, Marc 'HE' Brockschmidt!
+  * Add a shlibs file for libgl1-mesa-swx11-i686.
+
+ -- Julien Cristau <jcristau@debian.org>  Fri, 27 Jul 2007 20:17:48 +0200
+
+mesa (7.0.0-0ubuntu3) gutsy; urgency=low
+
+  * Add gcc-3.4 as a build dependency for lpia.
+
+ -- Matthias Klose <doko@ubuntu.com>  Tue, 07 Aug 2007 17:15:37 +0000
+
+mesa (7.0.0-0ubuntu2) gutsy; urgency=low
+
+  [ Kyle McMartin ]
+  * Add support for Intel 945GME, G33, Q33, Q35
+    - 200_945gme.patch, upstream a74eec5af5397b612d60dd4b0d81666027f19bb0,
+      ad6351a994fd14af9d07da4f06837a7f9b9d0de4
+    - 201_g33.patch, upstream 8331d9d7aa7cde7126d38d4e1eb5fe8a168077f3
+
+ --  Kyle McMartin <kyle@ubuntu.com>  Tue, 03 Jul 2007 19:32:39 +0000
+
+mesa (7.0.0-0ubuntu1) gutsy; urgency=low
+
+  [ Bryce Harrington ]
+  * New upstream release
+    - Adds OpenGL 2.0 and 2.1 API support.
+    - Fixed a few fog-related bugs.
+    - Fixed broken GLSL mix() function.
+    - Fixed broken GLSL exp() functions.
+    - Fixed GLSL mod4(vec4, vec4) bug.
+    - Implemented GLSL asin(), acos(), atan() functions.
+    - Fixed an R300 driver bug that caused Xorg composite manager to
+      crash
+    - Fixed R300 vertex program/matrix bug (fdo# 10848)
+    - GLSL dFdx() and dFdy() work for fragment program inputs now
+      (texcoords)
+    - Fixed potential crash when specifying an invalid texture unit as a
+      sampler
+    - Fixed incorrect GLX protocol request for glXDestroyPBuffer()
+      (fdo# 10983)
+    - ARB vp state.light[n].half value was incorrect (fdo# 10987)
+    - Fixed a positional light source bug (fdo# 11009)
+    - Fixed point size attenuation problem (fdo# 11042)
+    - Fixed problem where glPopAttrib didn't restore texture object's
+      LOD bias (fdo# 11049)
+    - Fixed a TLS / TEXTREL problem (fdo# 7459)
+    - Some texture code consolidation and simplifiction
+    - R300 driver clean-ups.
+
+  [ Sarah Hobbs ]
+  * Added a conflicts of libgl1-mesa-glx against libgl1-mesa-swx11, and vice
+    versa
+
+ -- Sarah Hobbs <hobbsee@ubuntu.com>  Tue, 26 Jun 2007 15:32:00 +1000
+
+mesa (6.5.3-1ubuntu1) gutsy; urgency=low
+
+  * Update Maintainer for Ubuntu
+
+  [ Kyle McMartin ]
+  * Merge with Debian experimental:
+    - Remove lesstif-dev from Build-Depends (Timo Aaltonen)
+    - Comment out GLw libs from control file
+    - Add 102_ubuntu_no_glw.patch to remove lesstif build depends
+    - Add libxext-dev to Build-Depends (Paul Sladen)
+    - Add gcc-3.4 [i386 amd64] to Build-Depends (Ben Collins)
+    - Add 110_ubuntu_use_gcc-3.4_for_i965.patch (Timo Aaltonen)
+    - Add 101_ubuntu_hidden_glname.patch
+    - Add 112_fedora-hush-synthetic-visual-warning.patch (Adam Jackson)
+
+  * Dropped patches:
+    - 103_ubuntu_fd.org-9686-fog.patch merged upstream
+    - 104_r300_call_radeonsetcliprects.patch merged upstream
+    - 105_radeon_call_radeonsetcliprects.patch merged upstream
+    - 106_r200_call_radeonsetcliprects.patch merged upstream
+    - 107_r200_simplify_r200setcliprects.patch merged upstream
+    - 111_unichrome_remove_xdrawoffset.patch merged upstream
+
+ -- Kyle McMartin <kyle@ubuntu.com>  Fri, 25 May 2007 16:43:31 +0000
+
+mesa (6.5.3-1) experimental; urgency=low
+
+  [ David Nusinow ]
+  * New upstream release
+
+  [ Julien Cristau ]
+  * Cherry-pick commit 65faf023679988f93da82b4c7ebdc689f2094459 by Michel
+    Dänzer to fix r300 crash.
+
+ -- Julien Cristau <jcristau@debian.org>  Mon, 21 May 2007 11:34:51 +0200
+
+mesa (6.5.3~rc3-1) experimental; urgency=low
+
+  [ Brice Goglin ]
+  * Split out libGLw libs and headers from libgl1-mesa-swx11 and ship both
+    static and shared libraries, creating libglw1-mesa and libglw1-mesa-dev
+    (closes: #374904).
+
+  [ Julien Cristau ]
+  * New upstream release candidate.
+    + 06_fix_texture_data_corruption.patch,
+      07_call_radeonSetCliprects_from_radeonMakeCurrent.patch,
+      08_r300_update_window_state_when_bound_but_stamp_changed.patch,
+      09_i915_always_enable_pixel_fog.patch: remove, included upstream.
+    + 01_fix-makefile.patch, 02_use-ieee-fp-on-s390-and-m68k.patch: refresh.
+  * Add build-dependencies on libxdamage-dev and libxfixes-dev.
+  * Resync debian/scripts/install-source.sh.
+  * Build mesa-swx11-source only in binary-indep.
+  * Update from upstream git (commit
+    dee1b0d5bbe91f83854813cbbcd3090327bcb5c2).
+
+ -- Julien Cristau <jcristau@debian.org>  Wed, 25 Apr 2007 10:36:50 +0200
+
+mesa (6.5.2-7) unstable; urgency=low
+
+  [ Brice Goglin ]
+  * libgl1-mesa-dev does not need to depend on libgl1-mesa-dri,
+    libgl1-mesa-glx is enough (since their split in 6.4.1-0.1);
+    closes: #432081.  Thanks, Samuel Thibault!
+
+  [ Julien Cristau ]
+  * libgl1-mesa-dev Depends on libgl1-mesa-glx (>= ${source:Upstream-Version})
+    instead of >= ${Source-Version}.  This way it's still installable on
+    architectures where mesa isn't built yet when a minor revision is
+    uploaded.
+
+ -- Julien Cristau <jcristau@debian.org>  Wed, 11 Jul 2007 05:50:45 +0200
+
+mesa (6.5.2-6) unstable; urgency=low
+
+  * libgl1-mesa-swx11 needs to depend on libosmesa6 (>= 6.5.2-1) because
+    it used to contain libOSMesa.so.6.  This means that programs linked
+    against this lib got a dependency on -swx11 which was broken since
+    6.5.2-1.
+  * Fix build on hurd-i386 (build libgl1-mesa-glx without dri support and
+    don't build the dri drivers); closes: #420403.  Thanks, Samuel Thibault!
+
+ -- Julien Cristau <jcristau@debian.org>  Thu, 05 Jul 2007 00:56:35 +0200
+
+mesa (6.5.2-5) unstable; urgency=low
+
+  [ Brice Goglin ]
+  * Add 07_call_radeonSetCliprects_from_radeonMakeCurrent.patch
+    (closes: #420164). Thanks to Christian Ohm.
+  * Add 08_r300_update_window_state_when_bound_but_stamp_changed.patch
+  * Add 09_i915_always_enable_pixel_fog.patch
+
+ -- Julien Cristau <jcristau@debian.org>  Fri, 18 May 2007 13:36:25 +0200
+
+mesa (6.5.2-4) unstable; urgency=low
+
+  [ Julien Cristau ]
+  * debian/control: libgl1-mesa-dri now suggests libglide3, with an
+    explanation in the description (closes: #387339).
+  * Upload to unstable.
+
+  [ Brice Goglin ]
+  * Add 06_fix_texture_data_corruption.patch (closes: #412346).
+
+ -- Julien Cristau <jcristau@debian.org>  Fri, 20 Apr 2007 05:57:35 +0200
+
+mesa (6.5.2-3) experimental; urgency=low
+
+  * Set LIB_DIR and EXTRA_LIB_PATH in configs/debian-default to override
+    settings in configs/linux-x86-64. This fixes a FTBFS on amd64, thanks to
+    Marc 'HE' Brockschmidt for the report (closes: #410118).
+
+ -- Julien Cristau <jcristau@debian.org>  Wed,  7 Feb 2007 23:04:28 +0100
+
+mesa (6.5.2-2) experimental; urgency=low
+
+  * Sync Section/Priority for all packages with the override.
+  * Build the arch:all debs in binary-indep, and use the debhelper -s option
+    for commands in binary-arch, to fix FTBFS on non-i386 archs, thanks to
+    Marc 'HE' Brockschmidt (closes: #409638).
+  * Add myself to Uploaders.
+
+ -- Julien Cristau <jcristau@debian.org>  Sun,  4 Feb 2007 21:14:02 +0100
+
+mesa (6.5.2-1) experimental; urgency=low
+
+  [ Thierry Reding ]
+  * New upstream release.
+  * Set the Debian X Strike Force as maintainer.
+  * Add myself to uploaders.
+  * Build the i915tex DRI module on the i386 and amd64 architectures.
+  * Add patch 04_cleanup-osmesa-configs that makes the OSMesa configurations
+    behave as expected.
+  * Add patch 05_static-nonpic to build static libraries without -fPIC.
+  * Make debugging symbol packages depend on the corresponding binary package
+    and put them into the libdevel section.
+  * Bump shlibs file for the libosmesa6 package to account for added symbols.
+    Thanks Julien Cristau.
+  * Build the DRI modules with the default optimization flags. Thanks Julien
+    Cristau.
+  * mesa-common-dev now ships the GLX header files so it needs to replace
+    libgl1-mesa-swx11-dev and libgl1-mesa-dev. Thanks Julien Cristau.
+  * All OSMesa libraries were moved to the libosmesa6 and libosmesa6-dev
+    package, so have them replace libgl1-mesa-swx11, libgl1-mesa-swx11-dev and
+    mesa-common-dev respectively. Thanks Julien Cristau.
+
+  [ Julien Cristau ]
+  * Drop obsolete depends on xlibs.
+
+ -- Thierry Reding <thierry@gilfi.de>  Thu, 11 Jan 2007 15:06:52 +0100
+
+mesa (6.5.2~rc3-0.1) experimental; urgency=low
+
+  * Non-maintainer upload.
+  * Update to latest upstream release candidate.
+
+ -- Thierry Reding <thierry@gilfi.de>  Fri,  1 Dec 2006 01:06:28 +0100
+
+mesa (6.5.2~rc2-0.1) experimental; urgency=low
+
+  * Non-maintainer upload.
+  * New upstream release candidate:
+    + Refresh 02_use-ieee-fp-on-s390-and-m68k.patch.
+  * Add manual pages for the glxdemo, glxgears, glxheads and glxinfo
+    utilities (Closes: #385463).
+
+ -- Thierry Reding <thierry@gilfi.de>  Wed, 22 Nov 2006 20:49:06 +0100
+
+mesa (6.5.2~rc1-0.1) experimental; urgency=low
+
+  * Non-maintainer upload.
+  * New upstream release candidate.
+  * Update patches:
+    + Drop hunk #2 of 01_fix-makefile.patch, applied upstream.
+    + Drop 03_handle-sync-and-dont-unlock-display.patch, applied upstream.
+  * Bump build-dependency on libdrm-dev (>= 2.2.0).
+  * Use the new upstream minstall utility to install files and directories.
+    Using /usr/bin/install would result in a symlink's target being copied
+    instead of the symlink.
+
+ -- Thierry Reding <thierry@gilfi.de>  Sat, 18 Nov 2006 22:23:04 +0100
+
+mesa (6.5.1-0.6) experimental; urgency=low
+
+  * Non-maintainer upload.
+  * Rewrote the debian/rules file to make it easier to understand.
+  * Provide i686 optimized versions in libgl1-mesa-swx11-i686 instead of in
+    libgl1-mesa-swx11.
+  * Statically link libOSMesa with the software rasterization code from libGL
+    so that it works independently of the installed libGL. (Closes: #387706)
+  * Make libosmesa6-dev depend on mesa-common-dev because it only needs the
+    gl.h header file and no libGL anymore.
+  * Move glx*.h headers from libgl1-mesa(-swx11)-dev into mesa-common-dev
+    because both packages provide identical files.
+  * Add debugging symbol packages for libgl1-mesa-swx11, libgl1-mesa-glx and
+    libgl1-mesa-dri.
+  * Repack the contents of the three Mesa tarballs (MesaDemos, MesaGLUT and
+    MesaLib) as the original source tarball. (Closes: #392715)
+  * Make mesa-common-dev depend on libx11-dev.
+  * Provide a new package: mesa-utils. These utilities are shipped in the
+    MesaDemos package so mesa is the right package to provide them.
+
+ -- Thierry Reding <thierry@gilfi.de>  Sat, 18 Nov 2006 18:50:07 +0100
+
+mesa (6.5.1-0.5) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Build with -fno-strict-aliasing to fix misbuild of i965_dri.so
+    (closes: #394311).  Thanks to Michel Dänzer for the fix, and to Ryan
+    Richter for the report and testing.
+
+ -- Julien Cristau <julien.cristau@ens-lyon.org>  Wed,  3 Jan 2007 13:48:20 +0100
+
+mesa (6.5.1-0.4) unstable; urgency=medium
+
+  * Non-maintainer upload (and brown paper bag release).
+  * _Depend_ on libx11-dev from libgl1-mesa-dev; revert previous change.
+    Fixes FTBFS in other packages. (Really Closes: #396498)
+
+ -- Steinar H. Gunderson <sesse@debian.org>  Sat, 11 Nov 2006 13:55:20 +0100
+
+mesa (6.5.1-0.3) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Build-depend on libx11-dev; fixes FTBFS. (Closes: #396498)
+
+ -- Steinar H. Gunderson <sesse@debian.org>  Wed,  8 Nov 2006 20:58:40 +0100
+
+mesa (6.5.1-0.2) unstable; urgency=low
+
+  * Non-maintainer upload
+  * Disable generation of SSE instructions (closes: #390560)
+  * Remove duplicate and unused build configurations
+  * Remove extra source files left from CVS snapshots (closes: #389283)
+  * Enable i965 DRI driver on i386 and amd64. Thanks to Ryan Richter
+    for the patch. (closes: #392030)
+  * Enable Unichrome DRI driver on amd64 (closes: #391900)
+  * Enable FFB DRI driver on sparc, not i386 (closes: #388025)
+  * Consistently compile C sources as C99 (closes: #373623)
+  * Fix X display locking error in GLX. Thanks to Josh Triplett for
+    the patch. (closes: #391681)
+
+ -- Ben Hutchings <ben@decadent.org.uk>  Fri, 13 Oct 2006 02:25:52 +0100
+
+mesa (6.5.1-0.1) unstable; urgency=low
+
+  * New upstream version
+  * Build-dep on x11proto-gl-dev >= 1.4.8
+  * Stuff not in the upstream tarballs
+    + os2 glut stuff
+    + docs/gears.png
+  * Bump libdrm-dev build-dep to >= 2.0.2
+  * Add libdrm cflags to the debian-dri config. This allows the build system
+    to find drm.h
+  * Make sure that libGl looks for the dri drivers in the proper location. Do
+    this by setting the appropriate variables in the debian config
+  * Re-add s390 and m68k to the USE_IEEE test in src/mesa/main/imports.h. This
+    package seriously needs to store patches somewhere that are easy to find
+    and re-apply.
+  * Add patch from Cyril Brulebois to allow package to build on HURD, which
+    lacks DRI and directfb. This includes not using lib-directfb in the
+    build-depends for hurd-i386. It also creates a new debian config,
+    debian-indirect, which is used when building for HURD. This config is
+    invoked in the debian-dri config on hurd-i386. Thanks to Cyril Brulebois
+    for the patch, Michael Banck, Michel Dänzer, and Samuel Thibault for
+    input on an appropriate fix. (closes: #358065)
+
+ -- David Nusinow <dnusinow@debian.org>  Mon, 25 Sep 2006 21:21:47 -0400
+
+mesa (6.5.0.cvs.20060524-1.1) unstable; urgency=medium
+
+  * 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
+
+  * NMU
+  * Add versioned conflict between libgl1-mesa-dri and xlibmesa-dri so that
+    the xlibmesa-dri transitional upgrade package works
+
+ -- David Nusinow <dnusinow@debian.org>  Mon,  6 Mar 2006 21:46:18 -0500
+
+mesa (6.4.1-0.3) unstable; urgency=low
+
+  * NMU
+  * Add s390 and m68k to the USE_IEEE test in src/mesa/main/imports.h.
+    (closes: #349437)
+
+ -- David Nusinow <dnusinow@debian.org>  Sat, 11 Feb 2006 17:59:26 -0500
+
+mesa (6.4.1-0.2) unstable; urgency=low
+
+  * NMU
+  * Re-add dh_installdirs call to binary-indep target so that we get
+    arch-specific dirs for the mesa-swx11-source package
+  * Remove makedepend from build-depends. Now we'll just build-dep on xutils
+    to get the app, which will translate over to our own xorg 7.0 plans.
+
+ -- David Nusinow <dnusinow@debian.org>  Tue, 31 Jan 2006 19:21:12 -0500
+
+mesa (6.4.1-0.1) unstable; urgency=low
+
+  [ Marcelo E. Magallon <mmagallo@debian.org> ]
+  * debian/control: build-depend on xutils
+  * 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. (closes: #336565)
+  * 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.
+
+  [ David Nusinow <dnusinow@debian.org> ]
+  * New upstream version (6.4.1) (closes: #232665)
+  * Merge changes from Ubuntu version 6.4.1-0ubuntu1.
+    (closes: #341479, #340168, #334742)
+    + Add new files required by xorg-server GL build to mesa-swrast-source.
+  * NMU to begin getting Xorg 7.0 in to Debian
+  * Change libgl1-mesa-swrast Depends on libx11-6-dev to libx11-dev.
+  * Change libgl1-mesa-swrast to be named libgl1-mesa-swx11
+  * Change libgl1-mesa to be named libgl1-mesa-glx
+  * mesa-swrast-src.install stop looking for the swx11 dir and look for swrast
+
+ -- David Nusinow <dnusinow@debian.org>  Sat, 21 Jan 2006 21:43:37 -0500
+
+mesa (6.3.2-2.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Adjust Build-Depends:
+    + xlibs transition (Closes: #347129).
+    + xutils, xlibmesa-gl-dev (Closes: #326466).
+  * mesag-dev: Depends: libx11-dev (Closes: #347205).
+
+ -- Christoph Berg <myon@debian.org>  Fri, 20 Jan 2006 20:45:43 +0100
+
+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
--- mesa-7.6.0~git20090817.7c422387.orig/debian/libglw1-mesa.shlibs
+++ mesa-7.6.0~git20090817.7c422387/debian/libglw1-mesa.shlibs
@@ -0,0 +1 @@
+libGLw 1 libglw1-mesa | libglw1
--- mesa-7.6.0~git20090817.7c422387.orig/debian/glxdemo.1
+++ mesa-7.6.0~git20090817.7c422387/debian/glxdemo.1
@@ -0,0 +1,15 @@
+.TH glxdemo 1 "2006-11-29"
+.SH NAME
+glxdemo \- a demonstration of the GLX functions
+.SH SYNOPSIS
+.B glxdemo
+.SH DESCRIPTION
+The \fIglxdemo\fP program shows how to use the GLX functions in order to
+create an OpenGL program running on top of an X server. This program is most
+useful when studied in its source code form.
+.SH AUTHOR
+glxdemo was written by Brian Paul <brian.paul@tungstengraphics.com>.
+.PP
+This manual page was written by Thierry Reding <thierry@gilfi.de>, for the
+Debian project (but may be used by others).
+
--- mesa-7.6.0~git20090817.7c422387.orig/debian/libgl1-mesa-glx.install
+++ mesa-7.6.0~git20090817.7c422387/debian/libgl1-mesa-glx.install
@@ -0,0 +1 @@
+usr/lib/glx/libGL.so.* usr/lib
--- mesa-7.6.0~git20090817.7c422387.orig/debian/libglu1-mesa.install
+++ mesa-7.6.0~git20090817.7c422387/debian/libglu1-mesa.install
@@ -0,0 +1 @@
+usr/lib/libGLU.so.*
--- mesa-7.6.0~git20090817.7c422387.orig/debian/control
+++ mesa-7.6.0~git20090817.7c422387/debian/control
@@ -0,0 +1,356 @@
+Source: mesa
+Section: graphics
+Priority: optional
+Maintainer: Ubuntu X-SWAT <ubuntu-x@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
+Uploaders: Thierry Reding <thierry@gilfi.de>, Julien Cristau <jcristau@debian.org>, David Nusinow <dnusinow@debian.org>, Brice Goglin <bgoglin@debian.org>
+Standards-Version: 3.7.3
+Build-Depends: debhelper (>= 5), quilt (>= 0.40), pkg-config,
+ libdrm-dev (>= 2.4.3) [!hurd-i386], libx11-dev, xutils-dev,
+ x11proto-gl-dev (>= 1.4.8), libxxf86vm-dev,
+ libexpat1-dev, dpkg-dev (>= 1.13.19), libxfixes-dev,
+ libxdamage-dev, libxext-dev, autoconf, automake, x11proto-dri2-dev (>= 1.99.3),
+ linux-libc-dev (>= 2.6.29) [!hurd-i386 !kfreebsd-amd64 !kfreebsd-i386]
+Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/mesa
+Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/mesa.git
+Homepage: http://mesa3d.sourceforge.net/
+
+Package: libgl1-mesa-swx11
+Section: libs
+Priority: extra
+Architecture: any
+Depends: ${shlibs:Depends}, libosmesa6 (>= 6.5.2-1)
+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
+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-glx.
+ .
+ On Linux, this library is also known as libGL or libGL.so.1.
+
+Package: libgl1-mesa-swx11-dbg
+Section: debug
+Priority: extra
+Architecture: any
+Depends: libgl1-mesa-swx11 (= ${binary:Version})
+Conflicts: libgl1-mesa-swrast-dbg
+Provides: libgl1-mesa-swrast-dbg
+Replaces: libgl1-mesa-swrast-dbg
+Description: A free implementation of the OpenGL API -- debugging symbols
+ 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-glx.
+ .
+ On Linux, this library is also known as libGL or libGL.so.1.
+ .
+ This package contains debugging symbols for the software rasterization GL
+ library.
+
+Package: libgl1-mesa-swx11-i686
+Section: libs
+Priority: extra
+Architecture: i386
+Depends: libgl1-mesa-swx11 (= ${binary:Version}), ${shlibs:Depends}
+Description: Mesa OpenGL runtime [i686 optimized]
+ 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-glx.
+ .
+ On Linux, this library is also known as libGL or libGL.so.1.
+ .
+ This set of libraries is optimized for i686 machines and will only be used if
+ you are running a 2.6 kernel on an i686 class CPU. This includes Pentium Pro,
+ Pentium II/II/IV, Celeron CPU's and similar class CPU's (including clones
+ such as AMD Athlon/Opteron, VIA C3 Nehemiah, but not VIA C3 Ezla).
+
+Package: libgl1-mesa-swx11-dev
+Section: libdevel
+Priority: extra
+Architecture: any
+Depends: libgl1-mesa-swx11 (= ${binary:Version}), libc6-dev, libx11-dev, libxext6, mesa-common-dev (= ${binary:Version})
+Provides: libgl-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
+Description: A free implementation of the OpenGL API -- development 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-swx11 package.
+ .
+ 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-glx
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}
+Recommends: libgl1-mesa-dri (>= 7.2)
+Conflicts: libgl1, libgl1-mesa-dri (<< 6.4.0)
+Replaces: libgl1, libgl1-mesa-dri (<< 6.4.0)
+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
+ 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-swx11 package.
+
+Package: libgl1-mesa-glx-dbg
+Section: debug
+Priority: extra
+Architecture: any
+Depends: libgl1-mesa-glx (= ${binary:Version})
+Description: Debugging symbols for the Mesa 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-swx11 package.
+ .
+ This package contains debugging symbols for the GL library with GLX and DRI
+ capabilities.
+
+#Package: libgl1-mesa-glx-i686
+#Section: libs
+#Priority: extra
+#Architecture: i386
+#Pre-Depends: libgl1-mesa-glx
+#Description: A free implementation of the OpenGL API -- GLX runtime [i686 optimized]
+# 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-swx11 package.
+# .
+# This set of libraries is optimized for i686 machines and will only be used if
+# you are running a 2.6 kernel on an i686 class CPU. This includes Pentium Pro,
+# Pentium II/II/IV, Celeron CPU's and similar class CPU's (including clones
+# such as AMD Athlon/Opteron, VIA C3 Nehemiah, but not VIA C3 Ezla).
+
+Package: libgl1-mesa-dri
+Section: libs
+Priority: optional
+Architecture: any
+Depends: ${shlibs:Depends}
+Suggests: libglide3
+Conflicts: xlibmesa-dri (<< 1:7.0.0)
+Replaces: xlibmesa-dri (<< 1:7.0.0)
+Breaks: xserver-xorg-core (<< 2:1.5), libgl1-mesa-glx (<< 7.2)
+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-swx11 package.
+ .
+ The tdfx DRI module needs libglide3 to enable direct rendering.
+
+Package: libgl1-mesa-dri-dbg
+Section: debug
+Priority: extra
+Architecture: any
+Depends: libgl1-mesa-dri (= ${binary:Version})
+Description: Debugging symbols for the Mesa 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-swx11 package.
+ .
+ This package contains debugging symbols for the DRI modules.
+
+#Package: libgl1-mesa-dri-i686
+#Section: libs
+#Priority: extra
+#Architecture: i386
+#Pre-Depends: libgl1-mesa-dri
+#Description: A free implementation of the OpenGL API -- DRI modules [i686 optimized]
+# 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-swx11 package.
+# .
+# This set of libraries is optimized for i686 machines and will only be used if
+# you are running a 2.6 kernel on an i686 class CPU. This includes Pentium Pro,
+# Pentium II/II/IV, Celeron CPU's and similar class CPU's (including clones
+# such as AMD Athlon/Opteron, VIA C3 Nehemiah, but not VIA C3 Ezla).
+
+Package: libgl1-mesa-dev
+Section: libdevel
+Architecture: any
+Depends: libc6-dev, mesa-common-dev (= ${binary:Version}), libgl1-mesa-glx (= ${binary: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 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-swx11
+ package.
+
+Package: mesa-common-dev
+Section: libdevel
+Architecture: any
+Replaces: xlibmesa-gl-dev (<< 1:7), xlibosmesa-dev, libgl1-mesa-swx11-dev (<< 6.5.2), libgl1-mesa-dev (<< 6.5.2)
+Depends: libx11-dev
+Description: Developer documentation for Mesa
+ This package includes the specifications for the Mesa-specific OpenGL
+ extensions, the complete set of release notes and the development header
+ files common to all Mesa packages.
+
+Package: libosmesa6
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}
+Replaces: libgl1-mesa-swx11 (<< 6.5.2)
+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: libdevel
+Architecture: any
+Depends: libosmesa6 (= ${binary:Version}), mesa-common-dev (= ${binary:Version}) | libgl-dev
+Conflicts: xlibosmesa-dev, libosmesa4-dev, libosmesa-dev
+Replaces: xlibosmesa-dev, libosmesa-dev, libgl1-mesa-swx11-dev (<< 6.5.2), mesa-common-dev (<< 6.5.2)
+Provides: xlibosmesa-dev, libosmesa-dev
+Description: Mesa Off-screen rendering extension -- development 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-glx | 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: 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 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: libglw1-mesa
+#Section: libs
+#Architecture: any
+#Depends: ${shlibs:Depends}
+#Provides: libglw1
+#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 package provides a simple widgets library, libGLw, which
+# allows Motif-based applications to embed an OpenGL drawing context.
+# .
+# On Linux, this library is also known as libGLw or libGLw.so.1.
+
+#Package: libglw1-mesa-dev
+#Section: libdevel
+#Architecture: any
+#Depends: libglw1-mesa (= ${binary:Version}), libc6-dev, libx11-dev, libxext6, mesa-common-dev (= ${binary:Version})
+#Provides: mesag3-widgets, mesag-widgets-dev, libglw-dev
+#Conflicts: libglw-dev, libgl1-mesa-swx11-dev (<< 6.5.2-4)
+#Replaces: libglw-dev
+#Description: A free implementation of the OpenGL API -- development files
+# This package provides the development environment required for
+# compiling programs with the Mesa 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.
+
+Package: mesa-utils
+Section: x11
+Priority: optional
+Architecture: any
+Depends: ${shlibs:Depends}
+Replaces: xbase-clients (<< 6.8.2-38)
+Description: Miscellaneous Mesa GL utilities
+ This package provides several basic GL utilities built by Mesa, including
+ glxinfo and glxgears.
+
+# vim: tw=0
--- mesa-7.6.0~git20090817.7c422387.orig/debian/libosmesa6-dev.install
+++ mesa-7.6.0~git20090817.7c422387/debian/libosmesa6-dev.install
@@ -0,0 +1,8 @@
+usr/include/GL/osmesa.h
+usr/lib/libOSMesa.a
+usr/lib/libOSMesa.so
+usr/lib/libOSMesa16.a
+usr/lib/libOSMesa16.so
+usr/lib/libOSMesa32.a
+usr/lib/libOSMesa32.so
+usr/lib/pkgconfig/osmesa.pc
--- mesa-7.6.0~git20090817.7c422387.orig/debian/libgl1-mesa-glx-i686.install
+++ mesa-7.6.0~git20090817.7c422387/debian/libgl1-mesa-glx-i686.install
@@ -0,0 +1 @@
+usr/lib/glx/i686/cmov/libGL.so.* usr/lib/i686/cmov
--- mesa-7.6.0~git20090817.7c422387.orig/debian/libglw1-mesa.install
+++ mesa-7.6.0~git20090817.7c422387/debian/libglw1-mesa.install
@@ -0,0 +1 @@
+usr/lib/libGLw.so.*
--- mesa-7.6.0~git20090817.7c422387.orig/debian/libosmesa6.install
+++ mesa-7.6.0~git20090817.7c422387/debian/libosmesa6.install
@@ -0,0 +1,3 @@
+usr/lib/libOSMesa.so.*
+usr/lib/libOSMesa16.so.*
+usr/lib/libOSMesa32.so.*
--- mesa-7.6.0~git20090817.7c422387.orig/debian/mesa-common-dev.docs
+++ mesa-7.6.0~git20090817.7c422387/debian/mesa-common-dev.docs
@@ -0,0 +1,8 @@
+docs/bugs.html
+docs/debugging.html
+docs/envvars.html
+docs/faq.html
+docs/osmesa.html
+docs/RELNOTES-*
+docs/relnotes*
+docs/*.spec
--- mesa-7.6.0~git20090817.7c422387.orig/debian/libosmesa6.shlibs
+++ mesa-7.6.0~git20090817.7c422387/debian/libosmesa6.shlibs
@@ -0,0 +1,3 @@
+libOSMesa 6 libosmesa6 (>= 6.5.2-1) | libgl1-mesa-glide3
+libOSMesa16 6 libosmesa6 (>= 6.5.2-1)
+libOSMesa32 6 libosmesa6 (>= 6.5.2-1)
--- mesa-7.6.0~git20090817.7c422387.orig/debian/libglw1-mesa-dev.install
+++ mesa-7.6.0~git20090817.7c422387/debian/libglw1-mesa-dev.install
@@ -0,0 +1,4 @@
+usr/include/GL/GLw*A.h
+usr/lib/libGLw.a
+usr/lib/libGLw.so
+usr/lib/pkgconfig/glw.pc
--- mesa-7.6.0~git20090817.7c422387.orig/debian/mesa-utils.install
+++ mesa-7.6.0~git20090817.7c422387/debian/mesa-utils.install
@@ -0,0 +1,4 @@
+usr/bin/glxdemo
+usr/bin/glxgears
+usr/bin/glxheads
+usr/bin/glxinfo
--- mesa-7.6.0~git20090817.7c422387.orig/debian/libglu1-mesa.shlibs
+++ mesa-7.6.0~git20090817.7c422387/debian/libglu1-mesa.shlibs
@@ -0,0 +1 @@
+libGLU 1 libglu1-mesa | libglu1
--- mesa-7.6.0~git20090817.7c422387.orig/debian/libgl1-mesa-swx11-dev.install
+++ mesa-7.6.0~git20090817.7c422387/debian/libgl1-mesa-swx11-dev.install
@@ -0,0 +1,2 @@
+usr/lib/libGL.a
+usr/lib/libGL.so
--- mesa-7.6.0~git20090817.7c422387.orig/debian/rules
+++ mesa-7.6.0~git20090817.7c422387/debian/rules
@@ -0,0 +1,248 @@
+#!/usr/bin/make -f
+# debian/rules for the Debian mesa package
+# Copyright © 2006 Thierry Reding <thierry@gilfi.de>
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+unexport LDFLAGS
+
+CFLAGS = -Wall -g
+ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
+	CFLAGS += -O0
+else
+	CFLAGS += -O2
+endif
+ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+	NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+	MAKEFLAGS += -j$(NUMJOBS)
+endif
+
+DEB_BUILD_ARCH     ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
+DEB_HOST_ARCH     ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+DEB_HOST_ARCH_OS     ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
+DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+DEB_HOST_GNU_CPU ?= $(shell dpkg-architecture -qDEB_HOST_GNU_CPU)
+DEB_BUILD_DIR      ?= $(CURDIR)/obj-$(DEB_BUILD_GNU_TYPE)
+ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
+        confflags += --build=$(DEB_HOST_GNU_TYPE)
+else
+        confflags += --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE)
+endif
+
+# choose which configurations to build
+include debian/scripts/choose-configs
+
+# build the following configurations by default
+CONFIGS = $(SWX11_GLU_CONFIGS) \
+	  dri \
+	  osmesa \
+	  osmesa-static \
+	  osmesa16 \
+	  osmesa16-static \
+	  osmesa32 \
+	  osmesa32-static
+
+STAMP_DIR = debian/stamp
+STAMP = $(STAMP_DIR)/$(DEB_BUILD_GNU_TYPE)
+BUILD_STAMPS = $(addprefix $(STAMP)-build-, $(CONFIGS))
+INSTALL_TARGETS = $(addprefix install-, $(CONFIGS))
+
+QUILT_STAMPFN = $(STAMP_DIR)/patch
+include /usr/share/quilt/quilt.make
+
+# temporary until we figure out what to build
+confflags += --disable-gallium
+
+confflags-common = \
+	--disable-egl \
+	--disable-glu \
+	--disable-glut \
+	--disable-glw \
+	CFLAGS="$(CFLAGS)"
+
+DRI_DRIVERS = swrast
+
+# hurd doesn't do direct rendering
+ifeq ($(DEB_HOST_ARCH_OS), hurd)
+	DIRECT_RENDERING = --disable-driglx-direct
+else
+	DIRECT_RENDERING = --enable-driglx-direct
+  ifeq ($(DEB_HOST_ARCH), lpia)
+	DRI_DRIVERS += i915 i965
+  else ifneq ($(DEB_HOST_ARCH), s390)
+	DRI_DRIVERS += mach64 mga r128 r200 r300 r600 radeon s3v savage tdfx trident
+    ifeq ($(DEB_HOST_GNU_CPU), i486)
+	DRI_DRIVERS += i810 i915 i965 sis unichrome
+    else ifeq ($(DEB_HOST_GNU_CPU), x86_64)
+	DRI_DRIVERS += i915 i965 sis unichrome
+    else ifeq ($(DEB_HOST_ARCH), sparc)
+	DRI_DRIVERS += ffb
+    endif
+  endif
+endif
+
+confflags-dri = \
+	--with-driver=dri \
+	--with-dri-drivers="$(DRI_DRIVERS)" \
+	--with-demos=xdemos \
+	--libdir=/usr/lib/glx \
+	--with-dri-driverdir=/usr/lib/dri \
+	--enable-glx-tls \
+	$(DIRECT_RENDERING) \
+	$(confflags-common)
+
+confflags-osmesa = \
+	--with-driver=osmesa \
+	--with-demos= \
+	$(confflags-common)
+
+confflags-osmesa-static = \
+	--with-driver=osmesa \
+	--enable-static \
+	--with-demos= \
+	$(confflags-common)
+
+confflags-osmesa16 = \
+	--with-driver=osmesa \
+	--with-osmesa-bits=16 \
+	--with-demos= \
+	$(confflags-common)
+
+confflags-osmesa16-static = \
+	--with-driver=osmesa \
+	--with-osmesa-bits=16 \
+	--enable-static \
+	--with-demos= \
+	$(confflags-common)
+
+confflags-osmesa32 = \
+	--with-driver=osmesa \
+	--with-osmesa-bits=32 \
+	--with-demos= \
+	$(confflags-common)
+
+confflags-osmesa32-static = \
+	--with-driver=osmesa \
+	--with-osmesa-bits=32 \
+	--enable-static \
+	--with-demos= \
+	$(confflags-common)
+
+confflags-swx11+glu = \
+	--with-driver=xlib \
+	--disable-gl-osmesa \
+	--with-demos= \
+	--disable-egl \
+	--disable-glut \
+	--disable-glw \
+	CFLAGS="$(CFLAGS)"
+
+confflags-swx11+glu-static = \
+	--with-driver=xlib \
+	--disable-gl-osmesa \
+	--enable-static \
+	--with-demos= \
+	--disable-egl \
+	--disable-glut \
+	--disable-glw \
+	CFLAGS="$(CFLAGS)"
+
+confflags-swx11+glu-i386-i686 = \
+	--with-driver=xlib \
+	--disable-gl-osmesa \
+	--with-demos= \
+	--disable-glut \
+	--disable-egl \
+	--disable-glw \
+	--libdir=/usr/lib/i686/cmov \
+	CFLAGS="$(CFLAGS) -march=i686"
+
+configure: $(QUILT_STAMPFN) configure.ac
+	autoreconf -vfi
+
+# list the configurations that will built
+configs:
+	@echo Building the following configurations: $(CONFIGS)
+
+$(STAMP_DIR)/stamp:
+	dh_testdir
+	mkdir -p $(STAMP_DIR)
+	>$@
+
+$(QUILT_STAMPFN): $(STAMP_DIR)/stamp
+
+build: $(BUILD_STAMPS)
+
+$(STAMP)-build-%: configure
+	dh_testdir
+
+	mkdir -p $(DEB_BUILD_DIR)/$*
+	find $(CURDIR)/* -maxdepth 0 -not -path '$(DEB_BUILD_DIR)*' | \
+		xargs cp -rlf -t $(DEB_BUILD_DIR)/$*
+	cd $(DEB_BUILD_DIR)/$* && \
+	../../configure --prefix=/usr --mandir=\$${prefix}/share/man \
+	             --infodir=\$${prefix}/share/info --sysconfdir=/etc \
+	             --localstatedir=/var $(confflags) $(confflags-$*)
+	cd $(DEB_BUILD_DIR)/$* && $(MAKE)
+
+	touch $@
+
+install:
+	# Add here commands to install the package into debian/tmp
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
+	for config in $(CONFIGS); do \
+		$(MAKE) -f debian/rules install-$$config; \
+	done
+
+install-%: $(STAMP)-build-%
+	cd $(DEB_BUILD_DIR)/$* && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
+
+clean: unpatch
+	dh_testdir
+	dh_testroot
+	rm -rf .pc
+	
+	rm -f config.cache config.log config.status
+	rm -f */config.cache */config.log */config.status
+	rm -f conftest* */conftest*
+	rm -rf autom4te.cache */autom4te.cache
+	rm -rf obj-*
+	rm -rf configure config.guess config.sub config.h.in
+	rm -rf $$(find -name Makefile.in)
+	rm -rf aclocal.m4 missing depcomp install-sh ltmain.sh
+	rm -rf $(STAMP_DIR)
+	
+	dh_clean
+
+# Build architecture-independent files here.
+binary-indep: install
+
+# Build architecture-dependent files here.
+binary-arch: install
+	dh_testdir
+	dh_testroot
+	dh_installchangelogs -s
+	dh_installdocs -s
+	dh_installexamples -s
+	dh_install -s --sourcedir=debian/tmp --list-missing
+	dh_installman -s
+	dh_link -s
+	dh_strip -plibgl1-mesa-swx11 --dbg-package=libgl1-mesa-swx11-dbg
+	dh_strip -plibgl1-mesa-glx --dbg-package=libgl1-mesa-glx-dbg
+	dh_strip -plibgl1-mesa-dri --dbg-package=libgl1-mesa-dri-dbg
+	dh_strip -s
+	dh_compress -s
+	dh_fixperms -s
+	dh_makeshlibs -s
+	dh_installdeb -s
+	dh_shlibdeps -s
+	dh_gencontrol -s
+	dh_md5sums -s
+	dh_builddeb -s -- -Zlzma
+
+binary: binary-indep binary-arch
+.PHONY: configs build clean binary-indep binary-arch binary install
--- mesa-7.6.0~git20090817.7c422387.orig/debian/libgl1-mesa-swx11.shlibs
+++ mesa-7.6.0~git20090817.7c422387/debian/libgl1-mesa-swx11.shlibs
@@ -0,0 +1 @@
+libGL 1 libgl1-mesa-glx | libgl1
--- mesa-7.6.0~git20090817.7c422387.orig/debian/libgl1-mesa-glx.shlibs
+++ mesa-7.6.0~git20090817.7c422387/debian/libgl1-mesa-glx.shlibs
@@ -0,0 +1 @@
+libGL 1 libgl1-mesa-glx | libgl1
--- mesa-7.6.0~git20090817.7c422387.orig/debian/libglu1-mesa-dev.install
+++ mesa-7.6.0~git20090817.7c422387/debian/libglu1-mesa-dev.install
@@ -0,0 +1,5 @@
+usr/include/GL/glu.h
+usr/include/GL/glu_mangle.h
+usr/lib/libGLU.a
+usr/lib/libGLU.so
+usr/lib/pkgconfig/glu.pc
--- mesa-7.6.0~git20090817.7c422387.orig/debian/mesa-utils.manpages
+++ mesa-7.6.0~git20090817.7c422387/debian/mesa-utils.manpages
@@ -0,0 +1,4 @@
+debian/glxdemo.1
+debian/glxgears.1
+debian/glxheads.1
+debian/glxinfo.1
--- mesa-7.6.0~git20090817.7c422387.orig/debian/libgl1-mesa-dri.install
+++ mesa-7.6.0~git20090817.7c422387/debian/libgl1-mesa-dri.install
@@ -0,0 +1 @@
+usr/lib/dri/*.so
--- mesa-7.6.0~git20090817.7c422387.orig/debian/mesa-common-dev.install
+++ mesa-7.6.0~git20090817.7c422387/debian/mesa-common-dev.install
@@ -0,0 +1,8 @@
+usr/include/GL/gl.h
+usr/include/GL/glext.h
+usr/include/GL/gl_mangle.h
+usr/include/GL/glx.h
+usr/include/GL/glxext.h
+usr/include/GL/glx_mangle.h
+usr/include/GL/internal/dri_interface.h
+usr/lib/glx/pkgconfig/dri.pc usr/lib/pkgconfig/
--- mesa-7.6.0~git20090817.7c422387.orig/debian/libgl1-mesa-swx11-i686.install
+++ mesa-7.6.0~git20090817.7c422387/debian/libgl1-mesa-swx11-i686.install
@@ -0,0 +1 @@
+usr/lib/i686/cmov/libGL.so.*
--- mesa-7.6.0~git20090817.7c422387.orig/debian/glxheads.1
+++ mesa-7.6.0~git20090817.7c422387/debian/glxheads.1
@@ -0,0 +1,30 @@
+.TH glxheads 1 "2006-11-29"
+.SH NAME
+glxheads \- exercise multiple GLX connections
+.SH SYNOPSIS
+.B glxheads
+[\fIdisplay\fP ...]
+.SH DESCRIPTION
+The \fIglxheads\fP program will try to open GLX connections on multiple X
+displays as specified on the command-line. If a connection can be made it will
+try to create a direct GLX context (and fallback to using indirect contexts if
+that fails) and open a window displaying a spinning green triangle.
+.PP
+If no display names are specified, \fIglxheads\fP will default to opening a
+single local connection on display 0.
+.SH EXAMPLE
+To open a local connection on display 0 and two remote connections to the
+hosts \fImars\fP (display 0) and \fIvenus\fP (display 1), run glxheads with
+the following command-line:
+.PP
+.RS 3n
+.nf
+$ glxheads :0 mars:0 venus:1
+.fi
+.RE
+.SH AUTHOR
+glxheads was written by Brian Paul <brian.paul@tungstengraphics.com>.
+.PP
+This manual page was written by Thierry Reding <thierry@gilfi.de> for the
+Debian project (but may be used by others).
+
--- mesa-7.6.0~git20090817.7c422387.orig/debian/libgl1-mesa-swx11-i686.shlibs
+++ mesa-7.6.0~git20090817.7c422387/debian/libgl1-mesa-swx11-i686.shlibs
@@ -0,0 +1 @@
+libGL 1 libgl1-mesa-glx | libgl1
--- mesa-7.6.0~git20090817.7c422387.orig/debian/libgl1-mesa-dri-i686.install
+++ mesa-7.6.0~git20090817.7c422387/debian/libgl1-mesa-dri-i686.install
@@ -0,0 +1 @@
+usr/lib/dri/i686/cmov/*.so
--- mesa-7.6.0~git20090817.7c422387.orig/debian/glxinfo.1
+++ mesa-7.6.0~git20090817.7c422387/debian/glxinfo.1
@@ -0,0 +1,41 @@
+.TH glxinfo 1 "2006-11-29"
+.SH NAME
+glxinfo \- show information about the GLX implementation
+.SH SYNOPSIS
+.B glxinfo
+.RI [ options ]
+.SH DESCRIPTION
+The \fIglxinfo\fP program shows information about the OpenGL and GLX
+implementations running on a given X display.
+.PP
+The information includes details about the server- and client-side GLX
+implementation, the OpenGL and GLU implementations as well as a list
+of available GLX visuals.
+.SH OPTIONS
+.TP 8
+.B \-v
+Print visuals info in verbose form.
+.TP 8
+.B \-t
+Print verbose table.
+.TP 8
+.B \-display \fIdisplay\fP
+Specify the X display to interrogate.
+.TP 8
+.B \-h
+Print usage information.
+.TP 8
+.B \-i
+Force an indirect rendering context.
+.TP 8
+.B \-b
+Find the "best" visual and print its number.
+.TP 8
+.B \-l
+Print interesting OpenGL limits.
+.SH AUTHOR
+glxinfo was written by Brian Paul <brian.paul@tungstengraphics.com>.
+.PP
+This manual page was written by Thierry Reding <thierry@gilfi.de>, for the
+Debian project (but may be used by others).
+
--- mesa-7.6.0~git20090817.7c422387.orig/debian/libgl1-mesa-dev.install
+++ mesa-7.6.0~git20090817.7c422387/debian/libgl1-mesa-dev.install
@@ -0,0 +1,2 @@
+usr/lib/libGL.so
+usr/lib/pkgconfig/gl.pc
--- mesa-7.6.0~git20090817.7c422387.orig/debian/compat
+++ mesa-7.6.0~git20090817.7c422387/debian/compat
@@ -0,0 +1 @@
+5
--- mesa-7.6.0~git20090817.7c422387.orig/debian/copyright
+++ mesa-7.6.0~git20090817.7c422387/debian/copyright
@@ -0,0 +1,193 @@
+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
+again debianized by Thierry Reding <thierry@gilfi.de> on Sat, 14 Oct 2006
+02:01:12 +0200.
+
+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.
+
+----------------------------------------------------------------------
+
+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 2.0, Sept. 18, 2008)
+
+Copyright (C) [dates of first publication] Silicon Graphics, Inc. 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 including the dates of first publication and either
+this permission notice or a reference to http://oss.sgi.com/projects/FreeB/
+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 SILICON GRAPHICS, INC. 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.
+Except as contained in this notice, the name of Silicon Graphics, Inc. shall
+not be used in advertising or otherwise to promote the sale, use or other
+dealings in this Software without prior written authorization from Silicon
+Graphics, Inc.
+
+--------------------------------------------------------------------------
+
+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
+ ----------------------------------------------------------------------------
+ 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  mesa/drivers/beos/    Brian Paul          Mesa
+
+ MGL driver      include/GL/mglmesa.h  SciTech, Inc        GNU LGPL
+
+ Windows driver  mesa/drivers/windows/ Li Wei              GNU LGPL
+                 include/GL/wmesa.h
+
+ SVGA driver     mesa/drivers/svga/    Brian Paul          GNU LGPL
+                 include/GL/svgamesa.h
+
+ DOS driver      mesa/drivers/dos/     Charlie Wallace     GNU LGPL
+                 include/GL/dosmesa.h
+
+ GGI driver      mesa/drivers/ggi/     Uwe Maurer          GNU LGPL
+                 include/GL/ggimesa.h
+
+ GLUT            src/glut/*            Mark Kilgard        Mark's copyright
+                 include/GL/*glut*.h
+
+ GLU library     src/glu/*             Brian Paul          GNU LGPL
+
+ 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   progs/demos/*         various             see source files
+
+ X demos         progs/xdemos/*        Brian Paul          see source files
+
+ SGI demos       progs/samples/*       SGI                 SGI MIT-style
+
+ RedBook demos   progs/redbook/*       SGI                 SGI MIT-style
+
+
+On Debian systems the full text of the GNU LGPL license is found in
+/usr/share/common-licenses/LGPL.
+
+------------------------------------------------------------------------------
+
+The Debian packaging is (C) 2006, Thierry Reding <thierry@gilfi.de> and
+is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
+
--- mesa-7.6.0~git20090817.7c422387.orig/debian/glxgears.1
+++ mesa-7.6.0~git20090817.7c422387/debian/glxgears.1
@@ -0,0 +1,29 @@
+.TH glxgears 1 "2006-11-29"
+.SH NAME
+glxgears \- ``gears'' demo for GLX
+.SH SYNOPSIS
+.B glxgears
+.RI [ options ]
+.SH DESCRIPTION
+The \fIglxgears\fP program is a port of the ``gears'' demo to GLX. It displays
+a set of rotating gears and prints out the frame rate at regular intervals. It
+has become quite popular as basic benchmarking tool.
+.SH OPTIONS
+.TP 8
+.B \-display \fIdisplay\fP
+Specify which X display to run on.
+.TP 8
+.B \-info
+Display OpenGL renderer information.
+.TP 8
+.B \-stereo
+Use a stereo enabled GLX visual.
+.TP 8
+.B \-fullscreen
+Run in fullscreen mode.
+.SH AUTHOR
+glxgears was written by Brian Paul <brian.paul@tungstengraphics.com>.
+.PP
+This manual page was written by Thierry Reding <thierry@gilfi.de>, for the
+Debian project (but may be used by others).
+
--- mesa-7.6.0~git20090817.7c422387.orig/debian/libgl1-mesa-swx11.install
+++ mesa-7.6.0~git20090817.7c422387/debian/libgl1-mesa-swx11.install
@@ -0,0 +1 @@
+usr/lib/libGL.so.*
--- mesa-7.6.0~git20090817.7c422387.orig/debian/patches/series
+++ mesa-7.6.0~git20090817.7c422387/debian/patches/series
@@ -0,0 +1,9 @@
+02_use-ieee-fp-on-s390-and-m68k.patch
+03_optional-progs-and-install.patch
+04_osmesa_version.diff
+05_hurd-ftbfs.diff
+06_kfreebsd-ftbfs.diff
+101_ubuntu_hidden_glname.patch
+102_dont_vblank.diff
+#107_glxgears_is_not_a_benchmark.patch
+#108_bo_assertion.patch
--- mesa-7.6.0~git20090817.7c422387.orig/debian/patches/108_bo_assertion.patch
+++ mesa-7.6.0~git20090817.7c422387/debian/patches/108_bo_assertion.patch
@@ -0,0 +1,27 @@
+From c72261f2a886e1f53025c2cf4b38b33ccfd62857 Mon Sep 17 00:00:00 2001
+From: Eric Anholt <eric@anholt.net>
+Date: Tue, 30 Jun 2009 01:48:27 +0000
+Subject: i915: Fix assertion failure on remapping a non-BO-backed VBO.
+
+Failure to set the obj->Pointer back to null tripped up the assertion.
+Bug #22428.
+(cherry picked from commit 57a06d3a48c9af1067ec05e3ad96c58f4b9b99be)
+---
+diff --git a/src/mesa/drivers/dri/intel/intel_buffer_objects.c b/src/mesa/drivers/dri/intel/intel_buffer_objects.c
+index c31fe91..2e6b778 100644
+--- a/src/mesa/drivers/dri/intel/intel_buffer_objects.c
++++ b/src/mesa/drivers/dri/intel/intel_buffer_objects.c
+@@ -265,7 +265,10 @@ intel_bufferobj_unmap(GLcontext * ctx,
+    struct intel_buffer_object *intel_obj = intel_buffer_object(obj);
+ 
+    assert(intel_obj);
+-   if (intel_obj->buffer != NULL) {
++   if (intel_obj->sys_buffer != NULL) {
++      assert(obj->Pointer);
++      obj->Pointer = NULL;
++   } else if (intel_obj->buffer != NULL) {
+       assert(obj->Pointer);
+       if (intel_obj->mapped_gtt) {
+ 	 drm_intel_gem_bo_unmap_gtt(intel_obj->buffer);
+--
+cgit v0.8.2
--- mesa-7.6.0~git20090817.7c422387.orig/debian/patches/04_osmesa_version.diff
+++ mesa-7.6.0~git20090817.7c422387/debian/patches/04_osmesa_version.diff
@@ -0,0 +1,13 @@
+Index: mesa/src/mesa/drivers/osmesa/Makefile
+===================================================================
+--- mesa.orig/src/mesa/drivers/osmesa/Makefile
++++ mesa/src/mesa/drivers/osmesa/Makefile
+@@ -39,7 +39,7 @@
+ # -DCHAN_BITS=16/32.
+ $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_NAME): $(OBJECTS) $(CORE_MESA)
+ 	$(MKLIB) -o $(OSMESA_LIB) -linker '$(CC)' -ldflags '$(LDFLAGS)' \
+-		-major $(MESA_MAJOR) -minor $(MESA_MINOR) -patch $(MESA_TINY) \
++		-major 6 -minor 5 -patch 3 \
+ 		-install $(TOP)/$(LIB_DIR) $(MKLIB_OPTIONS) \
+ 		-id $(INSTALL_LIB_DIR)/lib$(OSMESA_LIB).$(MESA_MAJOR).dylib \
+ 		$(OSMESA_LIB_DEPS) $(OBJECTS) $(CORE_MESA)
--- mesa-7.6.0~git20090817.7c422387.orig/debian/patches/03_optional-progs-and-install.patch
+++ mesa-7.6.0~git20090817.7c422387/debian/patches/03_optional-progs-and-install.patch
@@ -0,0 +1,55 @@
+Allow the programs that are to be built to be defined in the build
+configuration.
+
+Provide an install target for installing the programs in $(INSTALL_DIR)/bin.
+
+This patch by Thierry Reding.
+Not submitted to Mesa.
+--
+Also remove references to GLU library since it is not required
+and we don't actually build it at this point.
+
+
+Index: mesa/progs/xdemos/Makefile
+===================================================================
+--- mesa.orig/progs/xdemos/Makefile
++++ mesa/progs/xdemos/Makefile
+@@ -10,7 +10,7 @@
+ 
+ LIBS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) $(APP_LIB_DEPS)
+ 
+-PROGS = \
++PROGS ?= \
+ 	corender \
+ 	glsync \
+ 	glthreads \
+@@ -62,6 +62,11 @@
+ extra: $(EXTRA_PROGS)
+ 
+ 
++install: $(PROGS)
++	$(INSTALL) -d $(DESTDIR)$(INSTALL_DIR)/bin
++	$(INSTALL) -m 755 $(PROGS) $(DESTDIR)$(INSTALL_DIR)/bin
++
++
+ clean:
+ 	-rm -f $(PROGS) $(EXTRA_PROGS)
+ 	-rm -f *.o *~
+Index: mesa/progs/Makefile
+===================================================================
+--- mesa.orig/progs/Makefile
++++ mesa/progs/Makefile
+@@ -21,8 +21,12 @@
+ 		fi \
+ 	done
+ 
+-# Dummy install target
+ install:
++	@for dir in $(SUBDIRS) ; do \
++		if [ -d $$dir ] ; then \
++			(cd $$dir ; $(MAKE) install) ; \
++		fi \
++	done
+ 
+ clean:
+ 	-@for dir in $(SUBDIRS) tests ; do \
--- mesa-7.6.0~git20090817.7c422387.orig/debian/patches/107_glxgears_is_not_a_benchmark.patch
+++ mesa-7.6.0~git20090817.7c422387/debian/patches/107_glxgears_is_not_a_benchmark.patch
@@ -0,0 +1,13 @@
+diff --git a/progs/xdemos/glxgears.c b/progs/xdemos/glxgears.c
+index 2dc157a..d7c8191 100644
+--- a/progs/xdemos/glxgears.c
++++ b/progs/xdemos/glxgears.c
+@@ -347,7 +347,7 @@ draw_frame(Display *dpy, Window win)
+    if (t - tRate0 >= 5.0) {
+       GLfloat seconds = t - tRate0;
+       GLfloat fps = frames / seconds;
+-      printf("%d frames in %3.1f seconds = %6.3f FPS\n", frames, seconds,
++      printf("%d frames in %3.1f seconds\n", frames, seconds,
+              fps);
+       tRate0 = t;
+       frames = 0;
--- mesa-7.6.0~git20090817.7c422387.orig/debian/patches/102_dont_vblank.diff
+++ mesa-7.6.0~git20090817.7c422387/debian/patches/102_dont_vblank.diff
@@ -0,0 +1,13 @@
+Index: mesa/src/mesa/drivers/dri/intel/intel_screen.c
+===================================================================
+--- mesa.orig/src/mesa/drivers/dri/intel/intel_screen.c	2009-06-29 14:43:07.000000000 +0300
++++ mesa/src/mesa/drivers/dri/intel/intel_screen.c	2009-06-29 14:45:38.000000000 +0300
+@@ -54,7 +54,7 @@
+    DRI_CONF_BEGIN
+    DRI_CONF_SECTION_PERFORMANCE
+       DRI_CONF_FTHROTTLE_MODE(DRI_CONF_FTHROTTLE_IRQS)
+-      DRI_CONF_VBLANK_MODE(DRI_CONF_VBLANK_ALWAYS_SYNC)
++      DRI_CONF_VBLANK_MODE(DRI_CONF_VBLANK_DEF_INTERVAL_0)
+       /* Options correspond to DRI_CONF_BO_REUSE_DISABLED,
+        * DRI_CONF_BO_REUSE_ALL
+        */
--- mesa-7.6.0~git20090817.7c422387.orig/debian/patches/101_ubuntu_hidden_glname.patch
+++ mesa-7.6.0~git20090817.7c422387/debian/patches/101_ubuntu_hidden_glname.patch
@@ -0,0 +1,12 @@
+Index: mesa/src/mesa/x86/glapi_x86.S
+===================================================================
+--- mesa.orig/src/mesa/x86/glapi_x86.S	2009-06-29 14:43:07.000000000 +0300
++++ mesa/src/mesa/x86/glapi_x86.S	2009-06-29 14:45:38.000000000 +0300
+@@ -148,7 +148,6 @@
+ 
+ 		ALIGNTEXT16
+ 		GLOBL GLNAME(gl_dispatch_functions_start)
+-		HIDDEN(GLNAME(gl_dispatch_functions_start))
+ GLNAME(gl_dispatch_functions_start):
+ 
+ 	GL_STUB(NewList, _gloffset_NewList, NewList@8)
--- mesa-7.6.0~git20090817.7c422387.orig/debian/patches/06_kfreebsd-ftbfs.diff
+++ mesa-7.6.0~git20090817.7c422387/debian/patches/06_kfreebsd-ftbfs.diff
@@ -0,0 +1,19 @@
+From: Aurelien Jarno <aurel32@debian.org>
+    
+mesa fails to build on GNU/kFreeBSD, since some parts are not enabled.
+    
+http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=524690
+
+Index: mesa/configure.ac
+===================================================================
+--- mesa.orig/configure.ac
++++ mesa/configure.ac
+@@ -721,7 +721,7 @@
+             ;;
+         esac
+         ;;
+-    freebsd* | dragonfly*)
++    freebsd* | dragonfly* | kfreebsd*-gnu*)
+         DEFINES="$DEFINES -DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1"
+         DEFINES="$DEFINES -DIN_DRI_DRIVER -DHAVE_ALIAS"
+         DEFINES="$DEFINES -DGLX_INDIRECT_RENDERING"
--- mesa-7.6.0~git20090817.7c422387.orig/debian/patches/05_hurd-ftbfs.diff
+++ mesa-7.6.0~git20090817.7c422387/debian/patches/05_hurd-ftbfs.diff
@@ -0,0 +1,70 @@
+From: Samuel Thibault <samuel.thibault@ens-lyon.org>
+Subject: Fix build on GNU/Hurd
+
+Index: mesa/src/glx/x11/dri2.c
+===================================================================
+--- mesa.orig/src/glx/x11/dri2.c
++++ mesa/src/glx/x11/dri2.c
+@@ -30,6 +30,7 @@
+  *   Kristian Høgsberg (krh@redhat.com)
+  */
+ 
++#ifdef GLX_DIRECT_RENDERING
+ 
+ #define NEED_REPLIES
+ #include <X11/Xlibint.h>
+@@ -369,3 +370,4 @@
+     UnlockDisplay(dpy);
+     SyncHandle();
+ }
++#endif
+Index: mesa/configure.ac
+===================================================================
+--- mesa.orig/configure.ac
++++ mesa/configure.ac
+@@ -528,6 +528,13 @@
+     enable_xcb=no
+ fi
+ 
++dnl Direct rendering or just indirect rendering
++AC_ARG_ENABLE([driglx-direct],
++    [AS_HELP_STRING([--disable-driglx-direct],
++        [enable direct rendering in GLX for DRI @<:@default=enabled@:>@])],
++    [driglx_direct="$enableval"],
++    [driglx_direct="yes"])
++
+ dnl
+ dnl libGL configuration per driver
+ dnl
+@@ -561,11 +568,13 @@
+         AC_MSG_ERROR([Can't use static libraries for DRI drivers])
+     fi
+ 
+-    # Check for libdrm
+-    PKG_CHECK_MODULES([LIBDRM], [libdrm >= $LIBDRM_REQUIRED])
+-    PKG_CHECK_MODULES([DRI2PROTO], [dri2proto >= $DRI2PROTO_REQUIRED])
+-    GL_PC_REQ_PRIV="libdrm >= $LIBDRM_REQUIRED dri2proto >= $DRI2PROTO_REQUIRED"
+-    DRI_PC_REQ_PRIV="libdrm >= $LIBDRM_REQUIRED"
++    if test x"$driglx_direct" = xyes; then
++        # Check for libdrm
++        PKG_CHECK_MODULES([LIBDRM], [libdrm >= $LIBDRM_REQUIRED])
++        PKG_CHECK_MODULES([DRI2PROTO], [dri2proto >= $DRI2PROTO_REQUIRED])
++        GL_PC_REQ_PRIV="libdrm >= $LIBDRM_REQUIRED dri2proto >= $DRI2PROTO_REQUIRED"
++        DRI_PC_REQ_PRIV="libdrm >= $LIBDRM_REQUIRED"
++    fi
+ 
+     # find the DRI deps for libGL
+     if test "$x11_pkgconfig" = yes; then
+@@ -632,12 +641,6 @@
+     [DRI_DRIVER_INSTALL_DIR="$withval"],
+     [DRI_DRIVER_INSTALL_DIR='${libdir}/dri'])
+ AC_SUBST([DRI_DRIVER_INSTALL_DIR])
+-dnl Direct rendering or just indirect rendering
+-AC_ARG_ENABLE([driglx-direct],
+-    [AS_HELP_STRING([--disable-driglx-direct],
+-        [enable direct rendering in GLX for DRI @<:@default=enabled@:>@])],
+-    [driglx_direct="$enableval"],
+-    [driglx_direct="yes"])
+ dnl Which drivers to build - default is chosen by platform
+ AC_ARG_WITH([dri-drivers],
+     [AS_HELP_STRING([--with-dri-drivers@<:@=DIRS...@:>@],
--- mesa-7.6.0~git20090817.7c422387.orig/debian/patches/02_use-ieee-fp-on-s390-and-m68k.patch
+++ mesa-7.6.0~git20090817.7c422387/debian/patches/02_use-ieee-fp-on-s390-and-m68k.patch
@@ -0,0 +1,19 @@
+Patch that fixes Debian bug #349437.
+
+This patch by David Nusinow.
+
+Index: mesa/src/mesa/main/compiler.h
+===================================================================
+--- mesa.orig/src/mesa/main/compiler.h
++++ mesa/src/mesa/main/compiler.h
+@@ -345,8 +345,9 @@
+  * USE_IEEE: Determine if we're using IEEE floating point
+  */
+ #if defined(__i386__) || defined(__386__) || defined(__sparc__) || \
+-    defined(__s390x__) || defined(__powerpc__) || \
++    defined(__s390__) || defined(__s390x__) || defined(__powerpc__) || \
+     defined(__x86_64__) || \
++    defined(__m68k__) || \
+     defined(ia64) || defined(__ia64__) || \
+     defined(__hppa__) || defined(hpux) || \
+     defined(__mips) || defined(_MIPS_ARCH) || \
--- mesa-7.6.0~git20090817.7c422387.orig/debian/scripts/choose-configs
+++ mesa-7.6.0~git20090817.7c422387/debian/scripts/choose-configs
@@ -0,0 +1,58 @@
+# Script to choose which configurations are to be built depending on the value
+# of the DEB_BUILD_ARCH variable.
+#
+# Copyright © 2006 Thierry Reding <thierry@gilfi.de>
+
+##############################################################################
+## architecture-specific configurations ######################################
+
+# choose an architecture-specific build of swx11 and GLU if a matching
+# configuration exists
+#ifneq ($(wildcard configs/debian-swx11+glu-$(DEB_BUILD_ARCH)),)
+#	SWX11_GLU_CONFIGS := debian-swx11+glu-$(DEB_BUILD_ARCH)
+#else
+#	SWX11_GLU_CONFIGS := debian-swx11+glu-any
+#endif
+
+# same for static builds
+#ifneq ($(wildcard configs/debian-swx11+glu-static-$(DEB_BUILD_ARCH)),)
+#	SWX11_GLU_CONFIGS += debian-swx11+glu-static-$(DEB_BUILD_ARCH)
+#else
+#	SWX11_GLU_CONFIGS += debian-swx11+glu-static-any
+#endif
+
+SWX11_GLU_CONFIGS := swx11+glu swx11+glu-static
+
+# and for the GLX/DRI-enabled libGL
+ifneq ($(wildcard configs/debian-indirect-$(DEB_BUILD_ARCH)),)
+	DRI_CONFIGS := debian-indirect-$(DEB_BUILD_ARCH)
+else
+  ifneq ($(wildcard configs/debian-dri-$(DEB_BUILD_ARCH)),)
+	DRI_CONFIGS := debian-dri-$(DEB_BUILD_ARCH)
+  else
+	DRI_CONFIGS := debian-dri-any
+  endif
+endif
+
+##############################################################################
+## CPU-optimized configurations ##############################################
+
+ifeq ($(DEB_BUILD_ARCH), i386)
+	SWX11_GLU_CONFIGS += swx11+glu-i386-i686
+#	DRI_CONFIGS += debian-dri-i386-i686
+endif
+
+#ifeq ($(DEB_BUILD_ARCH), alpha)
+#	SWX11_GLU_CONFIGS += debian-swx11+glu-alpha-ev5
+#endif
+
+#ifeq ($(DEB_BUILD_ARCH), powerpc)
+#	SWX11_GLU_CONFIGS += debian-swx11+glu-powerpc-603
+#endif
+
+#ifeq ($(DEB_BUILD_ARCH), sparc)
+#	SWX11_GLU_CONFIGS += debian-swx11+glu-sparc-ultrasparc
+#endif
+
+# vim: ft=make
+
