[ntp:bk-ntp-dev-send] BitKeeper diffs

[Harlan Stenn]

#### ChangeSet ####
2006-08-04 21:55:48-04:00, stenn at whimsy.udel.edu 
  Merge whimsy.udel.edu:/deacon/backroom/ntp-stable
  into  whimsy.udel.edu:/deacon/backroom/ntp-dev

==== BitKeeper/deleted/.del-packageinfo.sh~7f44215e99c0cd03 ====
2006-08-04 21:55:37-04:00, stenn at whimsy.udel.edu +0 -0
  Auto merged

==== BitKeeper/deleted/.del-packageinfo.sh~7f44215e99c0cd03 ====
2006-08-04 21:55:35-04:00, stenn at whimsy.udel.edu +0 -0
  Merge rename: packageinfo.sh -> BitKeeper/deleted/.del-packageinfo.sh~7f44215e99c0cd03

==== Makefile.am ====
2006-08-04 21:55:36-04:00, stenn at whimsy.udel.edu +0 -0
  Auto merged

#### ChangeSet ####
2006-08-04 21:46:01-04:00, stenn at whimsy.udel.edu 
  ready for release

==== packageinfo.sh ====
2006-08-04 21:45:50-04:00, stenn at whimsy.udel.edu +6 -6
  ready for release

--- 1.27.14.1/packageinfo.sh	2006-08-04 21:58:26 -04:00
+++ 1.27.14.2/packageinfo.sh	2006-08-04 21:58:26 -04:00
@@ -14,13 +14,13 @@ point=3
 #special=ag
 special=
 # ReleaseCandidate. 'yes' or 'no'.
-#releasecandidate=yes
-releasecandidate=no
+releasecandidate=yes
 # ChangeLog tag
 CLTAG=NTP_4_2_0
 ###
-# The following is for ntp-stable.  3 cases:
+# The following is for ntp-stable.  2 cases:
 # - Numeric values increment
-# - empty 'increments' to 1
-# - NEW 'increments' to empty
-rcpoint=NEW
+# - GO triggers a release
+# - - rcpoint gets set to 0
+# - - releasecandidate gets set to no
+rcpoint=GO

==== scripts/genChangeLog ====
2006-08-04 16:18:47-04:00, stenn at whimsy.udel.edu +0 -0
  Change mode to -rwxrwxr-x

#### ChangeSet ####
2006-08-04 16:00:28-04:00, stenn at whimsy.udel.edu 
  Clean up the ChangeLog generation

==== Makefile.am ====
2006-08-04 15:59:20-04:00, stenn at whimsy.udel.edu +3 -5
  Clean up the ChangeLog generation

--- 1.48.1.6/Makefile.am	2006-08-04 21:58:27 -04:00
+++ 1.48.1.7/Makefile.am	2006-08-04 21:58:27 -04:00
@@ -129,11 +129,9 @@ dist-hook:
 
 ChangeLog: FRC.ChangeLog
 	cd $(srcdir)					\
-	&& . packageinfo.sh				\
-	&& ARGS="-hr$${CLTAG}.."			\
-	&& ( bk -R prs $${ARGS} -nd':I:'		\
-	   | bk changes -m -v - > ChangeLog.new )	\
-	&& mv ChangeLog.new ChangeLog
+	&& /bin/test -e ChangeLog			\
+		-a SCCS/s.ChangeSet -ot ChangeLog	\
+	|| scripts/genChangeLog
 
 # HMS: The following seems to be a work-in-progress...
 

==== scripts/Makefile.am ====
2006-08-04 15:59:21-04:00, stenn at whimsy.udel.edu +3 -2
  Clean up the ChangeLog generation

--- 1.13/scripts/Makefile.am	2006-08-04 21:58:27 -04:00
+++ 1.14/scripts/Makefile.am	2006-08-04 21:58:27 -04:00
@@ -1,4 +1,5 @@
 bin_SCRIPTS=	ntp-wait ntptrace
 noinst_SCRIPTS=	calc_tickadj checktime freq_adj html2man mkver ntpsweep ntpver plot_summary summary
-EXTRA_DIST = VersionName fixautomakedepsmagic genver hpadjtime.sh monitoring \
-	ntp-close ntp-groper ntp-restart ntp-status rc1 rc2 stats
+EXTRA_DIST = VersionName fixautomakedepsmagic genChangeLog genver	\
+	hpadjtime.sh monitoring ntp-close ntp-groper ntp-restart	\
+	ntp-status rc1 rc2 stats

==== scripts/genChangeLog ====
2006-08-04 15:39:21-04:00, stenn at whimsy.udel.edu +7 -0
  BitKeeper file /deacon/backroom/ntp-stable/scripts/genChangeLog

--- /dev/null	2006-08-04 21:57:53 -04:00
+++ 1.1/scripts/genChangeLog	2006-08-04 21:58:27 -04:00
@@ -0,0 +1,7 @@
+#! /bin/sh
+
+set -e
+
+. packageinfo.sh
+bk -R prs -hr${CLTAG}.. -nd':I:' | bk changes -m -v - > ChangeLog.new
+mv ChangeLog.new ChangeLog

==== scripts/genChangeLog ====
2006-08-04 15:39:21-04:00, stenn at whimsy.udel.edu +0 -0

#### ChangeSet ####
2006-07-28 07:02:21-04:00, stenn at whimsy.udel.edu 
  NTP_4_2_2P3
  TAG: NTP_4_2_2P3

==== packageinfo.sh ====
2006-07-28 07:02:18-04:00, stenn at whimsy.udel.edu +1 -1
  NTP_4_2_2P3

--- 1.27.13.2/packageinfo.sh	2006-08-04 21:58:27 -04:00
+++ 1.27.14.1/packageinfo.sh	2006-08-04 21:58:27 -04:00
@@ -9,7 +9,7 @@ version=${proto}.${major}.${minor}
 # - Numeric values increment
 # - empty 'increments' to 1
 # - NEW 'increments' to empty
-point=2
+point=3
 # Special.  Normally unused.  A suffix.
 #special=ag
 special=