Bumped versions numbers in preparation for 3.4.2 release.

8 files changed, 51 insertions, 29 deletions

diff --git a/Make-config b/Make-config
index 91c65dc806..c9c9d18ac8 100644
--- a/Make-config
+++ b/Make-config
@@ -1,13 +1,13 @@
-# $Id: Make-config,v 1.25.4.6 2001/01/24 04:49:27 brianp Exp $
+# $Id: Make-config,v 1.25.4.7 2001/05/14 19:11:32 brianp Exp $
 
 MESA_MAJOR=3
 MESA_MINOR=4
-MESA_TINY=1
+MESA_TINY=2
 VERSION=$(MESA_MAJOR).$(MESA_MINOR)
 
 # Mesa 3-D graphics library
 # 
-# Copyright (C) 1999-2000  Brian Paul   All Rights Reserved.
+# Copyright (C) 1999-2001  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"),
diff --git a/docs/README.3DFX b/docs/README.3DFX
index 6e4042aeb1..dba76ff8af 100644
--- a/docs/README.3DFX
+++ b/docs/README.3DFX
@@ -1,5 +1,5 @@
 
-                     3Dfx Glide device driver for Mesa 3.4.1
+                     3Dfx Glide device driver for Mesa 3.4.2
 				(see below for FAQ)
 
 
