X-Git-Url: http://cgit.sxemacs.org/?p=gnus;a=blobdiff_plain;f=makepub;h=4159d0f187e565499f0def07a561d58c7a1bf8f8;hp=7e9228e6ac7efc9963d0ae27d4cbd1b32614c18f;hb=f9ef018e3c287069cd0bf7f0c6af7f1cc3cb356c;hpb=4bc04db8ab265897888955269bb5c7934624be79;ds=sidebyside

diff --git a/makepub b/makepub
index 7e9228e6a..4159d0f18 100755
--- a/makepub
+++ b/makepub
@@ -19,13 +19,11 @@ next_version=`expr $next_version + 1`
 next_version="$prefix$next_version"
 
 date=`TZ=Z date "+%Y-%m-%d"`
-echo -e "$date  Lars Magne Ingebrigtsen  <lars@ingebrigtsen.no>\n\n\t* gnus.el: $name v$version is released.\n"\
+echo -e "$date  Lars Magne Ingebrigtsen  <lars@ingebrigtsen.no>\n\n\t* gnus.el: $name v$next_version is released.\n"\
   > /tmp/changelog
 cat lisp/ChangeLog >> /tmp/changelog
 mv /tmp/changelog lisp/ChangeLog
 
-git commit -a -m "$name v$version is released"
-
 # Then update the sources to the next version.
 
 sed "s/$name v[.0-9]*/$name v$next_version/" texi/gnus.texi > g.texi.tmp
@@ -35,7 +33,29 @@ mv m.texi.tmp texi/message.texi
 sed "s/defconst gnus-version-number \"$version\"/defconst gnus-version-number \"$next_version\"/" lisp/gnus.el > g.el.tmp
 mv g.el.tmp lisp/gnus.el
 
+git commit -a -m "$name v$next_version is released"
+
 tversion=`echo $next_version | sed 's/[.]/-/g'`
 
-git tag -a "$initial$tversion" -m "$name v$next_version is begun"
+git tag -a "$initial$tversion" -m "$name v$next_version is released"
+
+git push && git push origin tag "$initial$tversion"
+
+# Increase the number, yet again, to start the next development cycle.
+
+version=$next_version
+
+prefix=`echo $version | sed 's/^\(.*[.]\)\([0-9][0-9]*\)/\1/'`
+next_version=`echo $version | sed 's/^\(.*[.]\)\([0-9][0-9]*\)/\2/'`
+next_version=`expr $next_version + 1`
+next_version="$prefix$next_version"
+
+sed "s/$name v[.0-9]*/$name v$next_version/" texi/gnus.texi > g.texi.tmp
+mv g.texi.tmp texi/gnus.texi
+sed "s/$name v[.0-9]*/$name v$next_version/" texi/message.texi > m.texi.tmp
+mv m.texi.tmp texi/message.texi
+sed "s/defconst gnus-version-number \"$version\"/defconst gnus-version-number \"$next_version\"/" lisp/gnus.el > g.el.tmp
+mv g.el.tmp lisp/gnus.el
+
 git commit -a -m "$name v$next_version is begun"
+git push