Thanks, applied as 6e5f040f189917516df6bbe694f48b0e40129055.

Michael

[sent from post-receive hook]

On Thu, 25 Jun 2026 21:23:39 +0200, Alexander Dahl <[email protected]> wrote:
> When introduced as package to ptxdist, log4cplus 1.1.0 README already
> stated:
> 
> > This library is licensed under the Apache Public License 2.0 and two
> > clause BSD license.  Please read the included LICENSE file for
> > details.
> 
> Actually some files are under Apache-2.0 and other files are under
> BSD-2-Clause, so both apply.
> 
> Fixes: 0ac556f6b55d ("log4cplus: Add new package")
> Signed-off-by: Alexander Dahl <[email protected]>
> Message-Id: <[email protected]>
> Signed-off-by: Michael Olbrich <[email protected]>
> 
> diff --git a/rules/log4cplus.make b/rules/log4cplus.make
> index 75fdd923a0ed..91d0b8039a1d 100644
> --- a/rules/log4cplus.make
> +++ b/rules/log4cplus.make
> @@ -22,7 +22,8 @@ LOG4CPLUS_SUFFIX    := tar.xz
>  LOG4CPLUS_URL                := $(call ptx/mirror, SF, 
> log4cplus/$(LOG4CPLUS).$(LOG4CPLUS_SUFFIX))
>  LOG4CPLUS_SOURCE     := $(SRCDIR)/$(LOG4CPLUS).$(LOG4CPLUS_SUFFIX)
>  LOG4CPLUS_DIR                := $(BUILDDIR)/$(LOG4CPLUS)
> -LOG4CPLUS_LICENSE    := Apache-2.0
> +LOG4CPLUS_LICENSE    := Apache-2.0 AND BSD-2-Clause
> +LOG4CPLUS_LICENSE_FILES      := 
> file://LICENSE;md5=cedaa287ececcb94f9f2880d9c4ef085
>  
>  # 
> ----------------------------------------------------------------------------
>  # Prepare

Reply via email to