@@ -16,7 +16,7 @@ What do you need ?
 	  under Linux (more information in the "Useful Glide Environment
 	  Variables");
 
-	- Mesa 3.4.1;
+	- Mesa 3.4.2;
 
 	- The 3Dfx Glide library 2.3 or later for your OS (the 2.4 works fine).
 	  The Voodoo2 requires the Glide library 2.51. The Glide 3.1 is not
@@ -78,18 +78,18 @@ Linux:
 	  If your Glide libraries and headers are in a different directory
 	  you'll have to modify the Mesa-config and mklib.glide files.
 
-	- Unpack the MesaLib-3.4.1.tar.gz and MesaDemos-3.4.1.tar.gz archives;
+	- Unpack the MesaLib-3.4.2.tar.gz and MesaDemos-3.4.2.tar.gz archives;
 
 	- If you're going to use a newer Mesa/Glide driver than v0.27 then
           unpack the new driver archive over the Mesa directory.
 
-	- In the Mesa-3.4.1 directory type "make linux-glide"
+	- In the Mesa-3.4.2 directory type "make linux-glide"
 
 	- Compilation _should_ finish without errors;
 
 	- Set your LD_LIBRARY_PATH environment variable so that the
 	  libglide2x.so and Mesa library files can be found.  For example:
-	    setenv LD_LIBRARY_PATH "/usr/local/glide/lib:/SOMEDIR/Mesa-3.4.1/lib"
+	    setenv LD_LIBRARY_PATH "/usr/local/glide/lib:/SOMEDIR/Mesa-3.4.2/lib"
 
 	- You'll have to run Glide-based programs as root or set the suid
 	  bit on executables;
@@ -115,10 +115,10 @@ MS Windows:
 
 	- You must have the vcvars32.bat script in your PATH;
 
-	- Go to the directory Mesa-3.4.1 and run the mesafx.bat;
+	- Go to the directory Mesa-3.4.2 and run the mesafx.bat;
 
-	- The script will compile everything (Mesa-3.4.1/lib/OpenGL32.{lib,dll},
-	  Mesa-3.4.1/lib/GLU32.{lib,dll}, Mesa-3.4.1/lib/GLUT32.{lib,dll};
+	- The script will compile everything (Mesa-3.4.2/lib/OpenGL32.{lib,dll},
+	  Mesa-3.4.2/lib/GLU32.{lib,dll}, Mesa-3.4.2/lib/GLUT32.{lib,dll};
 
 	- Try some demo (fire.exe, teapot.exe, etc.) in order to check if
 	  everything is OK (you can use Alt-Tab or Ctrl-F9 to switch between
@@ -386,7 +386,7 @@ Hints and Special Features:
         - The Voodoo driver support multiple Voodoo Graphics boards in the
           some PC. Using this feature, you can write applications that use
           multiple monitors, videoprojectors or HMDs for the output. See
-	  Mesa-3.4.1/demos/tunnel2.c for an example of how setup one
+	  Mesa-3.4.2/demos/tunnel2.c for an example of how setup one
           context for each board.
 
 	- The v0.19 introduces a new powerful texture memory manager: the
@@ -404,7 +404,7 @@ Hints and Special Features:
 	- The Voodoo driver supports the GL_EXT_paletted_texture. it works
 	  only with GL_COLOR_INDEX8_EXT, GL_RGBA palettes and the alpha value
 	  is ignored because this is a limitation of the the current Glide
-	  version and of the Voodoo hardware. See Mesa-3.4.1/demos/paltex.c
+	  version and of the Voodoo hardware. See Mesa-3.4.2/demos/paltex.c
 	  for a demo of this extension.
 
 	- The Voodoo driver chooses the screen resolution according to the
@@ -476,12 +476,12 @@ version of GLQuake with works with the Mesa/3Dfx/Glide combo.
 Here's what you need to run GLQuake on Linux:
    PC with 100MHz Pentium or better
    a 3Dfx-based card
-   Mesa 3.4.1 libraries:  libGL.so  libGLU.so
+   Mesa 3.4.2 libraries:  libGL.so  libGLU.so
    Glide 2.4 libraries:  libglide2x.so  libtexus.so
    GLQuake for Linux.
 
 Also, the windows version of GLQuake works fine with the Mesa OpenGL32.dll,
-you have only to copy the Mesa-3.4.1/lib/OpenGL32.dll in the GLQuake directory
+you have only to copy the Mesa-3.4.2/lib/OpenGL32.dll in the GLQuake directory
 in order to test 'MesaQuake'.
 
 
diff --git a/docs/README.X11 b/docs/README.X11
index f998e18447..ee30993279 100644
--- a/docs/README.X11
+++ b/docs/README.X11
@@ -1,5 +1,5 @@
 
-                         Mesa 3.4.1 Unix/X11 Information
+                         Mesa 3.4.2 Unix/X11 Information
 
 
 
@@ -323,4 +323,4 @@ Summary of X-related environment variables:
 
 
 ----------------------------------------------------------------------
-$Id: README.X11,v 3.5.4.2 2001/01/24 04:53:26 brianp Exp $
+$Id: README.X11,v 3.5.4.3 2001/05/14 19:11:32 brianp Exp $
diff --git a/docs/RELNOTES-3.4.2 b/docs/RELNOTES-3.4.2
new file mode 100644
index 0000000000..3263f68c1f
--- /dev/null
+++ b/docs/RELNOTES-3.4.2
@@ -0,0 +1,22 @@
+
+                         Mesa 3.4.2 release notes
+
+                               May ??, 2001
+
+                              PLEASE READ!!!!
+
+
+
+Introduction
+------------
+
+Mesa uses an even/odd version number scheme like the Linux kernel.
+Odd numbered versions (such as 3.3) designate new developmental releases.
+Even numbered versions (such as 3.4) designate stable releases.
+
+Mesa 3.4.2 is a maintenance release that simply fixes bugs found since
+the Mesa 3.4.1 release.  For details, see the VERSIONS file.
+
+
+----------------------------------------------------------------------
+$Id: RELNOTES-3.4.2,v 1.1.2.1 2001/05/14 19:11:32 brianp Exp $
diff --git a/docs/VERSIONS b/docs/VERSIONS
index 0c933b30cf..3f3e862db9 100644
--- a/docs/VERSIONS
+++ b/docs/VERSIONS
@@ -1,4 +1,4 @@
-$Id: VERSIONS,v 1.38.2.41 2001/05/11 19:01:47 brianp Exp $
+$Id: VERSIONS,v 1.38.2.42 2001/05/14 19:11:32 brianp Exp $
 
 
 Mesa Version History
@@ -802,7 +802,7 @@ Mesa Version History
     Known problems:
 	- NURBS or evaluator surfaces inside display lists don't always work
 
-post-3.4.1
+3.4.2  May ??, 2001
     Bug fixes:
 	- deleting the currently bound texture could cause bad problems
 	- using fog could result in random vertex alpha values
diff --git a/src/glu/mesa/glu.c b/src/glu/mesa/glu.c
index 997019ffa7..f573e9b653 100644
--- a/src/glu/mesa/glu.c
+++ b/src/glu/mesa/glu.c
@@ -1,4 +1,4 @@
-/* $Id: glu.c,v 1.21.2.2 2001/01/24 04:49:27 brianp Exp $ */
+/* $Id: glu.c,v 1.21.2.3 2001/05/14 19:11:33 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -302,7 +302,7 @@ const GLubyte *GLAPIENTRY
 gluGetString(GLenum name)
 {
    static char *extensions = "GL_EXT_abgr";
-   static char *version = "1.1 Mesa 3.4.1";
+   static char *version = "1.1 Mesa 3.4.2";
 
    switch (name) {
    case GLU_EXTENSIONS:
diff --git a/src/mesa/drivers/x11/fakeglx.c b/src/mesa/drivers/x11/fakeglx.c
index 7b60698e34..b9fb0a6618 100644
--- a/src/mesa/drivers/x11/fakeglx.c
+++ b/src/mesa/drivers/x11/fakeglx.c
@@ -1,10 +1,10 @@
-/* $Id: fakeglx.c,v 1.34.4.7 2001/01/24 04:49:27 brianp Exp $ */
+/* $Id: fakeglx.c,v 1.34.4.8 2001/05/14 19:11:33 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
- * Version:  3.4
+ * Version:  3.4.2
  * 
- * Copyright (C) 1999-2000  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2001  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"),
@@ -65,7 +65,7 @@
 #define SERVER_MINOR_VERSION 3
 
 /* This is appended onto the glXGetClient/ServerString version strings. */
-#define MESA_GLX_VERSION "Mesa 3.4.1"
+#define MESA_GLX_VERSION "Mesa 3.4.2"
 
 /* Who implemented this GLX? */
 #define VENDOR "Brian Paul"
diff --git a/src/mesa/main/get.c b/src/mesa/main/get.c
index b73951c277..ee69141b08 100644
--- a/src/mesa/main/get.c
+++ b/src/mesa/main/get.c
@@ -1,10 +1,10 @@
-/* $Id: get.c,v 1.30.2.4 2001/01/24 04:49:27 brianp Exp $*/
+/* $Id: get.c,v 1.30.2.5 2001/05/14 19:11:32 brianp Exp $*/
 
 /*
  * Mesa 3-D graphics library
- * Version:  3.4
+ * Version:  3.4.2
  * 
- * Copyright (C) 1999-2000  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2001  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"),
@@ -5095,7 +5095,7 @@ _mesa_GetString( GLenum name )
    GET_CURRENT_CONTEXT(ctx);
    static const char *vendor = "Brian Paul";
    static const char *renderer = "Mesa";
-   static const char *version = "1.2 Mesa 3.4.1";
+   static const char *version = "1.2 Mesa 3.4.2";
 
    ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH_WITH_RETVAL(ctx, "glGetString", 0);