From: Harlan Stenn <stenn@ntp.org>
Date: Sun, 29 Dec 2013 10:20:38 +0000 (+0000)
Subject: [Bug 2187] Update version number generation scripts
X-Git-Tag: NTP_4_2_7P408~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5da11222e36d275c3e2fcf20d679c52415574f21;p=thirdparty%2Fntp.git

[Bug 2187] Update version number generation scripts

bk: 52bff776ywIz9zWNUzVcS6WL99TgVw
---

diff --git a/ChangeLog b/ChangeLog
index 4c27e9912..6bd38f747 100644
--- 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 8fc3bb08f..8b1735b50 100644
--- 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 2f574c321..cc7c01694 100644
--- 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 1030196ce..71e31a948 100755
--- 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) ;;
  '') ;;