Bumping version to 6.2 (and 6.2pre in configure.ac)

jrincayc · Dec 14, 2020 · 9193bdc · 9193bdc
1 parent 53367e1
commit 9193bdc
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 20 deletions.
diff --git a/README.md b/README.md
@@ -25,7 +25,7 @@ along with this program.  If not, see https://www.gnu.org/licenses/.
 
 This uses the repository https://github.com/jrincayc/ucblogo-code
 created for further UCBLogo development.
-The current version is 6.1
+The current version is 6.2
 
 Changes for this release:
 * The license has been changed to GPL3.

diff --git a/configure.ac b/configure.ac
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ([2.69])
-AC_INIT([ucblogo],[6.1],[],[],[https://github.com/jrincayc/ucblogo-code])
+AC_INIT([ucblogo],[6.2pre],[],[],[https://github.com/jrincayc/ucblogo-code])
 AC_CONFIG_SRCDIR([logodata.c])
 AC_CONFIG_HEADER(config.h)
 

diff --git a/docs/ucblogo.texi b/docs/ucblogo.texi
@@ -1,7 +1,7 @@
 \input texinfo @c -*-texinfo-*-
 @c %**start of header
 @setfilename ucblogo.info
-@settitle BERKELEY LOGO 6.1
+@settitle BERKELEY LOGO 6.2
 @setchapternewpage odd
 @c %**end of header
 
@@ -24,7 +24,7 @@
 @finalout
 
 @titlepage
-@title BERKELEY LOGO 6.1
+@title BERKELEY LOGO 6.2
 @subtitle Berkeley Logo User Manual
 @author Brian Harvey
 @end titlepage

diff --git a/inno/ucblogo.iss b/inno/ucblogo.iss
@@ -3,8 +3,8 @@
 
 [Setup]
 AppName=Berkeley Logo
-AppVerName=Berkeley Logo 6.1
-AppVersion=6.1
+AppVerName=Berkeley Logo 6.2
+AppVersion=6.2
 AppPublisher=University of California, Berkeley
 AppPublisherURL=http://www.cs.berkeley.edu/~bh/logo.html
 AppSupportURL=https://github.com/jrincayc/ucblogo-code/issues

diff --git a/logolib/Messages b/logolib/Messages
@@ -1,4 +1,4 @@
-; UCBLogo message file version 6.1
+; UCBLogo message file version 6.2
 ; Error messages -- position in this file corresponds to error number
 ; Lines starting with semicolon don't count in the line numbering
 ;  and may be added at will.

diff --git a/logolib/Messages.fr b/logolib/Messages.fr
@@ -1,4 +1,4 @@
-; French version of Berkeley Logo messages file 6.1
+; French version of Berkeley Logo messages file 6.2
 ; Error messages -- position in this file corresponds to error number
 ; Lines starting with semicolon don't count in the line numbering
 ;  and may be added at will.

diff --git a/logolib/Messages.sp b/logolib/Messages.sp
@@ -1,4 +1,4 @@
-; Spanish version of Berkeley Logo messages file 6.1
+; Spanish version of Berkeley Logo messages file 6.2
 ; Error messages -- position in this file corresponds to error number
 ; Lines starting with semicolon don't count in the line numbering
 ;  and may be added at will.

diff --git a/logolib/Messages.zh_TW b/logolib/Messages.zh_TW
@@ -1,4 +1,4 @@
-; UCBLogo message file version 6.1
+; UCBLogo message file version 6.2
 ; Error messages -- position in this file corresponds to error number
 ; Lines starting with semicolon don't count in the line numbering
 ;  and may be added at will.

diff --git a/main.c b/main.c
@@ -275,11 +275,7 @@ int main(int argc, char *argv[]) {
       {
 	char version[64];
 	lcleartext(NIL);
-#ifdef HAVE_WX
-	strcpy(version,"6.1");
-#else
-	strcpy(version,"5.6");
-#endif
+	strcpy(version, VERSION);
 #ifdef GITID
 	extern char *GIT;
 	strcat(version, GIT);
@@ -289,11 +285,7 @@ int main(int argc, char *argv[]) {
       }
     }
 
-#ifdef HAVE_WX
-    setvalnode__caseobj(LogoVersion, make_floatnode(6.1));
-#else
-    setvalnode__caseobj(LogoVersion, make_floatnode(5.6));
-#endif
+    setvalnode__caseobj(LogoVersion, make_floatnode(6.2));
     setflag__caseobj(LogoVersion, VAL_BURIED);
 
     argv2 = argv; argc2 = argc;