common tobuild,1.233,1.234

[seth vidal]

> Index: tobuild
> ===================================================================
> RCS file: /cvs/extras/common/tobuild,v
> retrieving revision 1.233
> retrieving revision 1.234
> diff -u -r1.233 -r1.234
> --- tobuild	8 May 2005 10:40:20 -0000	1.233
> +++ tobuild	8 May 2005 14:22:04 -0000	1.234
> @@ -1,6 +1,44 @@
>  # this is the build control file.  the format is
>  # user	repo	tag	target	status
>  # 
> +<<<<<<< tobuild
> +skvidal	rpms/bazaar/devel	bazaar-1_3_2-3	development
> +skvidal	rpms/uudeview/devel	uudeview-0_5_20-6	development
> +skvidal	rpms/qemu/devel	qemu-0_7_0-1	development
> +skvidal	rpms/hfsplusutils/devel	hfsplusutils-1_0_4-5	development
> +skvidal	rpms/xmms/devel	xmms-1_2_10-16	development
> +skvidal	rpms/cdo/devel	cdo-0_9_6-2	development
> +skvidal	rpms/libsigc++20/devel	libsigc++20-2_0_11-1	development
> +skvidal	rpms/glibmm24/devel	glibmm24-2_6_1-1	development
> +skvidal	rpms/gtkmm24/devel	gtkmm24-2_6_2-2	development
> +skvidal	rpms/gconfmm26/devel	gconfmm26-2_10_0-1	development
> +skvidal	rpms/gnome-vfsmm26/devel	gnome-vfsmm26-2_10_0-1	development
> +skvidal	rpms/libglademm24/devel	libglademm24-2_6_0-1	development
> +skvidal	rpms/libgnomecanvasmm26/devel	libgnomecanvasmm26-2_10_0-1	development
> +skvidal	rpms/libgnomemm26/devel	libgnomemm26-2_10_0-1	development
> +skvidal	rpms/libgnomeuimm26/devel	libgnomeuimm26-2_10_0-1	development
> +skvidal	rpms/inkscape/devel	inkscape-0_41-2	development
> +skvidal	rpms/ncftp/devel	ncftp-3_1_9-1	development
> +skvidal	rpms/help2man/devel	help2man-1_35_1-1_fc4	development
> +skvidal	rpms/Coin2/devel	Coin2-2_3_0-7_fc4	development
> +skvidal	rpms/csmash/devel	csmash-0_6_6-7	development
> +skvidal	rpms/d4x/devel	d4x-2_5_0-5	development
> +skvidal	rpms/udftools/devel	udftools-1_0_0b3-3	development
> +skvidal	rpms/gnotime/devel	gnotime-2_2_1-8	development
> +skvidal	rpms/perl-String-ShellQuote/devel	perl-String-ShellQuote-1_03-2	devel
> +skvidal	rpms/ccache/devel	ccache-2_4-3	devel
> +skvidal	rpms/pam_mount/devel	pam_mount-0_9_23-1	devel
> +skvidal	rpms/exim/devel	exim-4_51-1	devel
> +skvidal	rpms/quilt/devel	quilt-0_40-2_fc4	devel
> +skvidal	rpms/notemeister/devel	notemeister-0_1_7-7	devel
> +skvidal	rpms/enigma/devel	enigma-0_91-2	devel
> +skvidal	rpms/python-crypto/devel	python-crypto-2_0-4	devel
> +skvidal	rpms/xemacs/devel	xemacs-21_4_17-3	devel
> +skvidal	rpms/netcdf/devel	netcdf-3_6_0-3_p1_fc4	devel
> +skvidal	rpms/cdo/devel	cdo-0_9_6-2	devel
> +skvidal	rpms/seahorse/devel	seahorse-0_7_7-1	devel
> +corsepiu	rpms/Coin2/devel	Coin2-2_3_0-8_fc4	development
> +=======
>  skvidal	rpms/amarok/FC-3	amarok-1_2_3-1_fc3	fc3
>  skvidal	rpms/js/FC-3	js-1_5-0_rc6a_4_1	fc3
>  toshio	rpms/gnotime/FC-3	gnotime-2_2_1-5_fc3_8_1	FC3
> @@ -27,3 +65,5 @@
>  thl	rpms/alsa-tools/devel	alsa-tools-1_0_8-3	development
>  thl	rpms/revelation/devel	revelation-0_4_3-3	development
>  thl	rpms/wxGTK/devel	wxGTK-2_4_2-12	development
> +>>>>>>> 1.233
> +corsepiu	rpms/Coin2/devel	Coin2-2_3_0-8_fc4	development
> 

Make sure you run a cvs update of 'tobuild' before you run 'make build'

-sv