2007-01-13 [colin] 2.7.0cvs18

	* commitHelper
		Allow multiple commitHelpers to
		run at once

diff --git a/ChangeLog b/ChangeLog
index 8c7043a986d06e68b2abc88e3af7d5568b789771..9dd29005c3e9de7d7003dee2ea9ea70d50c849ab 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-01-13 [colin]     2.7.0cvs18
+
+       * commitHelper
+               Allow multiple commitHelpers to
+               run at once
+
 2007-01-12 [colin]     2.7.0cvs17
 
        * src/etpan/imap-thread.c

diff --git a/PATCHSETS b/PATCHSETS
index 4403f56646a9b088f1909dd48c2c6602b13fa334..105eba9cd8dc925c7bd3f87a578c7a94a2dea682 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2244,3 +2244,4 @@
 ( cvs diff -u -r 1.654.2.2295 -r 1.654.2.2296 configure.ac;  cvs diff -u -r 1.60.2.74 -r 1.60.2.75 src/addressbook.c;  cvs diff -u -r 1.26.2.30 -r 1.26.2.31 src/foldersel.c;  cvs diff -u -r 1.207.2.141 -r 1.207.2.142 src/folderview.c;  cvs diff -u -r 1.115.2.122 -r 1.115.2.123 src/main.c;  ) > 2.7.0cvs15.patchset
 ( cvs diff -u -r 1.382.2.350 -r 1.382.2.351 src/compose.c;  ) > 2.7.0cvs16.patchset
 ( cvs diff -u -r 1.1.4.63 -r 1.1.4.64 src/etpan/imap-thread.c;  ) > 2.7.0cvs17.patchset
+( cvs diff -u -r 1.1.2.33 -r 1.1.2.34 commitHelper;  ) > 2.7.0cvs18.patchset

diff --git a/commitHelper b/commitHelper
index e0fae9ca1b5a73c8d1e8f9161b3243c1c89899ce..4dde6c2827a9e991e11dcc0669ee5b7a34eb3d94 100644 (file)
--- a/commitHelper
+++ b/commitHelper
@@ -98,16 +98,16 @@ else
        EDITOR=$CVSEDITOR
 fi;
 
-echo -e "#please complete the changelog entry below" > /tmp/logentry
-echo -e -n $log >> /tmp/logentry
+echo -e "#please complete the changelog entry below" > /tmp/logentry.$$
+echo -e -n $log >> /tmp/logentry.$$
 
-$EDITOR /tmp/logentry
+$EDITOR /tmp/logentry.$$
 
 echo "--8<----------"
-grep -v "^#" /tmp/logentry > /tmp/log.tmp.$$ \
-&& mv /tmp/log.tmp.$$ /tmp/logentry
-echo >> /tmp/logentry
-cat /tmp/logentry
+grep -v "^#" /tmp/logentry.$$ > /tmp/log.tmp.$$ \
+&& mv /tmp/log.tmp.$$ /tmp/logentry.$$
+echo >> /tmp/logentry.$$
+cat /tmp/logentry.$$
 
 chlog="ChangeLog"
 
@@ -116,7 +116,7 @@ echo -n "Is it ok (write to $chlog and update configure.ac) [y/N]?"
 read ans
 if [ "$ans" == "y" ]; then
        mv $chlog $chlog.old
-       cat /tmp/logentry > $chlog
+       cat /tmp/logentry.$$ > $chlog
        cat $chlog.old >> $chlog
        rm $chlog.old
 
@@ -127,11 +127,11 @@ if [ "$ans" == "y" ]; then
 
        if [ "$args" != "" ]; then
                echo commiting $@ PATCHSETS $chlog configure.ac
-               cvs commit -m "`cat /tmp/logentry`" $@ PATCHSETS $chlog configure.ac
+               cvs commit -m "`cat /tmp/logentry.$$`" $@ PATCHSETS $chlog configure.ac
        else
                echo commiting recursively
-               cvs commit -m "`cat /tmp/logentry` "
+               cvs commit -m "`cat /tmp/logentry.$$` "
        fi;
-       rm -f /tmp/logentry
+       rm -f /tmp/logentry.$$
        wget -O /dev/null -o /dev/null http://www.colino.net/sylpheed-claws/update.php3
 fi

diff --git a/configure.ac b/configure.ac
index c01a4ac95816bdd81a1eb8c7f7a7f47b7ab9a036..4f810933d238f9024bfae3c370b07ff17a77ff7c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=7
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=17
+EXTRA_VERSION=18
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=