some cleanup of versioning info

diff --git a/.gitignore b/.gitignore
index 4305e29168a8fd28abb965c16aebacdb046f82c0..55e4cde6cba13dd94ca2b623864c69f03c25944c 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -20,6 +20,7 @@ CMakeCache.txt
 # product of: make dist
 graphviz-*.tar.gz
 VERSION
+COLLECTION
 
 lib/rxspencer/re
 lib/rxspencer/*.oo

diff --git a/Makefile.am b/Makefile.am
index 4e943c00d1de1dab8fe491681ba8fd8eca1a8c94..3b31f5117ef914626f54bfd390e7f03536d06657 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -27,6 +27,7 @@ doxygen:
 
 dist-hook:
        echo "@VERSION@" >VERSION
+       echo "@GRAPHVIZ_COLLECTION@" >COLLECTION
 #      find $(distdir) -name CVS -type d -prune -exec rm -rf {} \;
 #      rm -f ToPAS
 #      find $(distdir) -type f -exec md5sum {} >>ToPAS \;

diff --git a/autogen.sh b/autogen.sh
index 893df609588b8f6ed6dccb2f21172bb79f8fdc6a..59d4f3df1d6e40c372dcefb72b44d8ec409bb6db 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -31,21 +31,24 @@ dnl For the minor number: odd => unstable series
 dnl                       even => stable series
 dnl For the micro number: 0 => in-progress development
 dnl                       timestamp => tar-file snapshot or release
+
+dnl uncomment the next 4 lines for development releases, minor version must be odd
 m4_define([graphviz_version_major],[2])
 m4_define([graphviz_version_minor],[43])
+m4_define([graphviz_version_micro],[$GRAPHVIZ_VERSION_DATE])
+m4_define([graphviz_collection],[development])
 
-dnl NB: The next line is for hard-coding the micro version for stable releases
+dnl uncomment the next 4 lines for stable releases, minor version must be even
+dnl m4_define([graphviz_version_major],[2])
+dnl m4_define([graphviz_version_minor],[43])
 dnl m4_define([graphviz_version_micro],[0])
-
-dnl NB: the next line gets changed to a date/time string for development releases
-m4_define([graphviz_version_micro],[$GRAPHVIZ_VERSION_DATE])
+dnl m4_define([graphviz_collection],[stable])
 
 m4_define([graphviz_version_date],[$GRAPHVIZ_VERSION_DATE])
 m4_define([graphviz_change_date],["$GRAPHVIZ_CHANGE_DATE"])
 m4_define([graphviz_git_date],["$GRAPHVIZ_GIT_DATE"])
 m4_define([graphviz_author_name],["$GRAPHVIZ_AUTHOR_NAME"])
 m4_define([graphviz_author_email],[$GRAPHVIZ_AUTHOR_EMAIL])
-m4_define([graphviz_collection],[development])
 m4_define([graphviz_version_commit],[$GRAPHVIZ_VERSION_COMMIT])
 
 EOF