ntp-4.2.2

bk: 4484c3e8cu3cG4tj0RrZg1pE2IeW1w

diff --git a/NEWS b/NEWS
index ebd4af2346b63188f89b7744f9b21f87514a77d4..40cb667bd35630d72265bee2201169428e680309 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,11 @@
 (4.2.2)
 * SNTP
-* Bugfixes
+* Many bugfixes
+* Implements the current "goal state" of NTPv4
+* Autokey improvements
+* Much better IPv6 support
+* Rewrite of the multicast code
+* New version numbering scheme
 \f
 (4.2.0)
 * More stuff than I have time to document

diff --git a/packageinfo.sh b/packageinfo.sh
index 2bdd85170ee601c565bb87001444850b14a88a3c..f39051c0195003445e1e7426f156bea7f60bd64f 100644 (file)
--- a/packageinfo.sh
+++ b/packageinfo.sh
@@ -2,19 +2,19 @@
 # odd minor numbers are for -dev, even minor numbers are for -stable
 proto=4
 major=2
-minor=1
+minor=2
 version=${proto}.${major}.${minor}
 # Point.  3 cases:
 # - Numeric values increment
 # - empty 'increments' to 1
 # - NEW 'increments' to empty
-point=257
+point=NEW
 # Special.  Normally unused.  A suffix.
 #special=ag
 special=
 # ReleaseCandidate. 'yes' or 'no'.
-releasecandidate=yes
-#releasecandidate=no
+#releasecandidate=yes
+releasecandidate=no
 # ChangeLog tag
 CLTAG=NTP_4_2_0
 ###

diff --git a/scripts/VersionName b/scripts/VersionName
index df1d360b1738b67a06e669e02b1a78a4070a8e38..3ec023d028c8bca6d1fe560eb51c7c4bd9fb7a93 100755 (executable)
--- a/scripts/VersionName
+++ b/scripts/VersionName
@@ -8,6 +8,7 @@ case $point in
  [0-9]*)
     NAME="${NAME}p$point"
     ;;
+ NEW) ;;
  '') ;;
  *) echo "Unexpected value for 'point' <$point>!"
     exit 1