Release 1.2.9GLIB_1_2_9

Fri Mar  2 12:35:40 2001  Owen Taylor  <otaylor@redhat.com>

	* Release 1.2.9

        * NEWS: Final update for 1.2.9

	* INSTALL INSTALL.in: Add note about the movement of
	the include files.

11 files changed, 109 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 0dc61ce0a..1636b8285 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Fri Mar  2 12:35:40 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* Release 1.2.9
+
+        * NEWS: Final update for 1.2.9
+	 
+	* INSTALL INSTALL.in: Add note about the movement of
+	the include files.
+
 2001-03-01  Tor Lillqvist  <tml@iki.fi>
 
 	* README.win32: Make a note that this version of GLib preferrably
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 0dc61ce0a..1636b8285 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,12 @@
+Fri Mar  2 12:35:40 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* Release 1.2.9
+
+        * NEWS: Final update for 1.2.9
+	 
+	* INSTALL INSTALL.in: Add note about the movement of
+	the include files.
+
 2001-03-01  Tor Lillqvist  <tml@iki.fi>
 
 	* README.win32: Make a note that this version of GLib preferrably
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 0dc61ce0a..1636b8285 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,12 @@
+Fri Mar  2 12:35:40 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* Release 1.2.9
+
+        * NEWS: Final update for 1.2.9
+	 
+	* INSTALL INSTALL.in: Add note about the movement of
+	the include files.
+
 2001-03-01  Tor Lillqvist  <tml@iki.fi>
 
 	* README.win32: Make a note that this version of GLib preferrably
diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 0dc61ce0a..1636b8285 100644
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,12 @@
+Fri Mar  2 12:35:40 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* Release 1.2.9
+
+        * NEWS: Final update for 1.2.9
+	 
+	* INSTALL INSTALL.in: Add note about the movement of
+	the include files.
+
 2001-03-01  Tor Lillqvist  <tml@iki.fi>
 
 	* README.win32: Make a note that this version of GLib preferrably
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 0dc61ce0a..1636b8285 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,12 @@
+Fri Mar  2 12:35:40 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* Release 1.2.9
+
+        * NEWS: Final update for 1.2.9
+	 
+	* INSTALL INSTALL.in: Add note about the movement of
+	the include files.
+
 2001-03-01  Tor Lillqvist  <tml@iki.fi>
 
 	* README.win32: Make a note that this version of GLib preferrably
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 0dc61ce0a..1636b8285 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,12 @@
+Fri Mar  2 12:35:40 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* Release 1.2.9
+
+        * NEWS: Final update for 1.2.9
+	 
+	* INSTALL INSTALL.in: Add note about the movement of
+	the include files.
+
 2001-03-01  Tor Lillqvist  <tml@iki.fi>
 
 	* README.win32: Make a note that this version of GLib preferrably
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 0dc61ce0a..1636b8285 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,12 @@
+Fri Mar  2 12:35:40 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* Release 1.2.9
+
+        * NEWS: Final update for 1.2.9
+	 
+	* INSTALL INSTALL.in: Add note about the movement of
+	the include files.
+
 2001-03-01  Tor Lillqvist  <tml@iki.fi>
 
 	* README.win32: Make a note that this version of GLib preferrably
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 0dc61ce0a..1636b8285 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,12 @@
+Fri Mar  2 12:35:40 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* Release 1.2.9
+
+        * NEWS: Final update for 1.2.9
+	 
+	* INSTALL INSTALL.in: Add note about the movement of
+	the include files.
+
 2001-03-01  Tor Lillqvist  <tml@iki.fi>
 
 	* README.win32: Make a note that this version of GLib preferrably
diff --git a/INSTALL b/INSTALL
index d2c121d51..884b26b4a 100644
--- a/INSTALL
+++ b/INSTALL
@@ -5,9 +5,24 @@ Simple install procedure
   % cd glib-1.2.9                           # change to the toplevel directory
   % ./configure                             # run the `configure' script
   % make                                    # build GLIB
+
   [ Become root if necessary ]
+  % rm -rf /install-prefix/include/glib.h /install-prefix/include/gmodule.h
   % make install                            # install GLIB
 
+Special note for GLib+-1.2.9
+============================
+
+Between GLib-1.2.8 and GLib-1.2.9, the include files for GLib
+have been moved to $(includedir)/gtk-1-2/ to allow parallel installations
+of GLib-1.2 and GLib-2.0 to work correctly. If you are installing
+on top of an old installation of GLib, you should remove the files:
+
+ $(includedir)/glib.h
+ $(includedir)/gmodule.h
+
+Before running 'make install'
+
 The Nitty-Gritty
 ================
 
diff --git a/INSTALL.in b/INSTALL.in
index ebe4e5a56..6934e36ff 100644
--- a/INSTALL.in
+++ b/INSTALL.in
@@ -5,9 +5,24 @@ Simple install procedure
   % cd glib-@GLIB_VERSION@                           # change to the toplevel directory
   % ./configure                             # run the `configure' script
   % make                                    # build GLIB
+
   [ Become root if necessary ]
+  % rm -rf /install-prefix/include/glib.h /install-prefix/include/gmodule.h
   % make install                            # install GLIB
 
+Special note for GLib+-1.2.9
+============================
+
+Between GLib-1.2.8 and GLib-1.2.9, the include files for GLib
+have been moved to $(includedir)/gtk-1-2/ to allow parallel installations
+of GLib-1.2 and GLib-2.0 to work correctly. If you are installing
+on top of an old installation of GLib, you should remove the files:
+
+ $(includedir)/glib.h
+ $(includedir)/gmodule.h
+
+Before running 'make install'
+
 The Nitty-Gritty
 ================
 
diff --git a/NEWS b/NEWS
index ed8fc8f5c..ccb147018 100644
--- a/NEWS
+++ b/NEWS
@@ -1,10 +1,13 @@
 Overview of Changes in GLib 1.2.9:
 
-* Addition of .pc files
-* Include file movement into a glib-1.2 subdir
-* One or two pieces of sugar for your pet C++ compiler 
+* Move include files into a glib-1-2/ subdir to support parallel
+  installation with GLib-2.0. If you are installing from source
+  on top of a previous version, you should to remove $(includedir)/glib.h
+  $(includedir)/module.h manually before installing the new version.
+* Fix warnings about varargs macros with recent GCC versions
 * Miscellaneous important bug fixes 
-  (g_strncasecmp, varags warnings, some g_printf_string_upper_bound fixes)
+  (g_strncasecmp, some g_printf_string_upper_bound fixes)
+* Addition of .pc files
 
 Overview of Changes in GLib 1.2.8: