# HG changeset patch # User John W. Eaton # Date 1307388874 14400 # Node ID f66dacbeb7be6db220eb7d57a69223da791c9140 # Parent a5f4dad4ec27bee13b2fa853d5373ecb6d20534d# Parent 762d10c7727795445c74123077a94adbf0126bfb maint: Periodic merge of stable to default branch diff -r a5f4dad4ec27 -r f66dacbeb7be NEWS --- a/NEWS Mon Jun 06 12:46:48 2011 -0500 +++ b/NEWS Mon Jun 06 15:34:34 2011 -0400 @@ -36,6 +36,47 @@ studentize sylvester_matrix +Summary of important user-visible changes for version 3.4.1: +----------------------------------------------------------- + + ** Octave 3.4.1 is primarily a bug fixing release. + + ** IMPORTANT note about binary incompatibility in this release: + + The original goal was to ensure binary compatibility for all 3.4.x + releases but this is impossible for the 3.4.1 release due to a bug + in the way shared libraries were built in Octave 3.4.0. Because of + this bug, .oct files built for Octave 3.4.0 must be recompiled + before they will work with Octave 3.4.1. + + Given that there would be binary incompatibilities with shared + libraries going from Octave 3.4.0 to 3.4.1, we also made the + following incompatible changes in this release: + + * The Perl Compatible Regular Expression (PCRE) library is now + required to build Octave. + + Any future Octave 3.4.x release versions should remain binary + compatible with Octave 3.4.1 as we are now using proper library + versioning as recommended by the libtool manual. + + ** The following functions have been deprecated in Octave 3.4.1 and will + be removed from Octave 3.8 (or whatever version is the second major + release after 3.4): + + cquad is_duplicate_entry perror strerror + + ** The following functions are new in 3.4.1: + + colstyle iscolumn isrow + + ** The get_forge_pkg function is now private. + + ** The rectangle_lw, rectangle_sw, triangle_lw, and triangle_sw + functions are now private. + + ** The logistic_regression_derivatives and logistic_regression_likelihood + functions are now private. Summary of important user-visible changes for version 3.4: --------------------------------------------------------- diff -r a5f4dad4ec27 -r f66dacbeb7be configure.ac --- a/configure.ac Mon Jun 06 12:46:48 2011 -0500 +++ b/configure.ac Mon Jun 06 15:34:34 2011 -0400 @@ -125,7 +125,7 @@ '$(datadir)/octave/site/$(api_version)/m') OCTAVE_SET_DEFAULT(localverfcnfiledir, '$(datadir)/octave/$(version)/site/m') OCTAVE_SET_DEFAULT(octetcdir, '$(datadir)/octave/$(version)/etc') -OCTAVE_SET_DEFAULT(octlibdir, '$(libdir)/octave-$(version)') +OCTAVE_SET_DEFAULT(octlibdir, '$(libdir)/octave/$(version)') OCTAVE_SET_DEFAULT(archlibdir, '$(libexecdir)/octave/$(version)/exec/$(canonical_host_type)') OCTAVE_SET_DEFAULT(localarchlibdir, @@ -135,13 +135,13 @@ OCTAVE_SET_DEFAULT(localverarchlibdir, '$(libexecdir)/octave/$(version)/site/exec/$(canonical_host_type)') OCTAVE_SET_DEFAULT(octfiledir, - '$(libexecdir)/octave/$(version)/oct/$(canonical_host_type)') + '$(libdir)/octave/$(version)/oct/$(canonical_host_type)') OCTAVE_SET_DEFAULT(localoctfiledir, - '$(libexecdir)/octave/site/oct/$(canonical_host_type)') + '$(libdir)/octave/site/oct/$(canonical_host_type)') OCTAVE_SET_DEFAULT(localapioctfiledir, - '$(libexecdir)/octave/site/oct/$(api_version)/$(canonical_host_type)') + '$(libdir)/octave/site/oct/$(api_version)/$(canonical_host_type)') OCTAVE_SET_DEFAULT(localveroctfiledir, - '$(libexecdir)/octave/$(version)/site/oct/$(canonical_host_type)') + '$(libdir)/octave/$(version)/site/oct/$(canonical_host_type)') OCTAVE_SET_DEFAULT(imagedir, '$(datadir)/octave/$(version)/imagelib') ### Find pkg-config executable (sets $PKG_CONFIG) diff -r a5f4dad4ec27 -r f66dacbeb7be libcruft/Makefile.am --- a/libcruft/Makefile.am Mon Jun 06 12:46:48 2011 -0500 +++ b/libcruft/Makefile.am Mon Jun 06 15:34:34 2011 -0400 @@ -34,8 +34,18 @@ @CRUFT_DLL_DEFS@ \ $(AM_CPPFLAGS) +# Increment these as needed and according to the rules in the libtool +# manual: +libcruft_current = 0 +libcruft_revision = 0 +libcruft_age = 0 + +libcruft_version_info = $(libcruft_current):$(libcruft_revision):$(libcruft_age) + libcruft_la_LDFLAGS = \ - -release $(version) $(NO_UNDEFINED_LDFLAG) @XTRA_CRUFT_SH_LDFLAGS@ \ + -version-info $(libcruft_version_info) \ + $(NO_UNDEFINED_LDFLAG) \ + @XTRA_CRUFT_SH_LDFLAGS@ \ -bindir $(bindir) libcruft_la_LIBADD = \ diff -r a5f4dad4ec27 -r f66dacbeb7be liboctave/Makefile.am --- a/liboctave/Makefile.am Mon Jun 06 12:46:48 2011 -0500 +++ b/liboctave/Makefile.am Mon Jun 06 15:34:34 2011 -0400 @@ -526,7 +526,17 @@ $(ARPACK_CPPFLAGS) \ $(AM_CPPFLAGS) -liboctave_la_LDFLAGS = -release $(version) $(NO_UNDEFINED_LDFLAG) \ +# Increment these as needed and according to the rules in the libtool +# manual: +liboctave_current = 0 +liboctave_revision = 0 +liboctave_age = 0 + +liboctave_version_info = $(liboctave_current):$(liboctave_revision):$(liboctave_age) + +liboctave_la_LDFLAGS = \ + -version-info $(liboctave_version_info) \ + $(NO_UNDEFINED_LDFLAG) \ -bindir $(bindir) \ $(SPARSE_XLDFLAGS) \ $(ARPACK_LDFLAGS) \ diff -r a5f4dad4ec27 -r f66dacbeb7be scripts/pkg/pkg.m --- a/scripts/pkg/pkg.m Mon Jun 06 12:46:48 2011 -0500 +++ b/scripts/pkg/pkg.m Mon Jun 06 15:34:34 2011 -0400 @@ -255,7 +255,7 @@ if (prefix == -1) if (global_install) prefix = fullfile (OCTAVE_HOME (), "share", "octave", "packages"); - archprefix = fullfile (octave_config_info ("libexecdir"), + archprefix = fullfile (octave_config_info ("libdir"), "octave", "packages"); else prefix = fullfile ("~", "octave"); @@ -300,7 +300,7 @@ global_install = true; if (! user_prefix) prefix = fullfile (OCTAVE_HOME (), "share", "octave", "packages"); - archprefix = fullfile (octave_config_info ("libexecdir"), + archprefix = fullfile (octave_config_info ("libdir"), "octave", "packages"); endif case available_actions @@ -2219,14 +2219,14 @@ endfunction function arch = getarch () - persistent _arch = cstrcat (octave_config_info("canonical_host_type"), ... - "-", octave_config_info("api_version")); + persistent _arch = cstrcat (octave_config_info ("canonical_host_type"), + "-", octave_config_info ("api_version")); arch = _arch; endfunction function archprefix = getarchprefix (desc, global_install) if ((nargin == 2 && global_install) || (nargin < 2 && issuperuser ())) - archprefix = fullfile (octave_config_info ("libexecdir"), "octave", + archprefix = fullfile (octave_config_info ("libdir"), "octave", "packages", cstrcat(desc.name, "-", desc.version)); else archprefix = desc.dir; diff -r a5f4dad4ec27 -r f66dacbeb7be src/Makefile.am --- a/src/Makefile.am Mon Jun 06 12:46:48 2011 -0500 +++ b/src/Makefile.am Mon Jun 06 15:34:34 2011 -0400 @@ -591,7 +591,17 @@ liboctinterp_la_CPPFLAGS = @OCTINTERP_DLL_DEFS@ $(AM_CPPFLAGS) -liboctinterp_la_LDFLAGS = -release $(version) $(NO_UNDEFINED_LDFLAG) \ +# Increment these as needed and according to the rules in the libtool +# manual: +liboctinterp_current = 0 +liboctinterp_revision = 0 +liboctinterp_age = 0 + +liboctinterp_version_info = $(liboctinterp_current):$(liboctinterp_revision):$(liboctinterp_age) + +liboctinterp_la_LDFLAGS = \ + -version-info $(liboctinterp_version_info) \ + $(NO_UNDEFINED_LDFLAG) \ -bindir $(bindir) CLEANFILES = \