Attachment 105756 Details for Bug 57272 – COPYING: clarify licensing status of dbus-daemon on Windows

[patch] COPYING: clarify licensing status of dbus-daemon on Windows

0001-COPYING-clarify-licensing-status-of-dbus-daemon-on-W.patch (text/plain), 2.21 KB, created by Simon McVittie on 2014-09-04 16:30:45 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2014-09-04 16:30:45 UTC

Size: 2.21 KB

patch

obsolete

>From 8767fd1414d98cd3fa689bbf263c94ed8aabea10 Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Thu, 4 Sep 2014 17:30:06 +0100
>Subject: [PATCH] COPYING: clarify licensing status of dbus-daemon on Windows
>
>---
> COPYING | 26 ++++++++++++++++++--------
> 1 file changed, 18 insertions(+), 8 deletions(-)
>
>diff --git a/COPYING b/COPYING
>index 8260b10..4ab4a5a 100644
>--- a/COPYING
>+++ b/COPYING
>@@ -1,12 +1,20 @@
>-D-Bus is licensed to you under your choice of the Academic Free
>-License version 2.1, or the GNU General Public License version 2
>-(or, at your option any later version).
>+The majority of D-Bus (including the libdbus shared library) is licensed
>+to you under your choice of the Academic Free License version 2.1, or
>+the GNU General Public License version 2 (or, at your option any later
>+version). Both licenses are included here.
> 
>-Both licenses are included here. Some of the standalone binaries are
>-under the GPL only; in particular, but not limited to,
>-tools/dbus-cleanup-sockets.c and test/decode-gcov.c. Each source code
>-file is marked with the proper copyright information - if you find a
>-file that isn't marked please bring it to our attention.
>+Some of the standalone binaries are under the GPL only; in particular,
>+but not limited to, tools/dbus-cleanup-sockets.c and test/decode-gcov.c.
>+
>+dbus-sysdeps-util-win.c is effectively under the GPL only, because
>+it contains GPL-compatible but non-AFL code derived from kdelibs.
>+This means that when compiled for Windows, additional binaries, notably
>+including dbus-daemon.exe, are under the GPL only.
>+
>+Each source code file is marked with the proper copyright information -
>+if you find a file that isn't marked please bring it to our attention.
>+
>+-----------------------------------------------------------------------
> 
> The Academic Free License
> v. 2.1
>@@ -205,6 +213,8 @@ as is the case for the other licenses.
> without modification). This ensures that the owner of the copyright to the 
> license will control changes. The Apache license contains a copyright notice, 
> but the BSD, MIT and UoI/NCSA licenses do not. 
>+
>+-----------------------------------------------------------------------
> --
> START OF GNU GENERAL PUBLIC LICENSE
> --
>-- 
>2.1.0
>

Actions: View | Splinter Review

Attachments on bug 57272: 105756 | 105761 | 105806 | 105807 | 105809 | 105810 | 105811 | 105812 | 105893 | 105895

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.