updated

2001-06-11  Havoc Pennington  <hp@redhat.com>

	* NEWS: updated

	* configure.in (GLIB_MICRO_VERSION): increment version to 1.3.6

2001-06-12  Havoc Pennington  <hp@redhat.com>

	* Makefile.am (glib-mkenums): don't put $(srcdir)/glib-mkenums in
	bin_SCRIPTS, that breaks make install. Instead put 'glib-mkenums'
	in bin_SCRIPTS and cp it into builddir

diff --git a/ChangeLog b/ChangeLog
index 553b483..3444e61 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2001-06-11  Havoc Pennington  <hp@redhat.com>
+
+       * NEWS: updated
+
+       * configure.in (GLIB_MICRO_VERSION): increment version to 1.3.6
+
 2001-06-08  Alex Larsson  <alexl@redhat.com>
 
        * gstrfuncs.[ch]:

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 553b483..3444e61 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,9 @@
+2001-06-11  Havoc Pennington  <hp@redhat.com>
+
+       * NEWS: updated
+
+       * configure.in (GLIB_MICRO_VERSION): increment version to 1.3.6
+
 2001-06-08  Alex Larsson  <alexl@redhat.com>
 
        * gstrfuncs.[ch]:

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 553b483..3444e61 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+2001-06-11  Havoc Pennington  <hp@redhat.com>
+
+       * NEWS: updated
+
+       * configure.in (GLIB_MICRO_VERSION): increment version to 1.3.6
+
 2001-06-08  Alex Larsson  <alexl@redhat.com>
 
        * gstrfuncs.[ch]:

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 553b483..3444e61 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,9 @@
+2001-06-11  Havoc Pennington  <hp@redhat.com>
+
+       * NEWS: updated
+
+       * configure.in (GLIB_MICRO_VERSION): increment version to 1.3.6
+
 2001-06-08  Alex Larsson  <alexl@redhat.com>
 
        * gstrfuncs.[ch]:

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 553b483..3444e61 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,9 @@
+2001-06-11  Havoc Pennington  <hp@redhat.com>
+
+       * NEWS: updated
+
+       * configure.in (GLIB_MICRO_VERSION): increment version to 1.3.6
+
 2001-06-08  Alex Larsson  <alexl@redhat.com>
 
        * gstrfuncs.[ch]:

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 553b483..3444e61 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+2001-06-11  Havoc Pennington  <hp@redhat.com>
+
+       * NEWS: updated
+
+       * configure.in (GLIB_MICRO_VERSION): increment version to 1.3.6
+
 2001-06-08  Alex Larsson  <alexl@redhat.com>
 
        * gstrfuncs.[ch]:

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 553b483..3444e61 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+2001-06-11  Havoc Pennington  <hp@redhat.com>
+
+       * NEWS: updated
+
+       * configure.in (GLIB_MICRO_VERSION): increment version to 1.3.6
+
 2001-06-08  Alex Larsson  <alexl@redhat.com>
 
        * gstrfuncs.[ch]:

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 553b483..3444e61 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+2001-06-11  Havoc Pennington  <hp@redhat.com>
+
+       * NEWS: updated
+
+       * configure.in (GLIB_MICRO_VERSION): increment version to 1.3.6
+
 2001-06-08  Alex Larsson  <alexl@redhat.com>
 
        * gstrfuncs.[ch]:

diff --git a/INSTALL b/INSTALL
index 297b70b..29a08ed 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -1,8 +1,8 @@
 Simple install procedure
 ========================
 
-  % gzip -cd glib-1.3.5.tar.gz | tar xvf -  # unpack the sources
-  % cd glib-1.3.5                           # change to the toplevel directory
+  % gzip -cd glib-1.3.6.tar.gz | tar xvf -  # unpack the sources
+  % cd glib-1.3.6                           # change to the toplevel directory
   % ./configure                             # run the `configure' script
   % make                                    # build GLIB
 

diff --git a/NEWS b/NEWS
index c9cb40c..17564ad 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,17 @@
+Overview of Changes in GLib 1.3.6:
+
+* Threads have a "return value" from g_thread_join
+* Removed ability to adjust thread stack size
+* Prefix warnings with progname/PID by default, change toggle for this to 
+  be an env variable G_MESSAGES_PREFIXED not a compile-time option
+* GMarkup speedups
+* GDate const, convenience fixups
+* Include test cases that headers are compilable by C++ compiler
+* Add ability to spawn processes with argv[0] != executable path.
+* g_strstr_len, g_strrstr, g_strrstr_len
+* Add length argument to g_utf8_strchr and g_utf8_strrchr.
+* Misc bug fixes
+
 Overview of Changes in GLib 1.3.5:
 
 * Added an installed glib-mkenums Perl program for parsing enumeration

