Module Name:	pkgsrc
Committed By:	jmmv
Date:		Sun Aug 21 11:26:47 UTC 2005

Modified Files:
	pkgsrc/graphics: Makefile
	pkgsrc/x11/gnome-desktop: Makefile PLIST buildlink3.mk
Removed Files:
	pkgsrc/graphics/gnome2-pixmaps: DESCR Makefile PLIST buildlink3.mk
	    distinfo
	pkgsrc/x11/gnome-desktop/patches: patch-ae

Log Message:
Merge gnome2-pixmaps into gnome-desktop.  gnome-pixmaps (v1) was deleted
three months ago, so there is no need for this separation any more.
Simplifies maintenance.  Bump gnome-desktop's PKGREVISION to 1.


To generate a diff of this commit:
cvs rdiff -r1.388 -r1.389 pkgsrc/graphics/Makefile
cvs rdiff -r1.1.1.1 -r0 pkgsrc/graphics/gnome2-pixmaps/DESCR
cvs rdiff -r1.27 -r0 pkgsrc/graphics/gnome2-pixmaps/Makefile
cvs rdiff -r1.5 -r0 pkgsrc/graphics/gnome2-pixmaps/PLIST
cvs rdiff -r1.7 -r0 pkgsrc/graphics/gnome2-pixmaps/buildlink3.mk
cvs rdiff -r1.12 -r0 pkgsrc/graphics/gnome2-pixmaps/distinfo
cvs rdiff -r1.41 -r1.42 pkgsrc/x11/gnome-desktop/Makefile
cvs rdiff -r1.13 -r1.14 pkgsrc/x11/gnome-desktop/PLIST
cvs rdiff -r1.9 -r1.10 pkgsrc/x11/gnome-desktop/buildlink3.mk
cvs rdiff -r1.3 -r0 pkgsrc/x11/gnome-desktop/patches/patch-ae

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