Module Name:	pkgsrc
Committed By:	fredb
Date:		Mon Sep 11 20:46:41 UTC 2000

Modified Files:
	pkgsrc/x11/controlcenter: Makefile
	pkgsrc/x11/controlcenter/files: patch-sum
	pkgsrc/x11/controlcenter/pkg: PLIST
	pkgsrc/x11/gnome: Makefile
	pkgsrc/x11/gnome-core: Makefile
	pkgsrc/x11/xscreensaver: Makefile.common
	pkgsrc/x11/xscreensaver-gnome: Makefile
	pkgsrc/x11/xscreensaver-gnome/pkg: PLIST
Added Files:
	pkgsrc/x11/controlcenter/patches: patch-ac

Log Message:
Excise "screensaver" capplet from control-center, in order to resolve
conflict with xscreensaver-gnome, as discussed (briefly) on tech-pkg.
Also, reorder some dependencies: gnome-core (rather than gnome) depends
on xscreensaver-gnome, which depends on control-center; bump teeny
version of xscreensaver-gnome so control-center won't try to go with
old binary packages of xscreensaver-gnome, which would lead to circular
dependencies.


To generate a diff of this commit:
cvs rdiff -r1.22 -r1.23 pkgsrc/x11/controlcenter/Makefile
cvs rdiff -r1.4 -r1.5 pkgsrc/x11/controlcenter/files/patch-sum
cvs rdiff -r0 -r1.1 pkgsrc/x11/controlcenter/patches/patch-ac
cvs rdiff -r1.8 -r1.9 pkgsrc/x11/controlcenter/pkg/PLIST
cvs rdiff -r1.14 -r1.15 pkgsrc/x11/gnome/Makefile
cvs rdiff -r1.50 -r1.51 pkgsrc/x11/gnome-core/Makefile
cvs rdiff -r1.8 -r1.9 pkgsrc/x11/xscreensaver/Makefile.common
cvs rdiff -r1.2 -r1.3 pkgsrc/x11/xscreensaver-gnome/Makefile
cvs rdiff -r1.4 -r1.5 pkgsrc/x11/xscreensaver-gnome/pkg/PLIST

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