* include/w32api.h: Change to version 2.0 to reflect the change

	in the license.
	* README: Renamed.
	* README.w32api: Renamed from README.  Modified license to remove
	the restriction of notifying the author based on the fact that the
	author is unreachable at the notified address.
	* Makefile.in (VERSION): Change to 2.0.

4 files changed, 29 insertions, 20 deletions

diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index f4d76b51c..d692ef451 100644
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,5 +1,15 @@
 2002-06-14  Earnie Boyd  <earnie@users.sf.net>
 
+	* include/w32api.h: Change to version 2.0 to reflect the change
+	in the license.
+	* README: Renamed.
+	* README.w32api: Renamed from README.  Modified license to remove
+	the restriction of notifying the author based on the fact that the
+	author is unreachable at the notified address.
+	* Makefile.in (VERSION): Change to 2.0.
+
+2002-06-14  Earnie Boyd  <earnie@users.sf.net>
+
 	* include/wingdi.h (GetEnhMetaFileBits): Correct typo.
 	* Makefile.in (bindist): Correct the MinGW distribution.
 
diff --git a/winsup/w32api/Makefile.in b/winsup/w32api/Makefile.in
index c6f12e508..003b2bf1c 100644
--- a/winsup/w32api/Makefile.in
+++ b/winsup/w32api/Makefile.in
@@ -66,11 +66,11 @@ FLAGS_TO_PASS = \
 SUBDIRS = lib
 
 PACKAGE = w32api
-VERSION = 1.5
+VERSION = 2.0
 CYGRELEASE = 1
 
 DIST_FILES = Makefile.in configure.in configure config.guess config.sub \
-install-sh README ChangeLog TODO CONTRIBUTIONS
+install-sh README.w32api ChangeLog TODO CONTRIBUTIONS
 
 all: lib
 
diff --git a/winsup/w32api/README b/winsup/w32api/README.w32api
index a34153111..02ca26263 100644
--- a/winsup/w32api/README
+++ b/winsup/w32api/README.w32api
@@ -1,28 +1,27 @@
         Free headers and libraries for the Win32 API
 
-        Written by Anders Norlander <anorland@hem2.passagen.se>
-        URL: http://www.acc.umu.se/~anorland/gnu-win32/
+        Originally written by Anders Norlander 
+	Last known and not working email: <anorland@hem2.passagen.se>
 
-	Maintained by MinGW Developers
+	Now maintained by MinGW Developers
         Send bug reports and questions to MinGW-users@lists.sourceforge.net
 	URL: http://www.mingw.org
 
-* License
+* License 2.0
 
-  You are free to use, modify and copy this package. No restrictions
-  are imposed on programs or object files compiled with this library.
+  You are free to use, modify and copy this package as long as this
+  README.w32api file is included unmodified with any distribution, source or
+  binary, of this package.  No restrictions are imposed on any package or 
+  product using or incorporating this package.  You are free to license your 
+  package as you see fit.
   
-  You may not restrict the the usage of this library.
-
+  You may not restrict others freedoms as set forth in the above paragraph.
   You may distribute this library as part of another package or as a
-  modified package if and only if you do *not* restrict the usage of
-  the portions consisting of this (optionally modified) library.
-
-  If distributed as part of another package, please notify the author
-  of what you are going to do.  If distributed as a modified package,
-  this file *must* be included.
+  modified package if and only if you do *not* restrict others freedoms as
+  set forth in the above paragraph as it concerns this pakcage.  You do have
+  the right to restrict uses of any package using this package.
 
-  This library is distributed in the hope that it will be useful, but
+  This package is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
diff --git a/winsup/w32api/include/w32api.h b/winsup/w32api/include/w32api.h
index dc0c96c1e..9be737fb7 100644
--- a/winsup/w32api/include/w32api.h
+++ b/winsup/w32api/include/w32api.h
@@ -4,8 +4,8 @@
 #pragma GCC system_header
 #endif
 
-#define __W32API_VERSION 1.5
-#define __W32API_MAJOR_VERSION 1
-#define __W32API_MINOR_VERSION 5
+#define __W32API_VERSION 2.0
+#define __W32API_MAJOR_VERSION 2
+#define __W32API_MINOR_VERSION 0
 
 #endif /* ndef _W32API_H_ */