[6376] go to version 6.0dev

[karl]

Revision: 6376
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=6376
Author:   karl
Date:     2015-07-02 22:32:06 +0000 (Thu, 02 Jul 2015)
Log Message:
-----------
go to version 6.0dev

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/README-hacking
    trunk/configure.ac
    trunk/util/texi2dvi

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2015-07-02 20:21:23 UTC (rev 6375)
+++ trunk/ChangeLog     2015-07-02 22:32:06 UTC (rev 6376)
@@ -1,3 +1,9 @@
+2015-07-02  Karl Berry  <address@hidden>
+
+       * configure.ac (AC_INIT),
+       * util/texi2dvi (version): go to 6.0dev since we are past the release.
+       * README-hacking: mention it.
+
 2015-07-02  Gavin Smith  <address@hidden>
 
        * tp/Texinfo/Convert/XSParagraph/configure.ac 
@@ -27,7 +33,7 @@
        * configure.ac (AC_CONFIG_SUBDIRS): Configure 
        tp/Texinfo/Convert/XSParagraph.
        * tp/Makefile.am (SUBDIRS): Add Texinfo/Convert/XSParagraph.
-       (do_subst): Substitue also for "@pkglibexecdir@" in texi2any.pl.
+       (do_subst): Substitute also for "@pkglibexecdir@" in texi2any.pl.
        * doc/Makefile.am: Pass -I flag to makeinfo to find in-source 
        XSParagraph module.
 

Modified: trunk/README-hacking
===================================================================
--- trunk/README-hacking        2015-07-02 20:21:23 UTC (rev 6375)
+++ trunk/README-hacking        2015-07-02 22:32:06 UTC (rev 6376)
@@ -197,7 +197,7 @@
   svn+ssh://address@hidden/texinfo/tags/texinfo_6_0
 [for karl: /srv/svn/texinfo]  
 
-  ... update texinfo at tug.org (contact address@hidden); from last time:
+#  ... update texinfo at tug.org (contact address@hidden):
 prev=5.2
 ver=6.0
 cd ~ftp/tex
@@ -208,12 +208,12 @@
 !!:gs/gz/xz
 relink texinfo $ver
 
-  ... announcements:
+#  ... announcements:
 send announcement to info-gnu,
   cc bug-texinfo and bcc address@hidden
 news item at savannah.
 
-  ... make diffs at official release:
+#  ... make diffs at official release:
 prev=5.2
 ver=6.0
 cd $misc/archive/$pkg/prod
@@ -224,7 +224,11 @@
 gnupload --to ftp.gnu.org:texinfo !$
 rm -rf texinfo-$ver texinfo-$prev
 ro texinfo-*$ver*
-  
-  ... [personal for karl] move mail:
+
+#  ... post-release, or when development resumes:
+configure.ac, util/texi2dvi: add "dev" to versions for clarity,
+until it's time to do pretests again.
+
+#  ... [personal for karl] move mail:
 mv ~/mail/txi.done $ver.mail
 bzip2 $ver.mail

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac  2015-07-02 20:21:23 UTC (rev 6375)
+++ trunk/configure.ac  2015-07-02 22:32:06 UTC (rev 6376)
@@ -12,7 +12,7 @@
 # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 #
-AC_INIT([GNU Texinfo], [6.0], address@hidden)
+AC_INIT([GNU Texinfo], [6.0dev], address@hidden)
 
 dnl Must come before AM_INIT_AUTOMAKE.
 AC_CONFIG_AUX_DIR([build-aux])

Modified: trunk/util/texi2dvi
===================================================================
--- trunk/util/texi2dvi 2015-07-02 20:21:23 UTC (rev 6375)
+++ trunk/util/texi2dvi 2015-07-02 22:32:06 UTC (rev 6376)
@@ -235,7 +235,7 @@
 version ()
 {
   cat <<EOF
-texi2dvi (GNU Texinfo 6.0) $rcs_version
+texi2dvi (GNU Texinfo 6.0+dev) $rcs_version
 
 Copyright (C) 2015 Free Software Foundation, Inc.
 License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>