Increment version to 1.2.0.GLIB_1_2_0

Increment version to 1.2.0.

-Shawn
amundson@gtk.org

19 files changed, 129 insertions, 52 deletions

diff --git a/.cvsignore b/.cvsignore
index eb307c7ed..02f97e634 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -23,3 +23,5 @@ stamp-gc-h
 testgdate
 testgdateparser
 glibconfig-sysdefs.h
+glib.spec
+stamp-h.in
diff --git a/AUTHORS b/AUTHORS
index 07031bc2f..e8982366e 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,24 +1,25 @@
 Original Authors
 ----------------
-Peter Mattis      <petm@xcf.berkeley.edu>
-Spencer Kimball   <spencer@xcf.berkeley.edu>
-Josh MacDonald    <jmacd@xcf.berkeley.edu>
+Peter Mattis       <petm@xcf.berkeley.edu>
+Spencer Kimball    <spencer@xcf.berkeley.edu>
+Josh MacDonald     <jmacd@xcf.berkeley.edu>
 
+Please do not mail the original authors asking questions about this 
+version of GLib.
 
-Other people who made significant
-improvements to GLIB (shamelessly
-ripped from the ChangeLog, listed
-in alphabetical order)
----------------------------------
-Raja R Harinath <harinath@cs.umn.edu>
-Tim Janik <timj@gtk.org>
-Paolo Molaro <lupus@debian.org>
-Manish Singh <yosh@gimp.org>
-Owen Taylor <otaylor@gtk.org>
-
-
-Also, thanks to Shawn T. Amundson <amundson@gtk.org>
-for doing releases of GLIB.
+GLib Team
+---------
+Shawn T. Amundson  <amundson@gimp.org>
+Jeff Garzik        <jgarzik@pobox.com>
+Raja R Harinath    <harinath@cs.umn.edu>
+Tim Janik          <timj@gtk.org>
+Elliot Lee         <sopwith@redhat.com>
+Tor Lillqvist      <tml@iki.fi>
+Paolo Molaro       <lupus@debian.org>
+Havoc Pennington   <hp@pobox.com>
+Manish Singh       <yosh@gimp.org>
+Owen Taylor        <otaylor@gtk.org>
+Sebastian Wilhelmi <wilhelmi@ira.uka.de>
 
 There are also many others who have contributed patches and fixes;
 we thank them, for helping us in advancing GLIB.
diff --git a/ChangeLog b/ChangeLog
index c8ff1fdb8..786951f55 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sun Feb 21 22:11:51 CST 1999  Shawn T. Amundson <amundson@gtk.org>
+
+	* Released GLib 1.2.0
+
+	* AUTHORS: updated
+
 Wed Feb 24 00:08:42 CST 1999 Shawn T. Amundson <amundson@gtk.org>
 
 	* *.[ch]: inserted additional note to look for ChangeLog and
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index c8ff1fdb8..786951f55 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,9 @@
+Sun Feb 21 22:11:51 CST 1999  Shawn T. Amundson <amundson@gtk.org>
+
+	* Released GLib 1.2.0
+
+	* AUTHORS: updated
+
 Wed Feb 24 00:08:42 CST 1999 Shawn T. Amundson <amundson@gtk.org>
 
 	* *.[ch]: inserted additional note to look for ChangeLog and
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index c8ff1fdb8..786951f55 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+Sun Feb 21 22:11:51 CST 1999  Shawn T. Amundson <amundson@gtk.org>
+
+	* Released GLib 1.2.0
+
+	* AUTHORS: updated
+
 Wed Feb 24 00:08:42 CST 1999 Shawn T. Amundson <amundson@gtk.org>
 
 	* *.[ch]: inserted additional note to look for ChangeLog and
diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index c8ff1fdb8..786951f55 100644
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,9 @@
+Sun Feb 21 22:11:51 CST 1999  Shawn T. Amundson <amundson@gtk.org>
+
+	* Released GLib 1.2.0
+
+	* AUTHORS: updated
+
 Wed Feb 24 00:08:42 CST 1999 Shawn T. Amundson <amundson@gtk.org>
 
 	* *.[ch]: inserted additional note to look for ChangeLog and
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index c8ff1fdb8..786951f55 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,9 @@
+Sun Feb 21 22:11:51 CST 1999  Shawn T. Amundson <amundson@gtk.org>
+
+	* Released GLib 1.2.0
+
+	* AUTHORS: updated
+
 Wed Feb 24 00:08:42 CST 1999 Shawn T. Amundson <amundson@gtk.org>
 
 	* *.[ch]: inserted additional note to look for ChangeLog and
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index c8ff1fdb8..786951f55 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+Sun Feb 21 22:11:51 CST 1999  Shawn T. Amundson <amundson@gtk.org>
+
+	* Released GLib 1.2.0
+
+	* AUTHORS: updated
+
 Wed Feb 24 00:08:42 CST 1999 Shawn T. Amundson <amundson@gtk.org>
 
 	* *.[ch]: inserted additional note to look for ChangeLog and
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index c8ff1fdb8..786951f55 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+Sun Feb 21 22:11:51 CST 1999  Shawn T. Amundson <amundson@gtk.org>
+
+	* Released GLib 1.2.0
+
+	* AUTHORS: updated
+
 Wed Feb 24 00:08:42 CST 1999 Shawn T. Amundson <amundson@gtk.org>
 
 	* *.[ch]: inserted additional note to look for ChangeLog and
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index c8ff1fdb8..786951f55 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+Sun Feb 21 22:11:51 CST 1999  Shawn T. Amundson <amundson@gtk.org>
+
+	* Released GLib 1.2.0
+
+	* AUTHORS: updated
+
 Wed Feb 24 00:08:42 CST 1999 Shawn T. Amundson <amundson@gtk.org>
 
 	* *.[ch]: inserted additional note to look for ChangeLog and
