From eb9d0ae961ce436c193784b9fe4e2deb3866457e Mon Sep 17 00:00:00 2001
From: Colin Leroy <colin@colino.net>
Date: Sat, 10 Jul 2004 10:52:07 +0000
Subject: [PATCH] reflect version change

---
 commitHelper | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/commitHelper b/commitHelper
index 8abb9eb75..34ac58b6b 100644
--- a/commitHelper
+++ b/commitHelper
@@ -1,8 +1,13 @@
 #!/bin/sh
-head -15 configure.ac | grep VERSION > /tmp/commitTool.tmp
+head -16 configure.ac | grep VERSION= > /tmp/commitTool.tmp
 source /tmp/commitTool.tmp
-EXTRA_VERSION=`echo $EXTRA_VERSION | awk -F'.' '{for (i=1;i<NF;i++){printf $i"."};printf $NF+1}'`
-nextsversion="${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}cvs${EXTRA_VERSION}"
+if [ -z "$EXTRA_GTK2_VERSION" ]; then
+	EXTRA_VERSION=`echo $EXTRA_VERSION | awk -F'.' '{for (i=1;i<NF;i++){printf $i"."};printf $NF+1}'`
+	nextsversion="${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}cvs${EXTRA_VERSION}"
+else
+	EXTRA_GTK2_VERSION=`echo $EXTRA_GTK2_VERSION | awk -F'.' '{for (i=1;i<NF;i++){printf $i"."};printf $NF+1}'`
+	nextsversion="${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}cvs${EXTRA_VERSION}${EXTRA_GTK2_VERSION}"
+fi
 rm /tmp/commitTool.tmp
 
 IFS='