[FFmpeg-cvslog] r19114 - in trunk: COPYING.GPL COPYING.GPLv2 COPYING.LGPL COPYING.LGPLv2.1 LICENSE

[diego]

Author: diego
Date: Fri Jun  5 11:51:31 2009
New Revision: 19114

Log:
Rename COPYING.GPL --> COPYING.GPLv2 and COPYING.LGPL --> COPYING.LGPLv2.1.
This is in preparation for the (L)GPL license upgrade code that will add
version 3 of these licenses.

Added:
   trunk/COPYING.GPLv2
      - copied unchanged from r18972, trunk/COPYING.GPL
   trunk/COPYING.LGPLv2.1
      - copied unchanged from r18972, trunk/COPYING.LGPL
Deleted:
   trunk/COPYING.GPL
   trunk/COPYING.LGPL
Modified:
   trunk/LICENSE

Modified: trunk/LICENSE
==============================================================================
--- trunk/LICENSE	Fri Jun  5 11:05:17 2009	(r19113)
+++ trunk/LICENSE	Fri Jun  5 11:51:31 2009	(r19114)
@@ -1,10 +1,10 @@
 Most files in FFmpeg are under the GNU Lesser General Public License version 2.1
-or later (LGPL v2.1+). Read the file COPYING.LGPL for details. Some other files
-have a MIT/X11/BSD-style license. In combination the LGPL v2.1+ applies to
+or later (LGPL v2.1+). Read the file COPYING.LGPLv2.1 for details. Some other
+files have MIT/X11/BSD-style licenses. In combination the LGPL v2.1+ applies to
 FFmpeg.
 
 Some optional parts of FFmpeg are licensed under the GNU General Public License
-version 2 or later (GPL v2+). See the file COPYING.GPL for details. None of
+version 2 or later (GPL v2+). See the file COPYING.GPLv2 for details. None of
 these parts are used by default, you have to explicitly pass --enable-gpl to
 configure to activate them. In this case, FFmpeg's license changes to GPL v2+.