Module Name:	pkgsrc
Committed By:	jlam
Date:		Sun Jul 15 20:16:49 UTC 2001

Modified Files:
	pkgsrc/x11/qt2-designer: Makefile buildlink.mk
	pkgsrc/x11/qt2-designer-kde: Makefile
	pkgsrc/x11/qt2-designer-kde/pkg: DESCR PLIST

Log Message:
Make qt2-designer and qt2-designer-kde conflict with each other and
install identical filenames.  qt2-designer-kde is now a superset of the
functionality in qt2-designer.  Bump the version numbers of both packages
to 2.3.1nb1.  On suggestion by Nick Hudson (skrll@netbsd.org).


To generate a diff of this commit:
cvs rdiff -r1.12 -r1.13 pkgsrc/x11/qt2-designer/Makefile
cvs rdiff -r1.4 -r1.5 pkgsrc/x11/qt2-designer/buildlink.mk
cvs rdiff -r1.2 -r1.3 pkgsrc/x11/qt2-designer-kde/Makefile
cvs rdiff -r1.1 -r1.2 pkgsrc/x11/qt2-designer-kde/pkg/DESCR \
    pkgsrc/x11/qt2-designer-kde/pkg/PLIST

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