Re: pending bonobo-config problems

[Havoc Pennington <hp redhat com>]

"R.I.P. Deaddog" <maddog linuxhall org> writes: 
> Sorry for replying myself. Attached the patch; if nobody objects it I'll
> apply it into bonobo-config CVS soon.

How are you determining what conflicts with bonobo-conf? I don't get
some of the conflicts you seem to be fixing:

>  libbonobo_configincludedir = $(includedir)/bonobo-config
>  libbonobo_configinclude_HEADERS =	 		\
>  	Bonobo_Config.h				\
> +	bonobo-config-bag.h			\
>  	bonobo-config-database.h		\
> -	bonobo-property-frame.h			\
>  	bonobo-property-bag-proxy.h		\
>  	bonobo-config-utils.h			

bonobo-config and bonobo-conf headers are in different subdirs, so
this should not cause conflicts.

> -<oaf_server iid="OAFIID:Bonobo_Moniker_ditem_Factory" type="exe" location="@MONIKER_BINDIR@/bonobo-moniker-ditem">
> +<oaf_server iid="OAFIID:Bonobo_Moniker_ditem_Factory" type="exe"
> location="@MONIKER_BINDIR@/bonobo-moniker-ditem-2">

There's no ditem in bonobo-conf that I see, so this shouldn't need renaming.

Havoc