nouveau: match drm version bump

Fix some renderbuffer reference counting issues. Also fixes a mem leak.
destroy window on exit
2007-03-26 21:31:43 +10:00 · 2007-03-25 10:39:36 -06:00 · 2007-03-25 10:25:29 -06:00 · 2007-03-25 21:40:58 +08:00 · 2007-03-25 21:31:36 +08:00 · 2007-03-25 14:57:56 +02:00
1164 changed files with 198217 additions and 36987 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1,8 @@
+*~
+*.a
+*.o
+*.so
+depend
+depend.bak
+lib
+lib64
--- a/Makefile.orig
+++ b/Makefile.orig
@@ -1,453 +0,0 @@
-# Top-level Mesa makefile
-
-TOP = .
-
-SUBDIRS = src progs
-
-
-default: $(TOP)/configs/current
-	@for dir in $(SUBDIRS) ; do \
-		(cd $$dir ; $(MAKE)) || exit 1 ; \
-	done
-
-
-doxygen:
-	(cd doxygen ; make) ; \
-
-clean:
-	@for dir in $(SUBDIRS) ; do \
-		(cd $$dir ; $(MAKE) clean) ; \
-	done
-
-
-realclean:
-	touch $(TOP)/configs/current
-	$(MAKE) clean
-	-rm -rf lib*
-	-rm -f $(TOP)/configs/current
-	-rm -f `find . -name \*.o`
-	-rm -f `find . -name \*.a`
-	-rm -f `find . -name \*.so`
-	-rm -f `find . -name depend`
-
-
-
-install:
-	@echo "Installing"
-	$(TOP)/bin/installmesa $(DESTDIR)
-
-# DirectFBGL module installation
-linux-directfb-install:
-	cd src/mesa/drivers/directfb && $(MAKE) install
-
-# If there's no current configuration file
-$(TOP)/configs/current:
-	@echo
-	@echo
-	@echo "Please choose a configuration from the following list:"
-	@ls -1 $(TOP)/configs | grep -v "current\|default\|CVS"
-	@echo
-	@echo "Then type 'make <config>' (ex: 'make linux-x86')"
-	@echo "(ignore the following error message)"
-	@exit 1
-
-
-# Rules to set/install a specific build configuration
-aix \
-aix-64 \
-aix-gcc \
-aix-static \
-beos \
-darwin \
-darwin-static \
-freebsd \
-freebsd-dri \
-freebsd-dri-amd64 \
-freebsd-dri-x86 \
-hpux10 \
-hpux10-gcc \
-hpux10-static \
-hpux11-32 \
-hpux11-32-static \
-hpux11-32-static-nothreads \
-hpux11-64 \
-hpux11-64-static \
-hpux9 \
-hpux9-gcc \
-irix6-64 \
-irix6-64-static \
-irix6-n32 \
-irix6-n32-static \
-irix6-o32 \
-irix6-o32-static \
-linux \
-linux-alpha \
-linux-alpha-static \
-linux-debug \
-linux-directfb \
-linux-dri \
-linux-dri-x86 \
-linux-dri-x86-64 \
-linux-dri-ppc \
-linux-dri-xcb \
-linux-indirect \
-linux-fbdev \
-linux-glide \
-linux-icc \
-linux-icc-static \
-linux-osmesa16 \
-linux-osmesa16-static \
-linux-osmesa32 \
-linux-ppc \
-linux-ppc-static \
-linux-solo \
-linux-solo-x86 \
-linux-solo-ia64 \
-linux-sparc \
-linux-sparc5 \
-linux-static \
-linux-ultrasparc \
-linux-tcc \
-linux-x86 \
-linux-x86-debug \
-linux-x86-32 \
-linux-x86-64 \
-linux-x86-64-debug \
-linux-x86-64-static \
-linux-x86-glide \
-linux-x86-static \
-netbsd \
-openbsd \
-osf1 \
-solaris-x86 \
-solaris-x86-gcc \
-sunos4 \
-sunos4-gcc \
-sunos4-static \
-sunos5 \
-sunos5-gcc \
-sunos5-64-gcc \
-sunos5-smp \
-ultrix-gcc:
-	(cd configs && rm -f current && ln -s $@ current)
-	$(MAKE) default
-
-
-# Rules for making release tarballs
-
-DIRECTORY = Mesa-6.5.1
-LIB_NAME = MesaLib-6.5.1
-DEMO_NAME = MesaDemos-6.5.1
-GLUT_NAME = MesaGLUT-6.5.1
-
-MAIN_FILES = \
-	$(DIRECTORY)/Makefile*						\
-	$(DIRECTORY)/descrip.mms					\
-	$(DIRECTORY)/mms-config.					\
-	$(DIRECTORY)/bin/mklib						\
-	$(DIRECTORY)/bin/installmesa					\
-	$(DIRECTORY)/configs/[a-z]*					\
-	$(DIRECTORY)/docs/*.html					\
-	$(DIRECTORY)/docs/COPYING					\
-	$(DIRECTORY)/docs/README.*					\
-	$(DIRECTORY)/docs/RELNOTES*					\
-	$(DIRECTORY)/docs/VERSIONS					\
-	$(DIRECTORY)/docs/*.spec					\
-	$(DIRECTORY)/include/GL/internal/glcore.h			\
-	$(DIRECTORY)/include/GL/amesa.h					\
-	$(DIRECTORY)/include/GL/dmesa.h					\
-	$(DIRECTORY)/include/GL/directfbgl.h				\
-	$(DIRECTORY)/include/GL/fxmesa.h				\
-	$(DIRECTORY)/include/GL/ggimesa.h				\
-	$(DIRECTORY)/include/GL/gl.h					\
-	$(DIRECTORY)/include/GL/glext.h					\
-	$(DIRECTORY)/include/GL/gl_mangle.h				\
-	$(DIRECTORY)/include/GL/glu.h					\
-	$(DIRECTORY)/include/GL/glu_mangle.h				\
-	$(DIRECTORY)/include/GL/glx.h					\
-	$(DIRECTORY)/include/GL/glxext.h				\
-	$(DIRECTORY)/include/GL/glx_mangle.h				\
-	$(DIRECTORY)/include/GL/glfbdev.h				\
-	$(DIRECTORY)/include/GL/mesa_wgl.h				\
-	$(DIRECTORY)/include/GL/mglmesa.h				\
-	$(DIRECTORY)/include/GL/osmesa.h				\
-	$(DIRECTORY)/include/GL/svgamesa.h				\
-	$(DIRECTORY)/include/GL/ugl*.h					\
-	$(DIRECTORY)/include/GL/vms_x_fix.h				\
-	$(DIRECTORY)/include/GL/wmesa.h					\
-	$(DIRECTORY)/include/GL/xmesa.h					\
-	$(DIRECTORY)/include/GL/xmesa_x.h				\
-	$(DIRECTORY)/include/GL/xmesa_xf86.h				\
-	$(DIRECTORY)/include/GLView.h					\
-	$(DIRECTORY)/src/Makefile					\
-	$(DIRECTORY)/src/descrip.mms					\
-	$(DIRECTORY)/src/mesa/Makefile*					\
-	$(DIRECTORY)/src/mesa/sources					\
-	$(DIRECTORY)/src/mesa/descrip.mms				\
-	$(DIRECTORY)/src/mesa/depend					\
-	$(DIRECTORY)/src/mesa/main/*.[chS]				\
-	$(DIRECTORY)/src/mesa/main/descrip.mms				\
-	$(DIRECTORY)/src/mesa/glapi/*.[chS]				\
-	$(DIRECTORY)/src/mesa/glapi/descrip.mms				\
-	$(DIRECTORY)/src/mesa/array_cache/*.[ch]			\
-	$(DIRECTORY)/src/mesa/array_cache/descrip.mms			\
-	$(DIRECTORY)/src/mesa/math/*.[ch]				\
-	$(DIRECTORY)/src/mesa/math/descrip.mms				\
-	$(DIRECTORY)/src/mesa/shader/*.[ch]				\
-	$(DIRECTORY)/src/mesa/shader/descrip.mms			\
-	$(DIRECTORY)/src/mesa/shader/grammar/*.[ch]			\
-	$(DIRECTORY)/src/mesa/shader/grammar/descrip.mms		\
-	$(DIRECTORY)/src/mesa/shader/slang/*.[ch]			\
-	$(DIRECTORY)/src/mesa/shader/slang/descrip.mms			\
-	$(DIRECTORY)/src/mesa/shader/slang/library/*.[ch]		\
-	$(DIRECTORY)/src/mesa/swrast/*.[ch]				\
-	$(DIRECTORY)/src/mesa/swrast/descrip.mms			\
-	$(DIRECTORY)/src/mesa/swrast_setup/*.[ch]			\
-	$(DIRECTORY)/src/mesa/swrast_setup/descrip.mms			\
-	$(DIRECTORY)/src/mesa/tnl/*.[chS]				\
-	$(DIRECTORY)/src/mesa/tnl/descrip.mms				\
-	$(DIRECTORY)/src/mesa/tnl_dd/*.[ch]				\
-	$(DIRECTORY)/src/mesa/tnl_dd/imm/*.[ch]				\
-	$(DIRECTORY)/src/mesa/tnl_dd/imm/NOTES.imm			\
-	$(DIRECTORY)/src/mesa/drivers/beos/*.cpp			\
-	$(DIRECTORY)/src/mesa/drivers/beos/Makefile			\
-	$(DIRECTORY)/src/mesa/drivers/common/*.[ch]			\
-	$(DIRECTORY)/src/mesa/drivers/common/descrip.mms		\
-	$(DIRECTORY)/src/mesa/drivers/directfb/*.[ch]			\
-	$(DIRECTORY)/src/mesa/drivers/directfb/Makefile			\
-	$(DIRECTORY)/src/mesa/drivers/dos/*.[chS]			\
-	$(DIRECTORY)/src/mesa/drivers/fbdev/glfbdev.c			\
-	$(DIRECTORY)/src/mesa/drivers/glide/*.[ch]			\
-	$(DIRECTORY)/src/mesa/drivers/ggi/*.[ch]			\
-	$(DIRECTORY)/src/mesa/drivers/ggi/ggimesa.conf.in		\
-	$(DIRECTORY)/src/mesa/drivers/ggi/default/*.c			\
-	$(DIRECTORY)/src/mesa/drivers/ggi/default/genkgi.conf.in	\
-	$(DIRECTORY)/src/mesa/drivers/ggi/display/*.c			\
-	$(DIRECTORY)/src/mesa/drivers/ggi/display/fbdev.conf.in		\
-	$(DIRECTORY)/src/mesa/drivers/ggi/include/ggi/mesa/*.h		\
-	$(DIRECTORY)/src/mesa/drivers/osmesa/Makefile.win		\
-	$(DIRECTORY)/src/mesa/drivers/osmesa/descrip.mms		\
-	$(DIRECTORY)/src/mesa/drivers/osmesa/osmesa.def			\
-	$(DIRECTORY)/src/mesa/drivers/osmesa/*.[ch]			\
-	$(DIRECTORY)/src/mesa/drivers/svga/*.[ch]			\
-	$(DIRECTORY)/src/mesa/drivers/windows/*/*.[ch]			\
-	$(DIRECTORY)/src/mesa/drivers/windows/*/*.def			\
-	$(DIRECTORY)/src/mesa/drivers/x11/descrip.mms			\
-	$(DIRECTORY)/src/mesa/drivers/x11/*.[ch]			\
-	$(DIRECTORY)/src/mesa/ppc/*.[ch]				\
-	$(DIRECTORY)/src/mesa/sparc/*.[chS]				\
-	$(DIRECTORY)/src/mesa/x86/Makefile				\
-	$(DIRECTORY)/src/mesa/x86/*.[ch]				\
-	$(DIRECTORY)/src/mesa/x86/*.S					\
-	$(DIRECTORY)/src/mesa/x86/rtasm/*.[ch]				\
-	$(DIRECTORY)/src/mesa/x86-64/*.[chS]				\
-	$(DIRECTORY)/src/mesa/x86-64/Makefile				\
-	$(DIRECTORY)/progs/Makefile					\
-	$(DIRECTORY)/progs/util/README					\
-	$(DIRECTORY)/progs/util/*.[ch]					\
-	$(DIRECTORY)/progs/util/sampleMakefile				\
-	$(DIRECTORY)/vms/analyze_map.com				\
-	$(DIRECTORY)/vms/xlib.opt					\
-	$(DIRECTORY)/vms/xlib_share.opt					\
-	$(DIRECTORY)/windows/VC6/mesa/gdi/gdi.dsp			\
-	$(DIRECTORY)/windows/VC6/mesa/glu/*.txt				\
-	$(DIRECTORY)/windows/VC6/mesa/glu/glu.dsp			\
-	$(DIRECTORY)/windows/VC6/mesa/mesa.dsw				\
-	$(DIRECTORY)/windows/VC6/mesa/mesa/mesa.dsp			\
-	$(DIRECTORY)/windows/VC6/mesa/osmesa/osmesa.dsp			\
-	$(DIRECTORY)/windows/VC7/mesa/gdi/gdi.vcproj			\
-	$(DIRECTORY)/windows/VC7/mesa/glu/glu.vcproj			\
-	$(DIRECTORY)/windows/VC7/mesa/mesa.sln				\
-	$(DIRECTORY)/windows/VC7/mesa/mesa/mesa.vcproj			\
-	$(DIRECTORY)/windows/VC7/mesa/osmesa/osmesa.vcproj
-
-DRI_FILES = \
-	$(DIRECTORY)/include/GL/internal/dri_interface.h		\
-	$(DIRECTORY)/include/GL/internal/sarea.h			\
-	$(DIRECTORY)/src/glx/Makefile					\
-	$(DIRECTORY)/src/glx/x11/Makefile				\
-	$(DIRECTORY)/src/glx/x11/*.[ch]					\
-	$(DIRECTORY)/src/mesa/drivers/dri/Makefile			\
-	$(DIRECTORY)/src/mesa/drivers/dri/Makefile.template		\
-	$(DIRECTORY)/src/mesa/drivers/dri/common/xmlpool/*.[ch]		\
-	$(DIRECTORY)/src/mesa/drivers/dri/common/xmlpool/*.po		\
-	$(DIRECTORY)/src/mesa/drivers/dri/*/*.[chS]			\
-	$(DIRECTORY)/src/mesa/drivers/dri/*/Makefile			\
-	$(DIRECTORY)/src/mesa/drivers/dri/*/Doxyfile			\
-	$(DIRECTORY)/src/mesa/drivers/dri/*/server/*.[ch]
-
-SGI_GLU_FILES = \
-	$(DIRECTORY)/src/glu/Makefile					\
-	$(DIRECTORY)/src/glu/descrip.mms				\
-	$(DIRECTORY)/src/glu/sgi/Makefile				\
-	$(DIRECTORY)/src/glu/sgi/Makefile.win				\
-	$(DIRECTORY)/src/glu/sgi/Makefile.DJ				\
-	$(DIRECTORY)/src/glu/sgi/glu.def				\
-	$(DIRECTORY)/src/glu/sgi/dummy.cc				\
-	$(DIRECTORY)/src/glu/sgi/descrip.mms				\
-	$(DIRECTORY)/src/glu/sgi/mesaglu.opt				\
-	$(DIRECTORY)/src/glu/sgi/include/gluos.h			\
-	$(DIRECTORY)/src/glu/sgi/libnurbs/interface/*.h			\
-	$(DIRECTORY)/src/glu/sgi/libnurbs/interface/*.cc		\
-	$(DIRECTORY)/src/glu/sgi/libnurbs/internals/*.h			\
-	$(DIRECTORY)/src/glu/sgi/libnurbs/internals/*.cc		\
-	$(DIRECTORY)/src/glu/sgi/libnurbs/nurbtess/*.h			\
-	$(DIRECTORY)/src/glu/sgi/libnurbs/nurbtess/*.cc			\
-	$(DIRECTORY)/src/glu/sgi/libtess/README				\
-	$(DIRECTORY)/src/glu/sgi/libtess/alg-outline			\
-	$(DIRECTORY)/src/glu/sgi/libtess/*.[ch]				\
-	$(DIRECTORY)/src/glu/sgi/libutil/*.[ch]
-
-MESA_GLU_FILES = \
-	$(DIRECTORY)/src/glu/mesa/README[12]		\
-	$(DIRECTORY)/src/glu/mesa/Makefile*		\
-	$(DIRECTORY)/src/glu/mesa/descrip.mms		\
-	$(DIRECTORY)/src/glu/mesa/mms_depend		\
-	$(DIRECTORY)/src/glu/mesa/*.def			\
-	$(DIRECTORY)/src/glu/mesa/depend		\
-	$(DIRECTORY)/src/glu/mesa/*.[ch]
-
-GLW_FILES = \
-	$(DIRECTORY)/src/glw/*.[ch]			\
-	$(DIRECTORY)/src/glw/Makefile*			\
-	$(DIRECTORY)/src/glw/README			\
-	$(DIRECTORY)/src/glw/depend
-
-DEMO_FILES = \
-	$(DIRECTORY)/progs/beos/*.cpp			\
-	$(DIRECTORY)/progs/beos/Makefile		\
-	$(DIRECTORY)/progs/images/*.rgb			\
-	$(DIRECTORY)/progs/images/*.rgba		\
-	$(DIRECTORY)/progs/demos/Makefile*		\
-	$(DIRECTORY)/progs/demos/descrip.mms		\
-	$(DIRECTORY)/progs/demos/*.[ch]			\
-	$(DIRECTORY)/progs/demos/*.cxx			\
-	$(DIRECTORY)/progs/demos/*.dat			\
-	$(DIRECTORY)/progs/demos/README			\
-	$(DIRECTORY)/progs/osdemos/Makefile		\
-	$(DIRECTORY)/progs/osdemos/*.c			\
-	$(DIRECTORY)/progs/xdemos/Makefile*		\
-	$(DIRECTORY)/progs/xdemos/descrip.mms		\
-	$(DIRECTORY)/progs/xdemos/*.[chf]		\
-	$(DIRECTORY)/progs/redbook/Makefile*		\
-	$(DIRECTORY)/progs/redbook/README		\
-	$(DIRECTORY)/progs/redbook/*.[ch]		\
-	$(DIRECTORY)/progs/samples/Makefile*		\
-	$(DIRECTORY)/progs/samples/README		\
-	$(DIRECTORY)/progs/samples/*.c			\
-	$(DIRECTORY)/progs/windml/Makefile.ugl		\
-	$(DIRECTORY)/progs/windml/*.c			\
-	$(DIRECTORY)/progs/windml/*.bmp			\
-	$(DIRECTORY)/progs/ggi/*.c			\
-	$(DIRECTORY)/windows/VC6/progs/demos/*.dsp	\
-	$(DIRECTORY)/windows/VC6/progs/progs.dsw	\
-	$(DIRECTORY)/windows/VC7/progs/demos/*.vcproj	\
-	$(DIRECTORY)/windows/VC7/progs/progs.sln
-
-GLUT_FILES = \
-	$(DIRECTORY)/include/GL/glut.h			\
-	$(DIRECTORY)/include/GL/glutf90.h		\
-	$(DIRECTORY)/src/glut/glx/Makefile*		\
-	$(DIRECTORY)/src/glut/glx/depend		\
-	$(DIRECTORY)/src/glut/glx/*def			\
-	$(DIRECTORY)/src/glut/glx/descrip.mms		\
-	$(DIRECTORY)/src/glut/glx/mms_depend		\
-	$(DIRECTORY)/src/glut/glx/*.[ch]		\
-	$(DIRECTORY)/src/glut/beos/*.[ch]		\
-	$(DIRECTORY)/src/glut/beos/*.cpp		\
-	$(DIRECTORY)/src/glut/beos/Makefile		\
-	$(DIRECTORY)/src/glut/dos/*.[ch]		\
-	$(DIRECTORY)/src/glut/dos/Makefile.DJ		\
-	$(DIRECTORY)/src/glut/dos/PC_HW/*.[chS]		\
-	$(DIRECTORY)/src/glut/ggi/*.[ch]		\
-	$(DIRECTORY)/src/glut/ggi/Makefile		\
-	$(DIRECTORY)/windows/VC6/progs/glut/glut.dsp	\
-	$(DIRECTORY)/windows/VC7/progs/glut/glut.vcproj
-
-DEPEND_FILES = \
-	$(TOP)/src/mesa/depend		\
-	$(TOP)/src/glw/depend		\
-	$(TOP)/src/glut/glx/depend	\
-	$(TOP)/src/glu/sgi/depend
-
-
-LIB_FILES = $(MAIN_FILES) $(DRI_FILES) $(SGI_GLU_FILES) $(GLW_FILES)
-
-
-# Everything for new a Mesa release:
-tarballs: rm_depend lib_gz demo_gz glut_gz lib_bz2 demo_bz2 glut_bz2 lib_zip demo_zip glut_zip md5
-
-
-rm_depend:
-	@for dep in $(DEPEND_FILES) ; do \
-		rm -f $$dep ; \
-		touch $$dep ; \
-	done
-
-lib_gz:
-	rm -f configs/current ; \
-	cd .. ; \
-	tar -cf $(LIB_NAME).tar $(LIB_FILES) ; \
-	gzip $(LIB_NAME).tar ; \
-	mv $(LIB_NAME).tar.gz $(DIRECTORY)
-
-demo_gz:
-	cd .. ; \
-	tar -cf $(DEMO_NAME).tar $(DEMO_FILES) ; \
-	gzip $(DEMO_NAME).tar ; \
-	mv $(DEMO_NAME).tar.gz $(DIRECTORY)
-
-glut_gz:
-	cd .. ; \
-	tar -cf $(GLUT_NAME).tar $(GLUT_FILES) ; \
-	gzip $(GLUT_NAME).tar ; \
-	mv $(GLUT_NAME).tar.gz $(DIRECTORY)
-
-lib_bz2:
-	rm -f configs/current ; \
-	cd .. ; \
-	tar -cf $(LIB_NAME).tar $(LIB_FILES) ; \
-	bzip2 $(LIB_NAME).tar ; \
-	mv $(LIB_NAME).tar.bz2 $(DIRECTORY)
-
-demo_bz2:
-	cd .. ; \
-	tar -cf $(DEMO_NAME).tar $(DEMO_FILES) ; \
-	bzip2 $(DEMO_NAME).tar ; \
-	mv $(DEMO_NAME).tar.bz2 $(DIRECTORY)
-
-glut_bz2:
-	cd .. ; \
-	tar -cf $(GLUT_NAME).tar $(GLUT_FILES) ; \
-	bzip2 $(GLUT_NAME).tar ; \
-	mv $(GLUT_NAME).tar.bz2 $(DIRECTORY)
-
-lib_zip:
-	rm -f configs/current ; \
-	rm -f $(LIB_NAME).zip ; \
-	cd .. ; \
-	zip -qr $(LIB_NAME).zip $(LIB_FILES) ; \
-	mv $(LIB_NAME).zip $(DIRECTORY)
-
-demo_zip:
-	rm -f $(DEMO_NAME).zip ; \
-	cd .. ; \
-	zip -qr $(DEMO_NAME).zip $(DEMO_FILES) ; \
-	mv $(DEMO_NAME).zip $(DIRECTORY)
-
-glut_zip:
-	rm -f $(GLUT_NAME).zip ; \
-	cd .. ; \
-	zip -qr $(GLUT_NAME).zip $(GLUT_FILES) ; \
-	mv $(GLUT_NAME).zip $(DIRECTORY)
-
-md5:
-	@-md5sum $(LIB_NAME).tar.gz
-	@-md5sum $(LIB_NAME).tar.bz2
-	@-md5sum $(LIB_NAME).zip
-	@-md5sum $(DEMO_NAME).tar.gz
-	@-md5sum $(DEMO_NAME).tar.bz2
-	@-md5sum $(DEMO_NAME).zip
-	@-md5sum $(GLUT_NAME).tar.gz
-	@-md5sum $(GLUT_NAME).tar.bz2
-	@-md5sum $(GLUT_NAME).zip
--- a/bin/minstall
+++ b/bin/minstall
@@ -65,6 +65,7 @@ if [ $# -ge 2 ] ; then

 		elif [ -f "$FILE" ] ; then
 			#echo "$FILE" is a regular file
+			$RM "$DEST/`basename $FILE`"
 			cp "$FILE" "$DEST"
 			if [ $MODE ] ; then
 				FILE=`basename "$FILE"`
--- a/configs/.gitignore
+++ b/configs/.gitignore
@@ -0,0 +1 @@
+current
--- a/configs/debian-default
+++ b/configs/debian-default
@@ -1,14 +0,0 @@
-# Define Debian-specific defaults.
-
-CONFIG_NAME = debian-default
-
-OPT_FLAGS = -O2 -g
-CFLAGS += -fno-strict-aliasing
-
-SRC_DIRS = mesa
-PROGRAM_DIRS =
-
-INSTALL_DIR = $(DESTDIR)/usr
-
-# vim: ft=make
-
--- a/configs/debian-dri-amd64
+++ b/configs/debian-dri-amd64
@@ -1,9 +0,0 @@
-# Configuration for building the DRI drivers on i386.
-
-include $(TOP)/configs/linux-dri-x86-64
-include $(TOP)/configs/debian-dri-default
-
-CONFIG_NAME = debian-dri-amd64
-
-# vim: ft=make
-
--- a/configs/debian-dri-any
+++ b/configs/debian-dri-any
@@ -1,9 +0,0 @@
-# Configuration for building the DRI drivers on the build architecture.
-
-include $(TOP)/configs/linux-dri
-include $(TOP)/configs/debian-dri-default
-
-CONFIG_NAME = debian-dri-any
-
-# vim: ft=make
-
--- a/configs/debian-dri-default
+++ b/configs/debian-dri-default
@@ -1,36 +0,0 @@
-# Configuration defaults for building the DRI drivers and DRI/GLX-enabled
-# libGL.
-
-include $(TOP)/configs/debian-default
-
-CONFIG_NAME = debian-dri-default
-
-SRC_DIRS = glx/x11 mesa progs
-DRIVER_DIRS = dri
-PROGRAM_DIRS = xdemos
-PROGS = glxdemo \
-        glxgears \
-        glxheads \
-        glxinfo
-
-LIB_DIR = lib/glx
-
-DRI_DRIVER_INSTALL_DIR = $(INSTALL_DIR)/lib/dri
-DRI_DRIVER_SEARCH_DIR = /usr/lib/dri
-
-DRI_DIRS = mach64 mga r128 r200 r300 radeon s3v savage tdfx trident
-
-ARCH_X86 = i386 amd64
-
-ifneq ($(findstring $(DEB_BUILD_ARCH), $(ARCH_X86)),)
-	DRI_DIRS += i810 i915 i915tex i965 sis unichrome
-endif
-
-ifeq ($(DEB_BUILD_ARCH), sparc)
-	DRI_DIRS += ffb
-endif
-
-APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB)
-
-# vim: ft=make
-
--- a/configs/debian-dri-i386
+++ b/configs/debian-dri-i386
@@ -1,9 +0,0 @@
-# Configuration for building the DRI drivers on i386.
-
-include $(TOP)/configs/linux-dri-x86
-include $(TOP)/configs/debian-dri-default
-
-CONFIG_NAME = debian-dri-i386
-
-# vim: ft=make
-
--- a/configs/debian-dri-i386-i686
+++ b/configs/debian-dri-i386-i686
@@ -1,14 +0,0 @@
-# Configuration for building the DRI drivers on i386.
-
-include $(TOP)/configs/linux-dri-x86
-include $(TOP)/configs/debian-dri-optimized-default
-
-CONFIG_NAME = debian-dri-i386-i686
-
-ARCH_FLAGS = -march=i686
-LIB_DIR = lib/glx/i686/cmov
-
-DRI_DRIVER_INSTALL_DIR = $(INSTALL_DIR)/lib/dri/i686/cmov
-
-# vim: ft=make
-
--- a/configs/debian-dri-optimized-default
+++ b/configs/debian-dri-optimized-default
@@ -1,13 +0,0 @@
-# Configuration defaults for CPU-optimized builds of the DRI drivers and
-# DRI/GLX-enabled libGL.
-
-include $(TOP)/configs/debian-dri-default
-
-CONFIG_NAME = debian-dri-optimized-default
-
-# override so that the utility programs are not rebuilt with CPU-specific
-# optimizations
-SRC_DIRS = glx/x11 mesa
-
-# vim: ft=make
-
--- a/configs/debian-osmesa
+++ b/configs/debian-osmesa
@@ -1,9 +0,0 @@
-# Configuration for building only OSMesa on Debian.
-
-include $(TOP)/configs/linux-osmesa
-include $(TOP)/configs/debian-osmesa-default
-
-CONFIG_NAME = debian-osmesa
-
-# vim: ft=make
-
--- a/configs/debian-osmesa-default
+++ b/configs/debian-osmesa-default
@@ -1,10 +0,0 @@
-# Configuration defaults for building OSMesa.
-
-include $(TOP)/configs/debian-default
-
-CONFIG_NAME = debian-osmesa-default
-
-DRIVER_DIRS = osmesa
-
-# vim: ft=make
-
--- a/configs/debian-osmesa-static
+++ b/configs/debian-osmesa-static
@@ -1,9 +0,0 @@
-# Configuration for building only OSMesa (static version) on Debian.
-
-include $(TOP)/configs/linux-osmesa-static
-include $(TOP)/configs/debian-osmesa-default
-
-CONFIG_NAME = debian-osmesa-static
-
-# vim: ft=make
-
--- a/configs/debian-osmesa16
+++ b/configs/debian-osmesa16
@@ -1,10 +0,0 @@
-# Configuration for building OSMesa with support for 16 bits per color
-# channel.
-
-include $(TOP)/configs/linux-osmesa16
-include $(TOP)/configs/debian-osmesa-default
-
-CONFIG_NAME = debian-osmesa16
-
-# vim: ft=make
-
--- a/configs/debian-osmesa16-static
+++ b/configs/debian-osmesa16-static
@@ -1,10 +0,0 @@
-# Configuration for building a static version of OSMesa with support for 16
-# bits per color channel.
-
-include $(TOP)/configs/linux-osmesa16-static
-include $(TOP)/configs/debian-osmesa-default
-
-CONFIG_NAME = debian-osmesa16-static
-
-# vim: ft=make
-
--- a/configs/debian-osmesa32
+++ b/configs/debian-osmesa32
@@ -1,10 +0,0 @@
-# Configuration for building OSMesa with support for 32 bits per color
-# channel.
-
-include $(TOP)/configs/linux-osmesa32
-include $(TOP)/configs/debian-osmesa-default
-
-CONFIG_NAME = debian-osmesa32
-
-# vim: ft=make
-
--- a/configs/debian-osmesa32-static
+++ b/configs/debian-osmesa32-static
@@ -1,10 +0,0 @@
-# Configuration for building a static version of OSMesa with support for 32
-# bits per color channel.
-
-include $(TOP)/configs/linux-osmesa32-static
-include $(TOP)/configs/debian-osmesa-default
-
-CONFIG_NAME = debian-osmesa32-static
-
-# vim: ft=make
-
--- a/configs/debian-swx11+glu-alpha-ev5
+++ b/configs/debian-swx11+glu-alpha-ev5
@@ -1,12 +0,0 @@
-# Configuration for building Mesa (swx11 and GLU) on alpha (ev5 optimized).
-
-include $(TOP)/configs/linux-alpha
-include $(TOP)/configs/debian-swx11+glu-default
-
-CONFIG_NAME = debian-swx11+glu-alpha-ev5
-
-SRC_DIRS = mesa
-LIB_DIR = lib/ev5/cmov
-
-# vim: ft=make
-
--- a/configs/debian-swx11+glu-amd64
+++ b/configs/debian-swx11+glu-amd64
@@ -1,10 +0,0 @@
-# Configuration for building Mesa (swx11 and GLU) with runtime-detected
-# assembler optimizations on amd64.
-
-include $(TOP)/configs/linux-x86-64
-include $(TOP)/configs/debian-swx11+glu-default
-
-CONFIG_NAME = debian-swx11+glu-amd64
-
-# vim: ft=make
-
--- a/configs/debian-swx11+glu-any
+++ b/configs/debian-swx11+glu-any
@@ -1,9 +0,0 @@
-# Configuration for building Mesa (swx11 and GLU) on the build architecture.
-
-include $(TOP)/configs/linux
-include $(TOP)/configs/debian-swx11+glu-default
-
-CONFIG_NAME = debian-swx11+glu-any
-
-# vim: ft=make
-
--- a/configs/debian-swx11+glu-default
+++ b/configs/debian-swx11+glu-default
@@ -1,14 +0,0 @@
-# Configuration defaults for building Mesa (swx11 and GLU).
-
-include $(TOP)/configs/debian-default
-
-CONFIG_NAME = debian-swx11+glu-default
-
-SRC_DIRS = mesa glu glw
-DRIVER_DIRS = x11
-
-GLW_SOURCES += GLwMDrawA.c
-GLW_LIB_DEPS += -lXm
-
-# vim: ft=make
-
--- a/configs/debian-swx11+glu-i386
+++ b/configs/debian-swx11+glu-i386
@@ -1,10 +0,0 @@
-# Configuration for building Mesa (swx11 and GLU) with runtime-detected
-# assembler optimizations on i386.
-
-include $(TOP)/configs/linux-x86
-include $(TOP)/configs/debian-swx11+glu-default
-
-CONFIG_NAME = debian-swx11+glu-i386
-
-# vim: ft=make
-
--- a/configs/debian-swx11+glu-i386-i686
+++ b/configs/debian-swx11+glu-i386-i686
@@ -1,14 +0,0 @@
-# Configuration for building Mesa (swx11 and GLU) with runtime-detected
-# assembler optimizations on i386 (i686 optimized).
-
-include $(TOP)/configs/linux-x86
-include $(TOP)/configs/debian-swx11+glu-default
-
-CONFIG_NAME = debian-swx11+glu-i386-i686
-
-ARCH_FLAGS += -march=i686
-SRC_DIRS = mesa
-LIB_DIR = lib/i686/cmov
-
-# vim: ft=make
-
--- a/configs/debian-swx11+glu-powerpc-603
+++ b/configs/debian-swx11+glu-powerpc-603
@@ -1,13 +0,0 @@
-# Configuration for building Mesa (swx11 and GLU) with runtime-detected
-# assembler optimizations on powerpc (603 optimized).
-
-include $(TOP)/configs/linux-ppc
-include $(TOP)/configs/debian-swx11+glu-default
-
-CONFIG_NAME = debian-swx11+glu-powerpc-603
-
-SRC_DIRS = mesa
-LIB_DIR = lib/603/cmov
-
-# vim: ft=make
-
--- a/configs/debian-swx11+glu-ppc64
+++ b/configs/debian-swx11+glu-ppc64
@@ -1,11 +0,0 @@
-# Configuration for building Mesa (swx11 and GLU) with runtime-detected
-# assembler optimizations on ppc64.
-
-include $(TOP)/configs/debian-swx11+glu-any
-
-CONFIG_NAME = debian-swx11+glu-ppc64
-
-LIB_DIR = lib64
-
-# vim: ft=make
-
--- a/configs/debian-swx11+glu-sparc
+++ b/configs/debian-swx11+glu-sparc
@@ -1,10 +0,0 @@
-# Configuration for building Mesa (swx11 and GLU) with runtime-detected
-# assembler optimizations on sparc.
-
-include $(TOP)/configs/linux-sparc
-include $(TOP)/configs/debian-swx11+glu-default
-
-CONFIG_NAME = debian-swx11+glu-sparc
-
-# vim: ft=make
-
--- a/configs/debian-swx11+glu-sparc-ultrasparc
+++ b/configs/debian-swx11+glu-sparc-ultrasparc
@@ -1,13 +0,0 @@
-# Configuration for building Mesa (swx11 and GLU) with runtime-detected
-# assembler optimizations on sparc (ultrasparc-optimized).
-
-include $(TOP)/configs/linux-ultrasparc
-include $(TOP)/configs/debian-swx11+glu-default
-
-CONFIG_NAME = debian-swx11+glu-sparc-ultrasparc
-
-SRC_DIRS = mesa
-LIB_DIR = lib/ultrasparc/cmov
-
-# vim: ft=make
-
--- a/configs/debian-swx11+glu-static-amd64
+++ b/configs/debian-swx11+glu-static-amd64
@@ -1,10 +0,0 @@
-# Configuration for building static versions of the libraries (swx11 and GLU)
-# on amd64.
-
-include $(TOP)/configs/linux-x86-64-static
-include $(TOP)/configs/debian-swx11+glu-default
-
-CONFIG_NAME = debian-swx11+glu-static-amd64
-
-# vim: ft=make
-
--- a/configs/debian-swx11+glu-static-any
+++ b/configs/debian-swx11+glu-static-any
@@ -1,10 +0,0 @@
-# Configuration for building static versions of the libraries (swx11 and GLU)
-# on the build architecture.
-
-include $(TOP)/configs/linux-static
-include $(TOP)/configs/debian-swx11+glu-default
-
-CONFIG_NAME = debian-swx11+glu-static-any
-
-# vim: ft=make
-
--- a/configs/debian-swx11+glu-static-i386
+++ b/configs/debian-swx11+glu-static-i386
@@ -1,10 +0,0 @@
-# Configuration for building static versions of the libraries (swx11 and GLU)
-# on i386.
-
-include $(TOP)/configs/linux-x86-static
-include $(TOP)/configs/debian-swx11+glu-default
-
-CONFIG_NAME = debian-swx11+glu-static-i386
-
-# vim: ft=make
-
--- a/configs/debian-swx11+glu-static-ppc64
+++ b/configs/debian-swx11+glu-static-ppc64
@@ -1,11 +0,0 @@
-# Configuration for building static versions of the libraries (swx11 and GLU)
-# on ppc64.
-
-include $(TOP)/configs/debian-swx11+glu-static-any
-
-CONFIG_NAME = debian-swx11+glu-static-ppc64
-
-LIB_DIR = lib64
-
-# vim: ft=make
-
--- a/configs/default-bp
+++ b/configs/default-bp
@@ -1,75 +0,0 @@
-# Default/template configuration
-
-# This is included by other config files which may override some
-# of these variables.
-
-CONFIG_NAME = default
-
-# Version info
-MESA_MAJOR=6
-MESA_MINOR=3
-MESA_TINY=0
-
-# external projects
-#DRM_SOURCE_PATH=$(TOP)/../drm
-DRM_SOURCE_PATH=/home/projects/DRI-freedesktop/drm
-
-# Compiler and flags
-CC = cc
-CXX = CC
-CFLAGS = -O
-CXXFLAGS = -O
-GLU_CFLAGS = 
-
-# Misc tools and flags
-MKLIB_OPTIONS = 
-MKDEP = makedepend
-MKDEP_OPTIONS = -fdepend
-MAKE = make
-
-# Library names (base name)
-GL_LIB = GL
-GLU_LIB = GLU
-GLUT_LIB = glut
-GLW_LIB = GLw
-OSMESA_LIB = OSMesa
-
-
-# Library names (actual file names)
-GL_LIB_NAME = lib$(GL_LIB).so
-GLU_LIB_NAME = lib$(GLU_LIB).so
-GLUT_LIB_NAME = lib$(GLUT_LIB).so
-GLW_LIB_NAME = lib$(GLW_LIB).so
-OSMESA_LIB_NAME = lib$(OSMesa).so
-
-
-# Optional assembly language optimization files for libGL
-ASM_SOURCES = 
-
-# GLw widget sources (Append "GLwMDrawA.c" here and add -lXm to GLW_LIB_DEPS in
-# order to build the Motif widget too)
-GLW_SOURCES = GLwDrawA.c
-
-
-# Directories
-LIB_DIR = $(TOP)/lib
-INSTALL_PREFIX = /usr/local
-SRC_DIRS = mesa glu glut/glx glw
-GLU_DIRS = sgi
-DRIVER_DIRS = x11 osmesa
-# Which subdirs under $(TOP)/progs/ to enter:
-PROGRAM_DIRS = demos redbook samples xdemos
-
-
-# Library/program dependencies
-GL_LIB_DEPS = -lX11 -lXext -lm -lpthread
-OSMESA_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB)
-GLU_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -lm
-GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXmu -lXt -lXi -lm
-GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -lXt -lX11
-APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm
-
-
-# Shading language support (set to 0 or 1)
-SHADING_LANGUAGE = 0
-
--- a/configs/diffs
+++ b/configs/diffs
@@ -1,37 +0,0 @@
-? default-bp
-? diffs
-? linux-dri-bp
-? linux-tcc
-Index: linux-icc-static
-===================================================================
-RCS file: /cvs/mesa/Mesa/configs/linux-icc-static,v
-retrieving revision 1.4
-diff -r1.4 linux-icc-static
-9c9
-< CXX = g++
---
-> CXX = icpc
-11c11
-< CXXFLAGS = -O3
---
-> CXXFLAGS = -O3 -tpp6 -axK -DPTHREADS
-22,25c22,24
-< GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread
-< GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm
-< APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm
-< MKLIB_OPTIONS = -arch icc
---
-> GL_LIB_DEPS =
-> GLUT_LIB_DEPS =
-> APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm -lpthread -lcxa -lunwind
-29,30d27
-< 
-< 
-Index: linux-x86-64-static
-===================================================================
-RCS file: /cvs/mesa/Mesa/configs/linux-x86-64-static,v
-retrieving revision 1.6
-diff -r1.6 linux-x86-64-static
-21a22,23
-> APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) \
->                $(EXTRA_LIB_PATH) -lX11 -lXmu -lXt -lXi -lpthread -lstdc++ -lm
--- a/configs/freebsd-dri
+++ b/configs/freebsd-dri
@@ -28,7 +28,8 @@ ASM_SOURCES =
 LIBDRM_CFLAGS = `pkg-config --cflags libdrm`
 LIBDRM_LIB = `pkg-config --libs libdrm`
 DRI_LIB_DEPS = -L/usr/local/lib -lm -lpthread -lexpat $(LIBDRM_LIB)
-GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lXxf86vm -lm -lpthread $(LIBDRM_LIB)
+GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lXxf86vm -lXdamage -lXfixes \
+	-lm -lpthread $(LIBDRM_LIB)

 GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -L/usr/X11R6/lib -lGLU -lGL -lX11 -lXmu -lXt -lXi -lm
 GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -L/usr/X11R6/lib -lGL -lXt -lX11
--- a/configs/linux-dri
+++ b/configs/linux-dri
@@ -41,7 +41,8 @@ EXTRA_LIB_PATH=-L/usr/X11R6/lib
 LIBDRM_CFLAGS = `pkg-config --cflags libdrm`
 LIBDRM_LIB = `pkg-config --libs libdrm`
 DRI_LIB_DEPS  = $(EXTRA_LIB_PATH) -lm -lpthread -lexpat -ldl $(LIBDRM_LIB)
-GL_LIB_DEPS   = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lm -lpthread -ldl \
+GL_LIB_DEPS   = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lXdamage -lXfixes \
+		-lm -lpthread -ldl \
                $(LIBDRM_LIB)


--- a/configs/linux-dri-bp
+++ b/configs/linux-dri-bp
@@ -1,55 +0,0 @@
-# -*-makefile-*-
-# Configuration for linux-dri: Linux DRI hardware drivers for XFree86 & others
-
-include $(TOP)/configs/default
-
-CONFIG_NAME = linux-dri
-
-# Compiler and flags
-CC = gcc
-CXX = g++
-
-MKDEP = /usr/X11R6/bin/makedepend
-#MKDEP = gcc -M
-#MKDEP_OPTIONS = -MF depend
-
-WARN_FLAGS = -Wall
-OPT_FLAGS  = -g
-PIC_FLAGS  = -fPIC
-
-# Add '-DGLX_USE_TLS' to ARCH_FLAGS to enable TLS support.
-ARCH_FLAGS ?=
-
-DEFINES = -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE \
-	-D_BSD_SOURCE -D_GNU_SOURCE \
-	-DDRI_NEW_INTERFACE_ONLY -DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1 
-
-X11_INCLUDES = -I/usr/X11R6/include -I/usr/X11R6/include/X11/extensions
-
-CFLAGS   = $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) \
-	$(ASM_FLAGS) -std=c99 -ffast-math 
-
-CXXFLAGS = $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES)
-
-
-ASM_SOURCES = 
-
-# Library/program dependencies
-EXTRA_LIB_PATH=-L/usr/X11R6/lib
-
-DRI_LIB_DEPS  = $(EXTRA_LIB_PATH) -lm -lpthread -lexpat -ldl
-GL_LIB_DEPS   = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lm -lpthread -ldl
-GLUT_LIB_DEPS = $(EXTRA_LIB_PATH) -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB)  -lX11 -lXmu -lXt -lXi -lm
-GLW_LIB_DEPS  = $(EXTRA_LIB_PATH) -L$(LIB_DIR) -l$(GL_LIB) -lXt -lX11
-
-
-# Directories
-SRC_DIRS = glx/x11 mesa glu glut/glx glw
-DRIVER_DIRS = dri
-PROGRAM_DIRS = 
-WINDOW_SYSTEM=dri
-
-# ffb and gamma are missing because they have not been converted to use the new
-# interface.
-DRI_DIRS = dri_client i810 i830 i915 mach64 mga r128 r200 radeon s3v \
-	savage sis tdfx trident unichrome fb
--- a/configs/linux-dri-debug
+++ b/configs/linux-dri-debug
@@ -0,0 +1,16 @@
+# -*-makefile-*-
+# Configuration for linux-dri-debug: Linux DRI hardware drivers for XFree86 & others
+
+include $(TOP)/configs/linux-dri
+
+CONFIG_NAME = linux-dri-debug
+OPT_FLAGS  = -O0 -g
+ARCH_FLAGS = -DDEBUG
+
+# Helpful to reduce the amount of stuff that gets built sometimes:
+#DRI_DIRS = i915tex i915 
+#DRI_DIRS = i965
+#DRI_DIRS = radeon r200 r300
+#DRI_DIRS = unichrome sis trident
+#DRI_DIRS = i810 mga r128 tdfx
+
--- a/configs/linux-osmesa-static
+++ b/configs/linux-osmesa-static
@@ -1,14 +0,0 @@
-# Configuration for building only libOSMesa on Linux, no Xlib driver
-# This doesn't really have any Linux dependencies, so it should be usable
-# on other (gcc-based) systems.
-
-include $(TOP)/configs/linux-osmesa
-
-CONFIG_NAME = linux-osmesa-static
-
-# Compiler and flags
-MKLIB_OPTIONS = -static
-
-# Library names
-OSMESA_LIB_NAME = libOSMesa.a
-
--- a/configs/linux-osmesa32-static
+++ b/configs/linux-osmesa32-static
@@ -1,28 +0,0 @@
-# Configuration for 32 bits/channel OSMesa library on Linux
-
-include $(TOP)/configs/default
-
-CONFIG_NAME = linux-osmesa32-static
-
-# Compiler and flags
-CC = gcc
-CXX = g++
-CFLAGS = -O3 -ansi -pedantic -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -I/usr/X11R6/include -DCHAN_BITS=32 -DDEFAULT_SOFTWARE_DEPTH_BITS=31
-CXXFLAGS = -O3 -ansi -pedantic -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
-MKLIB_OPTIONS = -static
-
-
-# Library names
-OSMESA_LIB = OSMesa32
-OSMESA_LIB_NAME = libOSMesa32.a
-
-
-# Directories
-SRC_DIRS = mesa glu
-DRIVER_DIRS = osmesa
-PROGRAM_DIRS = 
-
-
-# Dependencies
-OSMESA_LIB_DEPS = -lm -lpthread
-APP_LIB_DEPS = -lOSMesa32
--- a/configs/linux-tcc
+++ b/configs/linux-tcc
@@ -1,22 +0,0 @@
-# Configuration for debugging on Linux
-
-include $(TOP)/configs/default
-
-CONFIG_NAME = linux-tcc
-
-# Compiler and flags
-CC = gcc
-CXX = g++
-
-TCC_DIR=/home/progs/tcc-0.9.20
-
-CFLAGS = -g -ansi -pedantic -Wall -Wmissing-prototypes -Wundef -fPIC -ffast-math -D_POSIX_SOURCE -D_SVID_SOURCE -D_BSD_SOURCE -I/usr/X11R6/include -DUSE_XSHM -DPTHREADS -DDEBUG -DMESA_DEBUG -DUSE_TCC -I$(TCC_DIR)
-
-CXXFLAGS = -g -ansi -pedantic -Wall -Wundef -fPIC -ffast-math -D_POSIX_SOURCE -D_SVID_SOURCE -D_BSD_SOURCE -DDEBUG -DMESA_DEBUG
-
-GLUT_CFLAGS = -fexceptions
-
-GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread -L$(TCC_DIR) -ltcc -ldl
-GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm
-GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -lXt -L/usr/X11R6/lib -lX11
-APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,973 +0,0 @@
-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
--- a/debian/compat
+++ b/debian/compat
@@ -1 +0,0 @@
-5
--- a/debian/control
+++ b/debian/control
@@ -1,324 +0,0 @@
-Source: mesa
-Section: graphics
-Priority: optional
-Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
-Uploaders: Thierry Reding <thierry@gilfi.de>, Julien Cristau <jcristau@debian.org>
-Standards-Version: 3.7.2
-Build-Depends: debhelper (>= 5), quilt (>= 0.40), pkg-config, libdrm-dev (>= 2.2.0) [!hurd-i386], libx11-dev, xutils-dev, x11proto-gl-dev (>= 1.4.8), libxxf86vm-dev, libexpat1-dev, lesstif2-dev, dpkg-dev (>= 1.13.19)
-
-Package: libgl1-mesa-swx11
-Section: libs
-Architecture: any
-Depends: ${shlibs:Depends}
-Conflicts: mesag3-glide, mesag3-glide2, mesag3+ggi, libgl1, nvidia-glx, mesag3, libgl1-mesa-swrast
-Provides: libgl1, mesag3, libgl1-mesa-swrast
-Replaces: libgl1, mesag3, libgl1-mesa-swrast
-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: libs
-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
-Pre-Depends: libgl1-mesa-swx11
-Description: A free implementation of the OpenGL API -- 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
-Architecture: any
-Depends: libgl1-mesa-swx11 (= ${binary:Version}), libc6-dev, libx11-dev, libxext6, mesa-common-dev (= ${source:Version})
-Provides: libgl-dev, mesag3-widgets, mesag-widgets-dev, libglw-dev, mesag-dev, libgl1-mesa-swrast-dev
-Conflicts: mesa-dev, libgl-dev, mesag3 (<< 3.1-1), nvidia-glx-dev, mesag-dev, libgl1-mesa-swrast-dev
-Replaces: libgl-dev, mesag-dev, libgl1-mesa-swrast-dev
-Description: A free implementation of the OpenGL API -- development support files
- This package provides the development environment required for
- compiling programs with Mesa.  For a complete description of Mesa,
- please look at the libgl1-mesa-swx11 package.
- .
- This package also provides a simple widgets library, libGLw, which
- allows Motif-based applications to embed an OpenGL drawing context.
- The headers and static libraries for compiling programs that use this
- library are included.
- .
- This library provides a pure software rasteriser; it does not provide
- a direct rendering-capable library, or one which uses GLX.  For that,
- please see libgl1-mesa-dev.
-
-Package: libgl1-mesa-glx
-Section: libs
-Architecture: any
-Depends: ${shlibs:Depends}
-Conflicts: libgl1, libgl1-mesa-dri (<< 6.4.0)
-Replaces: libgl1, libgl1-mesa-dri (<< 6.4.0)
-Provides: libgl1
-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: libdevel
-Priority: extra
-Architecture: any
-Depends: libgl1-mesa-glx (= ${binary:Version})
-Description: A free implementation of the OpenGL API -- GLX runtime -- debugging symbols
- 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}, libgl1-mesa-glx (= ${binary:Version})
-Conflicts: xlibmesa-dri (<< 1:7.0.0)
-Replaces: xlibmesa-dri (<< 1:7.0.0)
-Description: A free implementation of the OpenGL API -- DRI modules
- 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.
-
-Package: libgl1-mesa-dri-dbg
-Section: libdevel
-Priority: extra
-Architecture: any
-Depends: libgl1-mesa-dri (= ${binary:Version})
-Description: A free implementation of the OpenGL API -- DRI modules -- debugging symbols
- 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: all
-Depends: libc6-dev, mesa-common-dev (= ${source:Version}), libgl1-mesa-glx (>= ${Source-Version}), libgl1-mesa-dri (>= ${Source-Version})
-Conflicts: libgl-dev, libgl1-mesa-dri-dev
-Replaces: libgl-dev, libgl1-mesa-dri-dev
-Provides: libgl-dev, libgl1-mesa-dri-dev
-Description: A free implementation of the OpenGL API -- GLX development support files
- This version of Mesa provides GLX and DRI capabilities: it is capable of
- both direct and indirect rendering.  For direct rendering, it can use DRI
- modules from the libgl1-mesa-dri package to accelerate drawing.
- .
- This package includes headers and static libraries for compiling
- programs with Mesa.
- .
- For a complete description of Mesa, please look at the libgl1-mesa-swx11
- package.
-
-Package: mesa-common-dev
-Section: devel
-Architecture: all
-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 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: devel
-Architecture: any
-Depends: libosmesa6 (= ${binary:Version}), mesa-common-dev (= ${source: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 support files
- This package provides the required environment for developing programs
- that use the off-screen rendering extension of Mesa.
- .
- For more information on OSmesa see the libosmesa6 package.
-
-Package: libglu1-mesa
-Section: libs
-Architecture: any
-Depends: ${shlibs:Depends}, libgl1-mesa-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 support files
- Includes headers and static libraries for compiling programs with GLU.
- .
- For a complete description of GLU, please look at the libglu1-mesa
- package.
-
-Package: mesa-swx11-source
-Section: libdevel
-Architecture: all
-Description: Mesa software rasteriser source -- development support files
- This package contains the source to the Mesa software rasteriser, which
- implements all of Mesa's GL support in software.  It powers the X11 and
- X server backends (assuming unaccelerated indirect).  This package is
- provided mainly for modular X servers which support GL, and need the
- software rasteriser source to build the GLcore module for unaccelerated
- indirect rendering.
-
-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
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,444 +0,0 @@
-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 1.1 [02/22/2000])
-
-1.  Definitions.
-
-1.1. "Additional Notice Provisions" means such additional provisions as
-     appear in the Notice in Original Code under the heading "Additional
-     Notice Provisions."
-
-1.2. "Covered Code" means the Original Code or Modifications, or any
-     combination thereof.
-
-1.3. "Hardware" means any physical device that accepts input, processes
-     input, stores the results of processing, and/or provides output.
-
-1.4. "Larger Work" means a work that combines Covered Code or portions
-     thereof with code not governed by the terms of this License.
-
-1.5. "Licensable" means having the right to grant, to the maximum extent
-     possible, whether at the time of the initial grant or subsequently
-     acquired, any and all of the rights conveyed herein.
-
-1.6. "License" means this document.
-
-1.7. "Licensed Patents" means patent claims Licensable by SGI that are
-     infringed by the use or sale of Original Code or any Modifications
-     provided by SGI, or any combination thereof.
-
-1.8. "Modifications" means any addition to or deletion from the
-     substance or structure of the Original Code or any previous
-     Modifications. When Covered Code is released as a series of files,
-     a Modification is: 
-
-     A. Any addition to the contents of a file containing Original Code
-        and/or addition to or deletion from the contents of a file
-        containing previous Modifications.
-
-     B. Any new file that contains any part of the Original Code or
-        previous Modifications.
-
-1.9. "Notice" means any notice in Original Code or Covered Code, as
-     required by and in compliance with this License.
-
-1.10. "Original Code" means source code of computer software code that
-      is described in the source code Notice required by Exhibit A as
-      Original Code, and updates and error corrections specifically 
-      thereto.
-
-1.11. "Recipient" means an individual or a legal entity exercising
-      rights under, and complying with all of the terms of, this License
-      or a future version of this License issued under Section 8. For
-      legal entities, "Recipient" includes any entity that controls, is
-      controlled by, or is under common control with Recipient. For
-      purposes of this definition, "control" of an entity means (a) the
-      power, direct or indirect, to direct or manage such entity, or (b)
-      ownership of fifty percent (50%) or more of the outstanding shares
-      or beneficial ownership of such entity.
-
-1.12. "Recipient Patents" means patent claims Licensable by a Recipient
-      that are infringed by the use or sale of Original Code or any
-      Modifications provided by SGI, or any combination thereof.
-
-1.13. "SGI" means Silicon Graphics, Inc.
-
-1.14. "SGI Patents" means patent claims Licensable by SGI other than the
-      Licensed Patents.
-
-2.  License Grant and Restrictions.
-
-2.1. SGI License Grant. Subject to the terms of this License and any
-     third party intellectual property claims, for the duration of
-     intellectual property protections inherent in the Original Code,
-     SGI hereby grants Recipient a worldwide, royalty-free,
-     non-exclusive license, to do the following: (i) under copyrights
-     Licensable by SGI, to reproduce, distribute, create derivative
-     works from, and, to the extent applicable, display and perform the
-     Original Code and/or any Modifications provided by SGI alone and/or
-     as part of a Larger Work; and (ii) under any Licensable Patents, to
-     make, have made, use, sell, offer for sale, import and/or otherwise
-     transfer the Original Code and/or any Modifications provided by
-     SGI. Recipient accepts the terms and conditions of this License by
-     undertaking any of the aforementioned actions. The patent license
-     shall apply to the Covered Code if, at the time any related
-     Modification is added, such addition of the Modification causes
-     such combination to be covered by the Licensed Patents. The patent
-     license in Section 2.1(ii) shall not apply to any other
-     combinations that include the Modification. No patent license is
-     provided under SGI Patents for infringements of SGI Patents by
-     Modifications not provided by SGI or combinations of Original Code
-     and Modifications not provided by SGI.
-
-2.2. Recipient License Grant. Subject to the terms of this License and
-     any third party intellectual property claims, Recipient hereby
-     grants SGI and any other Recipients a worldwide, royalty-free,
-     non-exclusive license, under any Recipient Patents, to make, have
-     made, use, sell, offer for sale, import and/or otherwise transfer
-     the Original Code and/or any Modifications provided by SGI.
-
-2.3. No License For Hardware Implementations. The licenses granted in
-     Section 2.1 and 2.2 are not applicable to implementation in
-     Hardware of the algorithms embodied in the Original Code or any
-     Modifications provided by SGI .
-
-3.  Redistributions. 
-
-3.1. Retention of Notice/Copy of License. The Notice set forth in
-     Exhibit A, below, must be conspicuously retained or included in any
-     and all redistributions of Covered Code. For distributions of the
-     Covered Code in source code form, the Notice must appear in every
-     file that can include a text comments field; in executable form,
-     the Notice and a copy of this License must appear in related
-     documentation or collateral where the Recipient’s rights relating
-     to Covered Code are described. Any Additional Notice Provisions
-     which actually appears in the Original Code must also be retained
-     or included in any and all redistributions of Covered Code.
-
-3.2. Alternative License. Provided that Recipient is in compliance with
-     the terms of this License, Recipient may, so long as without
-     derogation of any of SGI’s rights in and to the Original Code,
-     distribute the source code and/or executable version(s) of Covered
-     Code under (1) this License; (2) a license identical to this
-     License but for only such changes as are necessary in order to
-     clarify Recipient’s role as licensor of Modifications; and/or (3) a
-     license of Recipient’s choosing, containing terms different from
-     this License, provided that the license terms include this Section
-     3 and Sections 4, 6, 7, 10, 12, and 13, which terms may not be
-     modified or superseded by any other terms of such license. If
-     Recipient elects to use any license other than this License,
-     Recipient must make it absolutely clear that any of its terms which
-     differ from this License are offered by Recipient alone, and not by
-     SGI. It is emphasized that this License is a limited license, and,
-     regardless of the license form employed by Recipient in accordance
-     with this Section 3.2, Recipient may relicense only such rights, in
-     Original Code and Modifications by SGI, as it has actually been
-     granted by SGI in this License.
-
-3.3. Indemnity. Recipient hereby agrees to indemnify SGI for any
-     liability incurred by SGI as a result of any such alternative
-     license terms Recipient offers.
-
-4.  Termination. This License and the rights granted hereunder will
-    terminate automatically if Recipient breaches any term herein and
-    fails to cure such breach within 30 days thereof. Any sublicense to 
-    the Covered Code that is properly granted shall survive any
-    termination of this License, absent termination by the terms of such
-    sublicense. Provisions that, by their nature, must remain in effect
-    beyond the termination of this License, shall survive.
-
-5.  No Trademark Or Other Rights. This License does not grant any rights
-    to: (i) any software apart from the Covered Code, nor shall any
-    other rights or licenses not expressly granted hereunder arise by
-    implication, estoppel or otherwise with respect to the Covered Code;
-    (ii) any trade name, trademark or service mark whatsoever, including
-    without limitation any related right for purposes of endorsement or
-    promotion of products derived from the Covered Code, without prior
-    written permission of SGI; or (iii) any title to or ownership of the
-    Original Code, which shall at all times remains with SGI. All rights
-    in the Original Code not expressly granted under this License are
-    reserved.
-
-6.  Compliance with Laws; Non-Infringement. There are various worldwide
-    laws, regulations, and executive orders applicable to dispositions
-    of Covered Code, including without limitation export, re-export, and
-    import control laws, regulations, and executive orders, of the U.S.
-    government and other countries, and Recipient is reminded it is
-    obliged to obey such laws, regulations, and executive orders.
-    Recipient may not distribute Covered Code that (i) in any way
-    infringes (directly or contributorily) any intellectual property
-    rights of any kind of any other person or entity or (ii) breaches
-    any representation or warranty, express, implied or statutory, to
-    which, under any applicable law, it might be deemed to have been
-    subject.
-
-7.  Claims of Infringement. If Recipient learns of any third party claim
-    that any disposition of Covered Code and/or functionality wholly or
-    partially infringes the third party's intellectual property rights,
-    Recipient will promptly notify SGI of such claim.
-
-8.  Versions of the License. SGI may publish revised and/or new versions
-    of the License from time to time, each with a distinguishing version
-    number. Once Covered Code has been published under a particular
-    version of the License, Recipient may, for the duration of the
-    license, continue to use it under the terms of that version, or
-    choose to use such Covered Code under the terms of any subsequent
-    version published by SGI. Subject to the provisions of Sections 3
-    and 4 of this License, only SGI may modify the terms applicable to
-    Covered Code created under this License.
-
-9.  DISCLAIMER OF WARRANTY. COVERED CODE IS PROVIDED "AS IS." ALL
-    EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS ARE DISCLAIMED,
-    INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND CONDITIONS
-    OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A PARTICULAR
-    PURPOSE, AND NON-INFRINGEMENT. SGI ASSUMES NO RISK AS TO THE QUALITY
-    AND PERFORMANCE OF THE SOFTWARE. SHOULD THE SOFTWARE PROVE DEFECTIVE
-    IN ANY RESPECT, SGI ASSUMES NO COST OR LIABILITY FOR SERVICING,
-    REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY IS AN ESSENTIAL
-    PART OF THIS LICENSE. NO USE OF ANY COVERED CODE IS AUTHORIZED
-    HEREUNDER EXCEPT SUBJECT TO THIS DISCLAIMER.
-
-10.  LIMITATION OF LIABILITY. UNDER NO CIRCUMSTANCES NOR LEGAL THEORY,
-     WHETHER TORT (INCLUDING, WITHOUT LIMITATION, NEGLIGENCE OR STRICT
-     LIABILITY), CONTRACT, OR OTHERWISE, SHALL SGI OR ANY SGI LICENSOR
-     BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR
-     CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT
-     LIMITATION, DAMAGES FOR LOSS OF GOODWILL, WORK STOPPAGE, LOSS OF
-     DATA, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER
-     COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN
-     INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF
-     LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY
-     RESULTING FROM SGI's NEGLIGENCE TO THE EXTENT APPLICABLE LAW
-     PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE
-     EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO
-     THAT EXCLUSION AND LIMITATION MAY NOT APPLY TO RECIPIENT.
-
-11.  Indemnity. Recipient shall be solely responsible for damages
-     arising, directly or indirectly, out of its utilization of rights
-     under this License. Recipient will defend, indemnify and hold
-     harmless Silicon Graphics, Inc. from and against any loss,
-     liability, damages, costs or expenses (including the payment of
-     reasonable attorneys fees) arising out of Recipient's use,
-     modification, reproduction and distribution of the Covered Code or
-     out of any representation or warranty made by Recipient.
-
-12.  U.S. Government End Users. The Covered Code is a "commercial item"
-     consisting of "commercial computer software" as such terms are
-     defined in title 48 of the Code of Federal Regulations and all U.S.
-     Government End Users acquire only the rights set forth in this
-     License and are subject to the terms of this License.
-
-13.  Miscellaneous. This License represents the complete agreement
-     concerning the its subject matter. If any provision of this License
-     is held to be unenforceable, such provision shall be reformed so as
-     to achieve as nearly as possible the same legal and economic effect
-     as the original provision and the remainder of this License will
-     remain in effect. This License shall be governed by and construed
-     in accordance with the laws of the United States and the State of
-     California as applied to agreements entered into and to be
-     performed entirely within California between California residents.
-     Any litigation relating to this License shall be subject to the
-     exclusive jurisdiction of the Federal Courts of the Northern
-     District of California (or, absent subject matter jurisdiction in
-     such courts, the courts of the State of California), with venue
-     lying exclusively in Santa Clara County, California, with the
-     losing party responsible for costs, including without limitation,
-     court costs and reasonable attorneys fees and expenses. The
-     application of the United Nations Convention on Contracts for the
-     International Sale of Goods is expressly excluded. Any law or
-     regulation that provides that the language of a contract shall be
-     construed against the drafter shall not apply to this License.
-
-Exhibit A
-
-License Applicability. Except to the extent portions of this file are
-made subject to an alternative license as permitted in the SGI Free
-Software License B, Version 1.1 (the "License"), the contents of this
-file are subject only to the provisions of the License. You may not use
-this file except in compliance with the License. You may obtain a copy
-of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
-Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
-
-http://oss.sgi.com/projects/FreeB
-
-Note that, as provided in the License, the Software is distributed on an
-"AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
-DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
-CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
-PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
-
-Original Code. The Original Code is: [name of software, version number,
-and release date], developed by Silicon Graphics, Inc. The Original Code
-is Copyright (c) [dates of first publication, as appearing in the Notice
-in the Original Code] Silicon Graphics, Inc. Copyright in any portions
-created by third parties is as indicated elsewhere herein. All Rights
-Reserved.
-
-Additional Notice Provisions: [such additional provisions, if any, as 
-appear in the Notice in the Original Code under the heading "Additional 
-Notice Provisions"]
-
--------------------------------------------------------------------------
-
-Some other files listed below are made available from Silicon Graphics,
-Inc. under a more liberal, MIT-style license, as follows:
-
-   Permission to use, copy, modify, and distribute this software for
-   any purpose and without fee is hereby granted, provided that the above
-   copyright notice appear in all copies and that both the copyright notice
-   and this permission notice appear in supporting documentation, and that
-   the name of Silicon Graphics, Inc. not be used in advertising
-   or publicity pertaining to distribution of the software without specific,
-   written prior permission.
-
-   THE MATERIAL EMBODIED ON THIS SOFTWARE IS PROVIDED TO YOU "AS-IS"
-   AND WITHOUT WARRANTY OF ANY KIND, EXPRESS, IMPLIED OR OTHERWISE
-   INCLUDING WITHOUT LIMITATION, ANY WARRANTY OF MERCHANTABILITY OR
-   FITNESS FOR A PARTICULAR PURPOSE.  IN NO EVENT SHALL SILICON
-   GRAPHICS, INC.  BE LIABLE TO YOU OR ANYONE ELSE FOR ANY DIRECT,
-   SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY
-   KIND, OR ANY DAMAGES WHATSOEVER, INCLUDING WITHOUT LIMITATION,
-   LOSS OF PROFIT, LOSS OF USE, SAVINGS OR REVENUE, OR THE CLAIMS OF
-   THIRD PARTIES, WHETHER OR NOT SILICON GRAPHICS, INC.  HAS BEEN
-   ADVISED OF THE POSSIBILITY OF SUCH LOSS, HOWEVER CAUSED AND ON
-   ANY THEORY OF LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE
-   POSSESSION, USE OR PERFORMANCE OF THIS SOFTWARE.
-   
-   US Government Users Restricted Rights
-   Use, duplication, or disclosure by the Government is subject to
-   restrictions set forth in FAR 52.227.19(c)(2) or subparagraph
-   (c)(1)(ii) of the Rights in Technical Data and Computer Software
-   clause at DFARS 252.227-7013 and/or in similar or successor
-   clauses in the FAR or the DOD or NASA FAR Supplement.
-   Unpublished-- rights reserved under the copyright laws of the
-   United States.  Contractor/manufacturer is Silicon Graphics,
-   Inc., 2011 N.  Shoreline Blvd., Mountain View, CA 94039-7311.
-
--------------------------------------------------------------------------
-
- Mesa Component Licenses:
-
- Component       Files                 Primary Author      License
- ----------------------------------------------------------------------------
- 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'.
-
--- a/debian/glxdemo.1
+++ b/debian/glxdemo.1
@@ -1,15 +0,0 @@
-.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).
-
--- a/debian/glxgears.1
+++ b/debian/glxgears.1
@@ -1,29 +0,0 @@
-.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).
-
--- a/debian/glxheads.1
+++ b/debian/glxheads.1
@@ -1,30 +0,0 @@
-.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).
-
--- a/debian/glxinfo.1
+++ b/debian/glxinfo.1
@@ -1,41 +0,0 @@
-.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 it's 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).
-
--- a/debian/libgl1-mesa-dev.install
+++ b/debian/libgl1-mesa-dev.install
@@ -1 +0,0 @@
-usr/lib/libGL.so
--- a/debian/libgl1-mesa-dri-i686.install
+++ b/debian/libgl1-mesa-dri-i686.install
@@ -1 +0,0 @@
-usr/lib/dri/i686/cmov/*.so
--- a/debian/libgl1-mesa-dri.install
+++ b/debian/libgl1-mesa-dri.install
@@ -1 +0,0 @@
-usr/lib/dri/*.so
--- a/debian/libgl1-mesa-glx-i686.install
+++ b/debian/libgl1-mesa-glx-i686.install
@@ -1 +0,0 @@
-usr/lib/glx/i686/cmov/libGL.so.* usr/lib/i686/cmov
--- a/debian/libgl1-mesa-glx.install
+++ b/debian/libgl1-mesa-glx.install
@@ -1 +0,0 @@
-usr/lib/glx/libGL.so.* usr/lib
--- a/debian/libgl1-mesa-glx.shlibs
+++ b/debian/libgl1-mesa-glx.shlibs
@@ -1 +0,0 @@
-libGL 1 libgl1-mesa-glx | libgl1
--- a/debian/libgl1-mesa-swx11-dev.install
+++ b/debian/libgl1-mesa-swx11-dev.install
@@ -1,4 +0,0 @@
-usr/include/GL/GLw*A.h
-usr/lib/libGL.a
-usr/lib/libGL.so
-usr/lib/libGLw.a
--- a/debian/libgl1-mesa-swx11-i686.install
+++ b/debian/libgl1-mesa-swx11-i686.install
@@ -1 +0,0 @@
-usr/lib/i686/cmov/libGL.so.*
--- a/debian/libgl1-mesa-swx11.install
+++ b/debian/libgl1-mesa-swx11.install
@@ -1 +0,0 @@
-usr/lib/libGL.so.*
--- a/debian/libgl1-mesa-swx11.shlibs
+++ b/debian/libgl1-mesa-swx11.shlibs
@@ -1 +0,0 @@
-libGL 1 libgl1-mesa-glx | libgl1
--- a/debian/libglu1-mesa-dev.install
+++ b/debian/libglu1-mesa-dev.install
@@ -1,4 +0,0 @@
-usr/include/GL/glu.h
-usr/include/GL/glu_mangle.h
-usr/lib/libGLU.a
-usr/lib/libGLU.so
--- a/debian/libglu1-mesa.install
+++ b/debian/libglu1-mesa.install
@@ -1 +0,0 @@
-usr/lib/libGLU.so.*
--- a/debian/libglu1-mesa.shlibs
+++ b/debian/libglu1-mesa.shlibs
@@ -1 +0,0 @@
-libGLU 1 libglu1-mesa | libglu1
--- a/debian/libosmesa6-dev.install
+++ b/debian/libosmesa6-dev.install
@@ -1,7 +0,0 @@
-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
--- a/debian/libosmesa6.install
+++ b/debian/libosmesa6.install
@@ -1,3 +0,0 @@
-usr/lib/libOSMesa.so.*
-usr/lib/libOSMesa16.so.*
-usr/lib/libOSMesa32.so.*
--- a/debian/libosmesa6.shlibs
+++ b/debian/libosmesa6.shlibs
@@ -1,3 +0,0 @@
-libOSMesa 6 libosmesa6 (>= 6.5.2-1) | libgl1-mesa-glide3
-libOSMesa16 6 libosmesa6 (>= 6.5.2-1)
-libOSMesa32 6 libosmesa6 (>= 6.5.2-1)
--- a/debian/mesa-common-dev.docs
+++ b/debian/mesa-common-dev.docs
@@ -1,8 +0,0 @@
-docs/bugs.html
-docs/debugging.html
-docs/envvars.html
-docs/faq.html
-docs/osmesa.html
-docs/RELNOTES-*
-docs/relnotes*
-docs/*.spec
--- a/debian/mesa-common-dev.install
+++ b/debian/mesa-common-dev.install
@@ -1,4 +0,0 @@
-usr/include/GL/gl.h
-usr/include/GL/glext.h
-usr/include/GL/gl_mangle.h
-usr/include/GL/glx*.h
--- a/debian/mesa-swx11-source.install
+++ b/debian/mesa-swx11-source.install
@@ -1 +0,0 @@
-usr/share/mesa-source/*
--- a/debian/mesa-utils.install
+++ b/debian/mesa-utils.install
@@ -1,4 +0,0 @@
-usr/bin/glxdemo
-usr/bin/glxgears
-usr/bin/glxheads
-usr/bin/glxinfo
--- a/debian/mesa-utils.manpages
+++ b/debian/mesa-utils.manpages
@@ -1,4 +0,0 @@
-debian/glxdemo.1
-debian/glxgears.1
-debian/glxheads.1
-debian/glxinfo.1
--- a/debian/patches/00_create-libdir.patch
+++ b/debian/patches/00_create-libdir.patch
@@ -1,17 +0,0 @@
-Patch that allows the Mesa makefile to create a LIB_DIR that is more than one
-level below TOP.
-
-This patch by Thierry Reding.
-Not submitted to Mesa.
-
--- a/src/Makefile
-+++ b/src/Makefile
-@@ -29,7 +29,7 @@
- 	done
- 
- $(TOP)/$(LIB_DIR):
-	-mkdir $(TOP)/$(LIB_DIR)
-+	mkdir -p $(TOP)/$(LIB_DIR)
- 
- 
- clean:
--- a/debian/patches/01_fix-makefile.patch
+++ b/debian/patches/01_fix-makefile.patch
@@ -1,16 +0,0 @@
-Do not build OSMesa for a standalone configuration, since Debian only ships
-OSMesa in a separate package.
-
-This patch by Thierry Reding.
-
--- a/src/mesa/Makefile
-+++ b/src/mesa/Makefile
-@@ -107,7 +107,7 @@
- 	$(OSMESA_DRIVER_OBJECTS)
- 
- 
-stand-alone: depend subdirs $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_NAME)
-+stand-alone: depend subdirs $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME)
- 
- osmesa-only: depend subdirs $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_NAME)
- 
--- a/debian/patches/02_use-ieee-fp-on-s390-and-m68k.patch
+++ b/debian/patches/02_use-ieee-fp-on-s390-and-m68k.patch
@@ -1,17 +0,0 @@
-Patch that fixes Debian bug #349437.
-
-This patch by David Nusinow.
-
--- a/src/mesa/main/imports.h
-+++ b/src/mesa/main/imports.h
-@@ -155,8 +155,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(__amd64__) || \
-+    defined(__m68k__) || \
-     defined(ia64) || defined(__ia64__) || \
-     defined(__hppa__) || defined(hpux) || \
-     defined(__mips) || defined(_MIPS_ARCH) || \
--- a/debian/patches/03_optional-progs-and-install.patch
+++ b/debian/patches/03_optional-progs-and-install.patch
@@ -1,45 +0,0 @@
-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.
-
--- a/progs/xdemos/Makefile
-+++ b/progs/xdemos/Makefile
-@@ -8,7 +8,7 @@
- 
- LIB_DEP = $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) $(TOP)/$(LIB_DIR)/$(GLU_LIB_NAME)
- 
-PROGS = glthreads \
-+PROGS ?= glthreads \
- 	glxdemo \
- 	glxgears \
- 	glxgears_fbconfig \
-@@ -44,6 +44,9 @@
- 
- default: $(PROGS)
- 
-+install: $(PROGS)
-+	$(INSTALL) -d $(INSTALL_DIR)/bin
-+	$(INSTALL) -m 755 $(PROGS) $(INSTALL_DIR)/bin
- 
- clean:
- 	-rm -f $(PROGS)
--- a/progs/Makefile
-+++ b/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 \
--- a/debian/patches/04_cleanup-osmesa-configs.patch
+++ b/debian/patches/04_cleanup-osmesa-configs.patch
@@ -1,189 +0,0 @@
-diff --git a/configs/linux-osmesa b/configs/linux-osmesa
-index cc1fbbd..aabab59 100644
--- a/configs/linux-osmesa
-+++ b/configs/linux-osmesa
-@@ -9,8 +9,17 @@ CONFIG_NAME = linux-osmesa
- # Compiler and flags
- CC = gcc
- CXX = g++
-CFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DPTHREADS
-CXXFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
-+
-+PIC_FLAGS  = -fPIC
-+
-+DEFINES = -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE \
-+	-D_BSD_SOURCE -D_GNU_SOURCE \
-+	-DPTHREADS -DUSE_XSHM -DHAVE_POSIX_MEMALIGN
-+
-+CFLAGS = -ansi -pedantic $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) \
-+	$(ASM_FLAGS) -ffast-math
-+
-+CXXFLAGS = -ansi -pedantic $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES)
- 
- 
- # Directories
-@@ -23,3 +33,4 @@ PROGRAM_DIRS = osdemos
- OSMESA_LIB_DEPS = -lm -lpthread
- GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(OSMESA_LIB)
- APP_LIB_DEPS = -lOSMesa -lGLU
-+
-diff --git a/configs/linux-osmesa-static b/configs/linux-osmesa-static
-index 465f83c..eb3575f 100644
--- a/configs/linux-osmesa-static
-+++ b/configs/linux-osmesa-static
-@@ -8,7 +8,8 @@ CONFIG_NAME = linux-osmesa-static
- 
- # Compiler and flags
- MKLIB_OPTIONS = -static
-+PIC_FLAGS =
- 
- # Library names
-OSMESA_LIB_NAME = libOSMesa.a
-+OSMESA_LIB_NAME = lib$(OSMESA_LIB).a
- 
-diff --git a/configs/linux-osmesa16 b/configs/linux-osmesa16
-index 1fb0186..2a06254 100644
--- a/configs/linux-osmesa16
-+++ b/configs/linux-osmesa16
-@@ -1,28 +1,17 @@
- # Configuration for 16 bits/channel OSMesa library on Linux
- 
-include $(TOP)/configs/default
-+include $(TOP)/configs/linux-osmesa
- 
- CONFIG_NAME = linux-osmesa16
- 
-# Compiler and flags
-CC = gcc
-CXX = g++
-CFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -I/usr/X11R6/include -DCHAN_BITS=16 -DDEFAULT_SOFTWARE_DEPTH_BITS=31
-CXXFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
-
-+DEFINES += -DCHAN_BITS=16 -DDEFAULT_SOFTWARE_DEPTH_BITS=32
- 
- # Library names
- OSMESA_LIB = OSMesa16
-OSMESA_LIB_NAME = libOSMesa16.so
-
- 
- # Directories
-SRC_DIRS = mesa glu
-DRIVER_DIRS = osmesa
- PROGRAM_DIRS = 
- 
-
- # Dependencies
-OSMESA_LIB_DEPS = -lm -lpthread
-GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(OSMESA_LIB)
-APP_LIB_DEPS = -lOSMesa16
-+APP_LIB_DEPS = -l$(OSMESA_LIB)
-+
-diff --git a/configs/linux-osmesa16-static b/configs/linux-osmesa16-static
-index 6645504..894cf82 100644
--- a/configs/linux-osmesa16-static
-+++ b/configs/linux-osmesa16-static
-@@ -1,28 +1,13 @@
- # Configuration for 16 bits/channel OSMesa library on Linux
- 
-include $(TOP)/configs/default
-+include $(TOP)/configs/linux-osmesa16
- 
- CONFIG_NAME = linux-osmesa16-static
- 
- # Compiler and flags
-CC = gcc
-CXX = g++
-CFLAGS = -O3 -ansi -pedantic -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -I/usr/X11R6/include -DCHAN_BITS=16 -DDEFAULT_SOFTWARE_DEPTH_BITS=31
-CXXFLAGS = -O3 -ansi -pedantic -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
- MKLIB_OPTIONS = -static
-
-+PIC_FLAGS =
- 
- # Library names
-OSMESA_LIB = OSMesa16
-OSMESA_LIB_NAME = libOSMesa16.a
-
-
-# Directories
-SRC_DIRS = mesa glu
-DRIVER_DIRS = osmesa
-PROGRAM_DIRS = 
-
-+OSMESA_LIB_NAME = lib$(OSMESA_LIB).a
- 
-# Dependencies
-OSMESA_LIB_DEPS = -lm -lpthread
-APP_LIB_DEPS = -lOSMesa16
-diff --git a/configs/linux-osmesa32 b/configs/linux-osmesa32
-index a1e5a35..5a703f6 100644
--- a/configs/linux-osmesa32
-+++ b/configs/linux-osmesa32
-@@ -1,28 +1,18 @@
- # Configuration for 32 bits/channel OSMesa library on Linux
- 
-include $(TOP)/configs/default
-+include $(TOP)/configs/linux-osmesa
- 
- CONFIG_NAME = linux-osmesa32
- 
- # Compiler and flags
-CC = gcc
-CXX = g++
-CFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -I/usr/X11R6/include -DCHAN_BITS=32 -DDEFAULT_SOFTWARE_DEPTH_BITS=31
-CXXFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
-
-+DEFINES += -DCHAN_BITS=32 -DDEFAULT_SOFTWARE_DEPTH_BITS=31
- 
- # Library names
- OSMESA_LIB = OSMesa32
-OSMESA_LIB_NAME = libOSMesa32.so
-
- 
- # Directories
-SRC_DIRS = mesa glu
-DRIVER_DIRS = osmesa
- PROGRAM_DIRS = 
- 
-
- # Dependencies
-OSMESA_LIB_DEPS = -lm -lpthread
-GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(OSMESA_LIB)
-APP_LIB_DEPS = -lOSMesa32
-+APP_LIB_DEPS = -l$(OSMESA_LIB)
-+
-diff --git a/configs/linux-osmesa32-static b/configs/linux-osmesa32-static
-index 6db8bc0..ecbb72e 100644
--- a/configs/linux-osmesa32-static
-+++ b/configs/linux-osmesa32-static
-@@ -1,28 +1,13 @@
- # Configuration for 32 bits/channel OSMesa library on Linux
- 
-include $(TOP)/configs/default
-+include $(TOP)/configs/linux-osmesa32
- 
- CONFIG_NAME = linux-osmesa32-static
- 
- # Compiler and flags
-CC = gcc
-CXX = g++
-CFLAGS = -O3 -ansi -pedantic -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -I/usr/X11R6/include -DCHAN_BITS=32 -DDEFAULT_SOFTWARE_DEPTH_BITS=31
-CXXFLAGS = -O3 -ansi -pedantic -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
- MKLIB_OPTIONS = -static
-
-+PIC_FLAGS =
- 
- # Library names
-OSMESA_LIB = OSMesa32
-OSMESA_LIB_NAME = libOSMesa32.a
-
-
-# Directories
-SRC_DIRS = mesa glu
-DRIVER_DIRS = osmesa
-PROGRAM_DIRS = 
-
-+OSMESA_LIB_NAME = lib$(OSMESA_LIB).a
- 
-# Dependencies
-OSMESA_LIB_DEPS = -lm -lpthread
-APP_LIB_DEPS = -lOSMesa32
--- a/debian/patches/05_static-nonpic.patch
+++ b/debian/patches/05_static-nonpic.patch
@@ -1,60 +0,0 @@
-diff --git a/configs/linux-alpha-static b/configs/linux-alpha-static
-index 2a30af9..eb6a08a 100644
--- a/configs/linux-alpha-static
-+++ b/configs/linux-alpha-static
-@@ -11,6 +11,7 @@ CFLAGS = -O3 -mcpu=ev5 -ansi -mieee -pedantic -D_XOPEN_SOURCE -DUSE_XSHM
- CXXFLAGS = -O3 -mcpu=ev5 -ansi -mieee -pedantic -D_XOPEN_SOURCE
- GLUT_CFLAGS = -fexceptions
- MKLIB_OPTIONS = -static
-+PIC_FLAGS =
- 
- 
- # Library names (actual file names)
-diff --git a/configs/linux-ppc-static b/configs/linux-ppc-static
-index d0e1688..3f3dc55 100644
--- a/configs/linux-ppc-static
-+++ b/configs/linux-ppc-static
-@@ -5,6 +5,7 @@ include $(TOP)/configs/linux-ppc
- CONFIG_NAME = linux-ppc-static
- 
- MKLIB_OPTIONS = -static
-+PIC_FLAGS =
- 
- # Library names (actual file names)
- GL_LIB_NAME = libGL.a
-diff --git a/configs/linux-static b/configs/linux-static
-index 85141ea..1592668 100644
--- a/configs/linux-static
-+++ b/configs/linux-static
-@@ -5,6 +5,7 @@ include $(TOP)/configs/linux
- CONFIG_NAME = linux-static
- 
- MKLIB_OPTIONS = -static
-+PIC_FLAGS =
- 
- # Library names (actual file names)
- GL_LIB_NAME = libGL.a
-diff --git a/configs/linux-x86-64-static b/configs/linux-x86-64-static
-index 0257430..2d0b664 100644
--- a/configs/linux-x86-64-static
-+++ b/configs/linux-x86-64-static
-@@ -5,6 +5,7 @@ include $(TOP)/configs/linux-x86-64
- CONFIG_NAME = linux-x86-64-static
- 
- MKLIB_OPTIONS = -static
-+PIC_FLAGS =
- 
- # Library names (actual file names)
- GL_LIB_NAME = libGL.a
-diff --git a/configs/linux-x86-static b/configs/linux-x86-static
-index 9915987..e6a3696 100644
--- a/configs/linux-x86-static
-+++ b/configs/linux-x86-static
-@@ -5,6 +5,7 @@ include $(TOP)/configs/linux-x86
- CONFIG_NAME = linux-x86-static
- 
- MKLIB_OPTIONS = -static
-+PIC_FLAGS =
- 
- # Library names (actual file names)
- GL_LIB_NAME = libGL.a
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +0,0 @@
-00_create-libdir.patch
-01_fix-makefile.patch
-02_use-ieee-fp-on-s390-and-m68k.patch
-03_optional-progs-and-install.patch
-04_cleanup-osmesa-configs.patch
-05_static-nonpic.patch
--- a/debian/rules
+++ b/debian/rules
@@ -1,139 +0,0 @@
-#!/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
-
-STAMP_DIR = debian/stamp
-
-QUILT_STAMPFN = $(STAMP_DIR)/patch
-include /usr/share/quilt/quilt.make
-
-CFLAGS = -Wall -g
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-	INSTALL_PROGRAM += -s
-endif
-
-DEB_BUILD_ARCH     ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
-DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-DEB_BUILD_DIR      ?= $(CURDIR)/obj-$(DEB_BUILD_GNU_TYPE)
-
-export DEB_BUILD_ARCH
-
-# choose which configurations to build
-SWX11_GLU_CONFIGS =
-DRI_CONFIGS =
-
-include debian/scripts/choose-configs
-
-# build the following configurations by default
-CONFIGS = $(SWX11_GLU_CONFIGS) \
-          $(DRI_CONFIGS) \
-          debian-osmesa \
-          debian-osmesa-static \
-          debian-osmesa16 \
-          debian-osmesa16-static \
-          debian-osmesa32 \
-          debian-osmesa32-static
-
-STAMP = $(STAMP_DIR)/$(DEB_BUILD_GNU_TYPE)
-BUILD_STAMPS = $(addprefix $(STAMP)-build-, $(CONFIGS))
-INSTALL_STAMPS = $(addprefix $(STAMP)-install-, $(CONFIGS)) \
-                 $(STAMP_DIR)/install-source
-
-# list the configurations that will built
-configs:
-	@echo Building the following configurations: $(CONFIGS)
-
-$(STAMP_DIR):
-	dh_testdir
-	mkdir -p $@
-
-$(QUILT_STAMPFN): $(STAMP_DIR)
-
-
-build: $(BUILD_STAMPS)
-
-$(STAMP)-build-%: patch
-	dh_testdir
-	mkdir -p $(DEB_BUILD_DIR)/$*
-	find $(CURDIR)/* -maxdepth 0 -not -path '$(DEB_BUILD_DIR)*' | \
-		xargs cp -rlf -t $(DEB_BUILD_DIR)/$*
-	ln -sf $* $(DEB_BUILD_DIR)/$*/configs/current
-	cd $(DEB_BUILD_DIR)/$* && $(MAKE)
-	touch $@
-
-pre-install:
-	dh_testdir
-	dh_testroot
-	dh_clean -k --exclude ./Makefile.orig --exclude configs/CVS/Root.bak
-	rm -rf $(INSTALL_STAMPS)
-
-install: pre-install $(INSTALL_STAMPS)
-
-$(STAMP)-install-%: $(STAMP)-build-%
-	# Add here commands to install the package into debian/tmp
-	cd $(DEB_BUILD_DIR)/$* && $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
-	touch $@
-
-$(STAMP_DIR)/install-source:
-	# install Mesa source for mesa-swx11-source package
-	chmod a+x debian/scripts/install-source.sh
-	debian/scripts/install-source.sh
-	touch $@
-
-clean: unpatch
-	dh_testdir
-	dh_testroot
-	dh_clean --exclude ./Makefile.orig
-	rm -rf $(DEB_BUILD_DIR) $(STAMP_DIR)
-
-# Build architecture-independent files here.
-binary-indep: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs -i
-	dh_installdocs -i
-	dh_installexamples -i
-	dh_install --sourcedir=debian/tmp --list-missing -i
-	dh_installman -i
-	dh_link -i
-	dh_compress -i
-	dh_fixperms -i
-	dh_installdeb -i
-	dh_gencontrol -i
-	dh_md5sums -i
-	dh_builddeb -i
-
-# Build architecture-dependent files here.
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs -s
-	dh_installdocs -s
-	dh_installexamples -s
-	dh_install --sourcedir=debian/tmp --list-missing -s
-	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
-
-binary: binary-indep binary-arch
-.PHONY: configs build clean binary-indep binary-arch binary install configure
-
--- a/debian/scripts/choose-configs
+++ b/debian/scripts/choose-configs
@@ -1,52 +0,0 @@
-# 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
-
-# and for the GLX/DRI-enabled libGL
-ifneq ($(wildcard configs/debian-dri-$(DEB_BUILD_ARCH)),)
-	DRI_CONFIGS := debian-dri-$(DEB_BUILD_ARCH)
-else
-	DRI_CONFIGS := debian-dri-any
-endif
-
-##############################################################################
-## CPU-optimized configurations ##############################################
-
-ifeq ($(DEB_BUILD_ARCH), i386)
-	SWX11_GLU_CONFIGS += debian-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
-
--- a/debian/scripts/install-source.sh
+++ b/debian/scripts/install-source.sh
@@ -1,46 +0,0 @@
-#!/bin/sh
-
-if [ -n "$1" ]; then
-	TOP="$1"
-else
-	TOP=`pwd`
-fi
-
-SOURCE_DIRS='
-	include/GL/internal
-	src/glx/x11
-	src/mesa/array_cache
-	src/mesa/drivers/common
-	src/mesa/drivers/dri/common
-	src/mesa/drivers/dri/glcore
-	src/mesa/drivers/x11
-	src/mesa/glapi
-	src/mesa/main
-	src/mesa/math
-	src/mesa/ppc
-	src/mesa/shader
-	src/mesa/sparc
-	src/mesa/swrast_setup
-	src/mesa/swrast
-	src/mesa/tnl_dd
-	src/mesa/tnl
-	src/mesa/x86-64
-	src/mesa/x86
-'
-
-FILTER="-not -path '*/.svn*'"
-TARGET=${TOP}/debian/tmp/usr/share/mesa-source
-
-(
-	find $SOURCE_DIRS $FILTER -name '*.[ch]';
-	find include/GL $FILTER -name 'xmesa*.h';
-) | \
-	while read x; do
-		DIRNAME=`dirname "$x"`
-		mkdir -p "$TARGET/$DIRNAME"
-		cp -lf "$x" "$TARGET/$DIRNAME"
-	done
-
-# fix permissions
-find "$TARGET" -type f | xargs chmod 0644
-
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +0,0 @@
-version=3
-http://sf.net/mesa3d/MesaLib-(.*)\.tar\.gz
--- a/docs/RELNOTES-6.4.1
+++ b/docs/RELNOTES-6.4.1
@@ -1,47 +0,0 @@
-
-		        Mesa 6.4.1 Release Notes
-
-
-Introduction
------------
-
-Mesa uses an even/odd version number scheme like the Linux kernel.
-Odd numbered versions (such as 6.3) designate new developmental releases.
-Even numbered versions (such as 6.4) designate stable releases.
-
-
-6.4.1 is a bug-fix release.  See the VERSIONS file for details.
-
-
-
-GLUT tarball
------------
-
-Starting with 6.4, the GLUT library sources are distributed in a separate
-tarball.  This was done at the request of Linux distro vendors who prefer
-to use freeglut.
-
-
-
-
-Driver			Status
----------------------	----------------------
-DRI drivers		varies with the driver
-XMesa (Xlib)		implements OpenGL 1.5
-OSMesa (off-screen)	implements OpenGL 1.5
-Windows/Win32		implements OpenGL 1.5
-Glide (3dfx Voodoo1/2)  requires updates	
-SVGA			requires updates
-DJGPP			requires updates
-GGI			requires updates
-BeOS			requires updates
-Allegro			requires updates
-D3D			requires updates
-
-The drivers which require updates mostly need to be updated to work
-with the new gl_renderbuffer / gl_framebuffer infrastructure introduced
-in Mesa 6.3.
-
-
----------------------------------------------------------------------
-$Id: RELNOTES-6.4.1,v 3.1 2006/02/03 17:21:54 brianp Exp $
--- a/docs/RELNOTES-6.4.2
+++ b/docs/RELNOTES-6.4.2
@@ -1,47 +0,0 @@
-
-		        Mesa 6.4.2 Release Notes
-
-
-Introduction
------------
-
-Mesa uses an even/odd version number scheme like the Linux kernel.
-Odd numbered versions (such as 6.3) designate new developmental releases.
-Even numbered versions (such as 6.4) designate stable releases.
-
-
-6.4.2 is a minor bug-fix release.  See the VERSIONS file for details.
-
-
-
-GLUT tarball
------------
-
-Starting with 6.4, the GLUT library sources are distributed in a separate
-tarball.  This was done at the request of Linux distro vendors who prefer
-to use freeglut.
-
-
-
-
-Driver			Status
----------------------	----------------------
-DRI drivers		varies with the driver
-XMesa (Xlib)		implements OpenGL 1.5
-OSMesa (off-screen)	implements OpenGL 1.5
-Windows/Win32		implements OpenGL 1.5
-Glide (3dfx Voodoo1/2)  requires updates	
-SVGA			requires updates
-DJGPP			requires updates
-GGI			requires updates
-BeOS			requires updates
-Allegro			requires updates
-D3D			requires updates
-
-The drivers which require updates mostly need to be updated to work
-with the new gl_renderbuffer / gl_framebuffer infrastructure introduced
-in Mesa 6.3.
-
-
----------------------------------------------------------------------
-$Id: RELNOTES-6.4.2,v 3.1 2006/02/03 17:21:54 brianp Exp $
--- a/docs/RELNOTES-6.5
+++ b/docs/RELNOTES-6.5
@@ -1,97 +0,0 @@
-
-			Mesa 6.5 Release Notes
-
-
-
-Introduction
------------
-
-Mesa uses an even/odd version number scheme like the Linux kernel.
-Odd numbered versions (such as 6.5) designate new developmental releases.
-Even numbered versions (such as 6.4) designate stable releases.
-
-
-
-New Features
------------
-
-OpenGL Shading language support
-   This includes the GL_ARB_shader_objects, GL_ARB_shading_language_100,
-   GL_ARB_vertex_shader and GL_ARB_fragment_shader extensions.  Most of
-   the work was done by Michal Krol.
-   There's probably a fair number of bugs since this is a pretty large,
-   complicated body of code.
-
-   The OpenGL 2.0 interface to these features will be implemented in a
-   future version of Mesa,
-
-GL_EXT_timer_query
-   Used to measure the time of OpenGL operations at high precision.
-   Only supported in the software/Xlib driver at this time.
-
-GL_EXT_packed_depth_stencil
-   Defines a new GL_DEPTH_STENCIL_EXT pixel format.
-
-GL_EXT_framebuffer_blit
-   A simplified glCopyPixels-like feature for copying pixel rectangles.
-
-GL_ARB_half_float_pixel
-   Adds a new half-precision floating point format for image transfers,
-   such as for glDrawPixels, glReadPixels, glTexImage, etc.
-
-
-
-Removed Extensions
------------------
-
-The following extensions have been removed:
-
-  GL_HP_occlusion_test - this is superceded by GL_ARB_occlusion_query.
-
-
-
-Known Issues
------------
-
-Rendering to depth textures will not work.  Rendering to GL_DEPTH_STENCIL
-textures should work.
-
-
-
-Driver Interface Changes
------------------------
-
-Stencil: The Driver.StencilOp/Func/Mask() functions have been replaced by
-the two-sided versions: Driver.Stencil*Separate().
-
-Render-to-texture: The functions for rendering to textures have changed.
-
-
-
-To Do (someday) items
---------------------
- Switch to freeglut
- Increase MAX_DRAWBUFFERS
- Fix linux-glide target/driver.
- Fix lambda calculation for frag progs.
-
-
-
-Driver			Status
----------------------	----------------------
-DRI drivers		varies with the driver
-XMesa/GLX (on Xlib)	implements OpenGL 1.5
-OSMesa (off-screen)	implements OpenGL 1.5
-Glide (3dfx Voodoo1/2)	implements OpenGL 1.3
-SVGA			implements OpenGL 1.3
-Wind River UGL		implements OpenGL 1.3
-Windows/Win32		implements OpenGL 1.5
-DJGPP			implements OpenGL 1.5
-GGI			implements OpenGL 1.3
-BeOS			implements OpenGL 1.5
-Allegro			needs updating
-D3D			needs updating
-
-
----------------------------------------------------------------------
-$Id: RELNOTES-6.5,v 3.4 2006/03/29 04:53:02 brianp Exp $
--- a/docs/RELNOTES-6.5.1
+++ b/docs/RELNOTES-6.5.1
@@ -1,60 +0,0 @@
-
-			Mesa 6.5.1 Release Notes
-
-
-
-Introduction
------------
-
-Mesa uses an even/odd version number scheme like the Linux kernel.
-Odd numbered versions (such as 6.5) designate new developmental releases.
-Even numbered versions (such as 6.4) designate stable releases.
-
-
-
-Mesa 6.5.1 is a 6.5 follow-on development release mostly consisting of
-bug fixes (see the VERSIONS file).
-
-
-New Features
------------
-
-  Intel i965 "broadwater" DRI driver
-
-  GL_APPLE_vertex_array_object - allows encapsulation of a set of vertex
-	arrays in an object.
-
-  GL_EXT_texture_sRGB - non-linearly mapped texture formats
-
-  GL_EXT_gpu_program_parameters - addes a few new functions for setting
-	multiple vertex/fragment program parameters with one call.
-
-
-
-To Do (someday) items
---------------------
- Switch to freeglut
- Increase MAX_DRAWBUFFERS
- Fix linux-glide target/driver.
- Fix lambda calculation for frag progs.
-
-
-
-Driver			Status
----------------------	----------------------
-DRI drivers		varies with the driver
-XMesa/GLX (on Xlib)	implements OpenGL 1.5
-OSMesa (off-screen)	implements OpenGL 1.5
-Glide (3dfx Voodoo1/2)	implements OpenGL 1.3
-SVGA			implements OpenGL 1.3
-Wind River UGL		implements OpenGL 1.3
-Windows/Win32		implements OpenGL 1.5
-DJGPP			implements OpenGL 1.5
-GGI			implements OpenGL 1.3
-BeOS			implements OpenGL 1.5
-Allegro			needs updating
-D3D			needs updating
-
-
----------------------------------------------------------------------
-$Id: RELNOTES-6.5.1,v 1.2 2006/08/18 20:24:54 brianp Exp $
--- a/docs/contents.html
+++ b/docs/contents.html
@@ -63,8 +63,7 @@ a:visited {
 <b>Developer Topics</b>
 <ul>
 <li><a href="http://sourceforge.net/projects/mesa3d" target="_parent">SourceForge homepage</a>
-<li><a href="cvs_access.html" target="MainFrame">CVS Access</a>
-<li><a href="cvs_branches.html" target="MainFrame">CVS Branch Info</a>
+<li><a href="repository.html" target="MainFrame">Source Code Repository</a>
 <li><a href="utilities.html" target="MainFrame">Utilities</a>
 <li><a href="helpwanted.html" target="MainFrame">Help Wanted</a>
 <li><a href="devinfo.html" target="MainFrame">Development Notes</a>
--- a/docs/cvs_access.html
+++ b/docs/cvs_access.html
@@ -1,106 +0,0 @@
-<HTML>
-
-<TITLE>CVS Access</TITLE>
-
-<link rel="stylesheet" type="text/css" href="mesa.css"></head>
-
-<BODY>
-
-<h1>CVS Access</h1>
-
-<p>
-Mesa's CVS repository (code management system) is hosted on
-<a href="http://www.freedesktop.org" target="_parent">freedesktop.org</a>.
-</p>
-
-<p>
-You may access the repository either as an
-<a href="#anonymous">anonymous user</a> (read-only) or as a
-<a href="#developer">developer</a>
-(read/write).
-</p>
-
-<p>
-You may also 
-<a href="http://freedesktop.org/cgi-bin/viewcvs.cgi/mesa/Mesa/"
-target="_parent">browse the CVS repository</a>.
-</p>
-
-
-<a name="anonymous">
-<H2>Anonymous CVS Access</H2>
-
-<p>
-Anonymous, public, read-only access to the CVS repository is available.
-Here are the basic instructions for Unix systems:
-</p>
-
-<ol>
-<li>Install CVS client software on your computer if needed.
-    Version 1.9.28 is known to work.
-<li>Login as an anonymous user:
-    <pre>
-    cvs -d:pserver:anonymous@anoncvs.freedesktop.org:/cvs/mesa login
-    </pre>
-    Just press Enter/Return when prompted for a password.
-    <br>
-    <br>
-<li>Check out the code:
-    <pre>
-    cvs -d:pserver:anonymous@anoncvs.freedesktop.org:/cvs/mesa co Mesa
-    </pre>
-</ol>
-
-
-<p>To update your Mesa CVS source to the latest CVS source:</p>
-
-<ol>
-<li><code>cd Mesa</code>
-<li><code>cvs -z3 -d:pserver:anonymous@anoncvs.freedesktop.org:/cvs/mesa update</code>
-</ol>
-
-
-<a name="developer">
-<H2>Developer CVS Access</H2>
-
-<p>
-Mesa developers working with the Mesa CVS repository need to first
-have an account on <a href="http://www.freedesktop.org" target="_parent">
-freedesktop.org</a>.
-To get an account, please ask Brian or the other Mesa developers for
-permission.
-Then, if there are no objections, follow this
-<a href="http://www.freedesktop.org/wiki/AccountRequests" target="_parent">
-procedure</a>.
-</p>
-
-<p>
-Once your account is established, you can check out the Mesa CVS tree
-with:
-<pre>
-   setenv CVS_RSH ssh        (if using a csh-like shell)
-</pre>
-<em>OR</em>
-<pre>
-   export CVS_RSH=rsh        (if using a bash-like shell)
-</pre>
-followed by:
-<pre>
-   cvs -d:ext:yourusername@cvs.freedesktop.org:/cvs/mesa co Mesa
-</pre>
-
-<p>
-Of course, replace <em>yourusername</em> with your actual login name.
-</p>
-
-<p>
-Subsequent updates should only require:
-</p>
-<pre>
-   cvs update
-</pre>
-
-
-
-</body>
-</html>
--- a/docs/cvs_branches.html
+++ b/docs/cvs_branches.html
@@ -1,80 +0,0 @@
-<HTML>
-
-<TITLE>CVS Branches</TITLE>
-
-<link rel="stylesheet" type="text/css" href="mesa.css"></head>
-
-<BODY>
-
-<H1>CVS Branch Information</H1>
-
-<p>
-At any given time, there may be several active branches in Mesa's
-CVS repository.
-
-Generally, the CVS trunk contains the latest development (unstable)
-code while a CVS branch has the latest stable code.
-</p>
-
-<p>
-Currently (Oct 2004), the trunk is the Mesa 6.3 development code
-while the mesa_6_2_branch branch has the stable Mesa 6.2.x code.
-</p>
-
-<p>
-Mesa releases use an even/odd numbering scheme to represent stable/development
-releases.
-
-For example, Mesa 6.2 (0 is considered even) is a stable release while
-Mesa 6.3 is a development release.
-</p>
-
-<p>
-To checkout a specific CVS branch pass <code>-r</code> and
-the branch tag after your CVS command.
-
-For example <code>cvs checkout -r mesa_6_2_branch Mesa</code> will
-checkout the 6.2 branch and <code>cvs update -r
-mesa_6_2_branch</code> will convert your current CVS tree to the 6.2
-branch.
-
-Consult <a href="http://www.durak.org/cvswebsites/doc/cvs_5.php3#SEC54"
-target="_parent">http://www.durak.org/cvswebsites/doc/cvs_5.php3#SEC54</a>
-for more on branching in CVS.
-</p>
-
-<p>
-To see a list of all the CVS branches run <code>cvs log README</code> (or any
-other file) and look for the section labeled <code>symbolic names</code>.
-You'll see something like this:
-</p>
-
-<pre>  symbolic names:
-        mesa_4_0: 1.3
-        mesa_4_0_branch: 1.3.0.6
-        mesa_3_5: 1.3
-        mesa_3_4_2: 1.3
-        mesa_3_4_1: 1.3
-        mesa_3_4: 1.3
-        mesa_3_4_branch: 1.3.0.4
-        mesa_3_3: 1.3
-        mesa_3_2_1: 1.1.1.1
-        mesa_3_3_texture_env_combine2: 1.3.0.2
-        mesa_3_2: 1.1.1.1
-        mesa_3_2_beta_1: 1.1.1.1
-        mesa_3_1: 1.1.1.1
-        mesa_3_2_dev: 1.1.1.1.0.2
-        mesa_3_1_beta_3: 1.1.1.1
-        start: 1.1.1.1
-        mesa: 1.1.1
-</pre>
-
-<p>
-Most will be obsolete branches.  Generally, the newer branches are at
-the top.  Ask on the mesa3d-dev mailing list to learn which branches
-are active.
-</p>
-
-
-</body>
-</html>
--- a/docs/download.html
+++ b/docs/download.html
@@ -9,7 +9,7 @@
 <H1>Downloading</H1>

 <p>
-Last development release: <b>6.5.1</b>
+Last development release: <b>6.5.2</b>
 </p>

 <p>
--- a/docs/drivers.html
+++ b/docs/drivers.html
@@ -1,221 +0,0 @@
-<HTML>
-
-<TITLE>Writing Mesa Device Drivers</TITLE>
-
-<BODY text="#000000" bgcolor="#55bbff" link="#111188">
-
-<center><h1>Writing Mesa Device Drivers</h1></center>
-
-<h2>Introduction</h2>
-
-<p>
-Several different classes of drivers can be identified:
-</p>
-<ul>
-<li><b>100% Software Driver</b> -
-    a software driver that does not utilize accelerated graphics hardware.
-    Such a driver will basically just write (and read) pixel values to the
-    computer's frame buffer or a malloc'd color buffer.
-    Examples include the X11/XMesa driver, the Windows driver and OSMesa.
-</li>
-<br>
-<li><b>Hardware Rasterization Driver</b> -
-    for graphics hardware that implements accelerated point/line/triangle
-    rasterization, but relies on core Mesa for vertex transformation.
-    Examples include the DRI 3Dfx, Matrox, and Rage 128 drivers.
-</li>
-<br>
-<li><b>Hardware Transformation and Rasterization Driver</b> -
-    for graphics hardware that implements accelerated rasterization and vertex
-    transformation.
-    Examples include the DRI Radeon and R200 drivers.
-</li>
-</ul>
-
-<p>
-Each class of driver builds on the functionality of the preceeding one.
-For example, a hardware rasterization driver may need to fall back to
-software rasterization when a particular OpenGL state combination is set
-but not supported by the hardware (perhaps smooth, stippled, textured
-triangles).
-</p>
-
-<p>
-Likewise, a hardware transformation driver might need to fall back to
-software-based transformation when a particular, seldom-used lighting
-mode is enabled.
-</p>
-
-
-<h2>Getting Started</h2>
-
-<p>
-The best way to get started writing a new driver is to find an existing
-driver similar to what you plan to implement, and then study it.
-</p>
-<p>
-It's not feasible for this document to explain every detail of writing
-a driver.
-The minute details can be gleaned by looking at existing drivers.
-This document focuses on the high-level concepts and will perhaps expand
-on the details in the future.
-</p>
-<p>
-For examples of 100% software drivers, the OSMesa and XMesa (fake/stand-alone
-GLX) drivers are the best examples.
-</p>
-<p>
-For examples of hardware drivers, the DRI Radeon and R200 drivers are good
-examples.
-</p>
-
-
-
-<h2>Programming API vs. Drivers</h2>
-
-<p>
-There are two aspects to a Mesa device driver:
-</p>
-
-<ul>
-<li><b>Public programming API</b> -
-    this is the interface which application programmers use.
-    Examples are the GLX, WGL and OSMesa interfaces.
-    If you're developing a device driver for a new operating system or
-    window system you'll have to design and implement an <em>OpenGL glue</em>
-    interface similar to these.
-    This interface will, in turn, communicate with the internal driver code.
-</li>
-<br>
-<li><b>Private/internal driver code</b> -
-    this is the code which (effectively) translates OpenGL API calls into
-    rendering operations.
-    The device driver must manage hardware resources, track OpenGL state
-    and implement or dispatch the fundamental rendering operations such as
-    point, line, triangle and image rendering.
-</li>
-</ul>
-
-<p>
-The remainder of this document will focus on the later part.
-Furthermore, we'll use the GLX interface for examples.
-</p>
-
-<p>
-In the case of the DRI drivers, the public GLX interface is contained in
-the <b>libGL.so</b> library.
-libGL.so, in turn, dynamically loads one of the DRI drivers (such as
-radeon_dri.so).
-Both libGL.so and the driver modules talk to the X window system via the
-DRI extension.
-Furthermore, the driver modules interface to the graphics hardware with
-the help of a kernel module and the conventional 2D X server driver.
-</p>
-
-
-
-
-<h2>Software Driver Overview</h2>
-
-<p>
-A software driver is primarily concerned with writing pixel values to the
-system's color buffer (and reading them back).
-The color buffers might be window canvases (typically the front
-color buffer) and/or off-screen image buffers (typically the back color
-buffer).
-The depth, stencil and accumulation buffers will be implemented within
-core Mesa.
-</p>
-<p>
-The software driver must also be concerned with allocation and deallocation
-of rendering contexts, frame buffers and pixel formats (visuals).
-</p>
-
-
-<h3>Rendering Contexts</h3>
-
-<p>
-The glue interface will always have a function for creating new rendering
-contexts (such as glXCreateContext).
-The device driver must have a function which allocates and initializes
-a device-specific rendering context.
-</p>
-
-
-<h3>Frame Buffers</h3>
-
-<p>
-The <em>frame buffer</em> can either be a screen region defined by a window
-or the entire screen.
-</p>
-<p>
-In either case, the device driver must implement functions for allocating,
-initializing and managing frame buffers.
-<p>
-
-
-<h3>Spans</h3>
-
-<p>
-The fundamental rendering operation is to write (and read)
-<em>spans</em> of pixels to the front / back color buffers.
-A span is a horizontal array of pixel colors with an array of mask
-flags.  The span begins at a particular (x,y) screen coordinate,
-extends for N pixels, describes N RGBA colors (or color indexes) and
-has an array of N boolean flags indicating which pixels to write and skip.
-<p>
-
-<h3>Miscellaneous functions</h3>
-
-<p>
-Additionally, a software driver will typically have functions for
-binding rendering contexts to frame buffers (via glXMakeCurrent),
-swapping color buffers (via glXSwapBuffers), synchronization
-(via glFlush/glFinish) and queries (via glGetString).
-</p>
-
-<h3>Optimizations</h3>
-
-<p>
-A software driver might implement optimized routines for drawing lines
-and triangles for common cases (such as smooth shading with depth-testing).
-Then, the span functions can be bypassed for a little extra speed.
-The OSMesa and XMesa drivers have examples of this.
-</p>
-
-
-
-
-
-
-
-<h2>Hardware Driver Overview</h2>
-
-<p>
-To do...
-</p>
-
-
-
-<h2>OOP-Style Inheritance and Specialization</h2>
-
-<p>
-Even though Mesa and most device drivers are written in C, object oriented
-programming principles are used in several places.
-</p>
-
-<h3>Rendering Contexts</h3>
-
-<p>
-Every Mesa device driver will need to define a device-specific rendering
-context structure.
-</p>
-
-
-<h2>State Tracking</h2>
-
-
-
-
-</BODY>
-</HTML>
--- a/docs/lists.html
+++ b/docs/lists.html
@@ -9,47 +9,58 @@
 <H1>Mailing Lists</H1>


-<p>There are four Mesa mailing lists:</p>
-<ul>
-<li><b>mesa3d-users</b> - intended for users of the Mesa library.
-Newbie questions are appropriate, but please try reading the Mesa documentation first.
-</li><li><b>mesa3d-dev</b> - intended for developers of the Mesa library.
-This is not for beginners.
-</li><li><b>mesa3d-cvs</b> - CVS check-in messages are sent to this list.
-This is useful for tracking ongoing development changes.
-</li><li><b>mesa3d-announce</b> - announcements of new Mesa versions are sent to this list.
-</li></ul>
-
-<p>
-To subscribe or unsubscribe, go to the
-<a href="http://www.sourceforge.net/mail/?group_id=3" target="_parent">
-SourceForge lists page.</a>
+<p>There are four Mesa mailing lists:
 </p>

-<p>The mailing lists are managed by SourceForge.  If you're having trouble
-with the mailing lists please contact the SourceForge administrators for help.</p>
+<ul>
+<li><a href="https://lists.sourceforge.net/lists/listinfo/mesa3d-announce"
+target="_parent">mesa3d-announce</a> - announcements of new Mesa
+versions are sent to this list.
+</li>
+<br>
+<li><a href="https://lists.sourceforge.net/lists/listinfo/mesa3d-users"
+target="_parent">mesa3d-users</a> - intended for users of the Mesa library.
+Newbie questions are appropriate, but please try the general OpenGL
+resources and Mesa documentation first.
+</li>
+<br>
+<li><a href="https://lists.sourceforge.net/lists/listinfo/mesa3d-dev"
+target="_parent">mesa3d-dev</a> - for discussion of Mesa development.
+Not for beginners.
+</li>
+<br>
+<li><a href="http://lists.freedesktop.org/mailman/listinfo/mesa-commit"
+target="_parent">mesa-commit</a> - relays git check-in messages
+(for developers).
+<br>
+Note: the old mesa3d-cvs list is no longer in use.
+</li>
+</ul>

-<p>Archives of the old Mesa mailing list which was hosted by unicamp.br
-are available <a href="http://groups.yahoo.com/group/mesa/messages/"
-target="_parent">here</a>.</p>
+<p>
+<b>Notice</b>: non-member posts to any of these lists will be automatically
+rejected.
+</p>
+
+
+<br>
+
+<H1>OpenGL Forums</H1>

 <p>
 Here are some other OpenGL-related forums you might find useful:
 </p>

-<p>
-Usenet newsgroups:
 <ul>
-<li>comp.graphics.algorithms
-<li>comp.graphics.api.opengl
-<li>comp.os.linux.x
+<li><a href="http://www.opengl.org/cgi-bin/ubb/ultimatebb.cgi"
+target="_parent">OpenGL discussion forums</A> at www.opengl.org</li>
+<li>Usenet newsgroups:
+<ul>
+<li>comp.graphics.algorithms</li>
+<li>comp.graphics.api.opengl</li>
+<li>comp.os.linux.x</li>
+</ul>
 </ul>
-</p>
-
-<p>
-<a href="http://www.opengl.org/" target="_parent">OpenGL discussion forums</A>
-at www.opengl.org
-</p>

 </HTML>
 </BODY>
--- a/docs/news.html
+++ b/docs/news.html
@@ -11,6 +11,13 @@
 <H1>News</H1>


+<h2>December 5, 2006</h2>
+<p>
+Mesa is now using git as its source code management system.
+The previous CVS repository should no longer be used.
+See the <a href="repository.html">repository page</a> for more information.
+</p>
+
 <h2>December 2, 2006</h2>
 <p>
 <a href="relnotes-6.5.2.html">Mesa 6.5.2</a> has been released.
--- a/docs/relnotes-6.5.2.html
+++ b/docs/relnotes-6.5.2.html
@@ -18,7 +18,15 @@ but mostly consisting of bug fixes.

 <h2>MD5 checksums</h2>
 <pre>
-TBD
+11a033b078e090b3caaeb467234fe299  MesaLib-6.5.2.tar.gz
+e4d894181f1859651658b3704633e10d  MesaLib-6.5.2.tar.bz2
+63bf1d444fa738cca52ce1043e284021  MesaLib-6.5.2.zip
+2b8f1375d16bda5f5a2304174cd5bcf7  MesaDemos-6.5.2.tar.gz
+e870efe98d3a50be01ab211b9b2e25d9  MesaDemos-6.5.2.tar.bz2
+d92cc6f5fee5ca75af0be04f9f4908f0  MesaDemos-6.5.2.zip
+8d4d77e3a7132f4217bbc7c1ab157030  MesaGLUT-6.5.2.tar.gz
+e84edbb11c69c8e408dfadd2ed08e95b  MesaGLUT-6.5.2.tar.bz2
+c6d7134843ed5faf11f6686ecb5d2a2e  MesaGLUT-6.5.2.zip
 </pre>


--- a/docs/relnotes-6.5.3.html
+++ b/docs/relnotes-6.5.3.html
@@ -0,0 +1,82 @@
+<HTML>
+
+<TITLE>Mesa Release Notes</TITLE>
+
+<head><link rel="stylesheet" type="text/css" href="mesa.css"></head>
+
+<BODY>
+
+<body bgcolor="#eeeeee">
+
+<H1>Mesa 6.5.3 Release Notes / (in progress)</H1>
+
+<p>
+Mesa 6.5.3 is a 6.5 follow-on development release mostly consisting of
+bug fixes</a>.
+</p>
+
+
+<h2>MD5 checksums</h2>
+<pre>
+TBD
+</pre>
+
+
+<h2>New features</h2>
+<ul>
+<li>Updated glext.h file (version 39)
+<li>Updated glxext.h file (version 18)
+</ul>
+
+<h2>Bug fixes</h2>
+<ul>
+<li>Fog was errantly applied when a fragment shader was enabled (bug 9346)
+<li>glPush/PopClientAttrib didn't handle VBO bindings correctly (bug 9445)
+<li>With 32-bit Z buffer, the fragment Z of lines and points was sometimes wrong.
+<li>1D convolution state could effect 2D image transfers
+</ul>
+
+
+<h2>Internal code changes</h2>
+
+<ul>
+<li>The _MaintainTnlProgram, _MaintainTexEnvProgram, _TexEnvProgram and
+_TnlProgram fields have been moved.
+<li>The ctx->FragmentProgram._Active field has been removed.
+<li>The ctx->Vertex/FragmentProgram._Current fields point to the program
+in effect, whether it comes from a shader, user-program or generated
+fixed-function program.
+<li>The _UseTexEnvProgram field has been removed.
+</ul>
+
+
+<h2>To Do (someday) items</h2>
+<ul>
+<li>Switch to freeglut
+<li>Increase MAX_DRAWBUFFERS
+<li>Fix linux-glide target/driver.
+<li>Improved lambda and derivative calculation for frag progs.
+</ul>
+
+
+<h2>Driver Status</h2>
+
+<pre>
+Driver			Status
+----------------------	----------------------
+DRI drivers		varies with the driver
+XMesa/GLX (on Xlib)	implements OpenGL 1.5
+OSMesa (off-screen)	implements OpenGL 1.5
+Glide (3dfx Voodoo1/2)	implements OpenGL 1.3
+SVGA			implements OpenGL 1.3
+Wind River UGL		implements OpenGL 1.3
+Windows/Win32		implements OpenGL 1.5
+DJGPP			implements OpenGL 1.5
+GGI			implements OpenGL 1.3
+BeOS			implements OpenGL 1.5
+Allegro			needs updating
+D3D			needs updating
+</pre>
+
+</body>
+</html>
--- a/docs/relnotes.html
+++ b/docs/relnotes.html
@@ -20,6 +20,7 @@ The release notes summarize what's new or changed in each Mesa release.
 </p>

 <UL>
+<LI><A HREF="relnotes-6.5.3.html">6.5.3 release notes</A>
 <LI><A HREF="relnotes-6.5.2.html">6.5.2 release notes</A>
 <LI><A HREF="relnotes-6.5.1.html">6.5.1 release notes</A>
 <LI><A HREF="relnotes-6.5.html">6.5 release notes</A>
--- a/docs/repository.html
+++ b/docs/repository.html
@@ -0,0 +1,111 @@
+<HTML>
+
+<TITLE>Cocd Repository</TITLE>
+
+<link rel="stylesheet" type="text/css" href="mesa.css"></head>
+
+<BODY>
+
+<h1>Code Repository</h1>
+
+<p>
+As of December 5, 2006, Mesa is using
+<a href="http://git.or.cz/"target="_parent">git</a>
+as its source code management system.
+CVS was used previously.
+The old CVS repository should no longer be used.
+</p>
+
+The master git repository is hosted on
+<a href="http://www.freedesktop.org" target="_parent">freedesktop.org</a>.
+</p>
+
+<p>
+You may access the repository either as an
+<a href="#anonymous">anonymous user</a> (read-only) or as a
+<a href="#developer">developer</a>
+(read/write).
+</p>
+
+<p>
+You may also 
+<a href="http://gitweb.freedesktop.org/?p=mesa/mesa.git"
+target="_parent">browse the git repository</a>.
+</p>
+
+
+<a name="anonymous">
+<H2>Anonymous git Access</H2>
+
+<p>
+To get the Mesa sources anonymously (read-only):
+</p>
+
+<ol>
+<li>Install the git software on your computer if needed.<br><br>
+<li>Get an initial, local copy of the repository with:
+    <pre>
+    git clone git://anongit.freedesktop.org/git/mesa/mesa
+    </pre>
+<li>Later, you can update your tree from the master repository with:
+    <pre>
+    git pull origin
+    </pre>
+</ol>
+
+
+<a name="developer">
+<H2>Developer git Access</H2>
+
+<p>
+Mesa developers need to first have an account on
+<a href="http://www.freedesktop.org" target="_parent">freedesktop.org</a>.
+To get an account, please ask Brian or the other Mesa developers for
+permission.
+Then, if there are no objections, follow this
+<a href="http://www.freedesktop.org/wiki/AccountRequests" target="_parent">
+procedure</a>.
+</p>
+
+<p>
+Once your account is established:
+</p>
+
+<ol>
+<li>Install the git software on your computer if needed.<br><br>
+<li>Get an initial, local copy of the repository with:
+    <pre>
+    git clone git+ssh://username@git.freedesktop.org/git/mesa/mesa
+    </pre>
+    Replace <em>username</em> with your actual login name.<br><br>
+<li>Later, you can update your tree from the master repository with:
+    <pre>
+    git pull origin
+    </pre>
+</ol>
+
+
+<a name="developer">
+<H2>Development Branches</H2>
+
+<p>
+At any given time, there may be several active branches in Mesa's
+repository.
+Generally, the trunk contains the latest development (unstable)
+code while a branch has the latest stable code.
+</p>
+
+<p>
+The command <code>git-branch</code> will list all available branches.
+</p>
+
+<p>
+Questions about branch status/activity should be posted to the
+mesa3d-dev mailing list.
+</p>
+
+
+</body>
+</html>
+
+
--- a/doxygen/.gitignore
+++ b/doxygen/.gitignore
@@ -0,0 +1,15 @@
+*.tag
+agpgart
+array_cache
+core
+core_subset
+math
+math_subset
+miniglx
+radeon_subset
+radeondrm
+radeonfb
+swrast
+swrast_setup
+tnl
+tnl_dd
--- a/doxygen/Makefile
+++ b/doxygen/Makefile
@@ -0,0 +1,33 @@
+
+default: full
+
+all: full subset
+
+%.tag: %.doxy
+	doxygen $<
+
+FULL = \
+	main.doxy \
+	math.doxy \
+	vbo.doxy \
+	glapi.doxy \
+	shader.doxy \
+	swrast.doxy \
+	swrast_setup.doxy \
+	tnl.doxy \
+	tnl_dd.doxy
+
+full: $(FULL:.doxy=.tag)
+	$(foreach FILE,$(FULL),doxygen $(FILE);)
+
+SUBSET = \
+	main.doxy \
+	math.doxy \
+	miniglx.doxy
+
+subset: $(SUBSET:.doxy=.tag)
+	$(foreach FILE,$(SUBSET),doxygen $(FILE);)
+
+clean:
+	rm -rf $(FULL:.doxy=) $(SUBSET:.doxy=)
+	rm -rf *.tag
--- a/doxygen/README
+++ b/doxygen/README
@@ -0,0 +1,10 @@
+
+This directory is for doxygen (a source code documentation system).
+
+See http://www.doxygen.org/ for more info.
+
+Either run 'make' (Unix) or 'doxy.bat' (Windows) to run doxygen
+and generate souce code documentation.
+
+Then, load either doxygen/main/index.html or doxygen/core_subset/index.html into
+your web browser.
--- a/doxygen/common.doxy
+++ b/doxygen/common.doxy
--- a/Show More
+++ b/Show More
				`@@ -1 +0,0 @@`
				`usr/lib/glx/i686/cmov/libGL.so.* usr/lib/i686/cmov`