Module Name:	pkgsrc
Committed By:	jlam
Date:		Thu Jan 11 19:00:43 UTC 2001

Modified Files:
	pkgsrc/print/cups: Makefile
	pkgsrc/print/cups/files: md5 patch-sum
	pkgsrc/print/cups/patches: patch-aa patch-ab patch-ac patch-af
Removed Files:
	pkgsrc/print/cups/patches: patch-ae patch-ah patch-ai patch-aj patch-ak

Log Message:
Update cups to 1.1.5.2.  No functional changes from 1.1.5.1, but NetBSD
changes were folded back into the main source tree.


To generate a diff of this commit:
cvs rdiff -r1.17 -r1.18 pkgsrc/print/cups/Makefile
cvs rdiff -r1.5 -r1.6 pkgsrc/print/cups/files/md5
cvs rdiff -r1.8 -r1.9 pkgsrc/print/cups/files/patch-sum
cvs rdiff -r1.5 -r1.6 pkgsrc/print/cups/patches/patch-aa \
    pkgsrc/print/cups/patches/patch-ac
cvs rdiff -r1.6 -r1.7 pkgsrc/print/cups/patches/patch-ab
cvs rdiff -r1.4 -r0 pkgsrc/print/cups/patches/patch-ae
cvs rdiff -r1.4 -r1.5 pkgsrc/print/cups/patches/patch-af
cvs rdiff -r1.3 -r0 pkgsrc/print/cups/patches/patch-ah \
    pkgsrc/print/cups/patches/patch-ai pkgsrc/print/cups/patches/patch-aj \
    pkgsrc/print/cups/patches/patch-ak

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.