# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1326303304 18000
# Node ID 20ab93491f83054f22807c57ac9793191216a51c
# Parent  72aebe6196414e38ef802469ff6e238f914f04c9# Parent  68fd9f95e1f92b82edf649ff8d6ba6ca2c2c9a10
merge changes made for release that were not immediately pushed to savannah

diff -r 68fd9f95e1f9 -r 20ab93491f83 autogen.sh
--- 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
diff -r 68fd9f95e1f9 -r 20ab93491f83 configure.ac
--- 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)
diff -r 68fd9f95e1f9 -r 20ab93491f83 libcruft/Makefile.am
--- 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
 
diff -r 68fd9f95e1f9 -r 20ab93491f83 liboctave/Makefile.am
--- 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
 
diff -r 68fd9f95e1f9 -r 20ab93491f83 src/Makefile.am
--- 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