[Libreoffice-commits] core.git: 3 commits - drawinglayer/drawinglayer.component drawinglayer/source filter/qa filter/source Library_merged.mk solenv/gbuild

[Rene Engelhard]

Hi,

didn't we at some point decide that only core stuff should be in
libmerged and not stuff which is not in -core or stuff which can be
split out?

On Sun, Apr 14, 2013 at 03:47:15PM -0700, Peter Foley wrote:
> +	$(call gb_Helper_optional,DBCONNECTIVITY,dbase) \
>  	$(call gb_Helper_optional,DBCONNECTIVITY,dbtools) \
>  	$(call gb_Helper_optional,DBCONNECTIVITY,dbu) \
>  	$(call gb_Helper_optional,EXPORT,egi) \
> @@ -44,11 +46,13 @@ gb_EXTRAMERGEDLIBS := \
>  	$(call gb_Helper_optional,EXPORT,eti) \
>  	$(call gb_Helper_optional,EXPORT,exp) \
>  	$(call gb_Helper_optional,DBCONNECTIVITY,file) \
> +	$(call gb_Helper_optional,DBCONNECTIVITY,flat) \
>  	flash \
>  	for \
>  	forui \
>  	fwl \
>  	graphicfilter \
> +	$(if $(filter TRUE,$(SOLAR_JAVA)),hsqldb) \
>  	icd \
>  	icg \
>  	idx \
[...]
> +	$(call gb_Helper_optional,DBCONNECTIVITY,mysql) \
> +	$(if $(filter-out ANDROID IOS,$(OS)),odbc) \
>  	$(if $(filter-out ANDROID IOS,$(OS)),odbcbase) \
>  	odfflatxml \
>  	oox \
> @@ -69,6 +77,7 @@ gb_EXTRAMERGEDLIBS := \
>  	$(call gb_Helper_optional,PYUNO,pyuno) \
>  	$(call gb_Helper_optional,DBCONNECTIVITY,rpt) \
>  	sd \
> +	$(call gb_Helper_optional,DBCONNECTIVITY,sdbc2) \
>  	svgfilter \
>  	swd \
>  	t602filter \

Those get moved into -base for me. (They are database drivers, and yes,
I know those are in core upstream, I consider that a bug)

And thus this commit would break my packaging if I used libmerged...

See http://packages.debian.org/experimental/amd64/libreoffice-base/filelist

Regards,

Rene