--- a/components/desktop/dbus/dbus.license Mon May 02 17:20:40 2016 -0700
+++ b/components/desktop/dbus/dbus.license Mon May 02 18:30:48 2016 -0700
@@ -1,4 +1,7 @@
- GNU GENERAL PUBLIC LICENSE
+Oracle elects to license this component under the terms of the GNU GPL 2
+as permitted under the D-Bus licensing scheme.
+
+ GNU GENERAL PUBLIC LICENSE
Version 2, June 1991
Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
@@ -339,9 +342,36 @@
Public License instead of this License.
-The dbus/dbus-hash.c source file in D-Bus includes code under this license:
+The dbus/dbus-hash.c source file in D-Bus uses this license:
/*
+ * Copyright (C) 2002 Red Hat, Inc.
+ * Copyright (c) 1991-1993 The Regents of the University of California.
+ * Copyright (c) 1994 Sun Microsystems, Inc.
+ *
+ * Hash table implementation based on generic/tclHash.c from the Tcl
+ * source code. The original Tcl license applies to portions of the
+ * code from tclHash.c; the Tcl license follows this standad D-Bus
+ * license information.
+ *
+ * Licensed under the Academic Free License version 2.1
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ */
+/*
* The following copyright applies to code from the Tcl distribution.
*
* Copyright (c) 1991-1993 The Regents of the University of California.