[ntp:bk-ntp-dev-send] BitKeeper patch
Harlan Stenn
stenn at whimsy.udel.edu
Sat Aug 5 01:58:28 UTC 2006
This BitKeeper patch contains the following changesets:
stenn at whimsy.udel.edu|ChangeSet|20060805015548|44814
stenn at whimsy.udel.edu|ChangeSet|20060804200028|12787
stenn at whimsy.udel.edu|ChangeSet|20060805014601|12795
stenn at whimsy.udel.edu|ChangeSet|20060728110221|00597
# This is a BitKeeper patch. What follows are the unified diffs for the
# set of deltas contained in the patch. The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# ID: stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
# User: stenn
# Host: whimsy.udel.edu
# Root: /deacon/backroom/ntp-dev
#
#--- 1.48.1.6/Makefile.am 2006-08-04 21:58:26 -04:00
#+++ 1.69/Makefile.am 2006-08-04 21:58:26 -04:00
#@@ -1,78 +1,90 @@
# #AUTOMAKE_OPTIONS = util/ansi2knr foreign dist-tarZ no-dependencies
# AUTOMAKE_OPTIONS = util/ansi2knr foreign 1.8
#-ACLOCAL_AMFLAGS= -I m4
#+ACLOCAL_AMFLAGS= -I m4 -I libopts/m4
#
#-SUBDIRS = \
#- scripts \
#- include \
#+NULL=
#+
#+SUBDIRS=
#+if NEED_LIBOPTS
#+SUBDIRS+= libopts
#+endif
#+SUBDIRS+= \
#+ scripts \
#+ include \
# ElectricFence \
#- @ARLIB_DIR@ \
#- libntp \
#+ @ARLIB_DIR@ \
#+ libntp \
# libparse \
#- ntpd \
#- ntpdate \
#- ntpdc \
#- ntpq \
#+ ntpd \
#+ ntpdate \
#+ ntpdc \
#+ ntpq \
# parseutil \
# adjtimed \
# clockstuff \
#- kernel \
#- @MAKE_SNTP@ \
#- util
#-
#-DIST_SUBDIRS= \
#- scripts \
#- include \
#+ kernel \
#+ sntp \
#+ util \
#+ $(NULL)
#+
#+DIST_SUBDIRS= \
#+ scripts \
#+ include \
# ElectricFence \
#- arlib \
#- libntp \
#+ arlib \
#+ libntp \
#+ libopts \
# libparse \
#- ntpd \
#- ntpdate \
#- ntpdc \
#- ntpq \
#+ ntpd \
#+ ntpdate \
#+ ntpdc \
#+ ntpq \
# parseutil \
# adjtimed \
# clockstuff \
#- kernel \
#- sntp \
#- util
#-DISTCHECK_CONFIGURE_FLAGS= --with-arlib --with-sntp
#-
#-EXTRA_DIST = \
#- COPYRIGHT \
#- ChangeLog \
#+ kernel \
#+ sntp \
#+ util \
#+ $(NULL)
#+
#+DISTCHECK_CONFIGURE_FLAGS= --with-arlib --enable-local-libopts
#+
#+EXTRA_DIST = \
#+ COPYRIGHT \
#+ ChangeLog \
# ChangeLog-4.1.0 \
#- NEWS \
#- NOTES.y2kfixes \
#- README.bk \
#- README.hackers \
#- README.patches \
#+ NEWS \
#+ NOTES.y2kfixes \
#+ README.bk \
#+ README.hackers \
#+ README.patches \
# README.refclocks \
#- README.versions \
#- TODO \
#- WHERE-TO-START \
#- bootstrap \
#- build \
#- config.guess \
#- config.h.in \
#- config.sub \
#- dot.emacs \
#- excludes \
#- flock-build \
#- install-sh \
#- packageinfo.sh \
#- readme.y2kfixes \
#- results.y2kfixes \
#+ README.versions \
#+ TODO \
#+ WHERE-TO-START \
#+ bootstrap \
#+ build \
#+ config.guess \
#+ config.h.in \
#+ config.sub \
#+ dot.emacs \
#+ excludes \
#+ flock-build \
#+ install-sh \
#+ packageinfo.sh \
#+ readme.y2kfixes \
#+ results.y2kfixes \
#+ \
#+ conf \
#+ html \
#+ libisc \
#+ ports \
# \
#- conf \
#- html \
#- libisc \
#- ports \
#+ bincheck.mf \
#+ version \
#+ version.m4 \
# \
#- bincheck.mf \
#- version \
#- version.m4
#+ $(NULL)
#
# DISTCLEANFILES = .gcc-warning
#
#@@ -129,11 +141,9 @@
#
# 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...
#
#
#--- 1.27.13.2/packageinfo.sh 2006-08-04 21:58:27 -04:00
#+++ 1.61/BitKeeper/deleted/.del-packageinfo.sh~7f44215e99c0cd03 2006-08-04 21:58:27 -04:00
#@@ -9,18 +9,18 @@
# # - Numeric values increment
# # - empty 'increments' to 1
# # - NEW 'increments' to empty
#-point=2
#+point=3
# # Special. Normally unused. A suffix.
# #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
#
#--- 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
#--- New file ---
#+++ scripts/genChangeLog 06/08/04 15:39:21
##! /bin/sh
#
#set -e
#
#. packageinfo.sh
#bk -R prs -hr${CLTAG}.. -nd':I:' | bk changes -m -v - > ChangeLog.new
#mv ChangeLog.new ChangeLog
#
#
# Diff checksum=68f2dc73
# Patch vers: 1.3
# Patch type: REGULAR
== ChangeSet ==
stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
stenn at whimsy.udel.edu|ChangeSet|20060728052832|00614
D 1.1251.92.42 06/07/28 07:02:21-04:00 stenn at whimsy.udel.edu +1 -0
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c NTP_4_2_2P3
K 597
P ChangeSet
S NTP_4_2_2P3
s g
s stenn at whimsy.udel.edu|ChangeSet|20060726110251|00614
------------------------------------------------
0a0
> stenn at whimsy.udel.edu|packageinfo.sh|20060411084712|47225|7f44215e99c0cd03 stenn at whimsy.udel.edu|packageinfo.sh|20060728110218|52070
stenn at whimsy.udel.edu|ChangeSet|20060728110221|00597
D 1.1251.92.43 06/08/04 16:00:28-04:00 stenn at whimsy.udel.edu +3 -0
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c Clean up the ChangeLog generation
K 12787
P ChangeSet
------------------------------------------------
0a0
> stenn at whimsy.udel.edu|Makefile.am|19990526004810|01635|3aed0663 stenn at whimsy.udel.edu|Makefile.am|20060804195920|56584
> stenn at whimsy.udel.edu|scripts/Makefile.am|19990824045401|11799|bd702e17 stenn at whimsy.udel.edu|scripts/Makefile.am|20060804195921|26551
> stenn at whimsy.udel.edu|scripts/genChangeLog|20060804193921|58013|3c59f65379974c93 stenn at whimsy.udel.edu|scripts/genChangeLog|20060804193922|10515
stenn at whimsy.udel.edu|ChangeSet|20060804200028|12787
D 1.1251.92.44 06/08/04 21:46:01-04:00 stenn at whimsy.udel.edu +2 -0
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c ready for release
K 12795
P ChangeSet
------------------------------------------------
0a0
> stenn at whimsy.udel.edu|packageinfo.sh|20060411084712|47225|7f44215e99c0cd03 stenn at whimsy.udel.edu|packageinfo.sh|20060805014550|52834
> stenn at whimsy.udel.edu|scripts/genChangeLog|20060804193921|58013|3c59f65379974c93 stenn at whimsy.udel.edu|scripts/genChangeLog|20060804201847|46026
stenn at whimsy.udel.edu|ChangeSet|20060803110351|32621
D 1.1451 06/08/04 21:55:48-04:00 stenn at whimsy.udel.edu +2 -0
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c Merge whimsy.udel.edu:/deacon/backroom/ntp-stable
c into whimsy.udel.edu:/deacon/backroom/ntp-dev
i stenn at whimsy.udel.edu|ChangeSet|20060728110221|00597
i stenn at whimsy.udel.edu|ChangeSet|20060804200028|12787
i stenn at whimsy.udel.edu|ChangeSet|20060805014601|12795
K 44814
M stenn at whimsy.udel.edu|ChangeSet|20060805014601|12795
P ChangeSet
------------------------------------------------
0a0
> stenn at whimsy.udel.edu|Makefile.am|19990526004810|01635|3aed0663 stenn at whimsy.udel.edu|Makefile.am|20060805015536|64793
> stenn at whimsy.udel.edu|packageinfo.sh|20060411084712|47225|7f44215e99c0cd03 stenn at whimsy.udel.edu|BitKeeper/deleted/.del-packageinfo.sh~7f44215e99c0cd03|20060805015537|52834
== Makefile.am ==
stenn at whimsy.udel.edu|Makefile.am|19990526004810|01635|3aed0663
stenn at whimsy.udel.edu|Makefile.am|20060728020742|60682
D 1.48.1.7 06/08/04 15:59:20-04:00 stenn at whimsy.udel.edu +3 -5
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c Clean up the ChangeLog generation
K 56584
O -rw-rw-r--
P Makefile.am
------------------------------------------------
D132 5
I136 3
&& /bin/test -e ChangeLog \
-a SCCS/s.ChangeSet -ot ChangeLog \
|| scripts/genChangeLog
stenn at whimsy.udel.edu|Makefile.am|20060728021729|03355
D 1.69 06/08/04 21:55:36-04:00 stenn at whimsy.udel.edu +0 -0
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c Auto merged
i stenn at whimsy.udel.edu|Makefile.am|20060804195920|56584
K 64793
M stenn at whimsy.udel.edu|Makefile.am|20060804195920|56584
O -rw-rw-r--
P Makefile.am
------------------------------------------------
== BitKeeper/deleted/.del-packageinfo.sh~7f44215e99c0cd03 ==
stenn at whimsy.udel.edu|packageinfo.sh|20060411084712|47225|7f44215e99c0cd03
stenn at whimsy.udel.edu|packageinfo.sh|20060728052825|52069
D 1.27.14.1 06/07/28 07:02:18-04:00 stenn at whimsy.udel.edu +1 -1
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c NTP_4_2_2P3
K 52070
O -rw-rw-r--
P packageinfo.sh
------------------------------------------------
D12 1
I12 1
point=3
stenn at whimsy.udel.edu|packageinfo.sh|20060728110218|52070
D 1.27.14.2 06/08/04 21:45:50-04:00 stenn at whimsy.udel.edu +6 -6
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c ready for release
K 52834
O -rw-rw-r--
P packageinfo.sh
------------------------------------------------
D17 2
I18 1
releasecandidate=yes
D22 1
I22 1
# The following is for ntp-stable. 2 cases:
D24 3
I26 4
# - GO triggers a release
# - - rcpoint gets set to 0
# - - releasecandidate gets set to no
rcpoint=GO
stenn at whimsy.udel.edu|packageinfo.sh|20060805014550|52834
D 1.27.14.3 06/08/04 21:55:35-04:00 stenn at whimsy.udel.edu +0 -0
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
c Merge rename: packageinfo.sh -> BitKeeper/deleted/.del-packageinfo.sh~7f44215e99c0cd03
K 28593
O -rw-rw-r--
P BitKeeper/deleted/.del-packageinfo.sh~7f44215e99c0cd03
------------------------------------------------
stenn at whimsy.udel.edu|BitKeeper/deleted/.del-packageinfo.sh~7f44215e99c0cd03|20060728053202|52069
D 1.61 06/08/04 21:55:37-04:00 stenn at whimsy.udel.edu +0 -0
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c Auto merged
i stenn at whimsy.udel.edu|packageinfo.sh|20060728110218|52070
i stenn at whimsy.udel.edu|packageinfo.sh|20060805014550|52834
i stenn at whimsy.udel.edu|BitKeeper/deleted/.del-packageinfo.sh~7f44215e99c0cd03|20060805015535|28593
K 52834
M stenn at whimsy.udel.edu|BitKeeper/deleted/.del-packageinfo.sh~7f44215e99c0cd03|20060805015535|28593
O -rw-rw-r--
P BitKeeper/deleted/.del-packageinfo.sh~7f44215e99c0cd03
------------------------------------------------
== scripts/Makefile.am ==
stenn at whimsy.udel.edu|scripts/Makefile.am|19990824045401|11799|bd702e17
stenn at deacon.udel.edu|scripts/Makefile.am|20060504093655|25268
D 1.14 06/08/04 15:59:21-04:00 stenn at whimsy.udel.edu +3 -2
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c Clean up the ChangeLog generation
K 26551
O -rw-rw-r--
P scripts/Makefile.am
------------------------------------------------
D3 2
I4 3
EXTRA_DIST = VersionName fixautomakedepsmagic genChangeLog genver \
hpadjtime.sh monitoring ntp-close ntp-groper ntp-restart \
ntp-status rc1 rc2 stats
== scripts/genChangeLog ==
New file: scripts/genChangeLog
V 4
stenn at whimsy.udel.edu|scripts/genChangeLog|20060804193921|58013|3c59f65379974c93
D 1.0 06/08/04 15:39:21-04:00 stenn at whimsy.udel.edu +0 -0
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
K 58013
P scripts/genChangeLog
R 3c59f65379974c93
X 0x821
------------------------------------------------
stenn at whimsy.udel.edu|scripts/genChangeLog|20060804193921|58013|3c59f65379974c93
D 1.1 06/08/04 15:39:21-04:00 stenn at whimsy.udel.edu +7 -0
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c BitKeeper file /deacon/backroom/ntp-stable/scripts/genChangeLog
F 1
K 10515
O -rw-rw-r--
P scripts/genChangeLog
------------------------------------------------
I0 7
#! /bin/sh
\
set -e
\
. packageinfo.sh
bk -R prs -hr${CLTAG}.. -nd':I:' | bk changes -m -v - > ChangeLog.new
mv ChangeLog.new ChangeLog
stenn at whimsy.udel.edu|scripts/genChangeLog|20060804193922|10515
D 1.2 06/08/04 16:18:47-04:00 stenn at whimsy.udel.edu +0 -0
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c Change mode to -rwxrwxr-x
K 46026
O -rwxrwxr-x
P scripts/genChangeLog
------------------------------------------------
# Patch checksum=0d0db92b
More information about the bk-ntp-dev-send
mailing list