*** empty log message ***

diff --git a/ChangeLog b/ChangeLog
index b61ae00..7fded67 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2002-12-08  Rob Browning  <rlb@defaultvalue.org>
+
+       * configure.in (GUILE_EFFECTIVE_VERSION): AC_SUBST it.
+       (AC_CONFIG_FILES): separate out the files that need to be chmodded
+       at the end of config.status.  Our "default" approach using
+       AC_CONFIG_COMMANDS quit working (and would have needed to be
+       changed to AC_CONFIG_COMMANDS(,,CMDS) rather than our previous
+       AC_CONFIG_COMMANDS(default,CMDS), but I the new approach, using
+       per-file AC_CONFIG_FILES calls appears to be more "correct" in the
+       current autoconf docs.
+
+       * GUILE-VERSION (GUILE_EFFECTIVE_VERSION): new variable.
+
 2002-12-02  Marius Vollmer  <mvo@zagadka.ping.de>
 
        * Makefile.am (SUBDIRS): Removed qt.

diff --git a/NEWS b/NEWS
index d7edd5e..3494ce7 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-Guile NEWS --- history of user-visible changes.  -*- text -*-
+Guile NEWS --- history of user-visible changes.
 Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
 See the end for copying conditions.
 
@@ -8,8 +8,23 @@ Changes since the stable branch:
 
 * Changes to the distribution
 
-** There are two new thread implementation options: "null" and
-   "coop-pthreads".
+** Guile now provide and uses an "effective" version number.
+
+Guile now provides scm_effective_version and effective-version
+functions which return the "effective" version number.  This is just
+the normal full version string without the final micro-version number,
+so the current effective-version is "1.6".  The effective version
+should remain unchanged during a stable series, and should be used for
+items like the versioned share directory name
+i.e. /usr/share/guile/1.6.
+
+Providing an unchanging version number during a stable release for
+things like the versioned share directory can be particularly
+important for Guile "add-on" packages, since it provides a directory
+that they can install to that won't be changed out from under them
+with each micro release during a stable series.
+
+** There are two new thread implementation options: "null" and "coop-pthreads".
 
 When you configure "--with-threads=null", you will get the usual
 threading API (call-with-new-thread, make-mutex, etc), but you can't
@@ -46,6 +61,12 @@ debugging evaluator gives better error messages.
 
 * Changes to Scheme functions and syntax
 
+** New function: effective-version
+
+Returns the "effective" version number.  This is just the normal full
+version string without the final micro-version number.  See "Changes
+to the distribution" above.
+
 ** Mutexes are now recursive.
 
 Locking a mutex that you have already locked will now succeed.  Every
@@ -210,6 +231,12 @@ There is no replacement for undefine.
 
 * Changes to the C interface
 
+** New function: scm_effective_version
+
+Returns the "effective" version number.  This is just the normal full
+version string without the final micro-version number.  See "Changes
+to the distribution" above.
+
 ** The function scm_call_with_new_thread has a new prototype.
 
 Instead of taking a list with the thunk and handler, these two
@@ -6340,4 +6367,3 @@ Local variables:
 mode: outline
 paragraph-separate: "[         \f]*$"
 end:
-

diff --git a/doc/ref/ChangeLog b/doc/ref/ChangeLog
index 72f3f1d..418345c 100644 (file)
--- a/doc/ref/ChangeLog
+++ b/doc/ref/ChangeLog
@@ -1,3 +1,7 @@
+2002-12-08  Rob Browning  <rlb@defaultvalue.org>
+
+       * scheme-options.texi (Build Config): add effective-version docs.
+
 2002-11-17  Neil Jerram  <neil@ossau.uklinux.net>
 
        Applied patches from Stephen Compall as follows.  (Thanks!)

diff --git a/guile-readline/ChangeLog b/guile-readline/ChangeLog
index f18b793..024f788 100644 (file)
--- a/guile-readline/ChangeLog
+++ b/guile-readline/ChangeLog
@@ -1,3 +1,9 @@
+2002-12-08  Rob Browning  <rlb@defaultvalue.org>
+
+       * configure.in (GUILE_EFFECTIVE_VERSION): AC_SUBST.
+
+       * Makefile.am (ice9dir): VERSION -> GUILE_EFFECTIVE_VERSION.
+
 2002-10-27  Marius Vollmer  <mvo@zagadka.ping.de>
 
        * readline.c (reentry_barrier_mutex): Reimplemented with

diff --git a/ice-9/ChangeLog b/ice-9/ChangeLog
index 8f88ae0..bca320e 100644 (file)
--- a/ice-9/ChangeLog
+++ b/ice-9/ChangeLog
@@ -1,3 +1,13 @@
+2002-12-08  Rob Browning  <rlb@defaultvalue.org>
+
+       * debugger/breakpoints/Makefile.am (subpkgdatadir): VERSION ->
+       GUILE_EFFECTIVE_VERSION.
+
+       * debugger/Makefile.am (subpkgdatadir): VERSION ->
+       GUILE_EFFECTIVE_VERSION.
+
+       * Makefile.am (subpkgdatadir): VERSION -> GUILE_EFFECTIVE_VERSION.
+
 2002-12-04  Mikael Djurfeldt  <mdj@linnaeus>
 
        * threads.scm (par-map, par-for-each, parallel): 

diff --git a/ice-9/debugger/.cvsignore b/ice-9/debugger/.cvsignore
new file mode 100644 (file)
index 0000000..282522d
--- /dev/null
+++ b/ice-9/debugger/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in

diff --git a/ice-9/debugger/breakpoints/.cvsignore b/ice-9/debugger/breakpoints/.cvsignore
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/lang/elisp/ChangeLog b/lang/elisp/ChangeLog
index 9f28738..0fc9d19 100644 (file)
--- a/lang/elisp/ChangeLog
+++ b/lang/elisp/ChangeLog
@@ -1,3 +1,13 @@
+2002-12-08  Rob Browning  <rlb@defaultvalue.org>
+
+       * Makefile.am (subpkgdatadir): VERSION -> GUILE_EFFECTIVE_VERSION.
+
+       * primitives/Makefile.am (subpkgdatadir): VERSION ->
+       GUILE_EFFECTIVE_VERSION.
+
+       * internals/Makefile.am (subpkgdatadir): VERSION ->
+       GUILE_EFFECTIVE_VERSION.
+
 2002-02-13  Neil Jerram  <neil@ossau.uklinux.net>
 
        * base.scm (load-emacs): Add optional parameters for specifying an

diff --git a/lang/elisp/internals/Makefile.am b/lang/elisp/internals/Makefile.am
index c66edb4..b759212 100644 (file)
--- a/lang/elisp/internals/Makefile.am
+++ b/lang/elisp/internals/Makefile.am
@@ -35,7 +35,7 @@ elisp_sources = \
        time.scm \
        trace.scm
 
-subpkgdatadir = $(pkgdatadir)/$(VERSION)/lang/elisp/internals
+subpkgdatadir = $(pkgdatadir)/$(GUILE_EFFECTIVE_VERSION)/lang/elisp/internals
 subpkgdata_DATA = $(elisp_sources)
 ETAGS_ARGS = $(subpkgdata_DATA)
 

diff --git a/lang/elisp/primitives/Makefile.am b/lang/elisp/primitives/Makefile.am
index 283467a..8c8683b 100644 (file)
--- a/lang/elisp/primitives/Makefile.am
+++ b/lang/elisp/primitives/Makefile.am
@@ -43,7 +43,7 @@ elisp_sources = \
        system.scm \
        time.scm
 
-subpkgdatadir = $(pkgdatadir)/$(VERSION)/lang/elisp/primitives
+subpkgdatadir = $(pkgdatadir)/$(GUILE_EFFECTIVE_VERSION)/lang/elisp/primitives
 subpkgdata_DATA = $(elisp_sources)
 ETAGS_ARGS = $(subpkgdata_DATA)
 

diff --git a/libguile/ChangeLog b/libguile/ChangeLog
index b1b2cc9..20d7206 100644 (file)
--- a/libguile/ChangeLog
+++ b/libguile/ChangeLog
@@ -1,3 +1,20 @@
+2002-12-08  Rob Browning  <rlb@defaultvalue.org>
+
+       * version.h.in (SCM_MICRO_VERSION): use @--@ substitution now.
+       (SCM_MINOR_VERSION): use @--@ substitution now.
+       (SCM_MICRO_VERSION): use @--@ substitution now.
+       (scm_effective_version): new function prototype.
+
+       * version.c (scm_effective_version): new function, also add
+       effective-version.
+
+       * Makefile.am (schemelibdir): VERSION -> GUILE_EFFECTIVE_VERSION.
+       (libpath.h): use GUILE_EFFECTIVE_VERSION to compute
+       SCM_LIBRARY_DIR.
+       (version.h): generate this here rather than configure.in.  This
+       approach tracks source edits better (i.e. more immediately).
+       Might be worth considering for other .in files too.
+
 2002-12-02  Marius Vollmer  <mvo@zagadka.ping.de>
 
        Reorganized thread package selection.  A thread package now only

diff --git a/oop/ChangeLog b/oop/ChangeLog
index 94b44a8..21b509d 100644 (file)
--- a/oop/ChangeLog
+++ b/oop/ChangeLog
@@ -1,3 +1,10 @@
+2002-12-08  Rob Browning  <rlb@defaultvalue.org>
+
+       * Makefile.am (subpkgdatadir): VERSION -> GUILE_EFFECTIVE_VERSION.
+
+       * goops/Makefile.am (subpkgdatadir): VERSION ->
+       GUILE_EFFECTIVE_VERSION.
+
 2002-11-16  Dirk Herrmann  <D.Herrmann@tu-bs.de>
 
        * goops.scm (standard-define-class):  Changed definition to form

diff --git a/scripts/ChangeLog b/scripts/ChangeLog
index 3f5c17f..fecf9cc 100644 (file)
--- a/scripts/ChangeLog
+++ b/scripts/ChangeLog
@@ -1,3 +1,7 @@
+2002-12-08  Rob Browning  <rlb@defaultvalue.org>
+
+       * Makefile.am (subpkgdatadir): VERSION -> GUILE_EFFECTIVE_VERSION.
+
 2002-10-26  Neil Jerram  <neil@ossau.uklinux.net>
 
        * lint (lint): Add message telling resolved module name.

diff --git a/srfi/ChangeLog b/srfi/ChangeLog
index ff80337..dbb3a72 100644 (file)
--- a/srfi/ChangeLog
+++ b/srfi/ChangeLog
@@ -1,3 +1,7 @@
+2002-12-08  Rob Browning  <rlb@defaultvalue.org>
+
+       * Makefile.am (srfidir): VERSION -> GUILE_EFFECTIVE_VERSION.
+
 2002-12-02  Marius Vollmer  <mvo@zagadka.ping.de>
 
        * Makefile.am (srfiinclude_HEADERS): Added srfi-1.h.

diff --git a/test-suite/ChangeLog b/test-suite/ChangeLog
index 170e57f..0bee1cc 100644 (file)
--- a/test-suite/ChangeLog
+++ b/test-suite/ChangeLog
@@ -1,3 +1,7 @@
+2002-12-08  Rob Browning  <rlb@defaultvalue.org>
+
+       * tests/version.test: test (effective-version).
+
 2002-11-06  Neil Jerram  <neil@ossau.uklinux.net>
 
        * tests/options.test: New.