diff --git a/INSTALL b/INSTALL
index d4e86afbf..d4f38aee4 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,8 +1,8 @@
 Simple install procedure
 ========================
 
-  % gzip -cd glib-1.1.16.tar.gz | tar xvf - # unpack the sources
-  % cd glib-1.1.16                          # change to the toplevel directory
+  % gzip -cd glib-1.2.0.tar.gz | tar xvf -  # unpack the sources
+  % cd glib-1.2.0                           # change to the toplevel directory
   % ./configure                             # run the `configure' script
   % make                                    # build GLIB
   [ Become root if necessary ]
diff --git a/NEWS b/NEWS
index 5c1970b27..1e3b7cbc4 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,24 @@
+What's new in GLib 1.2.0 (since GLib 1.0.x):
+
+* GLib is distributed seperatedly from Gtk+
+* Win32 Portability
+* Threading support
+* GModule mechanism (implemented in an extra library) which wraps dynamic
+  object code loading facilities in a portable manner
+* GIOChannel structure to encapsulate the IPC mechanism
+* GQuarks and datasets
+* GRelations for n-way mapping of certain data
+* An n-way tree implementation
+* GDate functionality for calendar date manipulations
+* GAllocator type and assocated functions
+* Added generic callback maintenance functions (ghook)
+* Generic functions for TAB completions
+* Endian defines (G_*_ENDIAN)
+* g_log() mechanism for logging of messages at different log levels
+* Generic main-loop mechanism
+* New glib-config helper script
+* Many more API extensions
+
 Overview of Changes in GLib 1.1.16:
 
 * Allocate smaller pools of memory for glists, gslists, gnodes
diff --git a/README b/README
index 59fbbef9b..4d36ff070 100644
--- a/README
+++ b/README
@@ -1,13 +1,10 @@
 General Information
 ===================
 
-This is GLib version 1.1.16. GLib, is a library which includes support
+This is GLib version 1.2.0. GLib is a library which includes support
 routines for C such as lists, trees, hashes, memory allocation, and
 many other things.
 
-Versions of GLib prior to 1.1.0 are distributed with GTK+ versions prior
-to 1.1.0.
-
 The official ftp site is:
   ftp://ftp.gtk.org/pub/gtk
 
diff --git a/README.win32 b/README.win32
index f0434631c..27c4b7fe0 100644
--- a/README.win32
+++ b/README.win32
@@ -1,34 +1,43 @@
 For more information about the port or GLib, GTk+ and the GIMP to
-native Windows, see http://www.iki.fi/tml/gimp/win32/ . ("Native"
-means that we use the Win32 API only, and not any POSIX emulation
-layer except that provided by the Microsoft runtime C library, and the
-pthreads emulation library.)
-
-As for now, only the Microsoft compiler and tools are really
-supported. Before compiling, check the BIN definition in
-makefile.msc. Compile with `nmake -f makefile.msc`. Install with
-`nmake -f makefile.msc install`. Cygwin (without cygwin runtime,
-i.e. "mingw32"), and maybe LCC-Win32 support will be added later.
-
-When using the cygwin compiler and tools *with* the cygwin runtime the
+native Windows, and pre-built binary packages, see
+http://www.iki.fi/tml/gimp/win32/ . "Native" means that we use the
+Win32 API only, and not any POSIX emulation layer except that provided
+by the Microsoft runtime C library. Additionally the pthreads
+emulation library is used.
+
+As for now, to build GLib on Win32, you need the Microsoft compiler
+and tools. Both the compiler from MSVC 5.0 and MSVC 6.0 have been used
+successfully.
+
+Before building you must get the pthreads library for Windows from
+http://sourceware.cygnus.com/pthreads-win32/. Edit the location of the
+pthreads library and include files in makefile.msc. Also edit the BIN
+definition in makefile.msc.
+
+Build with `nmake -f makefile.msc`. Install with `nmake -f
+makefile.msc install`.
+
+Support for building using the cygwin tools (without depending on the
+cygwin runtime, i.e. "mingw32"), and maybe LCC-Win32 might be added
+later. When using the cygwin tools *with* the cygwin runtime the
 normal Unix configuration method should work as if on Unix (knock on
 wood).
 
 With a little work, it might be possible to use the ./configure
 mechanism also with a "mingw32" configuration. I.e. building GLib for
