Mercurial > octave-nkf
changeset 14194:20ab93491f83 stable
merge changes made for release that were not immediately pushed to savannah
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Wed, 11 Jan 2012 12:35:04 -0500 |
| parents | 72aebe619641 (diff) 68fd9f95e1f9 (current diff) |
| children | 1eeb3a8d5708 |
| files | |
| diffstat | 5 files changed, 9 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/autogen.sh Tue Jan 10 18:10:33 2012 -0800 +++ b/autogen.sh Wed Jan 11 12:35:04 2012 -0500 @@ -48,4 +48,6 @@ echo "replacing all occurrences of g77 with gfortran in configure script..." -sed 's/g77/gfortran/g' configure > configure.t && mv configure.t configure +sed 's/g77/gfortran/g' configure > configure.t +mv configure.t configure +chmod 755 configure
--- a/configure.ac Tue Jan 10 18:10:33 2012 -0800 +++ b/configure.ac Wed Jan 11 12:35:04 2012 -0500 @@ -27,13 +27,13 @@ EXTERN_CFLAGS="$CFLAGS" EXTERN_CXXFLAGS="$CXXFLAGS" -AC_INIT([GNU Octave], [3.5.92+], [http://octave.org/bugs.html], [octave]) +AC_INIT([GNU Octave], [3.6.0-rc0], [http://octave.org/bugs.html], [octave]) dnl PACKAGE_VERSION is set by the AC_INIT VERSION arg OCTAVE_VERSION="$PACKAGE_VERSION" -OCTAVE_API_VERSION_NUMBER="46" +OCTAVE_API_VERSION_NUMBER="47" OCTAVE_API_VERSION="api-v$OCTAVE_API_VERSION_NUMBER+" -OCTAVE_RELEASE_DATE="2012-01-06" +OCTAVE_RELEASE_DATE="2012-01-10" OCTAVE_COPYRIGHT="Copyright (C) 2012 John W. Eaton and others." AC_SUBST(OCTAVE_VERSION) AC_SUBST(OCTAVE_API_VERSION_NUMBER)
--- a/libcruft/Makefile.am Tue Jan 10 18:10:33 2012 -0800 +++ b/libcruft/Makefile.am Wed Jan 11 12:35:04 2012 -0500 @@ -43,7 +43,7 @@ # Increment these as needed and according to the rules in the libtool # manual: -libcruft_current = 0 +libcruft_current = 1 libcruft_revision = 0 libcruft_age = 0
--- a/liboctave/Makefile.am Tue Jan 10 18:10:33 2012 -0800 +++ b/liboctave/Makefile.am Wed Jan 11 12:35:04 2012 -0500 @@ -520,7 +520,7 @@ # Increment these as needed and according to the rules in the libtool # manual: -liboctave_current = 0 +liboctave_current = 1 liboctave_revision = 0 liboctave_age = 0
--- a/src/Makefile.am Tue Jan 10 18:10:33 2012 -0800 +++ b/src/Makefile.am Wed Jan 11 12:35:04 2012 -0500 @@ -515,7 +515,7 @@ $(LIBOCTINTERP_LINK_DEPS) # Increment these as needed and according to the rules in the libtool manual: -liboctinterp_current = 0 +liboctinterp_current = 1 liboctinterp_revision = 0 liboctinterp_age = 0