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 <eblake@redhat.com>

diff --git a/src/vbox/README b/src/vbox/README
index 22db91128b80b037030f09cf8322eff3a66800fe..6e88ae634c96f0b3cbf5687ff440bd8105863e89 100644 (file)
--- 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 a94d2ec269783aaf8079d5438a4da90097e96fa6..146ec49a15e3f3406090912778145525e9c0f07e 100644 (file)
--- 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 ed8b3dd0b1c4cac218450b17a6d782fd0f5cff05..8db94dfcc6830969c95ebde6378dead3804f1944 100644 (file)
--- 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 1eb27c46c1f5352fd4706f66d2f2c59ebb0716e7..a4034f83eed674b8b05b342db700a4faa7e2f84c 100644 (file)
--- 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 0fbe2e1d55ef0d9b238d4ffa85f36ea21061b443..2ce990ef27ca4388ab10ea5da3d2225042fd1f6e 100644 (file)
--- 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 0b8c838b748b692bce0b48a988113ea969e2ba2d..1a4ed2a3f1e660bf786a3e66951640de8ddb1f0a 100644 (file)
--- 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 7c94b4200202178978e414d129cf3888745248f9..77b2cc59f2267432902843b0672b3096f5e4f103 100644 (file)
--- 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 3674bb9907f628d36061532b8e707f27e613f5e1..dbd8f34009d461a9f9004f4f8f8f44a477547e4a 100644 (file)
--- 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 cd8ada2dcf883e03a77345b97f32eeab4f3abe77..b18b7a8fd2d5c82a2ba5846de95a62fc81ecb066 100644 (file)
--- 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 4c5b289113d32f4ad9bcf9de4eb78d15661af0db..f3579d02e4c9257ee615a13d63586efd53b14bd7 100644 (file)
--- 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 a67302c3d9c47579802a94f0599264d8231c0783..1ef3303bc090a9503a646ce7a861fabfb49a1ab7 100644 (file)
--- 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 <config.h>
 
 /** The API Version */

diff --git a/src/vbox/vbox_V4_0.c b/src/vbox/vbox_V4_0.c
index f976a1a22c4bdbec476ccc9a0c8fd053500c20bf..0c13c6ad1effc0e6835bf05c32da8371f4f274ab 100644 (file)
--- 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 <config.h>
 
 /** The API Version */

diff --git a/src/vbox/vbox_V4_1.c b/src/vbox/vbox_V4_1.c
index 00fab09f5e013a3678d7b4dbc6cf7b12877a7b18..b6d06f141b87d13376be0955e386f01d0b47f3dd 100644 (file)
--- 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 <config.h>
 
 /** The API Version */

diff --git a/src/vbox/vbox_XPCOMCGlue.c b/src/vbox/vbox_XPCOMCGlue.c
index e8b42809dcfff31051112b4633c8d5b7133cb314..9719014a3891a55fc1cf5b8e22a95a2b21221d0f 100644 (file)
--- 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 2a504045fc2b5bb32888b6d5ba7e3f9f3fa092de..3c112a8ffb6057143c25d8fa31f31fc69dc12b1d 100644 (file)
--- 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 5dfaf1c13f0d100b0af8dccb4b416c814502d12b..a68f33db5400d80160935dda8b49990e92d2299a 100644 (file)
--- 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 2eabf1c97733590580cb63eac6e963bcc1f66202..399e4c67f46ccc46d635ab8ac9cae10eaac431ee 100644 (file)
--- 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 eb8ac633f27576c7b1b86402a98027e8aa1dd228..5a5b429bfc9c0158c653fc6907ed5781f21553f3 100644 (file)
--- 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.
  *