-Win32 would use the cygwin tools (and dll), but the produced libraries
-would not depend on the cygwin runtime being present.
+Win32 would use the cygwin tools (and runtime), but the produced
+libraries would not depend on the cygwin runtime being present.
 
 The following preprocessor macros are used for conditional compilation 
 related to Win32:
 
 - WIN32 is defined when compiling for the Win32 platform, regardless
-  if using the X11 or Win32 GUI API (of course, in the case of GLib, this
-  dimension isn't significant), regardless whether using a more
-  or less complete Unix emulation runtime layer (like Cygwin) or not.
+  if using the X11 or Win32 windowing API (in the case of GLib, this
+  dimension isn't significant), regardless whether using a more or
+  less complete POSIX emulation runtime layer (like Cygwin) or not.
 
 - NATIVE_WIN32 is defined when compiling for Win32, *and* without
-  any Unix emulation, other that to the extent provided by the
+  any POSIX emulation, other that to the extent provided by the
   (Microsoft) C library, or the pthreads-win32 library. For instance,
   pathnames use the native Windows syntax.
 
@@ -41,6 +50,5 @@ also, and in that case _MSC_VER wouldn't be defined.
 Some of the usage of these macros is probably a bit mixed up, and will
 have to be straightened out when actually trying other combinations.
 
-The thread support uses the pthreads for Win32 package available from
-http://sourceware.cygnus.com/pthreads-win32/, which isn't ready yet,
-and thus really should not be relied upon.
+The pthreads for Win32 package that the thread support uses isn't
+released yet, and thus threads really should not be relied upon.
diff --git a/config.h.win32 b/config.h.win32
index 58e412cdc..685c25357 100644
--- a/config.h.win32
+++ b/config.h.win32
@@ -55,8 +55,8 @@
 #define G_HAVE___INLINE 1
 
 #define GLIB_MAJOR_VERSION 1
-#define GLIB_MINOR_VERSION 1
-#define GLIB_MICRO_VERSION 16
+#define GLIB_MINOR_VERSION 2
+#define GLIB_MICRO_VERSION 0
 #define GLIB_INTERFACE_AGE 0
 #define GLIB_BINARY_AGE 0
 
diff --git a/configure.in b/configure.in
index 6a6de778e..6695a95d8 100644
--- a/configure.in
+++ b/configure.in
@@ -32,8 +32,8 @@ AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)dnl
 # set GLIB_BINARY_AGE and GLIB_INTERFACE_AGE to 0.
 #
 GLIB_MAJOR_VERSION=1
-GLIB_MINOR_VERSION=1
-GLIB_MICRO_VERSION=16
+GLIB_MINOR_VERSION=2
+GLIB_MICRO_VERSION=0
 GLIB_INTERFACE_AGE=0
 GLIB_BINARY_AGE=0
 GLIB_VERSION=$GLIB_MAJOR_VERSION.$GLIB_MINOR_VERSION.$GLIB_MICRO_VERSION
diff --git a/docs/glib-config.1 b/docs/glib-config.1
index 6155a62bd..75b0878cc 100644
--- a/docs/glib-config.1
+++ b/docs/glib-config.1
@@ -1,4 +1,4 @@
-.TH GLIB 1 "16 December 1998" Version 1.1.16
+.TH GLIB 1 "16 December 1998" Version 1.2.0
 .SH NAME
 glib-config - script to get information about the installed version of GLib
 .SH SYNOPSIS
diff --git a/glibconfig.h.win32 b/glibconfig.h.win32
index a9c829fc0..1f5c9535c 100644
--- a/glibconfig.h.win32
+++ b/glibconfig.h.win32
@@ -77,8 +77,8 @@ typedef unsigned __int64 guint64;
 #define alloca _alloca
 
 #define GLIB_MAJOR_VERSION 1
-#define GLIB_MINOR_VERSION 1
-#define GLIB_MICRO_VERSION 16
+#define GLIB_MINOR_VERSION 2
+#define GLIB_MICRO_VERSION 0
 
 #ifdef	__cplusplus
 #define	G_HAVE_INLINE	1
diff --git a/makefile.msc b/makefile.msc
index 19d7e74fc..9b15dbaf5 100644
--- a/makefile.msc
+++ b/makefile.msc
@@ -21,7 +21,7 @@ CC = cl -G5 -GF -Ox -W3 -MD -nologo
 LDFLAGS = /link
 INSTALL = copy
 
-GLIB_VER = 1.1
+GLIB_VER = 1.2
 
 CFLAGS = -I. -DHAVE_CONFIG_H