Message ID | 1490204935-13172-1-git-send-email-rahul.bedarkar@imgtec.com |
---|---|
State | Accepted |
Headers | show |
Hello, On Wed, 22 Mar 2017 23:18:50 +0530, Rahul Bedarkar wrote: > dbus glib bindings are dual licensed under AFLv2.1 or GPLv2+. > Separate licenses using 'or' keyword. > > Signed-off-by: Rahul Bedarkar <rahul.bedarkar@imgtec.com> > --- > package/dbus-glib/dbus-glib.mk | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Patches 1 to 3 applied. On PATCH 3, I've changed MPLv1.1 to MPL-1.1, to match the SPDX license code. As discussed previously, I've dropped patches 4 to 6, since we really want to use the SPDX license codes. Thanks! Thomas
>>>>> "Rahul" == Rahul Bedarkar <rahul.bedarkar@imgtec.com> writes: > dbus glib bindings are dual licensed under AFLv2.1 or GPLv2+. > Separate licenses using 'or' keyword. > Signed-off-by: Rahul Bedarkar <rahul.bedarkar@imgtec.com> Committed to 2017.02.x, thanks.
diff --git a/package/dbus-glib/dbus-glib.mk b/package/dbus-glib/dbus-glib.mk index 4a1e4b4..5a6f5a0 100644 --- a/package/dbus-glib/dbus-glib.mk +++ b/package/dbus-glib/dbus-glib.mk @@ -7,7 +7,7 @@ DBUS_GLIB_VERSION = 0.108 DBUS_GLIB_SITE = http://dbus.freedesktop.org/releases/dbus-glib DBUS_GLIB_INSTALL_STAGING = YES -DBUS_GLIB_LICENSE = AFLv2.1, GPLv2+ +DBUS_GLIB_LICENSE = AFLv2.1 or GPLv2+ DBUS_GLIB_LICENSE_FILES = COPYING DBUS_GLIB_CONF_ENV = \
dbus glib bindings are dual licensed under AFLv2.1 or GPLv2+. Separate licenses using 'or' keyword. Signed-off-by: Rahul Bedarkar <rahul.bedarkar@imgtec.com> --- package/dbus-glib/dbus-glib.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)