Mercurial > hg > octave-lyh
changeset 6469:a848b846cb3a ss-2-9-10
[project @ 2007-03-27 18:42:11 by jwe]
author | jwe |
---|---|
date | Tue, 27 Mar 2007 18:42:11 +0000 |
parents | d19a0250e680 |
children | cfa1dc1f584d |
files | src/ChangeLog src/version.h |
diffstat | 2 files changed, 40 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,7 +1,29 @@ +<<<<<<< ChangeLog +2007-03-27 John W. Eaton <jwe@octave.org> + + * version.h (OCTAVE_VERSION): Now 2.9.10. + (OCTAVE_API_VERSION): Now api-v23. + (OCTAVE_RELEASE_DATE): Now 2007-03-27. + + * version.h (OCTAVE_COPYRIGHT): Update for 2007. Add "and others". + (X_OCTAVE_WARRANTY_STATEMENT): Rename from OCTAVE_WARRANTY_STATEMENT. + Accept arg. + (OCTAVE_WARRANTY_STATEMENT): Define using X_OCTAVE_WARRANTY_STATEMENT. + (OCTAVE_NAME_VERSION_COPYRIGHT_COPYING_AND_WARRANTY): Define using + X_OCTAVE_NAME_VERSION_COPYRIGHT_COPYING_AND_WARRANTY. + (X_OCTAVE_NAME_VERSION_COPYRIGHT_COPYING_AND_WARRANTY): Rename + from OCTAVE_NAME_VERSION_COPYRIGHT_COPYING_AND_WARRANTY. + Accept arg and pass to X_OCTAVE_WARRANTY_STATEMENT. + (OCTAVE_NAME_VERSION_COPYRIGHT_COPYING_AND_WARRANTY): Pass empty + arg to X_OCTAVE_NAME_VERSION_COPYRIGHT_COPYING_WARRANTY_AND_BUGS. + (OCTAVE_STARTUP_MESSAGE): Put info about news last. + +======= 2007-03-27 John W. Eaton <jwe@octave.org> * Makefile.in (dist, conf-dist): Use ln, not $(LN_S). +>>>>>>> 1.1688 2007-03-26 Juhani Saastamoinen <juhani@cs.joensuu.fi> * file-io.cc (do_stream_open) [! HAVE_ZLIB]:
--- a/src/version.h +++ b/src/version.h @@ -1,7 +1,7 @@ /* Copyright (C) 1992, 1993, 1994, 1994, 1996, 1997, 1998, 1999, 2000, -2001, 2002, 2003, 2004, 2005, 2006 John W. Eaton +2001, 2002, 2003, 2004, 2005, 2006, 2007 John W. Eaton This file is part of Octave. @@ -25,13 +25,13 @@ #if !defined (octave_version_h) #define octave_version_h 1 -#define OCTAVE_VERSION "2.9.9+" +#define OCTAVE_VERSION "2.9.10" -#define OCTAVE_API_VERSION "api-v22" +#define OCTAVE_API_VERSION "api-v23" -#define OCTAVE_RELEASE_DATE "2006-10-02" +#define OCTAVE_RELEASE_DATE "2007-03-27" -#define OCTAVE_COPYRIGHT "Copyright (C) 2006 John W. Eaton." +#define OCTAVE_COPYRIGHT "Copyright (C) 2007 John W. Eaton and others." // This is the first line printed by --version. The GNU coding // standards say that the version number should follow the last space @@ -45,9 +45,12 @@ #define OCTAVE_COPYING_STATEMENT \ "This is free software; see the source code for copying conditions." -#define OCTAVE_WARRANTY_STATEMENT \ +#define X_OCTAVE_WARRANTY_STATEMENT(ARG) \ "There is ABSOLUTELY NO WARRANTY; not even for MERCHANTIBILITY or\n\ -FITNESS FOR A PARTICULAR PURPOSE." +FITNESS FOR A PARTICULAR PURPOSE." ARG + +#define OCTAVE_WARRANTY_STATEMENT \ + X_OCTAVE_WARRANTY_STATEMENT ("") #define OCTAVE_WWW_STATEMENT \ "Additional information about Octave is available at http://www.octave.org." @@ -65,25 +68,27 @@ OCTAVE_COPYRIGHT #define OCTAVE_NAME_VERSION_COPYRIGHT_COPYING_AND_WARRANTY \ + X_OCTAVE_NAME_VERSION_COPYRIGHT_COPYING_AND_WARRANTY("") \ + +#define X_OCTAVE_NAME_VERSION_COPYRIGHT_COPYING_AND_WARRANTY(ARG) \ OCTAVE_NAME_VERSION_AND_COPYRIGHT "\n" \ OCTAVE_COPYING_STATEMENT "\n" \ - OCTAVE_WARRANTY_STATEMENT "\n\n" \ + X_OCTAVE_WARRANTY_STATEMENT (ARG) "\n\n" \ OCTAVE_CONFIG_STATEMENT #define X_OCTAVE_NAME_VERSION_COPYRIGHT_COPYING_WARRANTY_AND_BUGS(ARG) \ - OCTAVE_NAME_VERSION_COPYRIGHT_COPYING_AND_WARRANTY \ - ARG \ + X_OCTAVE_NAME_VERSION_COPYRIGHT_COPYING_AND_WARRANTY(ARG) "\n\n" \ OCTAVE_WWW_STATEMENT "\n\n" \ OCTAVE_CONTRIB_STATEMENT "\n\n" \ OCTAVE_BUGS_STATEMENT #define OCTAVE_NAME_VERSION_COPYRIGHT_COPYING_WARRANTY_AND_BUGS \ - X_OCTAVE_NAME_VERSION_COPYRIGHT_COPYING_WARRANTY_AND_BUGS ("\n\n") + X_OCTAVE_NAME_VERSION_COPYRIGHT_COPYING_WARRANTY_AND_BUGS ("") #define OCTAVE_STARTUP_MESSAGE \ X_OCTAVE_NAME_VERSION_COPYRIGHT_COPYING_WARRANTY_AND_BUGS \ - (" For details, type `warranty'.\n\ - For information about changes from previous versions, type `news'.\n\n") + (" For details, type `warranty'.") "\n\n" \ + "For information about changes from previous versions, type `news'." #endif