#! /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, *.info*, and *.html files are not # included because they can be recreated from the Texinfo files using # TeX, makeinfo, or texi2html. # # 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. # # 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-3.0.4/ChangeLog octave-3.0.5/ChangeLog *** octave-3.0.4/ChangeLog 2009-04-01 10:43:25.000000000 +0200 --- octave-3.0.5/ChangeLog 2009-04-07 12:01:40.000000000 +0200 *************** *** 1,3 **** --- 1,7 ---- + 2009-04-07 Jaroslav Hajek + + Version 3.0.5 released. + 2009-01-16 Jaroslav Hajek Version 3.0.4 released. diff -cNr octave-3.0.4/doc/ChangeLog octave-3.0.5/doc/ChangeLog *** octave-3.0.4/doc/ChangeLog 2009-04-01 10:43:25.000000000 +0200 --- octave-3.0.5/doc/ChangeLog 2009-04-07 12:01:40.000000000 +0200 *************** *** 1,3 **** --- 1,7 ---- + 2009-04-07 Jaroslav Hajek + + Version 3.0.5 released. + 2009-01-16 Jaroslav Hajek Version 3.0.4 released. diff -cNr octave-3.0.4/doc/conf.texi octave-3.0.5/doc/conf.texi *** octave-3.0.4/doc/conf.texi 2009-02-18 08:09:49.000000000 +0100 --- octave-3.0.5/doc/conf.texi 2009-04-07 12:11:11.000000000 +0200 *************** *** 20,26 **** @set top_srcdir .. @set abs_top_srcdir /home/hajek/devel/octave/release-3-0-x-build @set OCTAVEHOME /usr/local ! @set VERSION 3.0.4 @set HAVE_COLAMD @set HAVE_CHOLMOD @set HAVE_UMFPACK --- 20,26 ---- @set top_srcdir .. @set abs_top_srcdir /home/hajek/devel/octave/release-3-0-x-build @set OCTAVEHOME /usr/local ! @set VERSION 3.0.5 @set HAVE_COLAMD @set HAVE_CHOLMOD @set HAVE_UMFPACK Files octave-3.0.4/doc/interpreter/octave-a4.pdf and octave-3.0.5/doc/interpreter/octave-a4.pdf differ Files octave-3.0.4/doc/interpreter/octave.pdf and octave-3.0.5/doc/interpreter/octave.pdf differ Files octave-3.0.4/doc/liboctave/liboctave.pdf and octave-3.0.5/doc/liboctave/liboctave.pdf differ diff -cNr octave-3.0.4/libcruft/ChangeLog octave-3.0.5/libcruft/ChangeLog *** octave-3.0.4/libcruft/ChangeLog 2009-04-01 10:43:25.000000000 +0200 --- octave-3.0.5/libcruft/ChangeLog 2009-04-07 12:01:40.000000000 +0200 *************** *** 1,3 **** --- 1,7 ---- + 2009-04-07 Jaroslav Hajek + + Version 3.0.5 released. + 2009-01-16 Jaroslav Hajek Version 3.0.4 released. diff -cNr octave-3.0.4/liboctave/ChangeLog octave-3.0.5/liboctave/ChangeLog *** octave-3.0.4/liboctave/ChangeLog 2009-04-01 10:43:25.000000000 +0200 --- octave-3.0.5/liboctave/ChangeLog 2009-04-07 12:01:40.000000000 +0200 *************** *** 1,3 **** --- 1,7 ---- + 2009-04-07 Jaroslav Hajek + + Version 3.0.5 released. + 2009-01-16 Jaroslav Hajek Version 3.0.4 released. diff -cNr octave-3.0.4/scripts/ChangeLog octave-3.0.5/scripts/ChangeLog *** octave-3.0.4/scripts/ChangeLog 2009-04-01 10:43:25.000000000 +0200 --- octave-3.0.5/scripts/ChangeLog 2009-04-07 12:01:40.000000000 +0200 *************** *** 1,3 **** --- 1,7 ---- + 2009-04-07 Jaroslav Hajek + + Version 3.0.5 released. + 2009-01-16 Jaroslav Hajek Version 3.0.4 released. diff -cNr octave-3.0.4/src/ChangeLog octave-3.0.5/src/ChangeLog *** octave-3.0.4/src/ChangeLog 2009-04-01 10:43:25.000000000 +0200 --- octave-3.0.5/src/ChangeLog 2009-04-07 12:01:40.000000000 +0200 *************** *** 1,7 **** --- 1,17 ---- + 2009-04-07 Jaroslav Hajek + + Version 3.0.5 released. + 2009-01-16 Jaroslav Hajek Version 3.0.4 released. + 2009-04-05 Benjamin Lindner + + * ls-mat-ascii.cc (get_mat_data_input_line): fix eating a whole + line when only newline should be read. fixes broken ascii matrix + loading + 2009-03-18 Benjamin Lindner * ls-oct-ascii.cc (extract_keyword): fix leaving stray '\r' in stream diff -cNr octave-3.0.4/src/ls-mat-ascii.cc octave-3.0.5/src/ls-mat-ascii.cc *** octave-3.0.4/src/ls-mat-ascii.cc 2009-03-27 12:28:33.000000000 +0100 --- octave-3.0.5/src/ls-mat-ascii.cc 2009-04-05 19:06:12.000000000 +0200 *************** *** 84,90 **** if (c == '\n' || c == '\r') { // Let skip_until_newline handle CR/LF issues... ! skip_until_newline (is, false); break; } --- 84,91 ---- if (c == '\n' || c == '\r') { // Let skip_until_newline handle CR/LF issues... ! is.putback (c); ! skip_preceeding_newline (is); break; } diff -cNr octave-3.0.4/src/version.h octave-3.0.5/src/version.h *** octave-3.0.4/src/version.h 2009-04-01 10:43:51.000000000 +0200 --- octave-3.0.5/src/version.h 2009-04-07 12:02:08.000000000 +0200 *************** *** 24,34 **** #if !defined (octave_version_h) #define octave_version_h 1 ! #define OCTAVE_VERSION "3.0.4" #define OCTAVE_API_VERSION "api-v32" ! #define OCTAVE_RELEASE_DATE "2009-04-01" #define OCTAVE_COPYRIGHT "Copyright (C) 2008 John W. Eaton and others." --- 24,34 ---- #if !defined (octave_version_h) #define octave_version_h 1 ! #define OCTAVE_VERSION "3.0.5" #define OCTAVE_API_VERSION "api-v32" ! #define OCTAVE_RELEASE_DATE "2009-04-07" #define OCTAVE_COPYRIGHT "Copyright (C) 2008 John W. Eaton and others." diff -cNr octave-3.0.4/test/ChangeLog octave-3.0.5/test/ChangeLog *** octave-3.0.4/test/ChangeLog 2009-04-01 10:43:25.000000000 +0200 --- octave-3.0.5/test/ChangeLog 2009-04-07 12:01:40.000000000 +0200 *************** *** 1,3 **** --- 1,7 ---- + 2009-04-07 Jaroslav Hajek + + Version 3.0.5 released. + 2009-01-16 Jaroslav Hajek Version 3.0.4 released. PATCH_EOF