Testing version change - SR

NP-VERSION-GEN

@@ -6,7 +6,7 @@
 SRC_ROOT=`dirname $0`
 
 NPVF=NP-VERSION-FILE
-DEF_VER=1.5.git
+DEF_VER=2.0.git
 
 LF='
 '
@@ -19,21 +19,22 @@ if test -d $SRC_ROOT/.git -o -f $SRC_ROOT/.git &&
 	release-[0-9]*)
 		git update-index -q --refresh
 		test -z "`git diff-index --name-only HEAD --`" ||
-		VN="$VN-dirty" ;;
+		VN="$VN-dirty" 
+		echo $VN;;
 	esac
 then
 	VN=`echo "$VN" | sed -e 's/^release-//' | sed -e 's/-/./g'`;
-elif test -d $SRC_ROOT/.svn -o -f $SRC_ROOT/.svn &&
-	VN=`cd $SRC_ROOT; svn info 2>/dev/null | grep '^Revision'` &&
-	case "$VN" in
-	*$LF*) (exit 1) ;;
-	Revision:*)
-		VN=`echo $VN | awk '{print $NF}'`
-		test "`svn status 2>/dev/null | grep '^[AMD]' | wc -l | tr -d ' '`" = 0 ||
-		VN="$VN-dirty" ;;
-	esac
-then
-	VN=`echo "trunk.$VN" | sed -e 's/-/./g'`;
+#elif test -d $SRC_ROOT/.svn -o -f $SRC_ROOT/.svn &&
+#	VN=`cd $SRC_ROOT; svn info 2>/dev/null | grep '^Revision'` &&
+#	case "$VN" in
+#	*$LF*) (exit 1) ;;
+#	Revision:*)
+#		VN=`echo $VN | awk '{print $NF}'`
+#		test "`svn status 2>/dev/null | grep '^[AMD]' | wc -l | tr -d ' '`" = 0 ||
+#		VN="$VN-dirty" ;;
+#	esac
+#then
+#	VN=`echo "trunk.$VN" | sed -e 's/-/./g'`;
 else
 	VN="$DEF_VER"
 fi
@@ -46,6 +47,7 @@ then
 else
 	VC=unset
 fi
+echo "$VN"
 test "$VN" = "$VC" || {
 	echo >&2 "NP_VERSION = $VN"
 	echo "NP_VERSION = $VN" >$NPVF

configure.in

@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.59)
-AC_INIT(nagios-plugins,1.5)
+AC_INIT(nagios-plugins,2.0)
 AC_CONFIG_SRCDIR(NPTest.pm)
 AC_CONFIG_FILES([gl/Makefile 
 	nagios-plugins.spec])