[ntp:bk-ntp-stable-send] BitKeeper patch

Harlan Stenn stenn at whimsy.udel.edu
Tue Dec 23 21:43:03 PST 2003


This BitKeeper patch contains the following changesets:
stenn at whimsy.udel.edu|ChangeSet|20031224054150|25251

# 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:	/backroom/ntp-stable

#
#--- 1.44/Makefile.am	Mon Oct  6 03:12:35 2003
#+++ 1.45/Makefile.am	Wed Dec 24 00:38:57 2003
#@@ -1,5 +1,5 @@
# #AUTOMAKE_OPTIONS = util/ansi2knr foreign dist-tarZ no-dependencies
#-AUTOMAKE_OPTIONS = util/ansi2knr foreign 1.5
#+AUTOMAKE_OPTIONS = util/ansi2knr foreign 1.8
# 
# SUBDIRS = \
# 	scripts \
#
#--- 1.11/acinclude.m4	Fri Jan 17 18:07:39 2003
#+++ 1.12/acinclude.m4	Wed Dec 24 00:39:20 2003
#@@ -1,4 +1,4 @@
#-AC_DEFUN(hs_ULONG_CONST,
#+AC_DEFUN([hs_ULONG_CONST],
# [ AH_TEMPLATE(ULONG_CONST, [How do we create unsigned long constants?])
# AC_EGREP_CPP(Circus,
#  [#define ACAT(a,b)a ## b
#@@ -25,7 +25,7 @@
# dnl @version $Id: acinclude.m4,v 1.3 2000/08/04 03:26:22 stenn Exp $
# dnl @author Alexandre Oliva <oliva at lsd.ic.unicamp.br>
# 
#-AC_DEFUN(AC_DEFINE_DIR, [
#+AC_DEFUN([AC_DEFINE_DIR], [
# 	ac_expanded=`(
# 	    test "x$prefix" = xNONE && prefix="$ac_default_prefix"
# 	    test "x$exec_prefix" = xNONE && exec_prefix="${prefix}"
#
#--- 1.336/configure.in	Sat Nov 29 18:07:00 2003
#+++ 1.337/configure.in	Wed Dec 24 00:40:35 2003
#@@ -1,12 +1,13 @@
# dnl -*-fundamental-*-
# dnl Process this file with autoconf to produce a configure script.
#-AC_INIT(ntpd/ntp_refclock.c)
#+m4_include([version.m4])
#+AC_INIT(ntp, VERSION_NUMBER)
#+AM_INIT_AUTOMAKE
# AC_CANONICAL_HOST
# AC_DEFINE_UNQUOTED(STR_SYSTEM, "$host", [canonical system (cpu-vendor-os) string])
# AM_CONFIG_HEADER(config.h)
#-AC_ARG_PROGRAM
#-AM_INIT_AUTOMAKE(ntp, 4.2.0)
#-AC_PREREQ(2.53)
#+dnl AC_ARG_PROGRAM
#+AC_PREREQ(2.58)
# 
# ac_cv_var_atom_ok=no
# ac_cv_var_oncore_ok=no
#--- New file ---
#+++ version.m4	03/12/24 00:10:17
#m4_define([VERSION_NUMBER],[4.2.0a])
#
#

# Diff checksum=b47ed85c


# Patch vers:	1.3
# Patch type:	REGULAR

== ChangeSet ==
stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
stenn at whimsy.udel.edu|ChangeSet|20031221012835|14912
D 1.1185 03/12/24 00:41:50-05:00 stenn at whimsy.udel.edu +4 -0
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c Cleanups, fix [Bug 320]
K 25251
P ChangeSet
------------------------------------------------

0a0
> stenn at whimsy.udel.edu|Makefile.am|19990526004810|01635|3aed0663 stenn at whimsy.udel.edu|Makefile.am|20031224053857|13935
> stenn at whimsy.udel.edu|acinclude.m4|20000514035723|04847|457f12ef stenn at whimsy.udel.edu|acinclude.m4|20031224053920|34889
> stenn at whimsy.udel.edu|configure.in|19990526004811|01635|3aed0663 stenn at whimsy.udel.edu|configure.in|20031224054035|15660
> stenn at whimsy.udel.edu|version.m4|20031224051017|20686|4ef47e5fd0c38ddb stenn at whimsy.udel.edu|version.m4|20031224054005|02819

== Makefile.am ==
stenn at whimsy.udel.edu|Makefile.am|19990526004810|01635|3aed0663
stenn at whimsy.udel.edu|Makefile.am|20031006071235|13932
D 1.45 03/12/24 00:38:57-05:00 stenn at whimsy.udel.edu +1 -1
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c [Bug 230] Require automake-1.8.
K 13935
O -rw-rw-r--
P Makefile.am
------------------------------------------------

D2 1
I2 1
AUTOMAKE_OPTIONS = util/ansi2knr foreign 1.8

== acinclude.m4 ==
stenn at whimsy.udel.edu|acinclude.m4|20000514035723|04847|457f12ef
stenn at whimsy.udel.edu|acinclude.m4|20030117230739|34521
D 1.12 03/12/24 00:39:20-05:00 stenn at whimsy.udel.edu +2 -2
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c Quote auto* stuff properly.
K 34889
O -rw-rw-r--
P acinclude.m4
------------------------------------------------

D1 1
I1 1
AC_DEFUN([hs_ULONG_CONST],
D28 1
I28 1
AC_DEFUN([AC_DEFINE_DIR], [

== configure.in ==
stenn at whimsy.udel.edu|configure.in|19990526004811|01635|3aed0663
stenn at whimsy.udel.edu|configure.in|20031129230700|14178
D 1.337 03/12/24 00:40:35-05:00 stenn at whimsy.udel.edu +5 -4
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c Require autoconf-2.58.  Use version.m4.  Cleanup.
K 15660
O -rw-rw-r--
P configure.in
------------------------------------------------

D3 1
I3 3
m4_include([version.m4])
AC_INIT(ntp, VERSION_NUMBER)
AM_INIT_AUTOMAKE
D7 3
I9 2
dnl AC_ARG_PROGRAM
AC_PREREQ(2.58)

== version.m4 ==
New file: version.m4
V 4

stenn at whimsy.udel.edu|version.m4|20031224051017|20686|4ef47e5fd0c38ddb
D 1.0 03/12/24 00:10:17-05:00 stenn at whimsy.udel.edu +0 -0
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
c BitKeeper file /backroom/ntp-stable/version.m4
K 20686
P version.m4
R 4ef47e5fd0c38ddb
X 0x821
------------------------------------------------


stenn at whimsy.udel.edu|version.m4|20031224051017|20686|4ef47e5fd0c38ddb
D 1.1 03/12/24 00:10:17-05:00 stenn at whimsy.udel.edu +1 -0
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
F 1
K 2722
O -rw-rw-r--
P version.m4
------------------------------------------------

I0 1
m4_define([VERSION_NUMBER],[4.2.0])

stenn at whimsy.udel.edu|version.m4|20031224051018|02722
D 1.2 03/12/24 00:40:05-05:00 stenn at whimsy.udel.edu +1 -1
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c 4.2.0a
K 2819
O -rw-rw-r--
P version.m4
------------------------------------------------

D1 1
I1 1
m4_define([VERSION_NUMBER],[4.2.0a])

# Patch checksum=45aeccc4



More information about the bk-ntp-stable-send mailing list