From: Eric Blake Date: Wed, 15 May 2013 20:30:23 +0000 (-0600) Subject: maint: refer to correct license file X-Git-Tag: v1.0.6-rc1~108 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=043af8aca44b706ca8f8cd7a22f91ade5638355e;p=thirdparty%2Flibvirt.git maint: refer to correct license file Now that COPYING no longer contains the text of the LGPL, modify the LGPLv2-only files from vbox to call out the correct file. * src/vbox/vbox_CAPI_v2_2.h: Refer to correct file. * src/vbox/vbox_CAPI_v3_0.h: Likewise. * src/vbox/vbox_CAPI_v3_1.h: Likewise. * src/vbox/vbox_CAPI_v3_2.h: Likewise. * src/vbox/vbox_CAPI_v4_0.h: Likewise. * src/vbox/vbox_CAPI_v4_1.h: Likewise. * src/vbox/vbox_V2_2.c: Likewise. * src/vbox/vbox_V3_0.c: Likewise. * src/vbox/vbox_V3_1.c: Likewise. * src/vbox/vbox_XPCOMCGlue.c: Likewise. * src/vbox/vbox_XPCOMCGlue.h: Likewise. * src/vbox/vbox_driver.c: Likewise. * src/vbox/vbox_driver.h: Likewise. * src/vbox/vbox_tmpl.c: Likewise. * src/vbox/vbox_V3_2.c: Copy license notice from vbox_V3_1.c. * src/vbox/vbox_V4_0.c: Likewise. * src/vbox/vbox_V4_1.c: Likewise. * src/vbox/README: Mention copyright issues; this particular file contains no code and therefore does not need LGPL. Signed-off-by: Eric Blake --- diff --git a/src/vbox/README b/src/vbox/README index 22db91128b..6e88ae634c 100644 --- a/src/vbox/README +++ b/src/vbox/README @@ -1,3 +1,15 @@ + Licensing + +Note that much of the vbox in this directory is LGPLv2-only. Thus, it +cannot be linked into any software that also wants to use GPLv3+ code. +This readme file is: + +Copyright (C) 2009, 2013 Red Hat, Inc. + +Copying and distribution of this file, with or without modification, +are permitted in any medium without royalty provided the copyright +notice and this notice are preserved. This file is offered as-is, +without warranty of any kind. Explanation about the how multi-version support for VirtualBox libvirt driver is implemented. diff --git a/src/vbox/vbox_CAPI_v2_2.h b/src/vbox/vbox_CAPI_v2_2.h index a94d2ec269..146ec49a15 100644 --- a/src/vbox/vbox_CAPI_v2_2.h +++ b/src/vbox/vbox_CAPI_v2_2.h @@ -27,7 +27,7 @@ * This file is part of a free software library; you can redistribute * it and/or modify it under the terms of the GNU Lesser General * Public License version 2.1 as published by the Free Software - * Foundation and shipped in the "COPYING" file with this library. + * Foundation and shipped in the "COPYING.LESSER" file with this library. * The library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY of any kind. * diff --git a/src/vbox/vbox_CAPI_v3_0.h b/src/vbox/vbox_CAPI_v3_0.h index ed8b3dd0b1..8db94dfcc6 100644 --- a/src/vbox/vbox_CAPI_v3_0.h +++ b/src/vbox/vbox_CAPI_v3_0.h @@ -27,7 +27,7 @@ * This file is part of a free software library; you can redistribute * it and/or modify it under the terms of the GNU Lesser General * Public License version 2.1 as published by the Free Software - * Foundation and shipped in the "COPYING" file with this library. + * Foundation and shipped in the "COPYING.LESSER" file with this library. * The library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY of any kind. * diff --git a/src/vbox/vbox_CAPI_v3_1.h b/src/vbox/vbox_CAPI_v3_1.h index 1eb27c46c1..a4034f83ee 100644 --- a/src/vbox/vbox_CAPI_v3_1.h +++ b/src/vbox/vbox_CAPI_v3_1.h @@ -27,7 +27,7 @@ * This file is part of a free software library; you can redistribute * it and/or modify it under the terms of the GNU Lesser General * Public License version 2.1 as published by the Free Software - * Foundation and shipped in the "COPYING" file with this library. + * Foundation and shipped in the "COPYING.LESSER" file with this library. * The library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY of any kind. * diff --git a/src/vbox/vbox_CAPI_v3_2.h b/src/vbox/vbox_CAPI_v3_2.h index 0fbe2e1d55..2ce990ef27 100644 --- a/src/vbox/vbox_CAPI_v3_2.h +++ b/src/vbox/vbox_CAPI_v3_2.h @@ -27,7 +27,7 @@ * This file is part of a free software library; you can redistribute * it and/or modify it under the terms of the GNU Lesser General * Public License version 2.1 as published by the Free Software - * Foundation and shipped in the "COPYING" file with this library. + * Foundation and shipped in the "COPYING.LESSER" file with this library. * The library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY of any kind. * diff --git a/src/vbox/vbox_CAPI_v4_0.h b/src/vbox/vbox_CAPI_v4_0.h index 0b8c838b74..1a4ed2a3f1 100644 --- a/src/vbox/vbox_CAPI_v4_0.h +++ b/src/vbox/vbox_CAPI_v4_0.h @@ -27,7 +27,7 @@ * This file is part of a free software library; you can redistribute * it and/or modify it under the terms of the GNU Lesser General * Public License version 2.1 as published by the Free Software - * Foundation and shipped in the "COPYING" file with this library. + * Foundation and shipped in the "COPYING.LESSER" file with this library. * The library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY of any kind. * diff --git a/src/vbox/vbox_CAPI_v4_1.h b/src/vbox/vbox_CAPI_v4_1.h index 7c94b42002..77b2cc59f2 100644 --- a/src/vbox/vbox_CAPI_v4_1.h +++ b/src/vbox/vbox_CAPI_v4_1.h @@ -27,7 +27,7 @@ * This file is part of a free software library; you can redistribute * it and/or modify it under the terms of the GNU Lesser General * Public License version 2.1 as published by the Free Software - * Foundation and shipped in the "COPYING" file with this library. + * Foundation and shipped in the "COPYING.LESSER" file with this library. * The library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY of any kind. * diff --git a/src/vbox/vbox_V2_2.c b/src/vbox/vbox_V2_2.c index 3674bb9907..dbd8f34009 100644 --- a/src/vbox/vbox_V2_2.c +++ b/src/vbox/vbox_V2_2.c @@ -9,7 +9,7 @@ * This file is part of a free software library; you can redistribute * it and/or modify it under the terms of the GNU Lesser General * Public License version 2.1 as published by the Free Software - * Foundation and shipped in the "COPYING" file with this library. + * Foundation and shipped in the "COPYING.LESSER" file with this library. * The library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY of any kind. * diff --git a/src/vbox/vbox_V3_0.c b/src/vbox/vbox_V3_0.c index cd8ada2dcf..b18b7a8fd2 100644 --- a/src/vbox/vbox_V3_0.c +++ b/src/vbox/vbox_V3_0.c @@ -9,7 +9,7 @@ * This file is part of a free software library; you can redistribute * it and/or modify it under the terms of the GNU Lesser General * Public License version 2.1 as published by the Free Software - * Foundation and shipped in the "COPYING" file with this library. + * Foundation and shipped in the "COPYING.LESSER" file with this library. * The library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY of any kind. * diff --git a/src/vbox/vbox_V3_1.c b/src/vbox/vbox_V3_1.c index 4c5b289113..f3579d02e4 100644 --- a/src/vbox/vbox_V3_1.c +++ b/src/vbox/vbox_V3_1.c @@ -9,7 +9,7 @@ * This file is part of a free software library; you can redistribute * it and/or modify it under the terms of the GNU Lesser General * Public License version 2.1 as published by the Free Software - * Foundation and shipped in the "COPYING" file with this library. + * Foundation and shipped in the "COPYING.LESSER" file with this library. * The library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY of any kind. * diff --git a/src/vbox/vbox_V3_2.c b/src/vbox/vbox_V3_2.c index a67302c3d9..1ef3303bc0 100644 --- a/src/vbox/vbox_V3_2.c +++ b/src/vbox/vbox_V3_2.c @@ -3,6 +3,30 @@ * at runtime. */ +/* + * Copyright (C) 2008-2009 Sun Microsystems, Inc. + * + * This file is part of a free software library; you can redistribute + * it and/or modify it under the terms of the GNU Lesser General + * Public License version 2.1 as published by the Free Software + * Foundation and shipped in the "COPYING.LESSER" file with this library. + * The library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY of any kind. + * + * Sun LGPL Disclaimer: For the avoidance of doubt, except that if + * any license choice other than GPL or LGPL is available it will + * apply instead, Sun 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. + * + * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa + * Clara, CA 95054 USA or visit http://www.sun.com if you need + * additional information or have any questions. + */ + #include /** The API Version */ diff --git a/src/vbox/vbox_V4_0.c b/src/vbox/vbox_V4_0.c index f976a1a22c..0c13c6ad1e 100644 --- a/src/vbox/vbox_V4_0.c +++ b/src/vbox/vbox_V4_0.c @@ -3,6 +3,30 @@ * at runtime. */ +/* + * Copyright (C) 2008-2009 Sun Microsystems, Inc. + * + * This file is part of a free software library; you can redistribute + * it and/or modify it under the terms of the GNU Lesser General + * Public License version 2.1 as published by the Free Software + * Foundation and shipped in the "COPYING.LESSER" file with this library. + * The library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY of any kind. + * + * Sun LGPL Disclaimer: For the avoidance of doubt, except that if + * any license choice other than GPL or LGPL is available it will + * apply instead, Sun 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. + * + * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa + * Clara, CA 95054 USA or visit http://www.sun.com if you need + * additional information or have any questions. + */ + #include /** The API Version */ diff --git a/src/vbox/vbox_V4_1.c b/src/vbox/vbox_V4_1.c index 00fab09f5e..b6d06f141b 100644 --- a/src/vbox/vbox_V4_1.c +++ b/src/vbox/vbox_V4_1.c @@ -3,6 +3,30 @@ * at runtime. */ +/* + * Copyright (C) 2008-2009 Sun Microsystems, Inc. + * + * This file is part of a free software library; you can redistribute + * it and/or modify it under the terms of the GNU Lesser General + * Public License version 2.1 as published by the Free Software + * Foundation and shipped in the "COPYING.LESSER" file with this library. + * The library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY of any kind. + * + * Sun LGPL Disclaimer: For the avoidance of doubt, except that if + * any license choice other than GPL or LGPL is available it will + * apply instead, Sun 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. + * + * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa + * Clara, CA 95054 USA or visit http://www.sun.com if you need + * additional information or have any questions. + */ + #include /** The API Version */ diff --git a/src/vbox/vbox_XPCOMCGlue.c b/src/vbox/vbox_XPCOMCGlue.c index e8b42809dc..9719014a38 100644 --- a/src/vbox/vbox_XPCOMCGlue.c +++ b/src/vbox/vbox_XPCOMCGlue.c @@ -8,7 +8,7 @@ * This file is part of a free software library; you can redistribute * it and/or modify it under the terms of the GNU Lesser General * Public License version 2.1 as published by the Free Software - * Foundation and shipped in the "COPYING" file with this library. + * Foundation and shipped in the "COPYING.LESSER" file with this library. * The library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY of any kind. * diff --git a/src/vbox/vbox_XPCOMCGlue.h b/src/vbox/vbox_XPCOMCGlue.h index 2a504045fc..3c112a8ffb 100644 --- a/src/vbox/vbox_XPCOMCGlue.h +++ b/src/vbox/vbox_XPCOMCGlue.h @@ -8,7 +8,7 @@ * This file is part of a free software library; you can redistribute * it and/or modify it under the terms of the GNU Lesser General * Public License version 2.1 as published by the Free Software - * Foundation and shipped in the "COPYING" file with this library. + * Foundation and shipped in the "COPYING.LESSER" file with this library. * The library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY of any kind. * diff --git a/src/vbox/vbox_driver.c b/src/vbox/vbox_driver.c index 5dfaf1c13f..a68f33db54 100644 --- a/src/vbox/vbox_driver.c +++ b/src/vbox/vbox_driver.c @@ -9,7 +9,7 @@ * This file is part of a free software library; you can redistribute * it and/or modify it under the terms of the GNU Lesser General * Public License version 2.1 as published by the Free Software - * Foundation and shipped in the "COPYING" file with this library. + * Foundation and shipped in the "COPYING.LESSER" file with this library. * The library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY of any kind. * diff --git a/src/vbox/vbox_driver.h b/src/vbox/vbox_driver.h index 2eabf1c977..399e4c67f4 100644 --- a/src/vbox/vbox_driver.h +++ b/src/vbox/vbox_driver.h @@ -8,7 +8,7 @@ * This file is part of a free software library; you can redistribute * it and/or modify it under the terms of the GNU Lesser General * Public License version 2.1 as published by the Free Software - * Foundation and shipped in the "COPYING" file with this library. + * Foundation and shipped in the "COPYING.LESSER" file with this library. * The library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY of any kind. * diff --git a/src/vbox/vbox_tmpl.c b/src/vbox/vbox_tmpl.c index eb8ac633f2..5a5b429bfc 100644 --- a/src/vbox/vbox_tmpl.c +++ b/src/vbox/vbox_tmpl.c @@ -14,7 +14,7 @@ * This file is part of a free software library; you can redistribute * it and/or modify it under the terms of the GNU Lesser General * Public License version 2.1 as published by the Free Software - * Foundation and shipped in the "COPYING" file with this library. + * Foundation and shipped in the "COPYING.LESSER" file with this library. * The library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY of any kind. *