diff --git a/README b/README
index cab6a7a..af7cb8a 100644 (file)
--- a/README
+++ b/README
@@ -13,7 +13,7 @@ version is meant for developers of GLib only:
 General Information
 ===================
 
-This is GLib version 1.3.5. GLib is a library which includes support
+This is GLib version 1.3.6. GLib is a library which includes support
 routines for C such as lists, trees, hashes, memory allocation, and
 many other things.
 

diff --git a/configure.in b/configure.in
index 7e5bd01..6e39dbb 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -31,7 +31,7 @@ GLIB_AC_DIVERT_BEFORE_HELP([
 #
 GLIB_MAJOR_VERSION=1
 GLIB_MINOR_VERSION=3
-GLIB_MICRO_VERSION=5
+GLIB_MICRO_VERSION=6
 GLIB_INTERFACE_AGE=0
 GLIB_BINARY_AGE=0
 GLIB_VERSION=$GLIB_MAJOR_VERSION.$GLIB_MINOR_VERSION.$GLIB_MICRO_VERSION

diff --git a/docs/reference/glib/tmpl/macros_misc.sgml b/docs/reference/glib/tmpl/macros_misc.sgml
index cd71ee7..7b93d0a 100644 (file)
--- a/docs/reference/glib/tmpl/macros_misc.sgml
+++ b/docs/reference/glib/tmpl/macros_misc.sgml
@@ -71,7 +71,6 @@ arrays or arrays on the stack.
 Portable way to copy <type>va_list</type> variables.
 </para>
 
-<!-- # Unused Parameters # -->
 @ap1: the <type>va_list</type> variable to place a copy of @ap2 in.
 @ap2: a <type>va_list</type>.
 

diff --git a/docs/reference/glib/tmpl/unicode.sgml b/docs/reference/glib/tmpl/unicode.sgml
index 20d64a6..dcab172 100644 (file)
--- a/docs/reference/glib/tmpl/unicode.sgml
+++ b/docs/reference/glib/tmpl/unicode.sgml
@@ -423,6 +423,7 @@ that may contain invalid UTF-8.
 </para>
 
 @p: 
+@len: 
 @c: 
 @Returns: 
 <!-- # Unused Parameters # -->
@@ -435,6 +436,7 @@ that may contain invalid UTF-8.
 </para>
 
 @p: 
+@len: 
 @c: 
 @Returns: 
 <!-- # Unused Parameters # -->

diff --git a/gobject/ChangeLog b/gobject/ChangeLog
index 197839b..2eda694 100644 (file)
--- a/gobject/ChangeLog
+++ b/gobject/ChangeLog
@@ -1,3 +1,9 @@
+2001-06-12  Havoc Pennington  <hp@redhat.com>
+
+       * Makefile.am (glib-mkenums): don't put $(srcdir)/glib-mkenums in
+       bin_SCRIPTS, that breaks make install. Instead put 'glib-mkenums'
+       in bin_SCRIPTS and cp it into builddir
+
 Thu May 31 17:56:47 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gobject-query.c: Fix mispelling in help output.

diff --git a/gobject/Makefile.am b/gobject/Makefile.am
index b57b516..873eeab 100644 (file)
--- a/gobject/Makefile.am
+++ b/gobject/Makefile.am
@@ -154,7 +154,7 @@ libgobject_1_3_la_SOURCES = $(gruntime_target_sources)
 # programs to compile and install
 #
 bin_PROGRAMS = gobject-query glib-genmarshal
-bin_SCRIPTS = $(srcdir)/glib-mkenums
+bin_SCRIPTS = glib-mkenums
 noinst_PROGRAMS =  testgruntime
 # source files
 gobject_query_SOURCES = gobject-query.c
@@ -188,6 +188,12 @@ BUILT_EXTRA_DIST = \
        makefile.msc            \
        gobject.rc
 
+glib-mkenums: $(srcdir)/glib-mkenums
+       if test -e glib-mkenums; then           \
+         rm glib-mkenums;                      \
+        fi;                                    \
+       cp $(srcdir)/glib-mkenums glib-mkenums
+
 gobject.rc: $(top_builddir)/config.status $(top_srcdir)/gobject/gobject.rc.in
        cd $(top_builddir) && CONFIG_FILES=gobject/$@ CONFIG_HEADERS= $(SHELL) ./config.status