#! /bin/sh # # To apply this patch, cd to the top level Octave source directory and # run this file through /bin/sh. It will first remove any files that # have been deleted from the source distribution since the last # release and then update the sources with patch(1). # # Diffs for updating *.ps, *.dvi, and *.info* files are not included # because they can be recreated from the Texinfo files using TeX and # makeinfo. # # Diffs for updating parse.cc and y.tab.h are not included because # they can be recreated from the file parse.y using bison. # # Diffs for updating lex.cc are not included because it can be # recreated from lex.l using flex. # # Diffs for updating the configure script are not included because # it can be recreated from configure.in using autoconf. # # John W. Eaton # jwe@bevo.che.wisc.edu # University of Wisconsin-Madison # Department of Chemical Engineering if test -f src/octave.cc ; then true else echo '***********************************************************' 1>&2 echo 'You must run this script in the top-level octave directory!' 1>&2 echo '***********************************************************' 1>&2 exit 1 fi ### ### Special commands should go here. ### echo 'patching existing files' patch -p1 << \PATCH_EOF diff -cNr octave-2.0.6/ChangeLog octave-2.0.7/ChangeLog *** octave-2.0.6/ChangeLog Tue May 27 11:07:24 1997 --- octave-2.0.7/ChangeLog Wed Jun 4 12:44:21 1997 *************** *** 1,3 **** --- 1,25 ---- + Wed Jun 4 12:43:30 1997 John W. Eaton + + * Version 2.0.7 released. + + Wed Jun 4 02:11:11 1997 John W. Eaton + + * octMakefile.in: Only remove configure, config.h.in, BUGS, and + INSTALL.OCTAVE for maintainer-clean, not for distclean. + + * aclocal.m4 (OCTAVE_PROGRAM_INVOCATION_NAME): Fix test. + + * Makeconf.in (mk-includedir-link): New macro. + + Mon Jun 2 13:55:02 1997 John W. Eaton + + * configure.in: Move checks for RANLIB, AR, and ARFLAGS before + checks for libf2c. + + Fri May 30 14:59:59 1997 John W. Eaton + + * configure.in: Fix typo in check for $with_f77. + Tue May 27 11:06:46 1997 John W. Eaton * Version 2.0.6 released. diff -cNr octave-2.0.6/Makeconf.in octave-2.0.7/Makeconf.in *** octave-2.0.6/Makeconf.in Mon May 19 17:26:30 1997 --- octave-2.0.7/Makeconf.in Wed Jun 4 02:27:25 1997 *************** *** 360,362 **** --- 360,379 ---- -e "s;%TARGET_HOST_TYPE%;\"${target_host_type}\";" $(top_srcdir)/move-if-change $@.tmp $@ endef + + # Make a relative symbolic link from $includedir/octave to $octincludedir. + + # XXX FIXME XXX -- this assumes that $octincludedir is a subdirectory + # of $includedir. + + define mk-includedir-link + src=`echo $(octincludedir) | sed 's|^$(includedir)/*||'` ; \ + echo $$src ; \ + if [ "$$src" = "octave" ] ; then \ + true ; \ + else \ + cd $(includedir) ; \ + rm -f octave ; \ + $(LN_S) $$src octave ; \ + fi + endef diff -cNr octave-2.0.6/NEWS octave-2.0.7/NEWS *** octave-2.0.6/NEWS Mon May 19 20:34:14 1997 --- octave-2.0.7/NEWS Wed Jun 4 12:48:35 1997 *************** *** 1,3 **** --- 1,8 ---- + Summary of changes for version 2.0.7: + ------------------------------------ + + This is a bug-fixing release. There are no new user-visible features. + Summary of changes for version 2.0.6: ------------------------------------ diff -cNr octave-2.0.6/aclocal.m4 octave-2.0.7/aclocal.m4 *** octave-2.0.6/aclocal.m4 Mon May 19 17:45:31 1997 --- octave-2.0.7/aclocal.m4 Wed Jun 4 02:34:12 1997 *************** *** 522,528 **** AC_DEFUN(OCTAVE_PROGRAM_INVOCATION_NAME, [AC_MSG_CHECKING(whether program_invocation_name is predefined) AC_CACHE_VAL(octave_cv_var_program_inv_name, ! [AC_TRY_LINK(, [main() { program_invocation_name = "love"; }], octave_cv_var_program_inv_name=yes, octave_cv_var_program_inv_name=no)])dnl AC_MSG_RESULT($octave_cv_var_program_inv_name) if test $octave_cv_var_program_inv_name = yes; then --- 522,529 ---- AC_DEFUN(OCTAVE_PROGRAM_INVOCATION_NAME, [AC_MSG_CHECKING(whether program_invocation_name is predefined) AC_CACHE_VAL(octave_cv_var_program_inv_name, ! [AC_TRY_LINK(, ! [extern char *program_invocation_name; program_invocation_name = "love";], octave_cv_var_program_inv_name=yes, octave_cv_var_program_inv_name=no)])dnl AC_MSG_RESULT($octave_cv_var_program_inv_name) if test $octave_cv_var_program_inv_name = yes; then diff -cNr octave-2.0.6/configure.in octave-2.0.7/configure.in *** octave-2.0.6/configure.in Mon May 19 17:17:11 1997 --- octave-2.0.7/configure.in Mon Jun 2 13:49:53 1997 *************** *** 316,321 **** --- 316,335 ---- fi AC_SUBST(LD_STATIC_FLAG) + ### We need these before trying to find libf2c. + + if test -z "$AR"; then + AR=ar + fi + AC_SUBST(AR) + + if test -z "$ARFLAGS"; then + ARFLAGS="rc" + fi + AC_SUBST(ARFLAGS) + + AC_PROG_RANLIB + ### If we haven't been forced to use a particular Fortran compiler, ### try to find one using any one of several common Un*x Fortran ### compiler names. Put fc last to avoid confusion with some vendor's *************** *** 340,346 **** ### installed as /opt/gnu/bin/f77. if $use_f77; then ! if test "$with_g77" = yes; then F77=f77 else F77="$with_f77" --- 354,360 ---- ### installed as /opt/gnu/bin/f77. if $use_f77; then ! if test "$with_f77" = yes; then F77=f77 else F77="$with_f77" *************** *** 415,421 **** fi fi - f77_rules_frag=/dev/null if $have_fortran_compiler; then f77_rules_frag=Makefrag.f77 --- 429,434 ---- *************** *** 669,688 **** ### See if we should define NPOS. OCTAVE_STRING_NPOS - - ### We need these before trying to find libf2c. - - if test -z "$AR"; then - AR=ar - fi - AC_SUBST(AR) - - if test -z "$ARFLAGS"; then - ARFLAGS="rc" - fi - AC_SUBST(ARFLAGS) - - AC_PROG_RANLIB ### Checks for header files. --- 682,687 ---- diff -cNr octave-2.0.6/doc/ChangeLog octave-2.0.7/doc/ChangeLog *** octave-2.0.6/doc/ChangeLog Tue May 27 11:06:59 1997 --- octave-2.0.7/doc/ChangeLog Wed Jun 4 12:44:11 1997 *************** *** 1,3 **** --- 1,7 ---- + Wed Jun 4 12:43:30 1997 John W. Eaton + + * Version 2.0.7 released. + Tue May 27 11:06:46 1997 John W. Eaton * Version 2.0.6 released. diff -cNr octave-2.0.6/doc/interpreter/octave.1 octave-2.0.7/doc/interpreter/octave.1 *** octave-2.0.6/doc/interpreter/octave.1 Thu Jul 18 21:26:11 1996 --- octave-2.0.7/doc/interpreter/octave.1 Fri May 30 14:52:39 1997 *************** *** 22,28 **** .TH Octave 1 "Jan 8 1996" .LO 1 .SH NAME ! Octave \- A high-level interactive language for numerical computations. .SH SYNOPSIS .nf octave [options] --- 22,28 ---- .TH Octave 1 "Jan 8 1996" .LO 1 .SH NAME ! octave \- A high-level interactive language for numerical computations. .SH SYNOPSIS .nf octave [options] diff -cNr octave-2.0.6/kpathsea/ChangeLog octave-2.0.7/kpathsea/ChangeLog *** octave-2.0.6/kpathsea/ChangeLog Tue May 20 14:34:56 1997 --- octave-2.0.7/kpathsea/ChangeLog Wed Jun 4 02:33:42 1997 *************** *** 1,3 **** --- 1,7 ---- + Wed Jun 4 02:33:28 1997 John W. Eaton + + * common.ac (program_invocation_name): Fix check. + Tue May 20 14:34:34 1997 John W. Eaton * Makefile.in: Turn off optimization for hash.c. diff -cNr octave-2.0.6/kpathsea/common.ac octave-2.0.7/kpathsea/common.ac *** octave-2.0.6/kpathsea/common.ac Thu Jul 18 20:56:40 1996 --- octave-2.0.7/kpathsea/common.ac Wed Jun 4 02:33:27 1997 *************** *** 27,33 **** # This is a GNU libc invention. AC_MSG_CHECKING(whether program_invocation_name is predefined) AC_CACHE_VAL(kb_cv_var_program_inv_name, ! [AC_TRY_LINK(, [main() { program_invocation_name = "love"; }], kb_cv_var_program_inv_name=yes, kb_cv_var_program_inv_name=no)])dnl AC_MSG_RESULT($kb_cv_var_program_inv_name) if test $kb_cv_var_program_inv_name = yes; then --- 27,34 ---- # This is a GNU libc invention. AC_MSG_CHECKING(whether program_invocation_name is predefined) AC_CACHE_VAL(kb_cv_var_program_inv_name, ! [AC_TRY_LINK(, ! [extern char *program_invocation_name; program_invocation_name = "love";], kb_cv_var_program_inv_name=yes, kb_cv_var_program_inv_name=no)])dnl AC_MSG_RESULT($kb_cv_var_program_inv_name) if test $kb_cv_var_program_inv_name = yes; then diff -cNr octave-2.0.6/libcruft/ChangeLog octave-2.0.7/libcruft/ChangeLog *** octave-2.0.6/libcruft/ChangeLog Tue May 27 11:07:19 1997 --- octave-2.0.7/libcruft/ChangeLog Wed Jun 4 12:44:19 1997 *************** *** 1,3 **** --- 1,11 ---- + Wed Jun 4 12:43:30 1997 John W. Eaton + + * Version 2.0.7 released. + + Wed Jun 4 02:13:38 1997 John W. Eaton + + * misc/Makefile.in (install): Use mk-includedir-link here. + Tue May 27 11:06:46 1997 John W. Eaton * Version 2.0.6 released. diff -cNr octave-2.0.6/libcruft/misc/Makefile.in octave-2.0.7/libcruft/misc/Makefile.in *** octave-2.0.6/libcruft/misc/Makefile.in Wed Jan 22 20:08:56 1997 --- octave-2.0.7/libcruft/misc/Makefile.in Wed Jun 4 02:13:37 1997 *************** *** 41,46 **** --- 41,47 ---- $(top_srcdir)/mkinstalldirs $(octincludedir) $(INSTALL_DATA) $(srcdir)/f77-fcn.h $(octincludedir)/f77-fcn.h $(INSTALL_DATA) $(srcdir)/lo-error.h $(octincludedir)/lo-error.h + $(mk-includedir-link) uninstall:: rm -f $(octincludedir)/f77-fcn.h diff -cNr octave-2.0.6/liboctave/ChangeLog octave-2.0.7/liboctave/ChangeLog *** octave-2.0.6/liboctave/ChangeLog Tue May 27 11:07:18 1997 --- octave-2.0.7/liboctave/ChangeLog Wed Jun 4 12:44:18 1997 *************** *** 1,3 **** --- 1,15 ---- + Wed Jun 4 12:43:30 1997 John W. Eaton + + * Version 2.0.7 released. + + Wed Jun 4 02:12:59 1997 John W. Eaton + + * Makefile.in (install-inc): Use mk-includedir-link here. + + Mon Jun 2 12:44:14 1997 John W. Eaton + + * lo-mappers.cc (fix): Use floor and ceil instead of casting to int. + Tue May 27 11:06:46 1997 John W. Eaton * Version 2.0.6 released. diff -cNr octave-2.0.6/liboctave/Makefile.in octave-2.0.7/liboctave/Makefile.in *** octave-2.0.6/liboctave/Makefile.in Mon May 19 14:43:45 1997 --- octave-2.0.7/liboctave/Makefile.in Wed Jun 4 02:12:58 1997 *************** *** 181,199 **** rm -f $(octincludedir)/$$f ; \ $(INSTALL_DATA) $(srcdir)/$$f $(octincludedir)/$$f ; \ done ! tmp=`echo $(octincludedir) | sed 's|/*$$||'` ; \ ! dir=`echo $$tmp | sed 's|[^/]*$$||'` ; \ ! src=`echo $$tmp | sed 's|^.*/||'` ; \ ! dest=`echo $$src | sed 's|-$(version)$$||'` ; \ ! if [ "$$src" = "$$dest" ] ; then \ ! true ; \ ! else \ ! if [ -d $$dir/$$dest ] ; then \ ! true ; \ ! else \ ! cd $$dir ; rm -f $$dest && $(LN_S) $$src $$dest ; \ ! fi ; \ ! fi .PHONY: install-inc uninstall: --- 181,187 ---- rm -f $(octincludedir)/$$f ; \ $(INSTALL_DATA) $(srcdir)/$$f $(octincludedir)/$$f ; \ done ! $(mk-includedir-link) .PHONY: install-inc uninstall: diff -cNr octave-2.0.6/liboctave/lo-mappers.cc octave-2.0.7/liboctave/lo-mappers.cc *** octave-2.0.6/liboctave/lo-mappers.cc Sat Mar 2 19:16:15 1996 --- octave-2.0.7/liboctave/lo-mappers.cc Mon Jun 2 12:46:21 1997 *************** *** 83,91 **** double fix (double x) { ! int tmp; ! tmp = (int) x; ! return (double) tmp; } double --- 83,89 ---- double fix (double x) { ! return x > 0 ? floor (x) : ceil (x); } double *************** *** 286,294 **** Complex fix (const Complex& x) { ! int re = (int) real (x); ! int im = (int) imag (x); ! return Complex (re, im); } Complex --- 284,290 ---- Complex fix (const Complex& x) { ! return Complex (fix (real (x)), fix (imag (x))); } Complex diff -cNr octave-2.0.6/octMakefile.in octave-2.0.7/octMakefile.in *** octave-2.0.6/octMakefile.in Tue May 27 13:57:41 1997 --- octave-2.0.7/octMakefile.in Wed Jun 4 03:05:45 1997 *************** *** 124,139 **** $(foreach d, $(CLEANSUBDIRS), $(do-subdir-for-command)) .PHONY: clean mostlyclean distclean maintainer-clean ! distclean:: rm -f octMakefile octave-bug Makefile Makeconf config.cache \ config.h config.log config.status Makerules.f77 mk-oct-links \ mkoctfile Makefrag.f77 ! maintainer-clean distclean:: ! rm -f configure config.h.in octMakefile octave-bug Makefile \ ! Makeconf config.cache config.h config.log config.status \ ! Makerules.f77 mk-oct-links mkoctfile BUGS INSTALL.OCTAVE \ ! Makefrag.f77 # Rules for making a source distribution. --- 124,136 ---- $(foreach d, $(CLEANSUBDIRS), $(do-subdir-for-command)) .PHONY: clean mostlyclean distclean maintainer-clean ! maintainer-clean distclean:: rm -f octMakefile octave-bug Makefile Makeconf config.cache \ config.h config.log config.status Makerules.f77 mk-oct-links \ mkoctfile Makefrag.f77 ! maintainer-clean:: ! rm -f configure config.h.in BUGS INSTALL.OCTAVE # Rules for making a source distribution. diff -cNr octave-2.0.6/scripts/ChangeLog octave-2.0.7/scripts/ChangeLog *** octave-2.0.6/scripts/ChangeLog Tue May 27 11:07:03 1997 --- octave-2.0.7/scripts/ChangeLog Wed Jun 4 12:44:12 1997 *************** *** 1,3 **** --- 1,7 ---- + Wed Jun 4 12:43:30 1997 John W. Eaton + + * Version 2.0.7 released. + Tue May 27 11:06:46 1997 John W. Eaton * Version 2.0.6 released. diff -cNr octave-2.0.6/src/ChangeLog octave-2.0.7/src/ChangeLog *** octave-2.0.6/src/ChangeLog Tue May 27 11:07:16 1997 --- octave-2.0.7/src/ChangeLog Wed Jun 4 12:44:14 1997 *************** *** 1,3 **** --- 1,20 ---- + Wed Jun 4 12:43:30 1997 John W. Eaton + + * Version 2.0.7 released. + + Wed Jun 4 02:12:01 1997 John W. Eaton + + * Makefile.in (install-inc): Use mk-includedir-link here. + + Fri May 30 16:07:22 1997 John W. Eaton + + * mappers.cc: Include here. + + Fri May 30 16:03:42 1997 John W. Eaton + + * dynamic-ld.cc (shl_resolve_octave_reference): Pass address of + handle to shl_findsym. + Tue May 27 11:06:46 1997 John W. Eaton * Version 2.0.6 released. diff -cNr octave-2.0.6/src/Makefile.in octave-2.0.7/src/Makefile.in *** octave-2.0.6/src/Makefile.in Mon May 19 20:23:14 1997 --- octave-2.0.7/src/Makefile.in Wed Jun 4 02:12:22 1997 *************** *** 287,305 **** rm -f $(octincludedir)/$$f ; \ $(INSTALL_DATA) $$f $(octincludedir)/$$f ; \ done ! tmp=`echo $(octincludedir) | sed 's|/*$$||'` ; \ ! dir=`echo $$tmp | sed 's|[^/]*$$||'` ; \ ! src=`echo $$tmp | sed 's|^.*/||'` ; \ ! dest=`echo $$src | sed 's|-$(version)$$||'` ; \ ! if [ "$$src" = "$$dest" ] ; then \ ! true ; \ ! else \ ! if [ -d $$dir/$$dest ] ; then \ ! true ; \ ! else \ ! cd $$dir ; rm -f $$dest && $(LN_S) $$src $$dest ; \ ! fi ; \ ! fi .PHONY: install-inc uninstall: --- 287,293 ---- rm -f $(octincludedir)/$$f ; \ $(INSTALL_DATA) $$f $(octincludedir)/$$f ; \ done ! $(mk-includedir-link) .PHONY: install-inc uninstall: diff -cNr octave-2.0.6/src/dynamic-ld.cc octave-2.0.7/src/dynamic-ld.cc *** octave-2.0.6/src/dynamic-ld.cc Thu May 22 13:43:43 1997 --- octave-2.0.7/src/dynamic-ld.cc Fri May 30 16:04:02 1997 *************** *** 124,130 **** if (handle) { ! int status = shl_findsym (handle, nm, TYPE_PROCEDURE, &retval); if (status < 0) { --- 124,130 ---- if (handle) { ! int status = shl_findsym (&handle, nm, TYPE_PROCEDURE, &retval); if (status < 0) { diff -cNr octave-2.0.6/src/mappers.cc octave-2.0.7/src/mappers.cc *** octave-2.0.6/src/mappers.cc Mon May 19 20:41:25 1997 --- octave-2.0.7/src/mappers.cc Fri May 30 16:07:18 1997 *************** *** 25,30 **** --- 25,31 ---- #endif #include + #include #include "lo-mappers.h" diff -cNr octave-2.0.6/src/version.h octave-2.0.7/src/version.h *** octave-2.0.6/src/version.h Tue May 27 11:05:37 1997 --- octave-2.0.7/src/version.h Mon Jun 2 13:58:42 1997 *************** *** 20,26 **** */ ! #define OCTAVE_VERSION "2.0.6" #define OCTAVE_COPYRIGHT \ "Copyright (C) 1996, 1997 John W. Eaton." --- 20,26 ---- */ ! #define OCTAVE_VERSION "2.0.7" #define OCTAVE_COPYRIGHT \ "Copyright (C) 1996, 1997 John W. Eaton." diff -cNr octave-2.0.6/test/ChangeLog octave-2.0.7/test/ChangeLog *** octave-2.0.6/test/ChangeLog Tue May 27 11:06:56 1997 --- octave-2.0.7/test/ChangeLog Wed Jun 4 12:43:48 1997 *************** *** 1,3 **** --- 1,7 ---- + Wed Jun 4 12:43:30 1997 John W. Eaton + + * Version 2.0.7 released. + Tue May 27 11:06:46 1997 John W. Eaton * Version 2.0.6 released. PATCH_EOF