Index: /trunk/.scm-settings =================================================================== --- /trunk/.scm-settings (revision 69504) +++ /trunk/.scm-settings (revision 69505) @@ -63,4 +63,5 @@ --filter-out-files "*/COPYING" --filter-out-files "*/COPYING.LIB" +--filter-out-files "*/COPYING.CDDL" --filter-out-files "*.desktop" Index: /trunk/include/.scm-settings =================================================================== --- /trunk/include/.scm-settings (revision 69504) +++ /trunk/include/.scm-settings (revision 69505) @@ -31,5 +31,5 @@ # TODO: This is using LGPL with Oracle disclaimer. Implement. -/VBox/VBoxKeyboard.h: --external-copyright +/VBox/VBoxKeyboard.h: --external-copyright --lgpl-disclaimer # Some of the graphics stuff is using MIT. Index: /trunk/src/VBox/Devices/Graphics/shaderlib/wine/include/commctrl.rh =================================================================== --- /trunk/src/VBox/Devices/Graphics/shaderlib/wine/include/commctrl.rh (revision 69504) +++ /trunk/src/VBox/Devices/Graphics/shaderlib/wine/include/commctrl.rh (revision 69505) @@ -15,4 +15,13 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +/* + * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice + * other than GPL or LGPL is available it will apply instead, Oracle elects to use only + * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where + * a choice of LGPL license versions is made available with the language indicating + * that LGPLv2 or any later version may be used, or where a choice of which version + * of the LGPL is applied is otherwise unspecified. */ Index: /trunk/src/VBox/Devices/Graphics/shaderlib/wine/include/d3dvec.inl =================================================================== --- /trunk/src/VBox/Devices/Graphics/shaderlib/wine/include/d3dvec.inl (revision 69504) +++ /trunk/src/VBox/Devices/Graphics/shaderlib/wine/include/d3dvec.inl (revision 69505) @@ -15,4 +15,13 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +/* + * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice + * other than GPL or LGPL is available it will apply instead, Oracle elects to use only + * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where + * a choice of LGPL license versions is made available with the language indicating + * that LGPLv2 or any later version may be used, or where a choice of which version + * of the LGPL is applied is otherwise unspecified. */ Index: /trunk/src/VBox/Devices/Graphics/shaderlib/wine/include/d3dx9math.inl =================================================================== --- /trunk/src/VBox/Devices/Graphics/shaderlib/wine/include/d3dx9math.inl (revision 69504) +++ /trunk/src/VBox/Devices/Graphics/shaderlib/wine/include/d3dx9math.inl (revision 69505) @@ -18,4 +18,13 @@ */ +/* + * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice + * other than GPL or LGPL is available it will apply instead, Oracle elects to use only + * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where + * a choice of LGPL license versions is made available with the language indicating + * that LGPLv2 or any later version may be used, or where a choice of which version + * of the LGPL is applied is otherwise unspecified. + */ + #ifndef __D3DX9MATH_INL__ #define __D3DX9MATH_INL__ Index: /trunk/src/VBox/Devices/Graphics/shaderlib/wine/include/dde.rh =================================================================== --- /trunk/src/VBox/Devices/Graphics/shaderlib/wine/include/dde.rh (revision 69504) +++ /trunk/src/VBox/Devices/Graphics/shaderlib/wine/include/dde.rh (revision 69505) @@ -20,4 +20,13 @@ */ +/* + * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice + * other than GPL or LGPL is available it will apply instead, Oracle elects to use only + * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where + * a choice of LGPL license versions is made available with the language indicating + * that LGPLv2 or any later version may be used, or where a choice of which version + * of the LGPL is applied is otherwise unspecified. + */ + #define WM_DDE_INITIATE 0x3E0 #define WM_DDE_TERMINATE 0x3E1 Index: /trunk/src/VBox/Devices/Graphics/shaderlib/wine/include/rmxftmpl.x =================================================================== --- /trunk/src/VBox/Devices/Graphics/shaderlib/wine/include/rmxftmpl.x (revision 69504) +++ /trunk/src/VBox/Devices/Graphics/shaderlib/wine/include/rmxftmpl.x (revision 69505) @@ -16,4 +16,13 @@ // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA +/* + * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice + * other than GPL or LGPL is available it will apply instead, Oracle elects to use only + * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where + * a choice of LGPL license versions is made available with the language indicating + * that LGPLv2 or any later version may be used, or where a choice of which version + * of the LGPL is applied is otherwise unspecified. + */ + template Header { Index: /trunk/src/VBox/Devices/Graphics/shaderlib/wine/include/winnt.rh =================================================================== --- /trunk/src/VBox/Devices/Graphics/shaderlib/wine/include/winnt.rh (revision 69504) +++ /trunk/src/VBox/Devices/Graphics/shaderlib/wine/include/winnt.rh (revision 69505) @@ -17,4 +17,13 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +/* + * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice + * other than GPL or LGPL is available it will apply instead, Oracle elects to use only + * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where + * a choice of LGPL license versions is made available with the language indicating + * that LGPLv2 or any later version may be used, or where a choice of which version + * of the LGPL is applied is otherwise unspecified. */ Index: /trunk/src/VBox/Devices/Graphics/shaderlib/wine/include/winuser.rh =================================================================== --- /trunk/src/VBox/Devices/Graphics/shaderlib/wine/include/winuser.rh (revision 69504) +++ /trunk/src/VBox/Devices/Graphics/shaderlib/wine/include/winuser.rh (revision 69505) @@ -15,4 +15,13 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +/* + * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice + * other than GPL or LGPL is available it will apply instead, Oracle elects to use only + * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where + * a choice of LGPL license versions is made available with the language indicating + * that LGPLv2 or any later version may be used, or where a choice of which version + * of the LGPL is applied is otherwise unspecified. */ Index: /trunk/src/recompiler/Sun/e_powl-amd64.S =================================================================== --- /trunk/src/recompiler/Sun/e_powl-amd64.S (revision 69504) +++ /trunk/src/recompiler/Sun/e_powl-amd64.S (revision 69505) @@ -18,4 +18,13 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ + +/* + * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice + * other than GPL or LGPL is available it will apply instead, Oracle elects to use only + * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where + * a choice of LGPL license versions is made available with the language indicating + * that LGPLv2 or any later version may be used, or where a choice of which version + * of the LGPL is applied is otherwise unspecified. + */ /*#include */ Index: /trunk/src/recompiler/Sun/e_powl-x86.S =================================================================== --- /trunk/src/recompiler/Sun/e_powl-x86.S (revision 69504) +++ /trunk/src/recompiler/Sun/e_powl-x86.S (revision 69505) @@ -19,4 +19,13 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ + +/* + * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice + * other than GPL or LGPL is available it will apply instead, Oracle elects to use only + * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where + * a choice of LGPL license versions is made available with the language indicating + * that LGPLv2 or any later version may be used, or where a choice of which version + * of the LGPL is applied is otherwise unspecified. + */ /*#include */