[Bug 2187] Update version number generation scripts

bk: 52bff776ywIz9zWNUzVcS6WL99TgVw

diff --git a/ChangeLog b/ChangeLog
index 4c27e99125b3bc91b8bd29bc9d6bb84a285d6a0e..6bd38f7476168bc7fd948d38619c70e71b5cba7f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+* [Bug 2187] Update version number generation scripts.
 * [Bug 2519] mktime.c does not compile on 64-bit Solaris but we do not
   need timegm() and the Solaris provides mktime().
 * [Bug 2522] Revert Bug 2513 fix - it breaks backward compatibility.

diff --git a/configure.ac b/configure.ac
index 8fc3bb08f624460bba86421908020bab5d276a24..8b1735b50ade0310ae82a8ac676cd54558bc2775 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@ dnl
 m4_include([sntp/m4/version.m4])
 AC_PREREQ([2.61])
 AC_INIT(
-    [ntp],
+    [ntp4],
     [VERSION_NUMBER],
     [http://bugs.ntp.org./],
     [],

diff --git a/packageinfo.sh b/packageinfo.sh
index 2f574c3215150108a5ac6bd014c8688299ada2e4..cc7c016940018034f576748b5a9adcdc4e0ab4d5 100644 (file)
--- a/packageinfo.sh
+++ b/packageinfo.sh
@@ -47,13 +47,23 @@
 # repotype must be stable or dev
 repotype=dev
 
+# post-4.2.8:
+# version=Major.Minor
+# 4.2.8 and before:
 # version=Protocol.Major.Minor
 # odd minor numbers are for -dev, even minor numbers are for -stable
 # UpdatePoint will fail if repotype is inconsistent with minor.
 proto=4
 major=2
 minor=7
-version=${proto}.${major}.${minor}
+
+case "${proto}.${major}" in
+ 4.[012])
+    version=${proto}.${major}.${minor}
+    ;;
+ *) version=${major}.${minor}
+    ;;
+esac
 
 # Special.  Normally unused.  A suffix.
 #special=ag
@@ -65,6 +75,9 @@ prerelease=
 # ChangeLog starting tag (see also CommitLog-4.1.0)
 CLTAG=NTP_4_2_0
 
+### post-4.2.8:
+### Point number, after "major.minor.", normally modified by script.
+### 4.2.8 and before:
 ### Point number, after "p", normally modified by script.
 # 3 cases:
 # - Numeric values increment

diff --git a/scripts/build/VersionName b/scripts/build/VersionName
index 1030196ce392298d8f79bde9a7d77d4fba82a9ee..71e31a948ff0bc17e950d9136a4bff5e8053e2c9 100755 (executable)
--- a/scripts/build/VersionName
+++ b/scripts/build/VersionName
@@ -21,7 +21,13 @@ esac
 NAME="$version"
 case $point in
  [1-9]*)
-    NAME="${NAME}p${point}"
+    case "${proto}.${major}" in
+     4.[012])
+       NAME="${NAME}p${point}"
+        ;;
+     *) NAME="${NAME}.${point}"
+        ;;
+    esac
     ;;
  NEW) ;;
  '') ;;