FREEBSD-upgrade revision 237410
1248590Smm$FreeBSD: head/lib/libz/FREEBSD-upgrade 146082 2005-05-11 03:50:50Z kientzle $
2248590Smm
3248590SmmZLib 1.2.2
4248590Smm
5248590SmmOriginal distribution from http://www.gzip.org/zlib/
6248590Smm
7248590SmmVendor files removed from distribution before import:
8248590Smm	 INDEX		 configure	 qnx/
9248590Smm	 Makefile	 contrib/	 win32/
10248590Smm	 Makefile.in	 msdos/		 zconf.in.h
11248590Smm	 amiga/		 old/
12248590Smm	 as400/		 projects/
13248590Smm
14248590SmmVendor files imported:
15248590Smm	 ChangeLog	 example.c	 minigzip.c
16248590Smm	 FAQ		 gzio.c		 trees.c
17248590Smm	 README		 infback.c	 trees.h
18248590Smm	 adler32.c	 inffast.c	 uncompr.c
19248590Smm	 algorithm.txt	 inffast.h	 zconf.h
20248590Smm	 compress.c	 inffixed.h	 zlib.3
21248590Smm	 crc32.c	 inflate.c	 zlib.h
22248590Smm	 crc32.h	 inflate.h	 zutil.c
23248590Smm	 deflate.c	 inftrees.c	 zutil.h
24248590Smm	 deflate.h	 inftrees.h
25248590Smm
26248590SmmAs of April, 2005, only the following three vendor files
27248590Smmhad non-trivial local changes:
28248590Smm	 gzio.c   minigzip.c  zconf.h
29248590Smm
30248590SmmAdded files (not from vendor):
31248590Smm	 Makefile	 zopen.c	 FREEBSD-upgrade
32248590Smm
33248590SmmTo Update:
34248590Smm  1) Unpack vendor sources into a clean directory.
35248590Smm  2) Delete unnecessary files.
36248590Smm  3) Import onto the vendor branch.  The 1.2.2 import was done like this:
37248590Smm   cvs -d <CVSROOT> import -ko -m "ZLib 1.2.2" src/lib/libz ZLIB v1_2_2
38248590Smm  4) In a clean directory, check out a fresh copy of HEAD,
39248590Smm	 merging in vendor changes since the last import.
40248590Smm   cvs -d <CVSROOT> co -jZLIB:yesterday -jZLIB src/lib/libz
41248590Smm  5) Resolve any conflicts and commit them.
42248590Smm  6) Update this file with any changes to the file list or update procedure.
43248590Smm
44248590Smmkientzle@FreeBSD.org
45248590Smm